allura-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jetm...@apache.org
Subject [15/40] allura git commit: [#7924] ticket:836 Update perm_has_(no|yes)
Date Tue, 27 Oct 2015 17:07:32 GMT
[#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/e75593dd
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/e75593dd
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/e75593dd

Branch: refs/heads/ib/7924
Commit: e75593dde5a66cc4233e5439c90e21f8b2251ce7
Parents: 4213729
Author: Igor Bondarenko <jetmind2@gmail.com>
Authored: Thu Aug 13 16:23:04 2015 +0300
Committer: Igor Bondarenko <jetmind2@gmail.com>
Committed: Tue Oct 27 16:22:10 2015 +0200

----------------------------------------------------------------------
 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/e75593dd/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/e75593dd/Allura/allura/lib/app_globals.py
----------------------------------------------------------------------
diff --git a/Allura/allura/lib/app_globals.py b/Allura/allura/lib/app_globals.py
index 49fa366..cdcaf54 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'),
         )
 


Mime
View raw message