From 7eb1e1d1327b4966659a92e33127642a1d75771b Mon Sep 17 00:00:00 2001
From: llj <lingjun.li1@gmail.com>
Date: Mon, 16 May 2016 17:07:04 +0800
Subject: [PATCH] [CSS] modified 'table', removed backbone.css

---
 media/css/seahub.css                          | 83 +++++++++++--------
 seahub/templates/base_for_backbone.html       |  3 +-
 seahub/templates/js/templates.html            | 14 ++--
 .../templates/sysadmin/admin_repo_view.html   | 10 +--
 .../templates/sysadmin/sysadmin_backbone.html |  2 +-
 static/css/backbone.css                       | 38 ---------
 6 files changed, 62 insertions(+), 88 deletions(-)
 delete mode 100644 static/css/backbone.css

diff --git a/media/css/seahub.css b/media/css/seahub.css
index f50b4f125a..ce1f4c4602 100644
--- a/media/css/seahub.css
+++ b/media/css/seahub.css
@@ -20,6 +20,12 @@
  * common class ..........common class
  *
  * Widget
+ * (...)  
+ * discussions/comments
+ * custom select2
+ *
+ * Container
+ * Container ......... common container styles
  *
  * (TODO: complete this TOC)
  *
@@ -307,7 +313,6 @@ pre {
 }
 table {
     width:100%;
-    table-layout:fixed;
     margin:8px 0 40px;
 }
 caption { font-size:1.1em; font-weight:bold; margin-bottom:.6em; }
@@ -1441,7 +1446,43 @@ button.sf-dropdown-toggle:focus {
     cursor:pointer;
     text-align:center;
 }
-/********** container ***********/
+/**** custom select2 ****/
+.select2-container-multi .select2-choices {
+    border-color: #ddd;
+    border-radius: 2px;
+    background-image: none; /* rm the shadow */
+}
+.select2-container-multi .select2-choices .select2-search-field {
+    float:none;
+}
+.select2-container-multi .select2-choices .select2-search-field input {
+    padding:2px 2px 2px 5px;
+    font-family:inherit;
+    font-size:13px;
+}
+.select2-container-multi .select2-choices .select2-search-choice {
+    border:none;
+    border-radius:0;
+    background:#eee;
+}
+.select2-container .avatar,
+.select2-results .select2-result-label .avatar {
+    vertical-align:middle;
+    margin-right:3px;
+}
+.select2-result-label .text {
+    display:inline-block;
+    width:calc(100% - 42px);
+}
+.select2-results .select2-result-label .avatar {
+    margin-right:10px;
+}
+.select2-result-label .avatar,
+.select2-result-label .text {
+    vertical-align:middle;
+}
+
+/********** Container ***********/
 #wrapper {
 
 }
@@ -1712,11 +1753,6 @@ button.sf-dropdown-toggle:focus {
     text-decoration:none;
 }
 
-.select2-container .avatar,
-.select2-results .select2-result-label .avatar {
-    vertical-align:middle;
-    margin-right:3px;
-}
 /* header */
 #notice-con {
     color:red;
@@ -1995,15 +2031,8 @@ button.sf-dropdown-toggle:focus {
     padding:5px 14px;
 }
 .repo-file-list {
-    table-layout:auto;
     margin:0;
 }
