Skip to content

Commit

Permalink
Tweak activity streams HTML and CSS
Browse files Browse the repository at this point in the history
  • Loading branch information
Sean Hammond committed Feb 7, 2012
1 parent 495d944 commit 2acab36
Show file tree
Hide file tree
Showing 20 changed files with 29 additions and 27 deletions.
14 changes: 7 additions & 7 deletions ckan/public/css/style.css
View file
Expand Up @@ -1527,30 +1527,30 @@ body.authz form button {
/* = Activity Streams = */
/* ==================== */

.activity-stream-activity {
.activity-stream .activity {
padding-bottom:1em;

}
.activity-stream-activity a {
.activity-stream .activity a {
font-weight:bold;

}
.activity-stream-activity .actor {
.activity-stream .activity .actor {

}
.activity-stream-activity .verb {
.activity-stream .activity .verb {
background-color:PapayaWhip;
padding:.25em;
margin:.25em;

}
.activity-stream-activity .object {
.activity-stream .activity .object {

}
.activity-stream-activity .target {
.activity-stream .activity .target {

}
.activity-stream-activity .date {
.activity-stream .activity .date {
color:#999;

}
4 changes: 2 additions & 2 deletions ckan/templates/_util.html
View file
Expand Up @@ -451,8 +451,8 @@
</tr>
</table>

<div py:def="activity_stream_activity(actor, verb, object=None, target=None)"
class="activity-stream-activity">
<div py:def="activity_div(actor, verb, object=None, target=None)"
class="activity">
<span class="actor">
${actor}
</span>
Expand Down
2 changes: 1 addition & 1 deletion ckan/templates/activity_streams/added_tag.html
View file
Expand Up @@ -6,7 +6,7 @@
py:strip=""
>
<xi:include href="../_util.html" />
${activity_stream_activity(
${activity_div(
actor=h.linked_user(activity.user_id),
verb='added',
object="the tag "+h.tag_link(detail.data.tag),
Expand Down
2 changes: 1 addition & 1 deletion ckan/templates/activity_streams/changed_group.html
View file
Expand Up @@ -6,7 +6,7 @@
py:strip=""
>
<xi:include href="../_util.html" />
${activity_stream_activity(
${activity_div(
actor=h.linked_user(activity.user_id),
verb='updated',
object="the group "+h.group_link(activity.data.group),
Expand Down
2 changes: 1 addition & 1 deletion ckan/templates/activity_streams/changed_package.html
View file
Expand Up @@ -6,7 +6,7 @@
py:strip=""
>
<xi:include href="../_util.html" />
${activity_stream_activity(
${activity_div(
actor=h.linked_user(activity.user_id),
verb='updated',
object="the dataset "+h.dataset_link(activity.data.package),
Expand Down
2 changes: 1 addition & 1 deletion ckan/templates/activity_streams/changed_package_extra.html
View file
Expand Up @@ -6,7 +6,7 @@
py:strip=""
>
<xi:include href="../_util.html" />
${activity_stream_activity(
${activity_div(
actor=h.linked_user(activity.user_id),
verb='changed',
object='the extra "'+detail.data.package_extra.key+'"',
Expand Down
2 changes: 1 addition & 1 deletion ckan/templates/activity_streams/changed_resource.html
View file
Expand Up @@ -6,7 +6,7 @@
py:strip=""
>
<xi:include href="../_util.html" />
${activity_stream_activity(
${activity_div(
actor=h.linked_user(activity.user_id),
verb='updated',
object='the resource '+h.resource_link(detail.data.resource,
Expand Down
2 changes: 1 addition & 1 deletion ckan/templates/activity_streams/changed_user.html
View file
Expand Up @@ -6,7 +6,7 @@
py:strip=""
>
<xi:include href="../_util.html" />
${activity_stream_activity(
${activity_div(
actor=h.linked_user(activity.user_id),
verb='updated their profile.',
activity=activity
Expand Down
2 changes: 1 addition & 1 deletion ckan/templates/activity_streams/deleted_group.html
View file
Expand Up @@ -6,7 +6,7 @@
py:strip=""
>
<xi:include href="../_util.html" />
${activity_stream_activity(
${activity_div(
actor=h.linked_user(activity.user_id),
verb='deleted',
object="the group "+activity.data.group.name,
Expand Down
2 changes: 1 addition & 1 deletion ckan/templates/activity_streams/deleted_package.html
View file
Expand Up @@ -6,7 +6,7 @@
py:strip=""
>
<xi:include href="../_util.html" />
${activity_stream_activity(
${activity_div(
actor=h.linked_user(activity.user_id),
verb='deleted',
object="the dataset "+h.dataset_display_name(activity.data.package),
Expand Down
2 changes: 1 addition & 1 deletion ckan/templates/activity_streams/deleted_package_extra.html
View file
Expand Up @@ -6,7 +6,7 @@
py:strip=""
>
<xi:include href="../_util.html" />
${activity_stream_activity(
${activity_div(
actor=h.linked_user(activity.user_id),
verb='deleted',
object='the extra "'+detail.data.package_extra.key+'"',
Expand Down
2 changes: 1 addition & 1 deletion ckan/templates/activity_streams/deleted_resource.html
View file
Expand Up @@ -6,7 +6,7 @@
py:strip=""
>
<xi:include href="../_util.html" />
${activity_stream_activity(
${activity_div(
actor=h.linked_user(activity.user_id),
verb='deleted',
object='the resource '+h.resource_display_name(detail.data.resource),
Expand Down
2 changes: 1 addition & 1 deletion ckan/templates/activity_streams/new_group.html
View file
Expand Up @@ -6,7 +6,7 @@
py:strip=""
>
<xi:include href="../_util.html" />
${activity_stream_activity(
${activity_div(
actor=h.linked_user(activity.user_id),
verb='created',
object="the group "+h.group_link(activity.data.group),
Expand Down
2 changes: 1 addition & 1 deletion ckan/templates/activity_streams/new_package.html
View file
Expand Up @@ -6,7 +6,7 @@
py:strip=""
>
<xi:include href="../_util.html" />
${activity_stream_activity(
${activity_div(
actor=h.linked_user(activity.user_id),
verb='created',
object="the dataset "+h.dataset_link(activity.data.package),
Expand Down
2 changes: 1 addition & 1 deletion ckan/templates/activity_streams/new_package_extra.html
View file
Expand Up @@ -6,7 +6,7 @@
py:strip=""
>
<xi:include href="../_util.html" />
${activity_stream_activity(
${activity_div(
actor=h.linked_user(activity.user_id),
verb='added',
object='the extra "'+detail.data.package_extra.key+'"',
Expand Down
2 changes: 1 addition & 1 deletion ckan/templates/activity_streams/new_resource.html
View file
Expand Up @@ -6,7 +6,7 @@
py:strip=""
>
<xi:include href="../_util.html" />
${activity_stream_activity(
${activity_div(
actor=h.linked_user(activity.user_id),
verb='added',
object='the resource '+h.resource_link(detail.data.resource,
Expand Down
2 changes: 1 addition & 1 deletion ckan/templates/activity_streams/new_user.html
View file
Expand Up @@ -6,7 +6,7 @@
py:strip=""
>
<xi:include href="../_util.html" />
${activity_stream_activity(
${activity_div(
actor=h.linked_user(activity.user_id),
verb='signed up.',
activity=activity
Expand Down
2 changes: 1 addition & 1 deletion ckan/templates/activity_streams/removed_tag.html
View file
Expand Up @@ -6,7 +6,7 @@
py:strip=""
>
<xi:include href="../_util.html" />
${activity_stream_activity(
${activity_div(
actor=h.linked_user(activity.user_id),
verb='removed',
object="the tag "+h.tag_link(detail.data.tag),
Expand Down
4 changes: 3 additions & 1 deletion ckan/templates/user/read.html
View file
Expand Up @@ -69,7 +69,9 @@ <h2>Datasets</h2>
</div>
<div class="changes span-12 last">
<h2>Public Activity</h2>
${c.user_activity_stream}
<div class="activity-stream">
${c.user_activity_stream}
</div>
</div>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion ckan/tests/functional/test_activity.py
View file
Expand Up @@ -201,5 +201,5 @@ def test_activity(self):
# By now we've created >15 activities, but only the latest 15 should
# appear on the page.
result = self.app.get(offset, status=200)
assert result.body.count('<div class="activity-stream-activity">') \
assert result.body.count('<div class="activity">') \
== 15

0 comments on commit 2acab36

Please sign in to comment.