From 8ae359afbef34cf1d6175d2bea915cfc31a9b2e5 Mon Sep 17 00:00:00 2001
From: llj <lingjun.li1@gmail.com>
Date: Tue, 15 May 2018 14:25:43 +0800
Subject: [PATCH] [address book] fixup & improvement

---
 media/css/seahub.css                        | 12 ++++++++++-
 seahub/templates/js/sysadmin-templates.html | 24 ++++++++++++---------
 static/scripts/app/views/dir.js             |  3 ++-
 3 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/media/css/seahub.css b/media/css/seahub.css
index 0e9fa38118..c4d9de16a7 100644
--- a/media/css/seahub.css
+++ b/media/css/seahub.css
@@ -682,11 +682,17 @@ textarea:-moz-placeholder {/* for FF */
     text-decoration:underline;
 }
 .small-hd {
-    padding:3px 10px;
+    display:flex;
+    justify-content:space-between;
+    padding:8px 10px;
     background:#f7f7f7;
     border-radius:2px;
     margin:15px 0;
 }
+.small-hd-heading {
+    margin:0;
+    line-height:29px;
+}
 
 /*******ui widgets**************/
 /**** path ****/
@@ -4154,6 +4160,10 @@ img.thumbnail {
     text-align:center;
     margin-bottom:30px;
 }
+#address-book-group .hd {
+    height:auto;
+}
+
 .invite-link-in-popup,
 .invite-link-in-popup:hover {
     text-decoration:none;
diff --git a/seahub/templates/js/sysadmin-templates.html b/seahub/templates/js/sysadmin-templates.html
index 6ac46b5671..687e26b128 100644
--- a/seahub/templates/js/sysadmin-templates.html
+++ b/seahub/templates/js/sysadmin-templates.html
@@ -1082,17 +1082,15 @@
     <p class="error error-tip hide"></p>
 </script>
 <script type="text/template" id="address-book-group-tmpl">
-    <div class="hd ovhd">
-        <h3 class="fleft group-path"></h3>
-        <div class="fright">
-            <button class="btn-white js-add-group">{% trans "New Sub-department" %}</button>
-            <button class="btn-white js-add-member">{% trans "Add Member" %}</button>
-            <button class="btn-white js-add-library">{% trans "New Library" %}</button>
-        </div>
+    <div class="hd">
+        <h3 class="group-path"></h3>
     </div>
     <span class="loading-icon loading-tip"></span>
     <div class="groups">
-        <h4 class="small-hd">{% trans "Sub-departments" %}</h4>
+        <div class="small-hd">
+            <h4 class="small-hd-heading">{% trans "Sub-departments" %}</h4>
+            <button class="btn-white js-add-group">{% trans "New Sub-department" %}</button>
+        </div>
         <table class="hide">
             <thead>
                 <tr>
@@ -1108,7 +1106,10 @@
         <p class="empty-tip hide">{% trans "No sub-departments" %}</p>
     </div>
     <div class="members">
-        <h4 class="small-hd">{% trans "Members" %}</h4>
+        <div class="small-hd">
+            <h4 class="small-hd-heading">{% trans "Members" %}</h4>
+            <button class="btn-white js-add-member">{% trans "Add Member" %}</button>
+        </div>
         <table class="hide">
             <thead>
                 <tr>
@@ -1125,7 +1126,10 @@
         <p class="empty-tip hide">{% trans "No members" %}</p>
     </div>
     <div class="libraries">
-        <h4 class="small-hd">{% trans "Libraries" %}</h4>
+        <div class="small-hd">
+            <h4 class="small-hd-heading">{% trans "Libraries" %}</h4>
+            <button class="btn-white js-add-library">{% trans "New Library" %}</button>
+        </div>
         <table class="hide">
             <thead>
                 <tr>
diff --git a/static/scripts/app/views/dir.js b/static/scripts/app/views/dir.js
index 273aa522e5..1e0cc033b0 100644
--- a/static/scripts/app/views/dir.js
+++ b/static/scripts/app/views/dir.js
@@ -450,7 +450,8 @@ define([
                     },
                     success: function() {
                         _this.dir.user_can_set_folder_perm = false;
-                        if (_this.contextOptions.group_id) { // the repo is in a group
+                        if (_this.contextOptions &&
+                            _this.contextOptions.group_id) { // the repo is in a group
                             _this.getGroupInfo();
                         } else {
                             _this.reset();