changeset 2830:80053c4b6965

fix #443 upgrade font-awesome to 4.1; run m quickinstall to install renamed fonts
author RogerHaase <haaserd@gmail.com>
date Fri, 17 Oct 2014 06:14:37 -0700
parents 7e86797c6d01
children 5e0225f77597
files MoinMoin/templates/ticket/base.html MoinMoin/themes/basic/templates/diff.html MoinMoin/themes/basic/templates/layout.html MoinMoin/themes/basic/templates/show.html MoinMoin/themes/basic/templates/usersettings_forms.html setup.py
diffstat 6 files changed, 12 insertions(+), 13 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/templates/ticket/base.html	Tue Oct 14 14:37:06 2014 -0700
+++ b/MoinMoin/templates/ticket/base.html	Fri Oct 17 06:14:37 2014 -0700
@@ -54,7 +54,7 @@
             </div>
             <div id="user-actions" class="hidden">
                 <a href="{{ url_for('frontend.quicklink_item', item_name=item.fqname) }}" class="list-group-item" rel="nofollow" title="Create or remove a navigation link to this item">
-                    <i class="icon-star-empty icon-fixed-width"></i>
+                    <i class="fa fa-link fa-fw"></i>
                     {%- if user.is_quicklinked_to([item.fqname]) %}
                         {{ _('Remove Link') }}
                     {%- else %}
@@ -62,7 +62,7 @@
                     {%- endif %}
                 </a>
                 <a href="{{ url_for('frontend.subscribe_item', item_name=item.fqname) }}" class="list-group-item" rel="nofollow" title="witch notifications about item changes on or off">
-                    <i class="icon-envelope icon-fixed-width"></i>
+                    <i class="fa fa-envelope fa-fw"></i>
                     {%- if user.is_subscribed_to(item) %}
                         {{ _('Unsubscribe') }}
                     {%- else %}
--- a/MoinMoin/themes/basic/templates/diff.html	Tue Oct 14 14:37:06 2014 -0700
+++ b/MoinMoin/themes/basic/templates/diff.html	Fri Oct 17 06:14:37 2014 -0700
@@ -7,7 +7,7 @@
 
 {% block content %}
     {% block headline %}
-        <i class="icon-chevron-sign-left">
+        <i class="fa fa-chevron-left">
             <a href="{{ url_for('frontend.history', item_name=item_name) }}"> {{ _("Back") }} </a>
         </i>
         <h2>{{ _("Diff for '%(item_name)s'", item_name=newrev.item.name) }}</h2>
--- a/MoinMoin/themes/basic/templates/layout.html	Tue Oct 14 14:37:06 2014 -0700
+++ b/MoinMoin/themes/basic/templates/layout.html	Fri Oct 17 06:14:37 2014 -0700
@@ -52,7 +52,7 @@
                 <input name='q' type="text" class="form-control" placeholder="Search ...">
                 <div class="input-group-btn">
                     <button class="btn btn-primary" type="submit">
-                        <i class="icon-search"></i>
+                        <i class="fa fa-search"></i>
                     </button>
                 </div>
             </div>
@@ -149,19 +149,19 @@
                                         {% if user.name -%}
                                             {% set wiki_href, aliasname, title, exists = theme_supp.userhome() %}
                                             <li>
-                                                {{ hyperlink(wiki_href, title, exists, aliasname, "icon-user icon-white", None) }}
+                                                {{ hyperlink(wiki_href, title, exists, aliasname, "fa fa-user fa-inverse", None) }}
                                             </li>
                                             {% if 'frontend.usersettings' not in cfg.endpoints_excluded -%}
                                                 <li>
                                                     {{ hyperlink(url_for('frontend.usersettings'), None, True,
-                                                        _('Settings'), "icon-cog icon-white", None) }}
+                                                        _('Settings'), "fa fa-cog fa-inverse", None) }}
                                                 </li>
                                             {%- endif %}
                                         {%- endif %}
                                         {% if user.auth_method in cfg.auth_can_logout %}
                                             <li>
                                                 {{ hyperlink(url_for('frontend.logout', logout_submit=1), None, True,
-                                                        _('Logout'), "icon-off icon-white", None) }}
+                                                        _('Logout'), "fa fa-sign-out fa-inverse", None) }}
                                             </li>
                                         {% endif %}
                                     {% else %}
@@ -193,14 +193,13 @@
                                             class="{% if err %}moin-badinterwiki{% else %}moin-interwiki{% endif %}">
                                             {{ fqname|shorten_fqname }}
                                         </a>
-                                        <i class="icon-double-angle-right icon-fixed-width"></i>
                                     {%- else -%}
                                         <a href="{{ url_for('frontend.show_item', item_name=fqname) }}"{{ " " }}
                                             {% if not exists -%}class="moin-nonexistent"{%- endif -%}>
                                             {{ fqname|shorten_fqname }}
                                         </a>
-                                        <i class="icon-double-angle-right icon-fixed-width"></i>
                                     {%- endif %}
+                                    <i class="fa fa-angle-double-right fa-fw"></i>
                                     <ul class="moin-bcs-subitems">
                                         {% for fq_name in theme_supp.get_fqnames(fqname) -%}
                                             <li>
--- a/MoinMoin/themes/basic/templates/show.html	Tue Oct 14 14:37:06 2014 -0700
+++ b/MoinMoin/themes/basic/templates/show.html	Fri Oct 17 06:14:37 2014 -0700
@@ -49,7 +49,7 @@
                     data-toggle="button"
                     title="Show Comments">
                 <span class="pull-left">
-                    <i class="icon-comment icon-fixed-width"></i>
+                    <i class="fa fa-comment fa-fw"></i>
                     Comments
                 </span>
             </button>
@@ -58,7 +58,7 @@
                     data-toggle="button"
                     title="Show Transclusions">
                 <span class="pull-left">
-                    <i class="icon-edit icon-fixed-width"></i>
+                    <i class="fa fa-paste fa-fw"></i>
                     Transclusions
                 </span>
             </button>
--- a/MoinMoin/themes/basic/templates/usersettings_forms.html	Tue Oct 14 14:37:06 2014 -0700
+++ b/MoinMoin/themes/basic/templates/usersettings_forms.html	Fri Oct 17 06:14:37 2014 -0700
@@ -71,7 +71,7 @@
             {{ gen.label(form['email']) }}
             <div class="input-group">
                 {{ gen.input(form['email'], type="email", class="form-control") }}
-                <span class="input-group-addon"><i class="icon-envelope"></i></span>
+                <span class="input-group-addon"><i class="fa fa-envelope"></i></span>
             </div>
         </div>
         {{ forms.render_hidden('part', 'notification') }}
--- a/setup.py	Tue Oct 14 14:37:06 2014 -0700
+++ b/setup.py	Fri Oct 17 06:14:37 2014 -0700
@@ -101,7 +101,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==3.1.1.2',
-        'XStatic-Font-Awesome==3.2.1.1',  # see issue #443
+        'XStatic-Font-Awesome>=4.1.0.0',
         'XStatic-CKEditor>=3.6.1.2',
         'XStatic-autosize',
         'XStatic-jQuery>=1.8.2',