diff options
Diffstat (limited to 'src/templates')
| -rw-r--r-- | src/templates/akraino/base.html | 24 | ||||
| -rw-r--r-- | src/templates/akraino/dashboard/landing.html | 23 | ||||
| -rw-r--r-- | src/templates/base/base.html | 2 | ||||
| -rw-r--r-- | src/templates/base/booking/quick_deploy.html | 33 | ||||
| -rw-r--r-- | src/templates/lfedge/base.html | 45 | ||||
| -rw-r--r-- | src/templates/lfedge/booking/booking_table.html (renamed from src/templates/akraino/booking/booking_table.html) | 0 | ||||
| -rw-r--r-- | src/templates/lfedge/booking/quick_deploy.html (renamed from src/templates/akraino/booking/quick_deploy.html) | 2 | ||||
| -rw-r--r-- | src/templates/lfedge/dashboard/landing.html | 23 | ||||
| -rw-r--r-- | src/templates/lfedge/layout.html (renamed from src/templates/akraino/layout.html) | 2 |
9 files changed, 79 insertions, 75 deletions
diff --git a/src/templates/akraino/base.html b/src/templates/akraino/base.html deleted file mode 100644 index 1368476..0000000 --- a/src/templates/akraino/base.html +++ /dev/null @@ -1,24 +0,0 @@ -{% 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/dashboard/landing.html b/src/templates/akraino/dashboard/landing.html deleted file mode 100644 index 5533469..0000000 --- a/src/templates/akraino/dashboard/landing.html +++ /dev/null @@ -1,23 +0,0 @@ -{% 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/base/base.html b/src/templates/base/base.html index 3ecad1a..394ddec 100644 --- a/src/templates/base/base.html +++ b/src/templates/base/base.html @@ -36,6 +36,7 @@ <div class="col-6 col-sm-2 order-3 d-flex"> <ul class="nav mx-auto mr-sm-0"> <li class="dropdown ml-auto"> + {% block userDropDownText %} <a class="nav-link p-0 text-dark p-2" data-toggle="dropdown" href="#"> {% if request.user.username %} {{request.user.username}} @@ -44,6 +45,7 @@ {% endif %} <i class="fas fa-caret-down rotate"></i> </a> + {% endblock userDropDownText %} <div class="dropdown-menu dropdown-menu-right"> {% if LFID %} {% if user.is_authenticated %} diff --git a/src/templates/base/booking/quick_deploy.html b/src/templates/base/booking/quick_deploy.html index c954073..8c8b1df 100644 --- a/src/templates/base/booking/quick_deploy.html +++ b/src/templates/base/booking/quick_deploy.html @@ -18,7 +18,7 @@ </div> </div> <div class="row justify-content-center"> - <div class="col-12 col-lg-3 my-2"> + <div class="col-12 col-lg-4 my-2"> <div class="col border rounded py-2 h-100"> {% bootstrap_field form.purpose %} {% bootstrap_field form.project %} @@ -31,28 +31,19 @@ </div> </div> {% block collab %} - <div class="col-12 col-lg-3 my-2"> + <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 %} - <div class="col-12 col-lg-3 my-2"> + <div class="col-12 col-lg-4 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> - {% bootstrap_field form.installer %} - {% 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> @@ -85,6 +76,10 @@ } } + $(document).ready(function() { + $('.has-popover').popover({'trigger':'hover'}); + }); + var sup_image_dict = {{image_filter | safe}}; var sup_installer_dict = {{installer_filter | safe}}; var sup_scenario_dict = {{scenario_filter | safe}}; @@ -108,25 +103,11 @@ } imageFilter(); - $('#id_installer').children().hide(); - $('#id_scenario').children().hide(); - Array.from(document.getElementsByClassName("grid-item-select-btn")).forEach(function (element) { element.addEventListener('click', imageFilter); }); - function installerHider() { - dropFilter("id_installer", sup_installer_dict, "id_image"); - scenarioHider(); - } - document.getElementById('id_image').addEventListener('change', installerHider); - - function scenarioHider() { - dropFilter("id_scenario", sup_scenario_dict, "id_installer"); - } - document.getElementById('id_installer').addEventListener('change', scenarioHider); - function dropFilter(target, target_filter, master) { var dropdown = document.getElementById(target); diff --git a/src/templates/lfedge/base.html b/src/templates/lfedge/base.html new file mode 100644 index 0000000..64c05a4 --- /dev/null +++ b/src/templates/lfedge/base.html @@ -0,0 +1,45 @@ +{% extends "base/base.html" %} +{% load staticfiles %} +{% block bgColor %} +<style> +.LFEdge { + background: #0049b0; + margin-left: -25px; +} + +.wtext { + font-size: 18px; + color: #FFFFFF; +} + +.wtext:hover { + color: #FFFFFF; + text-decoration: none; +} +</style> +<nav class="navbar navbar-light LFEdge navbar-fixed-top border-bottom py-0 mb-0" role="navigation"> +{% endblock bgColor %} + +{% block logo %} +<div class="barClamp col-12 col-sm order-1 order-sm-2 text-center text-lg-left"> + <a href="https://www.lfedge.org/" class="navbar-brand"> + <img src="{% static "img/lfedge-logo.png" %}"> + </a> + + <a class="wtext d-none d-lg-inline" href={% url 'dashboard:index' %}> + Dashboard + </a> +</div> +{% endblock logo %} +{% block dropDown %} +{% endblock dropDown %} +{% block userDropDownText %} +<a class="nav-link p-0 wtext p-2" data-toggle="dropdown" href="#"> + {% if request.user.username %} + {{request.user.username}} + {% else %} + <i class="fas fa-user"></i> + {% endif %} + <i class="fas fa-caret-down rotate"></i> +</a> +{% endblock userDropDownText %} diff --git a/src/templates/akraino/booking/booking_table.html b/src/templates/lfedge/booking/booking_table.html index 4afb4d2..4afb4d2 100644 --- a/src/templates/akraino/booking/booking_table.html +++ b/src/templates/lfedge/booking/booking_table.html diff --git a/src/templates/akraino/booking/quick_deploy.html b/src/templates/lfedge/booking/quick_deploy.html index c3e519f..dac3815 100644 --- a/src/templates/akraino/booking/quick_deploy.html +++ b/src/templates/lfedge/booking/quick_deploy.html @@ -6,7 +6,7 @@ Please select a host type you wish to book. Only available types are shown. More information can be found here: - <a href="https://wiki.akraino.org/display/AK/Shared+Community+Lab">Akraino Wiki</a>. + <a href="https://wiki.lfedge.org/display/LE/Shared+Community+Lab">LF Edge Wiki</a>. If something isn't working right, let us know <a href="mailto:{{contact_email}}"> here! </a> </p> {% endblock form-text %} diff --git a/src/templates/lfedge/dashboard/landing.html b/src/templates/lfedge/dashboard/landing.html new file mode 100644 index 0000000..9a776dc --- /dev/null +++ b/src/templates/lfedge/dashboard/landing.html @@ -0,0 +1,23 @@ +{% extends "base/dashboard/landing.html" %} +{% block about_us %} + <p>The Shared Community Lab at the IOL aims to help development and testing of LF Edge projects by hosting hardware and providing access to the community.</p> + <p>To get started, you can request access to a pod at the right.</p> +{% endblock about_us %} + +{% block btnGrp %} +<style> +.btnLFEdge { + color: #fff; + background-color: #0049b0; +} +.btnLFEdge:hover{ + color: #fff; + background-color: #001776; +} +</style> +<p>To get started, book a pod below:</p> +<a class="btn btnLFEdge 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/lfedge/layout.html index d30ddb6..217060c 100644 --- a/src/templates/akraino/layout.html +++ b/src/templates/lfedge/layout.html @@ -1,5 +1,5 @@ {% extends "base/layout.html" %} {% block head-title %} -<title>Akraino Dashboard</title> +<title>LF Edge Dashboard</title> {% endblock head-title %} |