-.repo-file-list .select {
-    width:15px;
-}
-.repo-file-list .star {
-    width:25px;
-}
 .repo-file-list .icon-star-empty { color:#d0d0d0; }
 .repo-file-list .icon-star { color:#505050; }
 .repo-file-list .icon-star-empty,
@@ -2015,21 +2044,16 @@ button.sf-dropdown-toggle:focus {
     vertical-align:middle;
 }
 .repo-file-list .dirent-icon {
-    width:27px;
     text-align:center;
 }
 .repo-file-list .dirent-name {
     display:inline-block;
-    width:400px;
+    word-break:break-all;
 }
-.repo-file-list .dirent-size {
-    width:114px;
-}
-.repo-file-list .dirent-update {
-    width:133px;
-}
-.repo-file-list .dirent-op {
-    width:200px;
+.repo-file-list .file-locked-icon {
+    position:absolute;
+    right:0;
+    bottom:0;
 }
 .repo-file-list th {
     padding-top:1rem;
@@ -3198,17 +3222,6 @@ button.sf-dropdown-toggle:focus {
     height:30px;
     margin:0;
 }
-.select2-result-label .text {
-    display:inline-block;
-    width:calc(100% - 42px);
-}
-.select2-results .select2-result-label .avatar {
-    margin-right:10px;
-}
-.select2-result-label .avatar,
-.select2-result-label .text {
-    vertical-align:middle;
-}
 #add-group-members-form {
     margin-bottom:4px;
 }
diff --git a/seahub/templates/base_for_backbone.html b/seahub/templates/base_for_backbone.html
index 7d2c3adef6..010af9e428 100644
--- a/seahub/templates/base_for_backbone.html
+++ b/seahub/templates/base_for_backbone.html
@@ -16,10 +16,9 @@
 
 {% compress css %}
 <link rel="stylesheet" type="text/css" href="{% static "css/bootstrap.min.css" %}"/>
-<link rel="stylesheet" type="text/css" href="{{ MEDIA_URL }}css/seahub.css?t=1398068110" />
 <link rel="stylesheet" type="text/css" href="{% static "css/select2-3.5.2.css" %}"/>
+<link rel="stylesheet" type="text/css" href="{{ MEDIA_URL }}css/seahub.css?t=1398068110" />
 <link rel="stylesheet" type="text/css" href="{% static "css/magnific-popup.css" %}" />
-<link rel="stylesheet" type="text/css" href="{% static "css/backbone.css" %}"/>
 {% endcompress %}
 
 {% block extra_style %}{% endblock %}
diff --git a/seahub/templates/js/templates.html b/seahub/templates/js/templates.html
index d12e543526..28c7350ccb 100644
--- a/seahub/templates/js/templates.html
+++ b/seahub/templates/js/templates.html
@@ -174,15 +174,15 @@
 </script>
 <script type="text/template" id="dirents-hd-tmpl">
     <tr>
-        <th class="select">
+        <th width="3%" class="select">
             <input type="checkbox" class="vam" />
         </th>
-        <th class="star"></th>
-        <th class="dirent-icon"></th>
-        <th><a class="table-sort-op by-name" href="#"><span class="dirent-name">{% trans "Name"%} <span class="sort-icon icon-caret-up"></span></span></a></th>
-        <th class="dirent-op"><span class="sr-only">{% trans "Actions" %}</span></th>
-        <th class="dirent-size">{% trans "Size"%}</th>
-        <th class="dirent-update"><a class="table-sort-op by-time" href="#">{% trans "Last Update" %} <span class="sort-icon icon-caret-down hide" aria-hidden="true"></span></a></th>
+        <th width="3%" class="star"></th>
+        <th width="5%" class="dirent-icon"></th>
+        <th width="50%"><a class="table-sort-op by-name" href="#"><span class="dirent-name">{% trans "Name"%} <span class="sort-icon icon-caret-up"></span></span></a></th>
+        <th width="15%" class="dirent-op"><span class="sr-only">{% trans "Actions" %}</span></th>
+        <th width="11%" class="dirent-size">{% trans "Size"%}</th>
+        <th width="13%" class="dirent-update"><a class="table-sort-op by-time" href="#">{% trans "Last Update" %} <span class="sort-icon icon-caret-down hide" aria-hidden="true"></span></a></th>
     </tr>
 </script>
 
diff --git a/seahub/templates/sysadmin/admin_repo_view.html b/seahub/templates/sysadmin/admin_repo_view.html
index 1ea230b315..ee668a4f39 100644
--- a/seahub/templates/sysadmin/admin_repo_view.html
+++ b/seahub/templates/sysadmin/admin_repo_view.html
@@ -30,11 +30,11 @@
 
         <table class="repo-file-list">
             <tr>
-                <th class="dirent-icon"></th>
-                <th><span class="dirent-name">{% trans "Name"%}</span></th>
-                <th class="dirent-size">{% trans "Size"%}</th>
-                <th class="dirent-update">{% trans "Last Update" %}</th>
-                <th class="dirent-op">{% trans "Operations"%}</th>
+                <th class="dirent-icon" width="5%"></th>
+                <th width="50%"><span class="dirent-name">{% trans "Name"%}</span></th>
+                <th width="15%" class="dirent-size">{% trans "Size"%}</th>
+                <th width="15%" class="dirent-update">{% trans "Last Update" %}</th>
+                <th width="15%" class="dirent-op">{% trans "Operations"%}</th>
             </tr>
             {% for dirent in dir_list %}
             <tr class="dir-item">
diff --git a/seahub/templates/sysadmin/sysadmin_backbone.html b/seahub/templates/sysadmin/sysadmin_backbone.html
index 711a662bca..f1db0a6d45 100644
--- a/seahub/templates/sysadmin/sysadmin_backbone.html
+++ b/seahub/templates/sysadmin/sysadmin_backbone.html
@@ -15,8 +15,8 @@
 
 {% compress css %}
 <link rel="stylesheet" type="text/css" href="{% static "css/bootstrap.min.css" %}"/>
-<link rel="stylesheet" type="text/css" href="{{ MEDIA_URL }}css/seahub.css?t=1398068110" />
 <link rel="stylesheet" type="text/css" href="{% static "css/select2-3.5.2.css" %}"/>
+<link rel="stylesheet" type="text/css" href="{{ MEDIA_URL }}css/seahub.css?t=1398068110" />
 <link rel="stylesheet" type="text/css" href="{% static "css/magnific-popup.css" %}" />
 {% endcompress %}
 
diff --git a/static/css/backbone.css b/static/css/backbone.css
deleted file mode 100644
index f3fe79f481..0000000000
--- a/static/css/backbone.css
+++ /dev/null
@@ -1,38 +0,0 @@
-/* lib view */
-.repo-file-list .file-locked-icon {
-   position:absolute;
-   right:0;
-   bottom:0;
-}
-.repo-file-list .dirent-name {
-    width:220px;
-}
-.repo-file-list .dirent-size {
-    width:114px;
-}
-.repo-file-list .dirent-update {
-    width:123px;
-}
-.repo-file-list .dirent-op {
-    padding-left:30px;
-    width:150px;
-}
-/* custom select2 */
-.select2-container-multi .select2-choices {
-    border-color: #ddd;
-    border-radius: 2px;
-    background-image: none; /* rm the shadow */
-}
-.select2-container-multi .select2-choices .select2-search-field {
-    float:none;
-}
-.select2-container-multi .select2-choices .select2-search-field input {
-    padding:2px 2px 2px 5px;
-    font-family:inherit;
-    font-size:13px;
-}
-.select2-container-multi .select2-choices .select2-search-choice {
-    border:none;
-    border-radius:0;
-    background:#eee;
-}