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:30 UTC
[28/35] allura git commit: [#7924] ticket:858 Fix admin groups js
[#7924] ticket:858 Fix admin groups js
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/cc647741
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/cc647741
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/cc647741
Branch: refs/heads/master
Commit: cc647741bb8945549f51fab4c091c2c58f3523a6
Parents: a4e5e11
Author: Igor Bondarenko <je...@gmail.com>
Authored: Tue Oct 27 16:52:14 2015 +0200
Committer: Igor Bondarenko <je...@gmail.com>
Committed: Tue Oct 27 16:52:14 2015 +0200
----------------------------------------------------------------------
Allura/allura/ext/admin/templates/project_groups.html | 5 +----
Allura/allura/public/nf/js/project_groups.js | 9 +++++----
2 files changed, 6 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/cc647741/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 e78c622..afe91fd 100644
--- a/Allura/allura/ext/admin/templates/project_groups.html
+++ b/Allura/allura/ext/admin/templates/project_groups.html
@@ -116,10 +116,7 @@
<script type="text/javascript">
// these icons are used in the js, so set them up now
var spinner_img = '<img src="{{g.forge_static('images/spinner.gif')}}">';
- {% set perm_delete_ico = g.icons['perm_delete'].render(
- title='',
- show_title=True,
- extra_css='deleter') %}
+ {% set perm_delete_ico = g.icons['perm_delete'].render(title='', extra_css='deleter') %}
var perm_delete_ico = '{{perm_delete_ico}}';
</script>
{% endblock %}
http://git-wip-us.apache.org/repos/asf/allura/blob/cc647741/Allura/allura/public/nf/js/project_groups.js
----------------------------------------------------------------------
diff --git a/Allura/allura/public/nf/js/project_groups.js b/Allura/allura/public/nf/js/project_groups.js
index ca4acb3..6dc5d5c 100644
--- a/Allura/allura/public/nf/js/project_groups.js
+++ b/Allura/allura/public/nf/js/project_groups.js
@@ -89,7 +89,7 @@ $(function() {
else{
holder.attr('data-user', data.username).addClass('deleter');
holder.html(perm_delete_ico);
- holder.find('span').html(' ' + data.displayname + ' (' + data.username + ')');
+ holder.find('.fa').after(' ' + data.displayname + ' (' + data.username + ')');
holder.children('a.deleter').click(delete_user);
}
});
@@ -102,18 +102,19 @@ $(function() {
var item = data[k][i];
var perm_holder = group_holder.find('li[data-permission='+item.name+']');
var perm_link = perm_holder.find('a');
+ var perm_icon = perm_link.find('.fa');
if(!perm_holder.hasClass(item.has)){
perm_holder.effect('highlight', {}, 2000);
perm_holder.attr('class',item.has);
perm_link.attr('title',item.text);
if(item.has=="yes"){
- perm_link.attr('class','icon fa fa-check');
+ perm_icon.attr('class','fa fa-check');
}
else if(item.has=="inherit"){
- perm_link.attr('class','icon fa fa-check-circle');
+ perm_icon.attr('class','fa fa-check-circle');
}
else{
- perm_link.attr('class','icon fa fa-ban');
+ perm_icon.attr('class','fa fa-ban');
}
perm_holder.find('span').remove();
perm_link.show();