From 1b306dac287e7b4c98cbc21080965bec797e28e3 Mon Sep 17 00:00:00 2001
From: llj <lingjun.li1@gmail.com>
Date: Wed, 1 Apr 2015 16:43:09 +0800
Subject: [PATCH] [ui] modified ui details of 'share popup' & 'dir view'

---
 media/css/backbone.css               |   7 +++----
 media/css/seahub.css                 |  10 ++++++++++
 media/img/more_op.png                | Bin 0 -> 111 bytes
 seahub/templates/js/dirent.html      |   4 ++--
 seahub/templates/js/share-popup.html |   8 ++++----
 5 files changed, 19 insertions(+), 10 deletions(-)
 create mode 100644 media/img/more_op.png

diff --git a/media/css/backbone.css b/media/css/backbone.css
index 3ac9ceeb39..65aaf1c9c4 100644
--- a/media/css/backbone.css
+++ b/media/css/backbone.css
@@ -9,14 +9,13 @@
     width:123px;
 }
 .repo-file-list .dirent-op {
-    width:150px;
+    padding-left:30px;
+    width:120px;
 }
 .repo-file-list .hidden-op {
     min-width: 100px;
 }
-.displayed-op .download,
-.displayed-op .share,
-.displayed-op .delete {
+.displayed-op .op {
     margin-left:5px;
 }
 .hidden-op a {
diff --git a/media/css/seahub.css b/media/css/seahub.css
index 0afa75e3fc..4ed677efd0 100644
--- a/media/css/seahub.css
+++ b/media/css/seahub.css
@@ -3486,3 +3486,13 @@ textarea:-moz-placeholder {/* for FF */
 #multi-dirents-op .del-dirents {
     background-position: -57px -5px;
 }
+
+#dir-private-share .label {
+    margin:6px 0 8px;
+}
+#dir-private-share .select2-container {
+    margin-bottom:10px;
+}
+#dir-private-share .submit {
+    margin-top:18px;
+}
diff --git a/media/img/more_op.png b/media/img/more_op.png
new file mode 100644
index 0000000000000000000000000000000000000000..5a87433eaf2c79d4abb55541f3b782ee4b5cb578
GIT binary patch
literal 111
zcmeAS@N?(olHy`uVBq!ia0vp^JRr;gBp8b2n5}`7nWu|m2*>s09ox%AMc(W^zTx}V
zdX0*`(-W`OTST<Z-)zCbA$B-Ltof!vYPYzs5yR0SmFIU@8FrRdZ=15j`xVF}Pgg&e
IbxsLQ0B!UmMF0Q*

literal 0
HcmV?d00001

diff --git a/seahub/templates/js/dirent.html b/seahub/templates/js/dirent.html
index 7c139d0f34..9903a4e5da 100644
--- a/seahub/templates/js/dirent.html
+++ b/seahub/templates/js/dirent.html
@@ -24,7 +24,7 @@
             <% } %>
         </div>
         <% if (user_perm == 'rw') { %>
-        <img src="{{ MEDIA_URL }}img/dropdown-arrow.png" title="{% trans "More operations" %}" alt="{% trans "More operations" %}" class="more-op-icon cspt" />
+        <img src="{{ MEDIA_URL }}img/more_op.png" title="{% trans "More operations" %}" alt="{% trans "More operations" %}" class="more-op-icon cspt" />
         <ul class="hidden-op hide">
             <li><a class="op rename" href="#">{% trans "Rename" %}</a></li>
             <li><a class="op mv" href="#">{% trans "Move" %}</a></li>
@@ -78,7 +78,7 @@
             <% } %>
         </div>
         <% if (user_perm == 'rw') { %>
-        <img src="{{ MEDIA_URL }}img/dropdown-arrow.png" title="{% trans "More Operations"%}" alt="{% trans "More Operations"%}" class="more-op-icon cspt" />
+        <img src="{{ MEDIA_URL }}img/more_op.png" title="{% trans "More Operations"%}" alt="{% trans "More Operations"%}" class="more-op-icon cspt" />
         <ul class="hidden-op hide">
             <li><a class="op rename" href="#">{% trans "Rename" %}</a></li>
             <li><a class="op mv" href="#">{% trans "Move" %}</a></li>
diff --git a/seahub/templates/js/share-popup.html b/seahub/templates/js/share-popup.html
index 4359b5c59e..1c3f1d6716 100644
--- a/seahub/templates/js/share-popup.html
+++ b/seahub/templates/js/share-popup.html
@@ -99,19 +99,19 @@
                 <% if (!is_virtual && is_repo_owner) { %>
             <div id="dir-private-share" class="tabs-panel hide">
                 <form id="dir-private-share-form" action="" class="hide">
-                    <label>{% trans "People:" %}</label><br />
+                    <label class="label">{% trans "People:" %}</label><br />
                     <input type="hidden" name="emails" class="w100" /><br />
 
-                    <label>{% trans "Groups:" %}</label><br />
+                    <label class="label">{% trans "Groups:" %}</label><br />
                     <select name="groups" class="w100" multiple="multiple"></select><br />
 
-                    <label>{% trans "Permission:" %}</label><br />
+                    <label class="label">{% trans "Permission:" %}</label><br />
                     <select name="permission" class="share-permission-select w100">
                         <option value="rw" selected="selected">{% trans "Read-Write"%}</option>
                         <option value="r">{% trans "Read-Only"%}</option>
                     </select>
                     <p class="error hide"></p>
-                    <input type="submit" value="{% trans "Submit" %}" />
+                    <input type="submit" value="{% trans "Submit" %}" class="submit" />
                 </form>
             </div>
                 <% } %>