changeset 2833:b55ace92b0a9

merge
author RogerHaase <haaserd@gmail.com>
date Mon, 20 Oct 2014 14:41:40 -0700
parents f6ee7dd9f400 (current diff) caf95e12acbb (diff)
children 615599f53b07
files MoinMoin/templates/global_history.html MoinMoin/themes/basic/static/img/moin-copy.png MoinMoin/themes/basic/static/img/moin-rename.png MoinMoin/themes/basic/static/img/moin-revert.png MoinMoin/themes/basic/static/img/moin-save.png MoinMoin/themes/basic/static/img/moin-trash.png MoinMoin/themes/basic/templates/layout.html MoinMoin/themes/modernized/static/css/msie.css MoinMoin/themes/modernized/static/img/moin-deleted.png MoinMoin/themes/modernized/static/img/moin-edit.png MoinMoin/themes/modernized/static/img/moin-new.png MoinMoin/themes/modernized/static/img/moin-renamed.png
diffstat 21 files changed, 21 insertions(+), 104 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/templates/global_history.html	Mon Oct 20 19:47:37 2014 +0200
+++ b/MoinMoin/templates/global_history.html	Mon Oct 20 14:41:40 2014 -0700
@@ -1,6 +1,14 @@
 {% extends theme("layout.html") %}
 {% import "utils.html" as utils %}
 
+{# map meta.action to font awesome classes #}
+{% set awesome_class = {
+    'REVERT': 'fa fa-undo',
+    'SAVE': 'fa fa-save',
+    'RENAME': 'fa fa-pencil-square-o',
+    'TRASH': 'fa fa-trash-o',
+} %}
+
 {% block head %}
     {{ super() }}
     <link rel="alternate" title="Global History" href="{{ url_for('feed.atom') }}" type="application/atom+xml" />
@@ -25,7 +33,7 @@
                             {% set meta = rev.meta %}
                             <tr>
                                 <td class="moin-action col-md-1">
-                                    <span title="{{ meta.action|title }}" class="moin-history-{{ meta.action|lower }}"></span>
+                                    <i title="{{ meta.action|title }}" class="{{ awesome_class[meta.action] }}"></span>
                                 </td>
                                 <td class="moin-history-links col-md-1">
                                     <a href="{{ url_for('frontend.history', item_name=rev.fqname, bookmark=bookmark_time) }}">HIST</a>
--- a/MoinMoin/templates/ticket/base.html	Mon Oct 20 19:47:37 2014 +0200
+++ b/MoinMoin/templates/ticket/base.html	Mon Oct 20 14:41:40 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/static/css/theme.css	Mon Oct 20 19:47:37 2014 +0200
+++ b/MoinMoin/themes/basic/static/css/theme.css	Mon Oct 20 14:41:40 2014 -0700
@@ -7053,21 +7053,6 @@
 #editor > textarea {
   width: 100%;
 }
-.moin-history-save:before {
-  content: url("../img/moin-save.png");
-}
-.moin-history-trash:before {
-  content: url("../img/moin-trash.png");
-}
-.moin-history-rename:before {
-  content: url("../img/moin-rename.png");
-}
-.moin-history-copy:before {
-  content: url("../img/moin-copy.png");
-}
-.moin-history-revert:before {
-  content: url("../img/moin-revert.png");
-}
 .moin-history-container-header {
   margin-bottom: 5px;
 }
--- a/MoinMoin/themes/basic/static/custom-less/theme.less	Mon Oct 20 19:47:37 2014 +0200
+++ b/MoinMoin/themes/basic/static/custom-less/theme.less	Mon Oct 20 14:41:40 2014 -0700
@@ -663,21 +663,6 @@
 #editor > textarea {
   width: 100%;
 }
