You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by br...@apache.org on 2015/10/28 17:28:16 UTC
[14/35] allura git commit: [#7924] ticket:837 Add expand/resore icons
back
[#7924] ticket:837 Add expand/resore icons back
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/932e4150
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/932e4150
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/932e4150
Branch: refs/heads/master
Commit: 932e4150dd3d860aba711bd596c934c9eb4f95ed
Parents: 35098db
Author: Igor Bondarenko <je...@gmail.com>
Authored: Thu Oct 15 15:57:27 2015 +0000
Committer: Igor Bondarenko <je...@gmail.com>
Committed: Tue Oct 27 16:22:11 2015 +0200
----------------------------------------------------------------------
Allura/allura/lib/app_globals.py | 2 ++
Allura/allura/templates/jinja_master/lib.html | 8 ++------
2 files changed, 4 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/932e4150/Allura/allura/lib/app_globals.py
----------------------------------------------------------------------
diff --git a/Allura/allura/lib/app_globals.py b/Allura/allura/lib/app_globals.py
index faf82b4..ff5ecdb 100644
--- a/Allura/allura/lib/app_globals.py
+++ b/Allura/allura/lib/app_globals.py
@@ -253,6 +253,8 @@ class Globals(object):
secure=Icon('fa fa-lock', 'Lock'),
unsecure=Icon('fa fa-unlock', 'Unlock'),
star=Icon('fa fa-star', 'Star'),
+ expand=Icon('fa fa-expand', 'Maximize'),
+ restore=Icon('fa fa-compress', 'Restore'),
# 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/932e4150/Allura/allura/templates/jinja_master/lib.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/jinja_master/lib.html b/Allura/allura/templates/jinja_master/lib.html
index 83ea02e..e427279 100644
--- a/Allura/allura/templates/jinja_master/lib.html
+++ b/Allura/allura/templates/jinja_master/lib.html
@@ -196,12 +196,8 @@
{%- macro maximize_content_button() %}
{% do g.register_forge_js('js/maximize-content.js') %}
- <a id="maximize-content" href="#">
- <b data-icon="{{g.icons.expand.char}}" class="ico {{g.icons.expand.css}}" title="Maximize"> </b> Maximize
- </a>
- <a id="restore-content" href="#">
- <b data-icon="{{g.icons.restore.char}}" class="ico {{g.icons.restore.css}}" title="Restore"> </b> Restore
- </a>
+ {{ g.icons['expand'].render(show_title=True, id='maximize-content') }}
+ {{ g.icons['restore'].render(show_title=True, id='restore-content') }}
{%- endmacro %}