From 05e961f29f65246efafea193f8a6bcf41057f784 Mon Sep 17 00:00:00 2001
From: "xiaokong1937@gmail.com" <763691951@qq.com>
Date: Fri, 30 Sep 2016 20:50:40 +0800
Subject: [PATCH] user-group detail: fix #15

---
 apps/static/css/jumpserver.css                |  4 +--
 apps/templates/_foot_js.html                  | 16 +++++-----
 .../templates/users/user_group_detail.html    | 30 ++++++++++++-------
 apps/users/templates/users/user_list.html     |  4 +++
 4 files changed, 33 insertions(+), 21 deletions(-)

diff --git a/apps/static/css/jumpserver.css b/apps/static/css/jumpserver.css
index 6b2639daf..4bfc4324c 100644
--- a/apps/static/css/jumpserver.css
+++ b/apps/static/css/jumpserver.css
@@ -79,7 +79,7 @@ th a {
 }
 
 table.dataTable tbody > tr.selected, table.dataTable tbody > tr > .selected {
-    background-color: #1ab394;
+    background-color: #1ab394 !important;
 }
 table.dataTable tbody tr.selected a,
 table.dataTable tbody th.selected a,
@@ -88,7 +88,7 @@ table.dataTable tbody tr.selected td i.text-navy,
 table.dataTable tbody th.selected td i.text-navy,
 table.dataTable tbody td.selected td i.text-navy
 {
-    color: white;
+    color: white !important;
 }
 
 .m-0 {
diff --git a/apps/templates/_foot_js.html b/apps/templates/_foot_js.html
index 04bac17dd..660e6c434 100644
--- a/apps/templates/_foot_js.html
+++ b/apps/templates/_foot_js.html
@@ -8,12 +8,12 @@
 <script src="{% static "js/inspinia.js" %}"></script>
 <script src="{% static "js/jumpserver.js" %}"></script>
 <script>
-    activeNav();
-    $(document).ready(function(){
-        setAjaxCSRFToken();
-
-        // Set textarea rows five
-        $('textarea').attr('rows', 5);
-    });
-
+activeNav();
+$(document).ready(function(){
+    setAjaxCSRFToken();
+    $('textarea').attr('rows', 5);
+    if ($('.tooltip')[0]) {
+        $('.tooltip').tooltip();
+    }
+});
 </script>
diff --git a/apps/users/templates/users/user_group_detail.html b/apps/users/templates/users/user_group_detail.html
index 878ed3050..4f380542f 100644
--- a/apps/users/templates/users/user_group_detail.html
+++ b/apps/users/templates/users/user_group_detail.html
@@ -12,18 +12,21 @@
     <script src="{% static "js/plugins/dataTables/dataTables.min.js" %}"></script>
     <style>
 .user_div {
-    background-color: #d1dade;
     color: #5e5e5e;
     font-family: "Open Sans";
     padding: 3px 8px;
     text-shadow: none;
 }
+.user_div .ui_container {
+    background-color: #d1dade;
+    width: 100%;
+}
+.user_div a {
+    color: #5e5e5e;
+}
 .user_div .remove {
     color: #fff;
 }
-.user_div span {
-    color: #5e5e5e;
-}
 dl {
   width: 100%;
   overflow: hidden;
@@ -99,7 +102,7 @@ dd {
                                             <dt>{% trans 'Users' %}:</dt>
                                             <dd style="line-height: 2" id="group_user_container">
                                             {% for user in object.users.all %}
-                                            <div class="col-sm-4 user_div"><div class="col-xs-9"><a href="{{ user.get_absolute_url }}"><span>{{ user.name }}</span></a></div><div class="col-xs-3"><a data-uid="{{ user.id }}" class="btn_remove m-l-5"><i class="remove fa fa-times-circle"></i></a></div></div>
+                                            <div class="col-sm-4 user_div"><div class="ui_container row"><div class="col-xs-9"><a href="{{ user.get_absolute_url }}" title="{{ user.name }}" data-toggle="tooltip">{{ user.name|truncatechars:15 }}</a></div><div class="col-xs-3"><a data-uid="{{ user.id }}" class="btn_remove m-l-5"><i class="remove fa fa-times-circle"></i></a></div></div></div>
                                             {% endfor %}
                                             </dd>
                                         </dl>
@@ -189,6 +192,10 @@ $(document).on('click', '.btn_remove', function(){
                     $(td).html('<i class="fa fa-check text-navy"></i>')
                 }
              }},
+            {targets: 4, createdCell: function (td, cellData) {
+                var innerHtml = cellData.length > 8 ? cellData.substring(0, 8) + '...': cellData;
+                $(td).html('<a href="javascript:void(0);" data-toggle="tooltip" title="' + cellData + '">' + innerHtml + '</a>');
+             }}
         ],
         ajax_url: '{% url "users:user-bulk-update-api" %}',
         columns: [{data: function(){return ""}}, {data: "username" }, {data: "name" }, {data: "get_role_display" }, {data: "group_display" },
@@ -203,7 +210,6 @@ $(document).on('click', '.btn_remove', function(){
         plain_id_list.push(this.data().id);
         selected_users.push({id: this.data().id, name: this.data().name});
     });
-    console.log(selected_users)
     if (plain_id_list === []) {
         return false;
     };
@@ -218,13 +224,15 @@ $(document).on('click', '.btn_remove', function(){
         var html = "";
         $.each(selected_users, function(index, user) {
             html += [
-                '<div class="col-sm-4 user_div"><div class="col-xs-9"><a href="',
-                '{% url "users:user-detail" pk=99991937 %}'.replace(99991937, user.id),
-                '"><span>',
+                '<div class="col-sm-4 user_div"><div class="ui_container row"><div class="col-xs-9"><a title="',
                 user.name,
-                '</span></a></div><div class="col-xs-3"><a data-uid="',
+                '" data-toggle="tooltip" href="',
+                '{% url "users:user-detail" pk=99991937 %}'.replace(99991937, user.id),
+                '">',
+                user.name.length >=13 ? user.name.substring(0, 12) + '...' : user.name,
+                '</a></div><div class="col-xs-3"><a data-uid="',
                 user.id,
-                '" class="btn_remove m-l-5"><i class="remove fa fa-times-circle"></i></a></div></div>\n',
+                '" class="btn_remove m-l-5"><i class="remove fa fa-times-circle"></i></a></div></div></div>\n',
             ].join("");
         });
         $(html).appendTo($('#group_user_container'));
diff --git a/apps/users/templates/users/user_list.html b/apps/users/templates/users/user_list.html
index 944be4622..36029c59b 100644
--- a/apps/users/templates/users/user_list.html
+++ b/apps/users/templates/users/user_list.html
@@ -64,6 +64,10 @@ $(document).ready(function(){
                 var detail_btn = '<a href="{% url "users:user-detail" pk=99991937 %}">' + cellData + '</a>';
                 $(td).html(detail_btn.replace('99991937', rowData.id));
              }},
+            {targets: 4, createdCell: function (td, cellData) {
+                var innerHtml = cellData.length > 8 ? cellData.substring(0, 8) + '...': cellData;
+                $(td).html('<a href="javascript:void(0);" data-toggle="tooltip" title="' + cellData + '">' + innerHtml + '</a>');
+             }},
             {targets: 6, createdCell: function (td, cellData) {
                 if (!cellData) {
                     $(td).html('<i class="fa fa-times text-danger"></i>')