From 7d0e89eb188319334ac5bb6ee12421a7810f5a3c Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Sat, 23 May 2015 03:20:27 +0100
Subject: [PATCH] More UI improvements

---
 PyRIGS/settings.py                          |  1 +
 RIGS/templates/RIGS/activity_stream.html    | 28 ++++++++++++++-------
 RIGS/templates/RIGS/event_button.html       | 18 +++++++++++++
 RIGS/templates/RIGS/event_version_list.html | 10 +++++---
 RIGS/templates/RIGS/profile_button.html     | 12 +++++++++
 RIGS/versioning.py                          |  1 +
 6 files changed, 58 insertions(+), 12 deletions(-)
 create mode 100644 RIGS/templates/RIGS/event_button.html
 create mode 100644 RIGS/templates/RIGS/profile_button.html

diff --git a/PyRIGS/settings.py b/PyRIGS/settings.py
index 9c05d476..d2f19d15 100644
--- a/PyRIGS/settings.py
+++ b/PyRIGS/settings.py
@@ -185,6 +185,7 @@ USE_TZ = True
 DATETIME_INPUT_FORMATS = ('%Y-%m-%dT%H:%M','%Y-%m-%dT%H:%M:%S')
 
 RIGS_DATETIME_FORMAT = ('d/m/Y H:i')
