You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by je...@apache.org on 2015/10/27 18:07:45 UTC
[28/40] allura git commit: [#7924] ticket:853 Use fa-history for wiki
revert
[#7924] ticket:853 Use fa-history for wiki revert
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/35af1c26
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/35af1c26
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/35af1c26
Branch: refs/heads/ib/7924
Commit: 35af1c265efd404b39755a5fff8df94b4b8d0837
Parents: 8c1e1e4
Author: Igor Bondarenko <je...@gmail.com>
Authored: Thu Oct 22 19:44:10 2015 +0300
Committer: Igor Bondarenko <je...@gmail.com>
Committed: Tue Oct 27 16:22:11 2015 +0200
----------------------------------------------------------------------
Allura/allura/lib/app_globals.py | 1 +
ForgeWiki/forgewiki/templates/wiki/page_history.html | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/35af1c26/Allura/allura/lib/app_globals.py
----------------------------------------------------------------------
diff --git a/Allura/allura/lib/app_globals.py b/Allura/allura/lib/app_globals.py
index 8e1a8ab..4a2995f 100644
--- a/Allura/allura/lib/app_globals.py
+++ b/Allura/allura/lib/app_globals.py
@@ -260,6 +260,7 @@ class Globals(object):
vote_up=Icon('fa fa-plus', 'Vote Up'),
vote_down=Icon('fa fa-minus', 'Vote Down'),
download=Icon('fa fa-download', 'Download'),
+ revert=Icon('fa fa-history', 'Revert'),
# Permissions
perm_read=Icon('fa fa-eye', 'Read'),
perm_update=Icon('fa fa-rotate-left', 'Update'),
http://git-wip-us.apache.org/repos/asf/allura/blob/35af1c26/ForgeWiki/forgewiki/templates/wiki/page_history.html
----------------------------------------------------------------------
diff --git a/ForgeWiki/forgewiki/templates/wiki/page_history.html b/ForgeWiki/forgewiki/templates/wiki/page_history.html
index 753454d..dc3027a 100644
--- a/ForgeWiki/forgewiki/templates/wiki/page_history.html
+++ b/ForgeWiki/forgewiki/templates/wiki/page_history.html
@@ -52,7 +52,7 @@
<td><input name="v2" type="radio" value="{{p.version}}"/></td>
<td class="tright">
{% if i != 0 and h.has_access(p, 'edit')() %}
- {{ g.icons['fork'].render(
+ {{ g.icons['revert'].render(
extra_css='post-link',
title='Revert to version {}'.format(p.version),
**{'data-dialog-id': p.version}) }}