From 30dde45dbf5b47b7d4c18ed87779b2b2f2fec214 Mon Sep 17 00:00:00 2001
From: Parker Berberian <pberberian@iol.unh.edu>
Date: Thu, 17 Jan 2019 12:51:04 -0500
Subject: OverHaul the Snapshot Workflow

Makes the Snapshot workflow much prettier and more functional.

Change-Id: Icdd66f64e6d336ad49ed3cf638a301d0ca92fda9
Signed-off-by: Parker Berberian <pberberian@iol.unh.edu>
---
 src/templates/notifier/email_fulfilled.txt         |  6 +-
 src/templates/snapshot_workflow/steps/meta.html    | 19 ++++---
 .../snapshot_workflow/steps/select_host.html       | 65 ++++++++++++++++------
 3 files changed, 64 insertions(+), 26 deletions(-)

(limited to 'src/templates')

diff --git a/src/templates/notifier/email_fulfilled.txt b/src/templates/notifier/email_fulfilled.txt
index d473961..65593db 100644
--- a/src/templates/notifier/email_fulfilled.txt
+++ b/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/src/templates/snapshot_workflow/steps/meta.html b/src/templates/snapshot_workflow/steps/meta.html
index 2e767cc..cc49691 100644
--- a/src/templates/snapshot_workflow/steps/meta.html
+++ b/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/src/templates/snapshot_workflow/steps/select_host.html b/src/templates/snapshot_workflow/steps/select_host.html
index 16dd5d4..27a9238 100644
--- a/src/templates/snapshot_workflow/steps/select_host.html
+++ b/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;
-- 
cgit 1.2.3-korg