-.moin-history-save:before {
-  content: url("../img/moin-save.png");
-}
-.moin-history-trash:before {
-  content: url("../img/moin-trash.png");
-}
-.moin-history-rename:before {
-  content: url("../img/moin-rename.png");
-}
-.moin-history-copy:before {
-  content: url("../img/moin-copy.png");
-}
-.moin-history-revert:before {
-  content: url("../img/moin-revert.png");
-}
 .moin-history-container-header {
   margin-bottom: 5px;
   > h2 {
Binary file MoinMoin/themes/basic/static/img/moin-copy.png has changed
Binary file MoinMoin/themes/basic/static/img/moin-rename.png has changed
Binary file MoinMoin/themes/basic/static/img/moin-revert.png has changed
Binary file MoinMoin/themes/basic/static/img/moin-save.png has changed
Binary file MoinMoin/themes/basic/static/img/moin-trash.png has changed
--- a/MoinMoin/themes/basic/templates/diff.html	Mon Oct 20 19:47:37 2014 +0200
+++ b/MoinMoin/themes/basic/templates/diff.html	Mon Oct 20 14:41:40 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	Mon Oct 20 19:47:37 2014 +0200
+++ b/MoinMoin/themes/basic/templates/layout.html	Mon Oct 20 14:41:40 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	Mon Oct 20 19:47:37 2014 +0200
+++ b/MoinMoin/themes/basic/templates/show.html	Mon Oct 20 14:41:40 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	Mon Oct 20 19:47:37 2014 +0200
+++ b/MoinMoin/themes/basic/templates/usersettings_forms.html	Mon Oct 20 14:41:40 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/MoinMoin/themes/modernized/static/css/msie.css	Mon Oct 20 19:47:37 2014 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-/*  msie.css - MoinMoin MS Internet explorer bug workarounds
-
-    Copyright: 2003 MoinMoin:JuergenHermann
-    Copyright: 2010 MoinMoin:RogerHaase
-    License: GNU GPL v2 or later, see COPYING for details.
-*/
-
-/* IE6 and IE7 both suck with :before */
-a.www { padding-left: 19px; background: url(../img/moin-www.png) left center no-repeat; }
-a.http { padding-left: 19px; background: url(../img/moin-www.png) left center no-repeat; }
-a.https { padding-left: 19px; background: url(../img/moin-www.png) left center no-repeat; }
-a.file { padding-left: 19px; background: url(../img/moin-ftp.png) left center no-repeat; }
-a.ftp { padding-left: 19px; background: url(../img/moin-ftp.png) left center no-repeat; }
-a.nntp { padding-left: 19px; background: url(../img/moin-news.png) left center no-repeat; }
-a.news { padding-left: 19px; background: url(../img/moin-news.png) left center no-repeat; }
-a.telnet, a.ssh { padding-left: 19px; background: url(../img/moin-telnet.png) left center no-repeat; }
-a.irc, a.ircs  { padding-left: 19px; background: url(../img/moin-telnet.png) left center no-repeat; }
-a.mailto { padding-left: 19px; background: url(../img/moin-email.png) left center no-repeat; }
-a.attachment { padding-left: 19px; background: url(../img/moin-attach.png) left center no-repeat; }
-a.badinterwiki { padding-left: 19px; background: url(../img/moin-inter.png) left center no-repeat; }
-a.interwiki { padding-left: 19px; background: url(../img/moin-inter.png) left center no-repeat; }
-#message .warning { padding-left: 21px; background: url(../img/alert.png) left center no-repeat; }
-#message .error { padding-left: 21px; background: url(../img/icon-error.png) left center no-repeat; }
-
-#moin-pagetrail li, #moin-pagelocation li {
-    border-left: 1px solid #AAA;
-    padding: 0 0.3em;
-}
-
-/* Spans for line-anchors - needed for IE6 and IE7 where omitting the "display: none" triggers rendering bugs. */
-span.anchor { display: none; }
-
-/* Some * html hacks for IE6 and below only (IE7 ignores * html) */
-
-/* IE6 has a bug with rendering of float elements. We workaround this bug by
- * assigning those elements a height attribute because we currently don't know
- * a better solution. This results in IE calculating the correct height of the
- * characters and displaying them correctly. We don't know any negative side
- * effects of this workaround:
- */
-* html div#moin-page, * html div#moin-header { height: 0.001%; }
-
-/*  avoid a gap between navibar and pageline on IE7  */
-#moin-navibar { zoom: 1; }
--- a/MoinMoin/themes/modernized/static/css/stylus/theme.styl	Mon Oct 20 19:47:37 2014 +0200
+++ b/MoinMoin/themes/modernized/static/css/stylus/theme.styl	Mon Oct 20 14:41:40 2014 -0700
@@ -610,18 +610,6 @@
         border none
         width 100%
 
-.moin-history-save:before
-    content url('../img/moin-edit.png')
-
-.moin-history-trash:before
-    content url('../img/moin-deleted.png')
-
-.moin-history-rename:before
-    content url('../img/moin-renamed.png')
-
-.moin-history-copy:before
-    content url('../img/moin-new.png')
-
 .moin-history-links
     width 5%
 
--- a/MoinMoin/themes/modernized/static/css/theme.css	Mon Oct 20 19:47:37 2014 +0200
+++ b/MoinMoin/themes/modernized/static/css/theme.css	Mon Oct 20 14:41:40 2014 -0700
@@ -426,10 +426,6 @@
 .moin-history-container-header a.bookmark-link{margin-left:10px;color:#fff}
 .moin-history-container-body{margin:0;padding:0;font-size:1.2em;}
 .moin-history-container-body table{margin:0;border:none;width:100%}
-.moin-history-save:before{content:url("../img/moin-edit.png")}
-.moin-history-trash:before{content:url("../img/moin-deleted.png")}
-.moin-history-rename:before{content:url("../img/moin-renamed.png")}
-.moin-history-copy:before{content:url("../img/moin-new.png")}
 .moin-history-links{width:5%}
 .moin-history-links a{display:block;margin-bottom:4px}
 .moin-history-editortext,.moin-history-links span,.moin-history-comment span{color:#000;display:block;margin-bottom:5px}
Binary file MoinMoin/themes/modernized/static/img/moin-deleted.png has changed
Binary file MoinMoin/themes/modernized/static/img/moin-edit.png has changed
Binary file MoinMoin/themes/modernized/static/img/moin-new.png has changed
Binary file MoinMoin/themes/modernized/static/img/moin-renamed.png has changed
--- a/setup.py	Mon Oct 20 19:47:37 2014 +0200
+++ b/setup.py	Mon Oct 20 14:41:40 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',