changeset 2832:caf95e12acbb

fix #466 Revert icon missing on modernized theme partially addresses #162 use awesome font instead of icons?
author RogerHaase <haaserd@gmail.com>
date Sat, 18 Oct 2014 14:05:52 -0700
parents 5e0225f77597
children b55ace92b0a9 f5b310b4dcd1
files MoinMoin/templates/global_history.html MoinMoin/themes/basic/static/css/theme.css MoinMoin/themes/basic/static/custom-less/theme.less 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/modernized/static/css/stylus/theme.styl MoinMoin/themes/modernized/static/css/theme.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 14 files changed, 9 insertions(+), 47 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/templates/global_history.html	Sat Oct 18 10:04:20 2014 -0700
+++ b/MoinMoin/templates/global_history.html	Sat Oct 18 14:05:52 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/themes/basic/static/css/theme.css	Sat Oct 18 10:04:20 2014 -0700
+++ b/MoinMoin/themes/basic/static/css/theme.css	Sat Oct 18 14:05:52 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	Sat Oct 18 10:04:20 2014 -0700
+++ b/MoinMoin/themes/basic/static/custom-less/theme.less	Sat Oct 18 14:05:52 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/modernized/static/css/stylus/theme.styl	Sat Oct 18 10:04:20 2014 -0700
+++ b/MoinMoin/themes/modernized/static/css/stylus/theme.styl	Sat Oct 18 14:05:52 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	Sat Oct 18 10:04:20 2014 -0700
+++ b/MoinMoin/themes/modernized/static/css/theme.css	Sat Oct 18 14:05:52 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