[#1639] Add some basic CSS to activity streams

Just so they look better than being completely unstyled, trying to make them a little better to scan with the eyes: emphasise the actor, object and (to a lesser extend) the verb, demphasise the date, and add some vertical space in-between activities. Also tidied up the HTML, the CSS classes, and the Genshi macro a little.
ckan · Feb 5, 2012 · a7e49d0 · a7e49d0
1 parent ba07896
commit a7e49d0
Show file tree

Hide file tree

Showing 18 changed files with 68 additions and 38 deletions.
diff --git a/ckan/public/css/style.css b/ckan/public/css/style.css
@@ -1461,3 +1461,32 @@ body.authz form button {
 .alert-message.block-message.info p a {
   color: #404040;
 }
+
+/* ==================== */
+/* = Activity Streams = */
+/* ==================== */
+
+.activity-stream-activity {
+    padding-bottom:1em;
+
+}
+.activity-stream-activity a {
+    font-weight:bold;
+
+}
+.activity-stream-activity .actor {
+
+}
+.activity-stream-activity .verb {
+    background-color:PapayaWhip;
+    padding:.25em;
+    margin:.25em;
+
+}
+.activity-stream-activity .object {
+
+}
+.activity-stream-activity .date {
+    color:#999;
+
+}
diff --git a/ckan/templates/_util.html b/ckan/templates/_util.html
@@ -451,21 +451,22 @@
     </tr>
   </table>
 
-  <div py:def="activity_stream_event(subject, verb, object=None)">
-    <span class="activity_stream_event_subject">
-      ${subject}
+  <div py:def="activity_stream_activity(actor, verb, object=None)"
+      class="activity-stream-activity">
+    <span class="actor">
+      ${actor}
     </span>
-    <span class="activity_stream_event_verb">
+    <span class="verb">
       ${verb}
     </span>
     <py:choose>
-      <span class="activity_stream_event_object" py:when="object">
+      <span class="object" py:when="object">
         ${object}
       </span>
       <py:otherwise>
       </py:otherwise>
     </py:choose>
-    <span class="activity_stream_event_date">
+    <span class="date">
       ${h.render_datetime(activity.timestamp, '%B %d %Y')}
     </span>
   </div>

diff --git a/ckan/templates/activity_streams/added_tag.html b/ckan/templates/activity_streams/added_tag.html
@@ -6,8 +6,8 @@
   py:strip=""
   >
   <xi:include href="../_util.html" />
-${activity_stream_event(
-  subject=h.linked_user(activity.user_id),
+${activity_stream_activity(
+  actor=h.linked_user(activity.user_id),
   verb='added',
   object=("the tag "+h.tag_link(detail.data.tag)+
   " to the dataset "+h.dataset_link(detail.data.package)),

diff --git a/ckan/templates/activity_streams/changed_group.html b/ckan/templates/activity_streams/changed_group.html
@@ -6,8 +6,8 @@
   py:strip=""
   >
   <xi:include href="../_util.html" />
-${activity_stream_event(
-  subject=h.linked_user(activity.user_id),
+${activity_stream_activity(
+  actor=h.linked_user(activity.user_id),
   verb='updated',
   object="the group "+h.group_link(activity.data.group),
   activity=activity

diff --git a/ckan/templates/activity_streams/changed_package.html b/ckan/templates/activity_streams/changed_package.html
@@ -6,8 +6,8 @@
   py:strip=""
   >
   <xi:include href="../_util.html" />
-${activity_stream_event(
-  subject=h.linked_user(activity.user_id),
+${activity_stream_activity(
+  actor=h.linked_user(activity.user_id),
   verb='updated',
   object="the dataset "+h.dataset_link(activity.data.package),
   activity=activity)}

diff --git a/ckan/templates/activity_streams/changed_package_extra.html b/ckan/templates/activity_streams/changed_package_extra.html
@@ -6,8 +6,8 @@
   py:strip=""
   >
   <xi:include href="../_util.html" />
-${activity_stream_event(
-  subject=h.linked_user(activity.user_id),
+${activity_stream_activity(
+  actor=h.linked_user(activity.user_id),
   verb='changed',
   object=('the extra "'+detail.data.package_extra.key+'" of the dataset '
     +h.dataset_link(activity.data.package)),

diff --git a/ckan/templates/activity_streams/changed_resource.html b/ckan/templates/activity_streams/changed_resource.html
@@ -6,8 +6,8 @@
   py:strip=""
   >
   <xi:include href="../_util.html" />
-${activity_stream_event(
-  subject=h.linked_user(activity.user_id),
+${activity_stream_activity(
+  actor=h.linked_user(activity.user_id),
   verb='updated',
   object=('the resource '+h.resource_link(detail.data.resource,
     activity.data.package.id)+' in the dataset '

diff --git a/ckan/templates/activity_streams/changed_user.html b/ckan/templates/activity_streams/changed_user.html
@@ -6,8 +6,8 @@
   py:strip=""
   >
   <xi:include href="../_util.html" />
-${activity_stream_event(
-  subject=h.linked_user(activity.user_id),
+${activity_stream_activity(
+  actor=h.linked_user(activity.user_id),
   verb='updated their profile.',
   activity=activity
   )}

diff --git a/ckan/templates/activity_streams/deleted_group.html b/ckan/templates/activity_streams/deleted_group.html
@@ -6,8 +6,8 @@
   py:strip=""
   >
   <xi:include href="../_util.html" />
-${activity_stream_event(
-  subject=h.linked_user(activity.user_id),
+${activity_stream_activity(
+  actor=h.linked_user(activity.user_id),
   verb='deleted',
   object="the group "+h.group_link(activity.data.group),
   activity=activity

diff --git a/ckan/templates/activity_streams/deleted_package.html b/ckan/templates/activity_streams/deleted_package.html
@@ -6,8 +6,8 @@
   py:strip=""
   >
   <xi:include href="../_util.html" />
-${activity_stream_event(
-  subject=h.linked_user(activity.user_id),
+${activity_stream_activity(
+  actor=h.linked_user(activity.user_id),
   verb='updated',
   object="the dataset "+h.dataset_link(activity.data.package),
   activity=activity)}

diff --git a/ckan/templates/activity_streams/deleted_package_extra.html b/ckan/templates/activity_streams/deleted_package_extra.html
@@ -6,8 +6,8 @@
   py:strip=""
   >
   <xi:include href="../_util.html" />
-${activity_stream_event(
-  subject=h.linked_user(activity.user_id),
+${activity_stream_activity(
+  actor=h.linked_user(activity.user_id),
   verb='deleted',
   object=('the extra "'+detail.data.package_extra.key+'" from the dataset '
     +h.dataset_link(activity.data.package)),

diff --git a/ckan/templates/activity_streams/deleted_resource.html b/ckan/templates/activity_streams/deleted_resource.html
@@ -6,8 +6,8 @@
   py:strip=""
   >
   <xi:include href="../_util.html" />
-${activity_stream_event(
-  subject=h.linked_user(activity.user_id),
+${activity_stream_activity(
+  actor=h.linked_user(activity.user_id),
   verb='deleted',
   object=('the resource '+h.resource_link(detail.data.resource,
     activity.data.package.id)+' from the dataset '

diff --git a/ckan/templates/activity_streams/new_group.html b/ckan/templates/activity_streams/new_group.html
@@ -6,8 +6,8 @@
   py:strip=""
   >
   <xi:include href="../_util.html" />
-${activity_stream_event(
-  subject=h.linked_user(activity.user_id),
+${activity_stream_activity(
+  actor=h.linked_user(activity.user_id),
   verb='created',
   object="the group "+h.group_link(activity.data.group),
   activity=activity

diff --git a/ckan/templates/activity_streams/new_package.html b/ckan/templates/activity_streams/new_package.html
@@ -6,8 +6,8 @@
   py:strip=""
   >
   <xi:include href="../_util.html" />
-${activity_stream_event(
-  subject=h.linked_user(activity.user_id),
+${activity_stream_activity(
+  actor=h.linked_user(activity.user_id),
   verb='created',
   object="the dataset "+h.dataset_link(activity.data.package),
   activity=activity)}

diff --git a/ckan/templates/activity_streams/new_package_extra.html b/ckan/templates/activity_streams/new_package_extra.html
@@ -6,8 +6,8 @@
   py:strip=""
   >
   <xi:include href="../_util.html" />
-${activity_stream_event(
-  subject=h.linked_user(activity.user_id),
+${activity_stream_activity(
+  actor=h.linked_user(activity.user_id),
   verb='added',
   object=('the extra "'+detail.data.package_extra.key+'" to the dataset '
     +h.dataset_link(activity.data.package)),

diff --git a/ckan/templates/activity_streams/new_resource.html b/ckan/templates/activity_streams/new_resource.html
@@ -6,8 +6,8 @@
   py:strip=""
   >
   <xi:include href="../_util.html" />
-${activity_stream_event(
-  subject=h.linked_user(activity.user_id),
+${activity_stream_activity(
+  actor=h.linked_user(activity.user_id),
   verb='added',
   object=('the resource '+h.resource_link(detail.data.resource,
     activity.data.package.id)+' to the dataset '

diff --git a/ckan/templates/activity_streams/new_user.html b/ckan/templates/activity_streams/new_user.html
@@ -6,8 +6,8 @@
   py:strip=""
   >
   <xi:include href="../_util.html" />
-${activity_stream_event(
-  subject=h.linked_user(activity.user_id),
+${activity_stream_activity(
+  actor=h.linked_user(activity.user_id),
   verb='signed up.',
   activity=activity
   )}

diff --git a/ckan/templates/activity_streams/removed_tag.html b/ckan/templates/activity_streams/removed_tag.html
@@ -6,8 +6,8 @@
   py:strip=""
   >
   <xi:include href="../_util.html" />
-${activity_stream_event(
-  subject=h.linked_user(activity.user_id),
+${activity_stream_activity(
+  actor=h.linked_user(activity.user_id),
   verb='removed',
   object=("the tag "+h.tag_link(detail.data.tag)+
   " from the dataset "+h.dataset_link(detail.data.package)),