From b02aa2535c7b7beacbc2d7d24d8522fa596afeee Mon Sep 17 00:00:00 2001
From: Parker Berberian <pberberian@iol.unh.edu>
Date: Tue, 20 Nov 2018 11:19:55 -0500
Subject: Fixed Misc Bugs

Some corner cases that cause issues recently came to our attention.
Fixes issues in the booking workflow and the Notification system.

Change-Id: Ie16118ba1bdbeff86bb41a16dc783337b921d527
Signed-off-by: Parker Berberian <pberberian@iol.unh.edu>
---
 dashboard/src/templates/notifier/end_booking.html  | 2 +-
 dashboard/src/templates/notifier/inbox.html        | 2 +-
 dashboard/src/templates/notifier/new_booking.html  | 2 +-
 dashboard/src/templates/notifier/notification.html | 8 ++++++--
 4 files changed, 9 insertions(+), 5 deletions(-)

(limited to 'dashboard/src/templates')

diff --git a/dashboard/src/templates/notifier/end_booking.html b/dashboard/src/templates/notifier/end_booking.html
index 22014fb..a2981c1 100644
--- a/dashboard/src/templates/notifier/end_booking.html
+++ b/dashboard/src/templates/notifier/end_booking.html
@@ -30,7 +30,7 @@
                 </li>
             </ul>
 
-            <p>You can find more detailed information <a href=/booking/detail/{{booking.id/>Here</a></p>
+            <p>You can find more detailed information <a href=/booking/detail/{{booking.id}}/>Here</a></p>
         </div>
     </body>
 </html>
diff --git a/dashboard/src/templates/notifier/inbox.html b/dashboard/src/templates/notifier/inbox.html
index c0ee1ba..471eae4 100644
--- a/dashboard/src/templates/notifier/inbox.html
+++ b/dashboard/src/templates/notifier/inbox.html
@@ -56,7 +56,7 @@
 <div class="inbox-panel">
   <div class="section-panel">
     <div class="card-container">
-      {% for notification in notifier_messages  %}
+      {% for notification in notifications  %}
         <div class="inbox-entry card" onclick="showmessage({{notification.id}}); setactive(this);">
           {{ notification }}
         </div>
diff --git a/dashboard/src/templates/notifier/new_booking.html b/dashboard/src/templates/notifier/new_booking.html
index 4b53875..d23b12e 100644
--- a/dashboard/src/templates/notifier/new_booking.html
+++ b/dashboard/src/templates/notifier/new_booking.html
@@ -28,7 +28,7 @@
                 </li>
             </ul>
 
-            <p>You can find more detailed information <a href=/booking/detail/{{booking.id/>Here</a></p>
+            <p>You can find more detailed information <a href=/booking/detail/{{booking.id}}/>Here</a></p>
         </div>
     </body>
 </html>
diff --git a/dashboard/src/templates/notifier/notification.html b/dashboard/src/templates/notifier/notification.html
index 1258fe0..65d26c9 100644
--- a/dashboard/src/templates/notifier/notification.html
+++ b/dashboard/src/templates/notifier/notification.html
@@ -1,4 +1,8 @@
-{% load staticfiles %}
+{% extends "layout.html" %}
+{% block extrahead %}
+<base target="_parent">
+{% endblock %}
+{% block basecontent %}
 <div class="card-container">
 <h3 class="msg_header">{{notification.title}}</h3>
 <p class="content"></p>
@@ -6,7 +10,6 @@
 {{notification.content|safe}}
 </pre>
 
-<p class="sender">Message from {{notification.sender}}</p>
 </div>
 
 <style media="screen">
@@ -32,3 +35,4 @@
 
 
 </style>
+{% endblock %}
-- 
cgit 1.2.3-korg