changeset 2363:ae8395b702c2

Uses the xstatic-font-awesome package, fixes icon-stacking for the local panel
author sharky93 <rishabhr123@gmail.com>
date Wed, 07 Aug 2013 02:50:06 +0530
parents 1d461ab9df80
children 9f4e725f9868
files MoinMoin/templates/base.html MoinMoin/themes/basic/templates/show.html setup.py wikiconfig.py
diffstat 4 files changed, 36 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/templates/base.html	Tue Aug 06 15:44:15 2013 +0530
+++ b/MoinMoin/templates/base.html	Wed Aug 07 02:50:06 2013 +0530
@@ -46,6 +46,10 @@
     <link rel="stylesheet" href="{{ url_for('serve.files', name='bootstrap', filename='css/bootstrap.css') }}" />
     {% endblock %}
 
+    {% block icons_stylesheet %}
+    <link rel="stylesheet" href="{{ url_for('serve.files', name='font_awesome', filename='css/font-awesome.css') }}" />
+    {% endblock %}
+    
     <link rel="shortcut icon" href="{{ url_for('static', filename='logos/favicon.ico') }}" />
 
     {% block theme_stylesheets %}
--- a/MoinMoin/themes/basic/templates/show.html	Tue Aug 06 15:44:15 2013 +0530
+++ b/MoinMoin/themes/basic/templates/show.html	Wed Aug 07 02:50:06 2013 +0530
@@ -26,7 +26,9 @@
 
             {%- if endpoint == 'frontend.quicklink_item' and user.valid %}
                 <a class="list-group-item" href="{{ url_for(endpoint, item_name=item_name) }}" title="{{ title }}" rel="nofollow">
-                    <span class="icon-star-empty"></span>
+                    <span class="icon-stack">
+                        <i class="icon-star-empty"></i>
+                    </span>
                     {%- if user.is_quicklinked_to([item_name]) %}
                         {{ _('Remove Link') }}
                     {%- else %}
@@ -37,7 +39,9 @@
 
             {%- if endpoint == 'frontend.subscribe_item' and user.valid %}
                 <a class="list-group-item" href="{{ url_for(endpoint, item_name=item_name) }}" title="{{ title }}" rel="nofollow">
-                    <span class="icon-envelope"></span>
+                    <span class="icon-stack">
+                        <i class="icon-envelope"></i>
+                    </span>
                     {%- if user.is_subscribed_to([item_name]) %}
                         {{ _('Unsubscribe') }}
                     {%- else %}
@@ -56,14 +60,18 @@
 
             {%- if endpoint == 'frontend.index' %}
                 <a class="list-group-item" href="{{ url_for(endpoint, item_name=item_name) }}" title="{{ title }}" rel="nofollow">
-                <span class="icon-list-alt"></span>
+                <span class="icon-stack">    
+                    <i class="icon-list-alt"></i>
+                </span>
                     {{ label }}
                 </a>
             {%- endif %}
 
             {%- if endpoint == 'frontend.sitemap' %}
                 <a class="list-group-item" href="{{ url_for(endpoint, item_name=item_name) }}" title="{{ title }}" rel="nofollow">
-                <span class="icon-map-marker"></span>
+                <span class="icon-stack">
+                    <i class="icon-map-marker"></i>
+                </span>
                     {{ label }}
                 </a>
             {%- endif %}
@@ -79,42 +87,54 @@
 
             {%- if endpoint == 'frontend.rename_item' and user.may.write(item_name) %}
                 <a class="list-group-item" href="{{ url_for(endpoint, item_name=item_name) }}" title="{{ title }}" rel="nofollow">
-                    <span class="icon-tag"></span>
+                <span class="icon-stack">
+                    <i class="icon-tag"></i>
+                </span>
                     {{ label }}
                 </a>
             {%- endif %}
 
             {%- if endpoint == 'frontend.delete_item' and user.may.write(item_name) %}
                 <a class="list-group-item" href="{{ url_for(endpoint, item_name=item_name) }}" title="{{ title }}" rel="nofollow">
-                    <span class="icon-trash"></span>
+                <span class="icon-stack">
+                    <i class="icon-trash"></i>
+                </span>
                     {{ label }}
                 </a>
             {% endif %}
 
             {%- if endpoint == 'frontend.destroy_item' and user.may.destroy(item_name) %}
                 <a class="list-group-item" href="{{ url_for(endpoint, item_name=item_name) }}" title="{{ title }}" rel="nofollow">
-                    <span class="icon-fire"></span>
+                <span class="icon-stack">
+                    <i class="icon-fire"></i>
+                </span>
                     {{ label }}
                 </a>
             {%- endif %}
 
             {%- if endpoint == 'frontend.similar_names' and user.may.write(item_name) %}
                 <a class="list-group-item" href="{{ url_for(endpoint, item_name=item_name) }}" title="{{ title }}" rel="nofollow">
-                    <span class="icon-search"></span>
+                <span class="icon-stack">
+                    <i class="icon-search"></i>
+                </span>
                     {{ label }}
                 </a>
             {%- endif %}
 
             {%- if endpoint == 'frontend.download_item' and user.may.write(item_name) %}
                 <a class="list-group-item" href="{{ url_for(endpoint, item_name=item_name) }}" title="{{ title }}" rel="nofollow">
-                    <span class="icon-download-alt"></span>
+                <span class="icon-stack">
+                    <i class="icon-download-alt"></i>
+                </span>
                     {{ label }}
                 </a>
             {%- endif %}
 
             {%- if endpoint == 'frontend.copy_item' and user.may.write(item_name) %}
                 <a class="list-group-item" href="{{ url_for(endpoint, item_name=item_name) }}" title="{{ title }}" rel="nofollow">
-                    <span class="icon-comment"></span>
+                <span class="icon-stack">
+                    <i class="icon-comment"></i>
+                </span>
                     {{ label }}
                 </a>
             {%- endif %}
--- a/setup.py	Tue Aug 06 15:44:15 2013 +0530
+++ b/setup.py	Wed Aug 07 02:50:06 2013 +0530
@@ -107,6 +107,7 @@
         'passlib>=1.6.0',  # strong password hashing (1.6 needed for consteq)
         'XStatic>=0.0.2',  # support for static file pypi packages
         'XStatic-Bootstrap>=2.3.2.1',
+        'XStatic-Font-Awesome>=3.2.1.1',
         'XStatic-CKEditor>=3.6.1.2',
         'XStatic-jQuery>=1.8.2',
         'XStatic-jQuery-File-Upload>=4.4.2',
--- a/wikiconfig.py	Tue Aug 06 15:44:15 2013 +0530
+++ b/wikiconfig.py	Wed Aug 07 02:50:06 2013 +0530
@@ -67,6 +67,7 @@
         'jquery', 'jquery_file_upload',
         'json_js',
         'bootstrap',
+        'font_awesome',
         'ckeditor',
         'svgweb',
         'svgedit_moin', 'twikidraw_moin', 'anywikidraw',