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/08/13 15:43:28 UTC
[8/9] allura git commit: [#7924] ticket:836 Update perm_has_(no|yes)
[#7924] ticket:836 Update perm_has_(no|yes)
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/7b41d45c
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/7b41d45c
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/7b41d45c
Branch: refs/heads/ib/7924
Commit: 7b41d45cbd06ee0d17469cc92c305aa4788a7f01
Parents: 5333e42
Author: Igor Bondarenko <je...@gmail.com>
Authored: Thu Aug 13 16:23:04 2015 +0300
Committer: Igor Bondarenko <je...@gmail.com>
Committed: Thu Aug 13 16:23:04 2015 +0300
----------------------------------------------------------------------
Allura/allura/ext/admin/templates/project_groups.html | 7 +++----
Allura/allura/lib/app_globals.py | 4 ++--
2 files changed, 5 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/7b41d45c/Allura/allura/ext/admin/templates/project_groups.html
----------------------------------------------------------------------
diff --git a/Allura/allura/ext/admin/templates/project_groups.html b/Allura/allura/ext/admin/templates/project_groups.html
index 7169b60..e78c622 100644
--- a/Allura/allura/ext/admin/templates/project_groups.html
+++ b/Allura/allura/ext/admin/templates/project_groups.html
@@ -29,10 +29,9 @@
<ul class="permissions">
{% for perm in permissions_by_role[role._id.__str__()] %}
<li class="{{perm['has']}}" data-permission="{{perm['name']}}">
- <a href="#" title="{{perm['text']}}">
- <b data-icon="{{g.icons['perm_has_%s'%perm['has']].char}}"
- class="ico {{g.icons['perm_has_%s'%perm['has']].css}}">
- </b> {{perm['name']}}</a>
+ {{ g.icons['perm_has_%s'%perm['has']].render(title=perm['text'], closing_tag=False) }}
+ {{perm['name']}}
+ </a> {# close tag, opened by render #}
</li>
{% endfor %}
</ul>
http://git-wip-us.apache.org/repos/asf/allura/blob/7b41d45c/Allura/allura/lib/app_globals.py
----------------------------------------------------------------------
diff --git a/Allura/allura/lib/app_globals.py b/Allura/allura/lib/app_globals.py
index 7511ba5..45567bd 100644
--- a/Allura/allura/lib/app_globals.py
+++ b/Allura/allura/lib/app_globals.py
@@ -261,8 +261,8 @@ class Globals(object):
perm_delete=Icon('fa fa-minus-circle', 'Remove'),
perm_tool=Icon('x', 'ico-config'),
perm_admin=Icon('(', 'ico-lock'),
- perm_has_yes=Icon('3', 'ico-check'),
- perm_has_no=Icon('d', 'ico-noentry'),
+ perm_has_yes=Icon('fa fa-check', 'Check'),
+ perm_has_no=Icon('fa fa-ban', 'No entry'),
perm_has_inherit=Icon('2', 'ico-checkcircle'),
)