Dashboard icons and colors for activity streams

ckan · Nov 25, 2012 · 8e07b4c · 8e07b4c
1 parent 2317da3
commit 8e07b4c
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/ckan/lib/activity_streams.py b/ckan/lib/activity_streams.py
@@ -198,7 +198,10 @@ def activity_stream_string_new_related_item():
   'follow user': 'user',
   'follow group': 'group',
   'new related item': 'picture',
-  'undefined': 'user', # This is when no activity icon can be found
+  'changed organization': 'briefcase',
+  'deleted organization': 'briefcase',
+  'new organization': 'briefcase',
+  'undefined': 'certificate', # This is when no activity icon can be found
 }
 
 # A list of activity types that may have details

diff --git a/ckan/public/base/less/activity.less b/ckan/public/base/less/activity.less
@@ -72,22 +72,25 @@
 
 // colors
 .activity .item {
-	& i { background-color: @activityColorNeutral; } // Non defined
+	& i { background-color: @activityColorBlank; } // Non defined
 	&.added-tag i { background-color: spin(@activityColorNew, 60); }
 	&.changed-group i { background-color: @activityColorModify; }
 	&.changed-package i { background-color: spin(@activityColorModify, 20); }
 	&.changed-package_extra i { background-color: spin(@activityColorModify, -20); }
 	&.changed-resource i { background-color: spin(@activityColorModify, 40); }
 	&.changed-user i { background-color: spin(@activityColorModify, -40); }
+	&.changed-organization i { background-color: spin(@activityColorNew, 50); }
 	&.deleted-group i { background-color: @activityColorDelete; }
 	&.deleted-package i { background-color: spin(@activityColorDelete, 20); }
 	&.deleted-package_extra i { background-color: spin(@activityColorDelete, -20); }
 	&.deleted-resource i { background-color: spin(@activityColorDelete, 40); }
+	&.deleted-organization i { background-color: spin(@activityColorDelete, -40); }
 	&.new-group i { background-color: @activityColorNew; }
 	&.new-package i { background-color: spin(@activityColorNew, 20); }
 	&.new-package_extra i { background-color: spin(@activityColorNew, -20); }
 	&.new-resource i { background-color: spin(@activityColorNew, -40); }
 	&.new-user i { background-color: spin(@activityColorNew, 40); }
+	&.new-organization i { background-color: spin(@activityColorNew, -40); }
 	&.removed-tag i { background-color: spin(@activityColorDelete, -40); }
 	&.deleted-related-item i { background-color: spin(@activityColorDelete, 60); }
 	&.follow-dataset i { background-color: @activityColorNeutral; }

diff --git a/ckan/public/base/less/variables.less b/ckan/public/base/less/variables.less
@@ -109,6 +109,7 @@
 
 // Activity Stream base colors
 @activityColorText: #FFFFFF;
+@activityColorBlank: #999999;
 @activityColorNew: #69A67A;
 @activityColorNeutral: #767DCE;
 @activityColorModify: #767DCE;