From 9544f24aea8446636382aa7097a23808aa1dd27a Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Fri, 22 May 2015 23:52:07 +0100
Subject: [PATCH] UI Improvements

---
 RIGS/templates/RIGS/activity_stream.html    | 14 +++++++-------
 RIGS/templates/RIGS/event_version_list.html |  8 ++++----
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/RIGS/templates/RIGS/activity_stream.html b/RIGS/templates/RIGS/activity_stream.html
index fe61f6a5..41927374 100644
--- a/RIGS/templates/RIGS/activity_stream.html
+++ b/RIGS/templates/RIGS/activity_stream.html
@@ -58,7 +58,7 @@
            		<td>{{ version.pk }}|{{ version.revision.pk }}</td>
                 <td>{{ version.revision.user.name }}</td>
                 <td>{% for key, old, new in version.changes %}
-                	<button title="Changes to {{ key }}" type="button" class="btn btn-default btn-xs" data-container="body" data-html="true" data-trigger='hover' data-placement='left' data-toggle="popover" data-content='
+                	<button title="Changes to {{ key }}" type="button" class="btn btn-default btn-xs" data-container="body" data-html="true" data-trigger='hover' data-toggle="popover" data-content='
 
                 	{% if new %}<div class="alert alert-success">{{new}}</div>{% endif %}
                 	{% if old %}<div class="alert alert-danger">{{old}}</div>{% endif %}
@@ -67,7 +67,7 @@
                 		'>{{ key }}</button>
                 	{% endfor %}
                     {% for key, old, new in version.item_changes %}
-                    <button title="{{ key }}" type="button" class="btn btn-default btn-xs" data-container="body" data-html="true" data-trigger='hover' data-placement='left' data-toggle="popover" data-content='
+                    <button title="{{ key }}" type="button" class="btn btn-default btn-xs" data-container="body" data-html="true" data-trigger='hover' data-toggle="popover" data-content='
 
                     {% if new %}
                         <div class="alert alert-success">
@@ -75,7 +75,7 @@
                                 <dt>Name</dt>
                                 <dd>{{new.name}}</dd>
                                 <dt>Description</dt>
-                                <dd>{{new.description}}</dd>
+                                <dd>{{new.description|linebreaks}}</dd>
                                 <dt>Quantity</dt>
                                 <dd>{{new.quantity}}</dd>
                                 <dt>Price</dt>
@@ -89,7 +89,7 @@
                                 <dt>Name</dt>
                                 <dd>{{old.name}}</dd>
                                 <dt>Description</dt>
-                                <dd>{{old.description}}</dd>
+                                <dd>{{old.description|linebreaks}}</dd>
                                 <dt>Quantity</dt>
                                 <dd>{{old.quantity}}</dd>
                                 <dt>Price</dt>
@@ -123,7 +123,7 @@
             '>{{ key }}</button>
         {% endfor %}
         {% for key, old, new in version.item_changes %}
-        <button title="{{ key }}" type="button" class="btn btn-default btn-xs" data-container="body" data-html="true" data-trigger='hover' data-placement='left' data-toggle="popover" data-content='
+        <button title="{{ key }}" type="button" class="btn btn-default btn-xs" data-container="body" data-html="true" data-trigger='hover' data-toggle="popover" data-content='
 
         {% if new %}
             <div class="alert alert-success">
@@ -131,7 +131,7 @@
                     <dt>Name</dt>
                     <dd>{{new.name}}</dd>
                     <dt>Description</dt>
-                    <dd>{{new.description}}</dd>
+                    <dd>{{new.description|linebreaks}}</dd>
                     <dt>Quantity</dt>
                     <dd>{{new.quantity}}</dd>
                     <dt>Price</dt>
@@ -145,7 +145,7 @@
                     <dt>Name</dt>
                     <dd>{{old.name}}</dd>
                     <dt>Description</dt>
-                    <dd>{{old.description}}</dd>
+                    <dd>{{old.description|linebreaks}}</dd>
                     <dt>Quantity</dt>
                     <dd>{{old.quantity}}</dd>
                     <dt>Price</dt>
diff --git a/RIGS/templates/RIGS/event_version_list.html b/RIGS/templates/RIGS/event_version_list.html
index 1ec99b1a..a112381a 100644
--- a/RIGS/templates/RIGS/event_version_list.html
+++ b/RIGS/templates/RIGS/event_version_list.html
@@ -49,11 +49,11 @@
                                 <dt>Name</dt>
                                 <dd>{{new.name}}</dd>
                                 <dt>Description</dt>
-                                <dd>{{new.description}}</dd>
+                                <dd>{{new.description|linebreaks}}</dd>
                                 <dt>Quantity</dt>
                                 <dd>{{new.quantity}}</dd>
                                 <dt>Price</dt>
-                                <dd>{{new.cost}}
+                                <dd>£ {{new.cost|default:0|floatformat:2}}
                             </dl>
                         </div>
                     {% endif %}
@@ -63,11 +63,11 @@
                                 <dt>Name</dt>
                                 <dd>{{old.name}}</dd>
                                 <dt>Description</dt>
-                                <dd>{{old.description}}</dd>
+                                <dd>{{old.description|linebreaks}}</dd>
                                 <dt>Quantity</dt>
                                 <dd>{{old.quantity}}</dd>
                                 <dt>Price</dt>
-                                <dd>{{old.cost}}
+                                <dd>£ {{old.cost|default:0|floatformat:2}}
                             </dl>
                         </div>
                     {% endif %}