Add 'target' arg to activity streams Genshi macro

Brings it inline with the http://activitystrea.ms/ standard: actor, verb, object, target.
ckan · Feb 5, 2012 · 2a58612 · 2a58612
1 parent a7e49d0
commit 2a58612
Show file tree

Hide file tree

Showing 10 changed files with 30 additions and 20 deletions.
diff --git a/ckan/public/css/style.css b/ckan/public/css/style.css
@@ -1485,6 +1485,9 @@ body.authz form button {
 }
 .activity-stream-activity .object {
 
+}
+.activity-stream-activity .target {
+
 }
 .activity-stream-activity .date {
     color:#999;

diff --git a/ckan/templates/_util.html b/ckan/templates/_util.html
@@ -451,7 +451,7 @@
     </tr>
   </table>
 
-  <div py:def="activity_stream_activity(actor, verb, object=None)"
+  <div py:def="activity_stream_activity(actor, verb, object=None, target=None)"
       class="activity-stream-activity">
     <span class="actor">
       ${actor}
@@ -466,6 +466,13 @@
       <py:otherwise>
       </py:otherwise>
     </py:choose>
+    <py:choose>
+      <span class="target" py:when="target">
+        ${target}
+      </span>
+      <py:otherwise>
+      </py:otherwise>
+    </py:choose>
     <span class="date">
       ${h.render_datetime(activity.timestamp, '%B %d %Y')}
     </span>

diff --git a/ckan/templates/activity_streams/added_tag.html b/ckan/templates/activity_streams/added_tag.html
@@ -9,8 +9,8 @@
 ${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)),
+  object="the tag "+h.tag_link(detail.data.tag),
+  target="to the dataset "+h.dataset_link(detail.data.package),
   activity=activity
   )}
 </html>
diff --git a/ckan/templates/activity_streams/changed_package_extra.html b/ckan/templates/activity_streams/changed_package_extra.html
@@ -9,8 +9,8 @@
 ${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)),
+  object='the extra "'+detail.data.package_extra.key+'"',
+  target='of the dataset '+h.dataset_link(activity.data.package),
   activity=activity
   )}
 </html>
diff --git a/ckan/templates/activity_streams/changed_resource.html b/ckan/templates/activity_streams/changed_resource.html
@@ -9,9 +9,9 @@
 ${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 '
-    +h.dataset_link(activity.data.package)),
+  object='the resource '+h.resource_link(detail.data.resource,
+    activity.data.package.id),
+  target='in the dataset '+h.dataset_link(activity.data.package),
   activity=activity
   )}
 </html>
diff --git a/ckan/templates/activity_streams/deleted_package_extra.html b/ckan/templates/activity_streams/deleted_package_extra.html
@@ -9,8 +9,8 @@
 ${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)),
+  object='the extra "'+detail.data.package_extra.key+'"',
+  target='from the dataset '+h.dataset_link(activity.data.package),
   activity=activity
   )}
 </html>
diff --git a/ckan/templates/activity_streams/deleted_resource.html b/ckan/templates/activity_streams/deleted_resource.html
@@ -9,9 +9,9 @@
 ${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 '
-    +h.dataset_link(activity.data.package)),
+  object='the resource '+h.resource_link(detail.data.resource,
+                                         activity.data.package.id),
+  target='from the dataset '+h.dataset_link(activity.data.package),
   activity=activity
   )}
 </html>
diff --git a/ckan/templates/activity_streams/new_package_extra.html b/ckan/templates/activity_streams/new_package_extra.html
@@ -9,8 +9,8 @@
 ${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)),
+  object='the extra "'+detail.data.package_extra.key+'"',
+  target='to the dataset '+h.dataset_link(activity.data.package),
   activity=activity
   )}
 </html>
diff --git a/ckan/templates/activity_streams/new_resource.html b/ckan/templates/activity_streams/new_resource.html
@@ -9,9 +9,9 @@
 ${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 '
-    +h.dataset_link(activity.data.package)),
+  object='the resource '+h.resource_link(detail.data.resource,
+                                         activity.data.package.id),
+  target='to the dataset '+h.dataset_link(activity.data.package),
   activity=activity
   )}
 </html>
diff --git a/ckan/templates/activity_streams/removed_tag.html b/ckan/templates/activity_streams/removed_tag.html
@@ -9,8 +9,8 @@
 ${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)),
+  object="the tag "+h.tag_link(detail.data.tag),
+  target="from the dataset "+h.dataset_link(detail.data.package),
   activity=activity
   )}
 </html>