icon update for font-awesome 4.x -- part 3

ckan · Jan 18, 2017 · 6e12b6a · 6e12b6a
1 parent e458c59
commit 6e12b6a
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 14 deletions.
diff --git a/ckan/lib/activity_streams.py b/ckan/lib/activity_streams.py
@@ -165,24 +165,24 @@ def activity_stream_string_follow_group(context, activity):
 # A dictionary mapping activity types to the icons associated to them
 activity_stream_string_icons = {
   'added tag': 'tag',
-  'changed group': 'group',
+  'changed group': 'users',
   'changed package': 'sitemap',
-  'changed package_extra': 'edit',
+  'changed package_extra': 'pencil-square-o',
   'changed resource': 'file',
   'changed user': 'user',
-  'deleted group': 'group',
+  'deleted group': 'users',
   'deleted package': 'sitemap',
-  'deleted package_extra': 'edit',
+  'deleted package_extra': 'pencil-square-o',
   'deleted resource': 'file',
-  'new group': 'group',
+  'new group': 'users',
   'new package': 'sitemap',
-  'new package_extra': 'edit',
+  'new package_extra': 'pencil-square-o',
   'new resource': 'file',
   'new user': 'user',
   'removed tag': 'tag',
   'follow dataset': 'sitemap',
   'follow user': 'user',
-  'follow group': 'group',
+  'follow group': 'users',
   'changed organization': 'briefcase',
   'deleted organization': 'briefcase',
   'new organization': 'briefcase',

diff --git a/ckanext/example_iconfigurer/plugin.py b/ckanext/example_iconfigurer/plugin.py
@@ -56,10 +56,10 @@ def before_map(self, map):
         with SubMapper(map, controller=controller) as m:
             m.connect('ckanext_myext_config_one',
                       '/ckan-admin/myext_config_one', action='config_one',
-                      ckan_icon='picture'),
+                      ckan_icon='picture-o'),
             m.connect('ckanext_myext_config_two',
                       '/ckan-admin/myext_config_two', action='config_two',
-                      ckan_icon='picture'),
+                      ckan_icon='picture-o'),
 
             # route used for testing helper method
             m.connect('build_extra_admin_nav', '/build_extra_admin_nav',

diff --git a/ckanext/example_iconfigurer/tests/test_example_iconfigurer.py b/ckanext/example_iconfigurer/tests/test_example_iconfigurer.py
@@ -69,7 +69,7 @@ def test_build_extra_admin_nav_one_value_in_config(self):
         Correct string returned when ckan.admin_tabs option has single value in config.
         '''
         app = self._get_test_app()
-        expected = """<li><a href="/ckan-admin/myext_config_one"><i class="fa fa-picture"></i> My Label</a></li>"""
+        expected = """<li><a href="/ckan-admin/myext_config_one"><i class="fa fa-picture-o"></i> My Label</a></li>"""
         response = app.get('/build_extra_admin_nav')
         nosetools.assert_equal(response.body, expected)
 
@@ -79,6 +79,6 @@ def test_build_extra_admin_nav_two_values_in_config(self):
         Correct string returned when ckan.admin_tabs option has two values in config.
         '''
         app = self._get_test_app()
-        expected = """<li><a href="/ckan-admin/myext_config_two"><i class="fa fa-picture"></i> My Other Label</a></li><li><a href="/ckan-admin/myext_config_one"><i class="fa fa-picture"></i> My Label</a></li>"""
+        expected = """<li><a href="/ckan-admin/myext_config_two"><i class="fa fa-picture-o"></i> My Other Label</a></li><li><a href="/ckan-admin/myext_config_one"><i class="fa fa-picture-o"></i> My Label</a></li>"""
         response = app.get('/build_extra_admin_nav')
         nosetools.assert_equal(response.body, expected)
diff --git a/...ext/example_theme/v16_initialize_a_javascript_module/templates/snippets/package_item.html b/...ext/example_theme/v16_initialize_a_javascript_module/templates/snippets/package_item.html
@@ -16,6 +16,6 @@
   <button data-module="example_theme_popover"
           class="btn"
           href="#">
-    <i class="icon-info-sign"></i>
+    <i class="fa fa-info-circle"></i>
   </button>
 {% endblock %}
diff --git a/ckanext/imageview/plugin.py b/ckanext/imageview/plugin.py
@@ -24,7 +24,7 @@ def update_config(self, config):
     def info(self):
         return {'name': 'image_view',
                 'title': p.toolkit._('Image'),
-                'icon': 'picture',
+                'icon': 'picture-o',
                 'schema': {'image_url': [ignore_empty, unicode]},
                 'iframed': False,
                 'always_available': True,

diff --git a/ckanext/textview/plugin.py b/ckanext/textview/plugin.py
@@ -65,7 +65,7 @@ def update_config(self, config):
     def info(self):
         return {'name': 'text_view',
                 'title': p.toolkit._('Text'),
-                'icon': 'file-text-alt',
+                'icon': 'file-text-o',
                 'default_title': p.toolkit._('Text'),
                 }