diff options
Diffstat (limited to 'dashboard/src/templates')
8 files changed, 137 insertions, 126 deletions
diff --git a/dashboard/src/templates/account/booking_list.html b/dashboard/src/templates/account/booking_list.html index c7c5e00..9c6f3db 100644 --- a/dashboard/src/templates/account/booking_list.html +++ b/dashboard/src/templates/account/booking_list.html @@ -1,52 +1,41 @@ {% extends "base.html" %} {% block content %} -<script> -function edit_booking(pk){ - var csrf = $('input[name="csrfmiddlewaretoken"]').val(); - $.ajax({ - type: "POST", - url: "/", - data: { "target": pk, "create": 0, "csrfmiddlewaretoken": csrf}, - beforeSend: function(request) { - request.setRequestHeader("X-CSFRToken", csrf); - } - }).done(function(){ - window.location.replace("/wf/"); - }).fail(function(){}) -} -</script> <h2>Bookings I Own</h2> + <div class="card_container"> {% for booking in bookings %} <div class="detail_card"> - <ul> - <li>id: {{booking.id}}</li> - <li>lab: {{booking.resource.template.lab.lab_user.username}}</li> - <li>resource: {{booking.resource.template.name}}</li> - <li>start: {{booking.start}}</li> - <li>end: {{booking.end}}</li> - <li>purpose: {{booking.purpose}}</li> - </ul> - <div class="detail_btn_group"> - <button style="display:none" class="btn btn-primary" onclick="edit_booking({{booking.id}});">Edit</button> - <button class="btn btn-primary" onclick="location.href='/booking/detail/{{booking.id}}/';">Details</button> + <div> + <h3>Booking {{booking.id}}</h3> + <ul class="list-group"> + <li class="list-group-item">id: {{booking.id}}</li> + <li class="list-group-item">lab: {{booking.resource.template.lab.lab_user.username}}</li> + <li class="list-group-item">resource: {{booking.resource.template.name}}</li> + <li class="list-group-item">start: {{booking.start}}</li> + <li class="list-group-item">end: {{booking.end}}</li> + <li class="list-group-item">purpose: {{booking.purpose}}</li> + </ul> </div> + <a class="btn btn-primary" href="/booking/detail/{{booking.id}}/">Details</a> </div> {% endfor %} + </div> <h2>Bookings I Collaborate On</h2> + <div class="card_container"> {% for booking in collab_bookings %} <div class="detail_card"> - <ul> - <li>id: {{booking.id}}</li> - <li>lab: {{booking.lab}}</li> - <li>resource: {{booking.resource_name}}</li> - <li>start: {{booking.start}}</li> - <li>end: {{booking.end}}</li> - <li>purpose: {{booking.purpose}}</li> - </ul> - <div class="detail_btn_group"> - <button style="display: none" class="btn btn-primary" disabled=true onclick="edit_booking({{booking.id}});">Edit</button> - <button class="btn btn-primary" onclick="location.href='/booking/detail/{{booking.id}}/';">Details</button> + <div> + <h3>Booking {{booking.id}}</h3> + <ul class="list-group"> + <li class="list-group-item">id: {{booking.id}}</li> + <li class="list-group-item">lab: {{booking.lab}}</li> + <li class="list-group-item">resource: {{booking.resource_name}}</li> + <li class="list-group-item">start: {{booking.start}}</li> + <li class="list-group-item">end: {{booking.end}}</li> + <li class="list-group-item">purpose: {{booking.purpose}}</li> + </ul> </div> + <a class="btn btn-primary" href="/booking/detail/{{booking.id}}/">Details</a> </div> {% endfor %} + </div> {% endblock %} diff --git a/dashboard/src/templates/account/configuration_list.html b/dashboard/src/templates/account/configuration_list.html index 9dcec07..14d0472 100644 --- a/dashboard/src/templates/account/configuration_list.html +++ b/dashboard/src/templates/account/configuration_list.html @@ -1,31 +1,18 @@ {% extends "base.html" %} {% block content %} -<script> -function edit_configuration(pk){ - var csrf = $('input[name="csrfmiddlewaretoken"]').val(); - $.ajax({ - type: "POST", - url: "/", - data: { "target": pk, "create": 2, "csrfmiddlewaretoken": csrf}, - beforeSend: function(request) { - request.setRequestHeader("X-CSFRToken", csrf); - } - }).done(function(){ - window.location.replace("/wf/"); - }).fail(function(){}); -} -</script> + <div class="card_container"> {% for config in configurations %} <div class="detail_card"> - <ul> - <li>id: {{config.id}}</li> - <li>name: {{config.name}}</li> - <li>description: {{config.description}}</li> - <li>resource: {{config.bundle}}</li> - </ul> - <div class="detail_btn_group"> - <button style="display: none" class="btn btn-primary" onclick="edit_configuration({{config.id}});">Edit</button> + <div> + <h3>Configuration {{config.id}}</h3> + <ul class="list-group"> + <li class="list-group-item">id: {{config.id}}</li> + <li class="list-group-item">name: {{config.name}}</li> + <li class="list-group-item">description: {{config.description}}</li> + <li class="list-group-item">resource: {{config.bundle}}</li> + </ul> </div> </div> {% endfor %} + </div> {% endblock %} diff --git a/dashboard/src/templates/account/details.html b/dashboard/src/templates/account/details.html index acf3eb1..3092ad0 100644 --- a/dashboard/src/templates/account/details.html +++ b/dashboard/src/templates/account/details.html @@ -2,8 +2,8 @@ {% load staticfiles %} {% block content %} <h1>Account Details</h1> -<a class="btn btn-primary" onclick="location.href = '{% url 'account:my-resources' %}'">My Resources</a> -<a class="btn btn-primary" onclick="location.href = '{% url 'account:my-bookings' %}'">My Bookings</a> -<a class="btn btn-primary" onclick="location.href = '{% url 'account:my-configurations' %}'">My Configurations</a> -<a class="btn btn-primary" onclick="location.href = '{% url 'account:my-images' %}'">My Snapshots</a> +<a class="btn btn-primary" href="{% url 'account:my-resources' %}">My Resources</a> +<a class="btn btn-primary" href="{% url 'account:my-bookings' %}">My Bookings</a> +<a class="btn btn-primary" href="{% url 'account:my-configurations' %}">My Configurations</a> +<a class="btn btn-primary" href="{% url 'account:my-images' %}">My Snapshots</a> {% endblock content %} diff --git a/dashboard/src/templates/account/image_list.html b/dashboard/src/templates/account/image_list.html index 72ea1f5..7566a9c 100644 --- a/dashboard/src/templates/account/image_list.html +++ b/dashboard/src/templates/account/image_list.html @@ -1,27 +1,37 @@ {% extends "base.html" %} {% block content %} <h2>Images I Own</h2> +<div class="card_container"> {% for image in images %} <div class="detail_card"> - <ul> - <li>id: {{image.id}}</li> - <li>lab: {{image.from_lab.name}}</li> - <li>name: {{image.name}}</li> - <li>description: {{image.description}}</li> - <li>host profile: {{image.host_type.name}}</li> - </ul> + <div> + <h3>Image {{image.id}}</h3> + <ul class="list-group"> + <li class="list-group-item">id: {{image.id}}</li> + <li class="list-group-item">lab: {{image.from_lab.name}}</li> + <li class="list-group-item">name: {{image.name}}</li> + <li class="list-group-item">description: {{image.description}}</li> + <li class="list-group-item">host profile: {{image.host_type.name}}</li> + </ul> + </div> </div> {% endfor %} +</div> <h2>Public Images</h2> +<div class="card_container"> {% for image in public_images %} <div class="detail_card"> - <ul> - <li>id: {{image.id}}</li> - <li>lab: {{image.from_lab.name}}</li> - <li>name: {{image.name}}</li> - <li>description: {{image.description}}</li> - <li>host profile: {{image.host_type.name}}</li> - </ul> + <div> + <h3>Image {{image.id}}</h3> + <ul class="list-group"> + <li class="list-group-item">id: {{image.id}}</li> + <li class="list-group-item">lab: {{image.from_lab.name}}</li> + <li class="list-group-item">name: {{image.name}}</li> + <li class="list-group-item">description: {{image.description}}</li> + <li class="list-group-item">host profile: {{image.host_type.name}}</li> + </ul> + </div> </div> {% endfor %} +</div> {% endblock %} diff --git a/dashboard/src/templates/account/resource_list.html b/dashboard/src/templates/account/resource_list.html index 7e4194b..cdacdd6 100644 --- a/dashboard/src/templates/account/resource_list.html +++ b/dashboard/src/templates/account/resource_list.html @@ -1,30 +1,17 @@ {% extends "base.html" %} {% block content %} -<script> -function edit_resource(pk){ - var csrf = $('input[name="csrfmiddlewaretoken"]').val(); - $.ajax({ - type: "POST", - url: "/", - data: { "target": pk, "create": 1, "csrfmiddlewaretoken": csrf}, - beforeSend: function(request) { - request.setRequestHeader("X-CSFRToken", csrf); - } - }).done(function(){ - window.location.replace("/wf/"); - }).fail(function(){}); -} -</script> + <div class="card_container"> {% for resource in resources %} <div class="detail_card"> - <ul> - <li>id: {{resource.id}}</li> - <li>name: {{resource.name}}</li> - <li>description: {{resource.description}}</li> - </ul> - <div class="detail_btn_group"> - <button style="display: none" class="btn btn-primary" onclick="edit_resource({{resource.id}});">Edit</button> + <div> + <h3>Resource {{resource.id}}</h3> + <ul class="list-group"> + <li class="list-group-item">id: {{resource.id}}</li> + <li class="list-group-item">name: {{resource.name}}</li> + <li class="list-group-item">description: {{resource.description}}</li> + </ul> </div> </div> {% endfor %} + </div> {% endblock %} diff --git a/dashboard/src/templates/notifier/email_fulfilled.txt b/dashboard/src/templates/notifier/email_fulfilled.txt index d473961..65593db 100644 --- a/dashboard/src/templates/notifier/email_fulfilled.txt +++ b/dashboard/src/templates/notifier/email_fulfilled.txt @@ -3,9 +3,9 @@ The booking you requested of the OPNFV Lab as a Service has finished deploying and is ready for you to use. The lab that fulfilled your booking request has sent you the following messages: - {% for message in messages %} - {% message.title %} - {% message.content %} + {% for email_message in messages %} + {{ email_message.title }} + {{ email_message.content }} -------------------- {% endfor %} diff --git a/dashboard/src/templates/snapshot_workflow/steps/meta.html b/dashboard/src/templates/snapshot_workflow/steps/meta.html index 2e767cc..cc49691 100644 --- a/dashboard/src/templates/snapshot_workflow/steps/meta.html +++ b/dashboard/src/templates/snapshot_workflow/steps/meta.html @@ -4,16 +4,21 @@ {% load bootstrap3 %} {% block content %} - - <style> +.meta_container { + padding: 50px; +} </style> - {% bootstrap_form_errors form type='non_fields' %} -<form id="meta_form" action="/wf/workflow/" method="POST" class="form"> -{% csrf_token %} -{{form}} -</form> +<div class="meta_container"> + <form id="meta_form" action="/wf/workflow/" method="POST" class="form"> + {% csrf_token %} + <div class="form-group"> + {% bootstrap_field form.name %} + {% bootstrap_field form.description %} + </div> + </form> +</div> {% endblock content %} {% block onleave %} diff --git a/dashboard/src/templates/snapshot_workflow/steps/select_host.html b/dashboard/src/templates/snapshot_workflow/steps/select_host.html index 16dd5d4..27a9238 100644 --- a/dashboard/src/templates/snapshot_workflow/steps/select_host.html +++ b/dashboard/src/templates/snapshot_workflow/steps/select_host.html @@ -5,43 +5,73 @@ {% block content %} - <style> .booking { - border-style: solid; + border-style: none; border-color: black; - border-width: 2px; - display: inline-block; - padding: 3px; + border: 2px; + border-radius: 5px; + margin: 20px; + padding-left: 25px; + padding-right: 25px; + padding-bottom: 25px; + box-shadow: 0px 0px 7px 0px rgba(0,0,0,0.75); + transition-property: box-shadow; + transition-duration: 0.1s; + float: left; + } + .booking:hover { + box-shadow: 0px 0px 10px 0px rgba(0,0,0,0.75); + transition-property: box-shadow; + transition-duration: 0.1s; } .host { + cursor: pointer; border-style: solid; border-color: black; border-width: 1px; - margin: 2px; + border-radius: 5px; + margin: 5px; + padding: 5px; + text-align: center; + box-shadow: 0px 0px 2px 0px rgba(0,0,0,0.75); + transition-property: box-shadow; + transition-duration: 0.1s; + } + .host:hover { + box-shadow: 0px 0px 4px 0px rgba(0,0,0,0.75); + transition-property: box-shadow; + transition-duration: 0.1s; + background-color: rgba(144,238,144,0.3); + } + .selected { + background-color: lightgreen !important; + } + .booking_container { + overflow: auto; + padding: 30px; } </style> - {% bootstrap_form_errors form type='non_fields' %} <form id="host_select_form" action="/wf/workflow/" method="POST" class="form"> {% csrf_token %} <input type="hidden" id="hidden_json_input", name="host"/> </form> -<div id="host_select_container"> +<div id="host_select_container" class="booking_container"> </div> <script> var selected_host = null; -var initial = {{chosen|default:'null'}}; +var initial = {{chosen|safe|default:'null'}}; function select(booking_id, host_name){ var input = document.getElementById("hidden_json_input"); input.value = JSON.stringify({"booking": booking_id, "name": host_name}); // clear out and highlist host if(selected_host){ - selected_host.style['background-color'] = "white"; + selected_host.classList.remove("selected"); } selected_host = document.getElementById("booking_" + booking_id + "_host_" + host_name); - selected_host.style['background-color'] = "lightgrey"; + selected_host.classList.add("selected"); } function draw_bookings(){ @@ -53,17 +83,20 @@ function draw_bookings(){ var heading = document.createElement("H3"); heading.appendChild(document.createTextNode("Booking " + booking_id)); booking.appendChild(heading); - var desc = "start: " + booking_hosts[booking_id].start + - " end: " + booking_hosts[booking_id].end + - " purpose: " + booking_hosts[booking_id].purpose; - booking.appendChild(document.createTextNode(desc)); + booking.appendChild(document.createTextNode("start: " + booking_hosts[booking_id].start)); + booking.appendChild(document.createElement("BR")); + booking.appendChild(document.createTextNode("end: " + booking_hosts[booking_id].end)); + booking.appendChild(document.createElement("BR")); + booking.appendChild(document.createTextNode("purpose: " + booking_hosts[booking_id].purpose)); + booking.appendChild(document.createElement("BR")); + booking.appendChild(document.createTextNode("hosts:")); booking.id = "booking_" + booking_id; booking.className = "booking"; var hosts = booking_hosts[booking_id].hosts; for(var i=0; i<hosts.length; i++){ var host = document.createElement("DIV"); host.id = "booking_" + booking_id + "_host_" + hosts[i].name; - host.className = "host"; + host.classList.add("host"); host.appendChild(document.createTextNode(hosts[i].name)); var hostname = hosts[i].name; host.booking = booking_id; |