aboutsummaryrefslogtreecommitdiffstats
path: root/src/templates/base
diff options
context:
space:
mode:
Diffstat (limited to 'src/templates/base')
-rw-r--r--src/templates/base/base.html2
-rw-r--r--src/templates/base/booking/quick_deploy.html33
2 files changed, 9 insertions, 26 deletions
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);