+RIGS_DATE_FORMAT = ('d/m/Y')
 
 TEMPLATE_CONTEXT_PROCESSORS = (
     "django.contrib.auth.context_processors.auth",
diff --git a/RIGS/templates/RIGS/activity_stream.html b/RIGS/templates/RIGS/activity_stream.html
index 81ad46bb..6c0fabc4 100644
--- a/RIGS/templates/RIGS/activity_stream.html
+++ b/RIGS/templates/RIGS/activity_stream.html
@@ -9,7 +9,11 @@
     <script src="{% static "js/moment.min.js" %}"></script>
     <script>
     	$(function () {
-		  $('[data-toggle="popover"]').popover();
+		  $('[data-toggle="popover"]').popover().click(function(){
+        if($(this).attr('href')){
+          window.location.href = $(this).attr('href');
+        }
+      });
 
           // This keeps timeago values correct, but uses an insane amount of resources
           // $(function () {
@@ -52,15 +56,18 @@
         </thead>
         <tbody>
         	{% for version in object_list %}
-                {% if version.item_changes or version.field_changes %}
+                {% if version.item_changes or version.field_changes or version.old == None%}
                     <tr>
                         <td>{{ version.revision.date_created|date:"RIGS_DATETIME_FORMAT" }}</td>
                         <td><a href="{% url 'event_detail' version.new.pk %}">N{{ version.new.pk|stringformat:"05d" }}</a></td>
                    		<td>{{ version.version.pk }}|{{ version.revision.pk }}</td>
                         <td>{{ version.revision.user.name }}</td>
                         <td>
+                          {% if version.old == None %}
+                            Event Created
+                          {% else %}
                             {% include 'RIGS/event_version_changes.html' %}
-                        </td>
+                          {% endif %}                        </td>
                     </tr>
                 {% endif %}
 			{% endfor %}
@@ -76,13 +83,16 @@
     <h2>Rigboard Activity Stream - Stream View</h2>
     <br>
 {% for version in object_list %}
-    {% if version.item_changes or version.field_changes %}
+    {% if version.item_changes or version.field_changes or version.old == None %}
         <div class="well">
-            <button title="title" type="button" class="btn btn-default btn-xs">{{ version.revision.user.first_name|default_if_none:"(unknown)" }}</button> changed 
-            
-            {% include 'RIGS/event_version_changes.html' %}
-            
-            in <button title="title" type="button" class="btn btn-default btn-xs">N{{ version.new.pk|stringformat:"05d" }}</button> <small>(<span data-date='{{ version.revision.date_created|date:"Y-m-d H:i:s" }}' class="date">{{ version.revision.date_created|date:"RIGS_DATETIME_FORMAT" }}</span>)</small>
+            {% include 'RIGS/profile_button.html' with profile=version.revision.user %}
+
+            {% if version.old == None %}
+              created
+            {% else %}
+              changed {% include 'RIGS/event_version_changes.html' %} in
+            {% endif %}
+            {% include 'RIGS/event_button.html' with event=version.current %}
 
         </div>
     {% endif %}
diff --git a/RIGS/templates/RIGS/event_button.html b/RIGS/templates/RIGS/event_button.html
new file mode 100644
index 00000000..9309ce2f
--- /dev/null
+++ b/RIGS/templates/RIGS/event_button.html
@@ -0,0 +1,18 @@
+{# pass in variable "event" to this template #}
+
+<button title="N{{ event.pk|stringformat:"05d" }} | {{event.name}}" type="button" href="{% url 'event_detail' event.pk %}" class="btn btn-default btn-xs" data-container="body" data-html="true" data-trigger='hover' data-toggle="popover" data-content='
+        <dl class="dl-vertical">
+			<dt>Date</dt>
+			<dd>{{event.start_date|date:"RIGS_DATE_FORMAT"}}</dd>			
+
+			<dt>Status</dt>
+			<dd>{{event.get_status_display}}</dd>
+
+			<dt>MIC</dt>
+			<dd>{{event.mic.name}}</dd>
+
+			<dt>Venue</dt>
+			<dd>{{event.venue}}</dd>
+		</dl>
+			
+        '>N{{ event.pk|stringformat:"05d" }}</button>
\ No newline at end of file
diff --git a/RIGS/templates/RIGS/event_version_list.html b/RIGS/templates/RIGS/event_version_list.html
index 7c3cad69..db4299ea 100644
--- a/RIGS/templates/RIGS/event_version_list.html
+++ b/RIGS/templates/RIGS/event_version_list.html
@@ -27,13 +27,17 @@
         </thead>
         <tbody>
         	{% for version in object_list %}
-                {% if version.item_changes or version.field_changes %}
+                {% if version.item_changes or version.field_changes or version.old == None %}
                     <tr>
                    		<td>{{ version.version.pk }}|{{ version.revision.pk }}</td>
-                        <td>{{ version.revision.date_created|date:"d/m/Y H:i" }}</td>
+                        <td>{{ version.revision.date_created|date:"RIGS_DATETIME_FORMAT" }}</td>
                         <td>{{ version.revision.user.name }}</td>
                         <td>
-                            {% include 'RIGS/event_version_changes.html' %}
+                            {% if version.old == None %}
+                                Event Created
+                            {% else %}
+                                {% include 'RIGS/event_version_changes.html' %}
+                            {% endif %}
                         </td>
                     </tr>
                 {% endif %}
diff --git a/RIGS/templates/RIGS/profile_button.html b/RIGS/templates/RIGS/profile_button.html
new file mode 100644
index 00000000..9957539a
--- /dev/null
+++ b/RIGS/templates/RIGS/profile_button.html
@@ -0,0 +1,12 @@
+{# pass in variable "profile" to this template #}
+
+<button title="{{profile.name}}" type="button" class="btn btn-default btn-xs" data-container="body" data-html="true" data-trigger='hover focus' data-toggle="popover" data-content='
+<img src="{{profile.profile_picture}}" class="img-responsive img-rounded center-block" style="max-width:4em" />
+        <dl class="dl-vertical">
+			<dt>Email</dt>
+			<dd>{{profile.email}}</dd>
+
+			<dt>Phone</dt>
+			<dd>{{profile.phone}}</dd>
+		</dl>
+        '>{{profile.first_name}}</button>
\ No newline at end of file
diff --git a/RIGS/versioning.py b/RIGS/versioning.py
index 35ed463e..49cd0ae0 100644
--- a/RIGS/versioning.py
+++ b/RIGS/versioning.py
@@ -122,6 +122,7 @@ def get_changes_for_version(newVersion, oldVersion=None):
     compare = {}
     compare['revision'] = newVersion.revision    
     compare['new'] = newVersion.object_version.object
+    compare['current'] = models.Event.objects.get(pk=compare['new'].pk)
     compare['version'] = newVersion
 
     if oldVersion: