From d7de69abfc5bfcf2a21778863337024f3bac0a84 Mon Sep 17 00:00:00 2001
From: Tom Price <tom@codedinternet.com>
Date: Mon, 25 May 2015 23:31:39 +0100
Subject: [PATCH] Redesigned activity feed to "group" by user

---
 RIGS/templates/RIGS/activity_feed_data.html | 63 ++++++++++++---------
 1 file changed, 35 insertions(+), 28 deletions(-)

diff --git a/RIGS/templates/RIGS/activity_feed_data.html b/RIGS/templates/RIGS/activity_feed_data.html
index c7d6412c..cdc19d3f 100644
--- a/RIGS/templates/RIGS/activity_feed_data.html
+++ b/RIGS/templates/RIGS/activity_feed_data.html
@@ -6,35 +6,42 @@
 
 {% block content %}
   {% if request.is_ajax %}
-
-      {% for version in object_list %}
-          {% if version.item_changes or version.field_changes or version.old == None %}
-              <div class="list-group-item" style="border-radius:0">
-                <div class="media" >
-                  <div class="media-left">
-                    <a href="#">
-                      <img class="media-object img-rounded" src="{{ version.revision.user.profile_picture}}" style="max-width:3em;">
-                    </a>
+    <div class="list-group-item">
+      <div class="media">
+        {% for version in object_list %}
+            {% if version.item_changes or version.field_changes or version.old == None %}
+                {% ifchanged version.revision.user %}
+                  {% if version != object_list|first %}
+                      </div> {#/.media-body#}
+                    </div> {#/.media#}
                   </div>
-                  <div class="media-body">
-                    <b>{{version.revision.user.name}}</b>
-                    <span class="pull-right"><small><span class="date" data-date="{{version.revision.date_created}}"></span></small></span>
-                    <br>
-                    <small>
-                    {% if version.old == None %}
-                      Created
-                    {% else %}
-                      Changed {% include 'RIGS/version_changes.html' %} in
-                    {% endif %}
-                      
-
-                    {% include 'RIGS/object_button.html' with object=version.new %}
-                  </small>
-                  </div>
-                </div>
-              </div>
-          {% endif %}
-      {% endfor %}
+                  <div class="list-group-item">
+                    <div class="media">
+                  {% endif %}
+                      <div class="media-left">
+                        <a href="#">
+                          <img class="media-object img-rounded" src="{{ version.revision.user.profile_picture}}" style="max-width: 3em;" />
+                        </a>
+                      </div>
+                      <div class="media-body">
+                        <h5>{{ version.revision.user.name }}</h5>
+                {% else %}
+                      <br />
+                {% endifchanged %}
+                      <small>
+                        {% if version.old == None %}
+                          Created
+                        {% else %}
+                          Changed {% include 'RIGS/version_changes.html' %} in
+                        {% endif %}
+                          
 
+                        {% include 'RIGS/object_button.html' with object=version.new %}
+                      </small>
+            {% endif %}
+        {% endfor %}
+        </div>
+      </div>
+    </div>
   {% endif %}
 {% endblock %}
\ No newline at end of file