summaryrefslogtreecommitdiffstats
path: root/src/templates
diff options
context:
space:
mode:
Diffstat (limited to 'src/templates')
-rw-r--r--src/templates/akraino/base.html24
-rw-r--r--src/templates/akraino/booking/quick_deploy.html11
-rw-r--r--src/templates/akraino/dashboard/landing.html22
-rw-r--r--src/templates/akraino/layout.html5
-rw-r--r--src/templates/base/base.html11
-rw-r--r--src/templates/base/booking/booking_list.html8
-rw-r--r--src/templates/base/booking/quick_deploy.html6
-rw-r--r--src/templates/base/booking/stats.html2
-rw-r--r--src/templates/base/config_bundle/steps/table_formset.html8
-rw-r--r--src/templates/base/dashboard/landing.html7
-rw-r--r--src/templates/base/dashboard/table.html8
-rw-r--r--src/templates/base/layout.html20
-rw-r--r--src/templates/base/resource/steps/pod_definition.html3
-rw-r--r--src/templates/base/workflow/viewport-base.html5
-rw-r--r--src/templates/laas/base.html13
-rw-r--r--src/templates/laas/layout.html5
16 files changed, 124 insertions, 34 deletions
diff --git a/src/templates/akraino/base.html b/src/templates/akraino/base.html
new file mode 100644
index 0000000..1368476
--- /dev/null
+++ b/src/templates/akraino/base.html
@@ -0,0 +1,24 @@
+{% extends "base/base.html" %}
+{% load staticfiles %}
+{% block bgColor %}
+<style>
+.bgAkr {
+ background: #d9c2f2;
+}
+</style>
+<nav class="navbar navbar-light bgAkr navbar-fixed-top border-bottom py-0 mb-0" role="navigation">
+{% endblock bgColor %}
+
+{% block logo %}
+<div class="col-12 col-sm order-1 order-sm-2 text-center text-lg-left">
+ <a href="https://www.lfedge.org/projects/akraino/" class="navbar-brand">
+ <img src="{% static "img/akraino_logo.logo" %}">
+ </a>
+
+ <a class="navbar-brand d-none d-lg-inline" href={% url 'dashboard:index' %}>
+ Akraino Dashboard
+ </a>
+</div>
+{% endblock logo %}
+{% block dropDown %}
+{% endblock dropDown %}
diff --git a/src/templates/akraino/booking/quick_deploy.html b/src/templates/akraino/booking/quick_deploy.html
new file mode 100644
index 0000000..56a4791
--- /dev/null
+++ b/src/templates/akraino/booking/quick_deploy.html
@@ -0,0 +1,11 @@
+{% extends "base/booking/quick_deploy.html" %}
+{% block opnfv %}
+{% endblock opnfv %}
+{% block collab %}
+<div class="col-12 col-lg-4 my-2">
+ <div class="col border rounded py-2 h-100">
+ <label>Collaborators</label>
+ {{ form.users }}
+ </div>
+</div>
+{% endblock collab %}
diff --git a/src/templates/akraino/dashboard/landing.html b/src/templates/akraino/dashboard/landing.html
new file mode 100644
index 0000000..d7f434b
--- /dev/null
+++ b/src/templates/akraino/dashboard/landing.html
@@ -0,0 +1,22 @@
+{% extends "base/dashboard/landing.html" %}
+{% block about_us %}
+ <p>The Shared Community Lab at the IOL aims to help development and testing of LFN projects by hosting hardware and providing access to the community.</p>
+ <p>To get started, you can request access to a server at the right.</p>
+{% endblock about_us %}
+
+{% block btnGrp %}
+<style>
+.btnAkr {
+ color: #fff;
+ background-color: #39c0c0;
+}
+.btnAkr:hover{
+ color: #fff;
+ background-color: #259a9a;
+}
+</style>
+<p>To get started, book a pod below:</p>
+<a class="btn btnAkr btn-lg d-flex flex-column justify-content-center align-content-center border text-white p-4" href="/booking/quick/">Book a Pod</a>
+{% endblock btnGrp %}
+{% block returningUsers %}
+{% endblock returningUsers %}
diff --git a/src/templates/akraino/layout.html b/src/templates/akraino/layout.html
new file mode 100644
index 0000000..d30ddb6
--- /dev/null
+++ b/src/templates/akraino/layout.html
@@ -0,0 +1,5 @@
+{% extends "base/layout.html" %}
+
+{% block head-title %}
+<title>Akraino Dashboard</title>
+{% endblock head-title %}
diff --git a/src/templates/base/base.html b/src/templates/base/base.html
index 4011739..663741a 100644
--- a/src/templates/base/base.html
+++ b/src/templates/base/base.html
@@ -12,17 +12,19 @@
{% block basecontent %}
<div id="wrapper" class="d-flex flex-column">
<!-- Navigation -->
+ {% block bgColor %}
<nav class="navbar navbar-light bg-light navbar-fixed-top border-bottom py-0 mb-0" role="navigation">
+ {% endblock bgColor %}
<div class="container-fluid pb-2 pb-sm-0">
<!-- Logo -->
+ {% block logo %}
<div class="col-12 col-sm order-1 order-sm-2 text-center text-lg-left">
- <a href="https://www.opnfv.org/" class="navbar-brand">
- <img src="{% static "img/opnfv-logo.png" %}">
- </a>
+ <h2>Logo Here</h2>
<a class="navbar-brand d-none d-lg-inline" href={% url 'dashboard:index' %}>
Laas Dashboard
</a>
</div>
+ {% endblock logo %}
<!-- Sidebar button -->
<div class="col-6 col-sm-2 d-flex order-1 order-lg-3 d-lg-none">
<button class="btn border mx-auto" type="button" data-toggle="collapse" data-target="#sidebar"
@@ -75,7 +77,7 @@
<a href="/" class="list-group-item list-group-item-action">
Home
</a>
- {% csrf_token %}
+ {% block dropDown %}
<a class="list-group-item list-group-item-action" data-toggle="collapse"
href="#createList" role="button">
Create <i class="fas fa-angle-down rotate"></i>
@@ -100,6 +102,7 @@
Configure OPNFV
</a>
</div>
+ {% endblock dropDown %}
<a href="{% url 'resource:hosts' %}" class="list-group-item list-group-item-action">
Hosts
</a>
diff --git a/src/templates/base/booking/booking_list.html b/src/templates/base/booking/booking_list.html
index 591ecc9..523c84b 100644
--- a/src/templates/base/booking/booking_list.html
+++ b/src/templates/base/booking/booking_list.html
@@ -5,11 +5,11 @@
{% block extrahead %}
{{ block.super }}
<!-- DataTables CSS -->
- <link href="{% static "bower_components/datatables.net-bs4/css/dataTables.bootstrap4.min.css" %}"
+ <link href="{% static "node_modules/datatables.net-bs4/css/dataTables.bootstrap4.min.css" %}"
rel="stylesheet">
<!-- DataTables Responsive CSS -->
- <link href="{% static "bower_components/datatables.net-responsive-bs4/css/responsive.bootstrap4.min.css" %}"
+ <link href="{% static "node_modules/datatables.net-responsive-bs4/css/responsive.bootstrap4.min.css" %}"
rel="stylesheet">
{% endblock extrahead %}
@@ -31,8 +31,8 @@
{% block extrajs %}
<!-- DataTables JavaScript -->
- <script src={% static "bower_components/datatables.net/js/jquery.dataTables.min.js" %}></script>
- <script src={% static "bower_components/datatables.net-bs4/js/dataTables.bootstrap4.min.js" %}></script>
+ <script src={% static "node_modules/datatables.net/js/jquery.dataTables.min.js" %}></script>
+ <script src={% static "node_modules/datatables.net-bs4/js/dataTables.bootstrap4.min.js" %}></script>
<script type="text/javascript">
$(document).ready(function () {
diff --git a/src/templates/base/booking/quick_deploy.html b/src/templates/base/booking/quick_deploy.html
index 8570f25..42148c8 100644
--- a/src/templates/base/booking/quick_deploy.html
+++ b/src/templates/base/booking/quick_deploy.html
@@ -12,7 +12,7 @@
{% bootstrap_field form.filter_field show_label=False %}
</div>
</div>
- <div class="row">
+ <div class="row justify-content-center">
<div class="col-12 col-lg-3 my-2">
<div class="col border rounded py-2 h-100">
{% bootstrap_field form.purpose %}
@@ -25,18 +25,21 @@
</script>
</div>
</div>
+ {% block collab %}
<div class="col-12 col-lg-3 my-2">
<div class="col border rounded py-2 h-100">
<label>Collaborators</label>
{{ form.users }}
</div>
</div>
+ {% endblock collab %}
<div class="col-12 col-lg-3 my-2">
<div class="col border rounded py-2 h-100">
{% bootstrap_field form.hostname %}
{% bootstrap_field form.image %}
</div>
</div>
+ {% block opnfv %}
<div class="col-12 col-lg-3 my-2">
<div class="col border rounded py-2 h-100">
<strong>OPNFV: (Optional)</strong>
@@ -44,6 +47,7 @@
{% bootstrap_field form.scenario %}
</div>
</div>
+ {% endblock opnfv %}
<div class="col-12 d-flex mt-2 justify-content-end">
<button id="quick_booking_confirm" onclick="submit_form();" type="button" class="btn btn-success">Confirm</button>
</div>
diff --git a/src/templates/base/booking/stats.html b/src/templates/base/booking/stats.html
index 94239f9..a78f793 100644
--- a/src/templates/base/booking/stats.html
+++ b/src/templates/base/booking/stats.html
@@ -3,7 +3,7 @@
{% block extrahead %}
{{ block.super }}
-<script src="https://cdn.plot.ly/plotly-latest.min.js"></script>
+<script src="{% static "node_modules/plotly.js-dist/plotly.js" %}"></script>
<script>
function drawGraph(data, graph_id, graph_title){
var container = document.getElementById(graph_id);
diff --git a/src/templates/base/config_bundle/steps/table_formset.html b/src/templates/base/config_bundle/steps/table_formset.html
index d25621e..3bee6af 100644
--- a/src/templates/base/config_bundle/steps/table_formset.html
+++ b/src/templates/base/config_bundle/steps/table_formset.html
@@ -5,11 +5,11 @@
{% block extrahead %}
<!-- DataTables CSS -->
- <link href="{% static "bower_components/datatables.net-bs4/css/dataTables.bootstrap4.min.css" %}"
+ <link href="{% static "node_modules/datatables.net-bs4/css/dataTables.bootstrap4.min.css" %}"
rel="stylesheet">
<!-- DataTables Responsive CSS -->
- <link href="{% static "bower_components/datatables.net-responsive-bs4/css/responsive.bootstrap4.min.css" %}"
+ <link href="{% static "node_modules/datatables.net-responsive-bs4/css/responsive.bootstrap4.min.css" %}"
rel="stylesheet">
{% endblock extrahead %}
@@ -43,8 +43,8 @@
{{ block.super }}
<!-- DataTables JavaScript -->
- <script src={% static "bower_components/datatables.net/js/jquery.dataTables.min.js" %}></script>
- <script src={% static "bower_components/datatables.net-bs4/js/dataTables.bootstrap4.min.js" %}></script>
+ <script src={% static "node_modules/datatables.net/js/jquery.dataTables.min.js" %}></script>
+ <script src={% static "node_modules/datatables.net-bs4/js/dataTables.bootstrap4.min.js" %}></script>
<script src={% static "js/dataTables-sort.js" %}></script>
diff --git a/src/templates/base/dashboard/landing.html b/src/templates/base/dashboard/landing.html
index 9e45b09..dd09dc4 100644
--- a/src/templates/base/dashboard/landing.html
+++ b/src/templates/base/dashboard/landing.html
@@ -32,9 +32,9 @@
To get started, please log in with your <a href="/accounts/login">Linux Foundation Jira account</a>
</h4>
{% else %}
+ {% block btnGrp %}
<p>To get started, book a server below:</p>
- <a class="btn btn-primary btn-lg d-flex flex-column justify-content-center align-content-center border text-white p-4"
- href="/booking/quick/">
+ <a class="btn btn-primary btn-lg d-flex flex-column justify-content-center align-content-center border text-white p-4" href="/booking/quick/">
Book a Server
</a>
<p class="mt-4">PTLs can use our advanced options to book multi-node pods. If you are a PTL, you may use the options
@@ -45,11 +45,13 @@
<button class="btn btn-primary" onclick="create_workflow(1)">Design a Pod</button>
<button class="btn btn-primary" onclick="create_workflow(2)">Configure a Pod</button>
</div>
+ {% endblock btnGrp %}
{% endif %}
</div>
<!-- Returning users -->
{% if not request.user.is_anonymous %}
+ {% block returningUsers %}
<div class="col-12 col-lg-6 offset-lg-6 mb-4 mt-lg-4">
<h2 class="ht-4 border-bottom">Returning Users</h2>
<p>If you're a returning user, some of the following options may be of interest:</p>
@@ -65,6 +67,7 @@
{% endif %}
</div>
</div>
+ {% endblock returningUsers %}
{% endif %}
</div>
diff --git a/src/templates/base/dashboard/table.html b/src/templates/base/dashboard/table.html
index 2b4628e..c55a011 100644
--- a/src/templates/base/dashboard/table.html
+++ b/src/templates/base/dashboard/table.html
@@ -4,11 +4,11 @@
{% block extrahead %}
{{ block.super }}
<!-- DataTables CSS -->
- <link href="{% static "bower_components/datatables.net-bs4/css/dataTables.bootstrap4.min.css" %}"
+ <link href="{% static "node_modules/datatables.net-bs4/css/dataTables.bootstrap4.min.css" %}"
rel="stylesheet">
<!-- DataTables Responsive CSS -->
- <link href="{% static "bower_components/datatables.net-responsive-bs4/css/responsive.bootstrap4.min.css" %}"
+ <link href="{% static "node_modules/datatables.net-responsive-bs4/css/responsive.bootstrap4.min.css" %}"
rel="stylesheet">
{% endblock extrahead %}
@@ -29,8 +29,8 @@
{% block extrajs %}
<!-- DataTables JavaScript -->
- <script src={% static "bower_components/datatables.net/js/jquery.dataTables.min.js" %}></script>
- <script src={% static "bower_components/datatables.net-bs4/js/dataTables.bootstrap4.min.js" %}></script>
+ <script src={% static "node_modules/datatables.net/js/jquery.dataTables.min.js" %}></script>
+ <script src={% static "node_modules/datatables.net-bs4/js/dataTables.bootstrap4.min.js" %}></script>
<script src={% static "js/dataTables-sort.js" %}></script>
diff --git a/src/templates/base/layout.html b/src/templates/base/layout.html
index eac0ac3..edf9b6b 100644
--- a/src/templates/base/layout.html
+++ b/src/templates/base/layout.html
@@ -10,22 +10,25 @@
<meta name="description" content="">
<meta name="author" content="">
+ {% block head-title %}
<title>OPNFV Laas {{ title }}</title>
+ {% endblock head-title %}
<!-- Bootstrap Core CSS -->
- <link href="{% static "bower_components/bootstrap/dist/css/bootstrap.min.css" %}"
+ <link href="{% static "node_modules/bootstrap/dist/css/bootstrap.min.css" %}"
rel="stylesheet">
<!-- Custom Fonts -->
- <link href="{% static "bower_components/Font-Awesome/css/all.min.css" %}"
+ <link href="{% static "node_modules/@fortawesome/fontawesome-free/css/all.min.css" %}"
rel="stylesheet" type="text/css">
<link href="{% static "css/base.css" %}" rel="stylesheet">
<!-- Favicon -->
<link rel="shortcut icon" href="{% static 'favicon.ico' %}">
- <script src="https://code.jquery.com/jquery-2.2.4.min.js"
- integrity="sha256-BbhdlvQf/xTY9gja0Dq3HiwQF8LaCRTXxZKRutelT44=" crossorigin="anonymous"></script>
+
+ <!-- jQuery -->
+ <script src="{% static "node_modules/jquery/dist/jquery.min.js" %}"></script>
{% block extrahead %}
{% endblock extrahead %}
@@ -36,7 +39,6 @@
<script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
<script src="https://oss.maxcdn.com/libs/respond.js/1.4.2/respond.min.js"></script>
<![endif]-->
-
</head>
{% block extrastyle %}
@@ -46,14 +48,10 @@
{% block basecontent %}
{% endblock basecontent %}
-{#<!-- jQuery -->#}
-{#<script src="{% static "bower_components/jquery/dist/jquery.min.js" %}"></script>#}
-{#<script src="{% static "bower_components/jquery-migrate/jquery-migrate.min.js" %}"></script>#}
<!-- Popper.js -->
-<script src="{% static "bower_components/popper.js/dist/umd/popper.min.js" %}"></script>
-{#<script src="https://code.jquery.com/jquery-2.2.0.min.js"></script>#}
+<script src="{% static "node_modules/popper.js/dist/umd/popper.min.js" %}"></script>
<!-- Bootstrap Core JavaScript -->
-<script src="{% static "bower_components/bootstrap/dist/js/bootstrap.min.js" %}"></script>
+<script src="{% static "node_modules/bootstrap/dist/js/bootstrap.min.js" %}"></script>
{% block extrajs %}
{% endblock extrajs %}
diff --git a/src/templates/base/resource/steps/pod_definition.html b/src/templates/base/resource/steps/pod_definition.html
index a6810de..4b8b296 100644
--- a/src/templates/base/resource/steps/pod_definition.html
+++ b/src/templates/base/resource/steps/pod_definition.html
@@ -1,6 +1,5 @@
{% extends "workflow/viewport-element.html" %}
{% block extrahead %}
-<link href="/static/css/graph_common.css" rel="stylesheet">
<title>Pod Definition Prototype</title>
<!-- Loads and initializes the library -->
@@ -15,7 +14,7 @@
<div class="h-100 w-100 position-absolute overflow-hidden">
<div class="row h-100">
<div id="graphParent" class="col h-100">
- <div class="d-flex bg-light border">
+ <div class="d-flex bg-light border align-items-center">
<div id="toolbarContainer"></div>
<div class="ml-4 text-info">Hold right click to drag</div>
</div>
diff --git a/src/templates/base/workflow/viewport-base.html b/src/templates/base/workflow/viewport-base.html
index bb13ab7..d08145c 100644
--- a/src/templates/base/workflow/viewport-base.html
+++ b/src/templates/base/workflow/viewport-base.html
@@ -62,9 +62,12 @@
success: update_page
});
});
+
+ // global variable required for mxgraph to load its css and images
+ mxBasePath = '{% static "node_modules/mxgraph/javascript/src" %}';
</script>
<!-- lazy load scripts -->
-<script type="text/javascript" src="/static/js/mxClient.min.js" ></script>
+<script type="text/javascript" src="{% static "node_modules/mxgraph/javascript/mxClient.js" %}" ></script>
<!-- end lazy load scripts -->
<div class="d-none" id="workflow_pop_form_div">
<form id="workflow_pop_form" action="/workflow/finish/" method="post">
diff --git a/src/templates/laas/base.html b/src/templates/laas/base.html
new file mode 100644
index 0000000..5e9e9db
--- /dev/null
+++ b/src/templates/laas/base.html
@@ -0,0 +1,13 @@
+{% extends "base/base.html" %}
+{% load staticfiles %}
+{% block logo %}
+<div class="col-12 col-sm order-1 order-sm-2 text-center text-lg-left">
+ <a href="https://www.opnfv.org/" class="navbar-brand">
+ <img src="{% static "img/opnfv-logo.png" %}">
+ </a>
+ <a class="navbar-brand d-none d-lg-inline" href={% url 'dashboard:index' %}>
+ Laas Dashboard
+ </a>
+</div>
+{% endblock logo %}
+
diff --git a/src/templates/laas/layout.html b/src/templates/laas/layout.html
new file mode 100644
index 0000000..f9b1d99
--- /dev/null
+++ b/src/templates/laas/layout.html
@@ -0,0 +1,5 @@
+{% extends "base/layout.html" %}
+
+{% block head-title %}
+<title>LaaS Dashboard</title>
+{% endblock head-title %}