Return-Path: 
 <commits-return-13447-apmail-allura-commits-archive=allura.apache.org@allura.apache.org>
X-Original-To: apmail-allura-commits-archive@www.apache.org
Delivered-To: apmail-allura-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 7D16C18BA5
	for <apmail-allura-commits-archive@www.apache.org>;
 Wed, 28 Oct 2015 16:28:04 +0000 (UTC)
Received: (qmail 47179 invoked by uid 500); 28 Oct 2015 16:28:04 -0000
Delivered-To: apmail-allura-commits-archive@allura.apache.org
Received: (qmail 47135 invoked by uid 500); 28 Oct 2015 16:28:04 -0000
Mailing-List: contact commits-help@allura.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@allura.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@allura.apache.org>
List-Post: <mailto:commits@allura.apache.org>
List-Id: <commits.allura.apache.org>
Reply-To: dev@allura.apache.org
Delivered-To: mailing list commits@allura.apache.org
Received: (qmail 46774 invoked by uid 99); 28 Oct 2015 16:28:04 -0000
Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org)
 (140.211.11.23)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 28 Oct 2015 16:28:04 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at
 git1-us-west.apache.org, from userid 33)
	id 1B446E00D8; Wed, 28 Oct 2015 16:28:04 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: brondsem@apache.org
To: commits@allura.apache.org
Date: Wed, 28 Oct 2015 16:28:30 -0000
Message-Id: <7ba3646dc8bf41ddb9898a67349a13a8@git.apache.org>
In-Reply-To: <f617dc9bad9e452b9782fc9f6ad81908@git.apache.org>
References: <f617dc9bad9e452b9782fc9f6ad81908@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [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 <jetmind2@gmail.com>
Authored: Tue Oct 27 16:52:14 2015 +0200
Committer: Igor Bondarenko <jetmind2@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('&nbsp;' + data.displayname + ' (' + data.username + ')');
+        holder.find('.fa').after('&nbsp;' + 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();