From 76489d2ca49c944b973fc41aa53407924d017e4e Mon Sep 17 00:00:00 2001
From: llj <lingjun.li1@gmail.com>
Date: Tue, 11 Sep 2018 15:08:27 +0800
Subject: [PATCH] [system/org admin] rm 'email' for group member; modified
 'Info' icon for org admin side nav

---
 seahub/templates/js/admin-common-templates.html  | 14 +++-----------
 seahub/templates/js/orgadmin-templates.html      |  2 +-
 seahub/templates/js/sysadmin-templates.html      |  5 ++---
 .../scripts/sysadmin-app/views/group-member.js   | 16 +++++++++++++++-
 4 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/seahub/templates/js/admin-common-templates.html b/seahub/templates/js/admin-common-templates.html
index 1de5fce527..2292254a3f 100644
--- a/seahub/templates/js/admin-common-templates.html
+++ b/seahub/templates/js/admin-common-templates.html
@@ -20,14 +20,7 @@
 
 <script type="text/template" id="group-member-item-tmpl">
     <td><img src="<%= avatar_url %>" alt="" width="20" class="avatar" /></td>
-    <td><%- name %></td>
-    <td>
-        <% if (app.pageOptions.org_id) { %>
-        <a href="{{ SITE_ROOT }}org/useradmin/info/<% print(encodeURIComponent(email)); %>/"><%- email %></a>
-        <% } else { %>
-        <a href="{{ SITE_ROOT }}useradmin/info/<% print(encodeURIComponent(email)); %>/"><%- email %></a>
-        <% } %>
-    </td>
+    <td><a href="<%= user_info_url %>"><%- name %></a></td>
     <td>
         <% if (role == 'Owner') { %>
         <span class="cur-role">{% trans "Owner" %}</span>
@@ -123,9 +116,8 @@
             <thead>
                 <tr>
                     <th width="5%"></th>
-                    <th width="25%">{% trans "Name" %}</th>
-                    <th width="35%">{% trans "Email" %}</th>
-                    <th width="25%">{% trans "Role" %}</th>
+                    <th width="50%">{% trans "Name" %}</th>
+                    <th width="35%">{% trans "Role" %}</th>
                     <th width="10%"><!--Operations--></th>
                 </tr>
             </thead>
diff --git a/seahub/templates/js/orgadmin-templates.html b/seahub/templates/js/orgadmin-templates.html
index f00b5050e1..2f55ec2529 100644
--- a/seahub/templates/js/orgadmin-templates.html
+++ b/seahub/templates/js/orgadmin-templates.html
@@ -5,7 +5,7 @@
     <h3 class="hd">{% trans "Admin" %}</h3>
     <ul class="side-tabnav-tabs">
         <li class="tab">
-        <a href="{% url 'org_manage' %}"><span class="sf2-icon-organization"></span>{% trans "Info" %}</a>
+        <a href="{% url 'org_manage' %}"><span class="sf2-icon-info"></span>{% trans "Info" %}</a>
         </li>
         <li class="tab">
         <a href="{% url 'org_repo_admin' %}"><span class="sf2-icon-library"></span>{% trans "Libraries" %}</a>
diff --git a/seahub/templates/js/sysadmin-templates.html b/seahub/templates/js/sysadmin-templates.html
index abab431808..4ec7175d08 100644
--- a/seahub/templates/js/sysadmin-templates.html
+++ b/seahub/templates/js/sysadmin-templates.html
@@ -905,9 +905,8 @@
         <thead>
             <tr>
                 <th width="5%"></th>
-                <th width="25%">{% trans "Name" %}</th>
-                <th width="35%">{% trans "Email" %}</th>
-                <th width="25%">{% trans "Role" %}</th>
+                <th width="50%">{% trans "Name" %}</th>
+                <th width="35%">{% trans "Role" %}</th>
                 <th width="10%"><!--Operations--></th>
             </tr>
         </thead>
diff --git a/static/scripts/sysadmin-app/views/group-member.js b/static/scripts/sysadmin-app/views/group-member.js
index 62e79ac7a9..f2e2850468 100644
--- a/static/scripts/sysadmin-app/views/group-member.js
+++ b/static/scripts/sysadmin-app/views/group-member.js
@@ -113,7 +113,21 @@ define([
         },
 
         render: function() {
-            this.$el.html(this.template(this.model.toJSON()));
+            var data = this.model.toJSON();
+
+            // get user info url
+            var email = this.model.get('email');
+            var url = app.config.siteRoot;
+            if (app.pageOptions.org_id) {
+                url += 'org/useradmin/info/' + encodeURIComponent(email);
+            } else {
+                url += 'useradmin/info/' + encodeURIComponent(email);
+            }
+
+            $.extend(data, {
+                'user_info_url': url
+            });
+            this.$el.html(this.template(data));
             return this;
         }