Merge pull request #51 from derilinx/master

Upgrade to font-awesome 4 without breaking compatibility with older CKANs (FA 3)
ckan · May 23, 2017 · 4d3e401 · 4d3e401
2 parents 1734f20 + 718a84d
commit 4d3e401
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 9 deletions.
diff --git a/ckanext/pages/plugin.py b/ckanext/pages/plugin.py
@@ -90,6 +90,16 @@ def get_recent_blog_posts(number=5, exclude=None):
     return new_list
 
 
+def get_plus_icon():
+    ckan_version = float(h.ckan_version()[0:3])
+    if ckan_version >= 2.7:
+        icon = 'plus-square'
+    else:
+        icon = 'plus-sign-alt'
+
+    return icon
+
+
 class PagesPlugin(PagesPluginBase):
     p.implements(p.IConfigurer, inherit=True)
     p.implements(p.ITemplateHelpers, inherit=True)
@@ -124,7 +134,8 @@ def get_helpers(self):
             'build_nav_main': build_pages_nav_main,
             'render_content': render_content,
             'get_wysiwyg_editor': get_wysiwyg_editor,
-            'get_recent_blog_posts': get_recent_blog_posts
+            'get_recent_blog_posts': get_recent_blog_posts,
+            'pages_get_plus_icon': get_plus_icon
         }
 
     def after_map(self, map):

diff --git a/ckanext/pages/theme/templates_main/ckanext_pages/base.html b/ckanext/pages/theme/templates_main/ckanext_pages/base.html
@@ -11,7 +11,7 @@
 
   <div class="module module-narrow module-shallow">
     <h2 class="module-heading">
-      <i class="icon-info-sign"></i>
+      <i class="fa fa-info-circle icon-info-sign"></i>
       {{ _('What are Pages?') }}
     </h2>
     <div class="module-content">

diff --git a/ckanext/pages/theme/templates_main/ckanext_pages/blog_edit_base.html b/ckanext/pages/theme/templates_main/ckanext_pages/blog_edit_base.html
@@ -5,7 +5,7 @@
 {% block secondary_content %}
   <div class="module module-narrow module-shallow">
     <h2 class="module-heading">
-      <i class="icon-info-sign"></i>
+      <i class="fa fa-info-circle icon-info-sign"></i>
       {{ _('Blog') }}
     </h2>
     <div class="module-content">

diff --git a/ckanext/pages/theme/templates_main/ckanext_pages/blog_list.html b/ckanext/pages/theme/templates_main/ckanext_pages/blog_list.html
@@ -2,7 +2,7 @@
 
 {% block page_primary_action %}
   {% if h.check_access('ckanext_pages_update', {}) %}
-    {% link_for _('Add Article'), controller='ckanext.pages.controller:PagesController', action='blog_edit', page='', class_='btn btn-primary', icon='plus-sign-alt' %}
+    {% link_for _('Add Article'), controller='ckanext.pages.controller:PagesController', action='blog_edit', page='', class_='btn btn-primary', icon=h.pages_get_plus_icon() %}
   {% endif %}
 {% endblock %}
 

diff --git a/ckanext/pages/theme/templates_main/ckanext_pages/group_page_list.html b/ckanext/pages/theme/templates_main/ckanext_pages/group_page_list.html
@@ -2,7 +2,7 @@
 
 {% block page_primary_action %}
   {% if h.check_access('package_create', {'group_id': c.group_dict.id}) %}
-    {% link_for _('Add page'), controller='ckanext.pages.controller:PagesController', action='group_edit', id=c.group_dict.name, page='', class_='btn btn-primary', icon='plus-sign-alt' %}
+    {% link_for _('Add page'), controller='ckanext.pages.controller:PagesController', action='group_edit', id=c.group_dict.name, page='', class_='btn btn-primary', icon=h.pages_get_plus_icon() %}
   {% endif %}
 {% endblock %}
 

diff --git a/ckanext/pages/theme/templates_main/ckanext_pages/organization_page_list.html b/ckanext/pages/theme/templates_main/ckanext_pages/organization_page_list.html
@@ -2,7 +2,7 @@
 
 {% block page_primary_action %}
   {% if h.check_access('package_create', {'group_id': c.group_dict.id}) %}
-    {% link_for _('Add page'), controller='ckanext.pages.controller:PagesController', action='org_edit', id=c.group_dict.name, page='', class_='btn btn-primary', icon='plus-sign-alt' %}
+    {% link_for _('Add page'), controller='ckanext.pages.controller:PagesController', action='org_edit', id=c.group_dict.name, page='', class_='btn btn-primary', icon=h.pages_get_plus_icon() %}
   {% endif %}
 {% endblock %}
 

diff --git a/ckanext/pages/theme/templates_main/ckanext_pages/pages_list.html b/ckanext/pages/theme/templates_main/ckanext_pages/pages_list.html
@@ -2,7 +2,7 @@
 
 {% block page_primary_action %}
   {% if h.check_access('ckanext_pages_update', {}) %}
-    {% link_for _('Add page'), controller='ckanext.pages.controller:PagesController', action='pages_edit', page='', class_='btn btn-primary', icon='plus-sign-alt' %}
+    {% link_for _('Add page'), controller='ckanext.pages.controller:PagesController', action='pages_edit', page='', class_='btn btn-primary', icon=h.pages_get_plus_icon() %}
   {% endif %}
 {% endblock %}
 

diff --git a/ckanext/pages/theme/templates_main/header.html b/ckanext/pages/theme/templates_main/header.html
@@ -3,12 +3,12 @@
 {% block header_account_logged %}
   <li>
     <a href="{{ h.url_for('pages_index') }}" title="{{ _('Pages') }}">
-      <i class="icon-file"></i>
+      <i class="fa fa-file icon-file"></i>
     </a>
   </li>
   <li>
     <a href="{{ h.url_for('blog_index') }}" title="{{ _('Blog') }}">
-      <i class="icon-pencil"></i>
+      <i class="fa fa-pencil icon-pencil"></i>
     </a>
   </li>
   {{ super() }}