redesigned right-panel hd, modified side-nav, top-grp-info-popup, <th> ...

media/css/seahub.css

@@ -154,7 +154,7 @@ table {
     margin:8px 0 40px;
 }
 caption {font-size:1.1em; font-weight:bold; margin-bottom:.6em;}
-th { text-align:left; font-weight:bold; }
+th { text-align:left; font-weight:normal; color:#9c9c9c; }
 td, th { padding:5px 3px; word-wrap:break-word; border-bottom:1px solid #eee; }
 td { color: #333; }
 table img { vertical-align:middle; }
@@ -392,8 +392,7 @@ textarea:-moz-placeholder {/* for FF */
 }
 /**** side-tabnav ****/
 .side-textnav .hd,
-.side-info .hd,
+.side-info .hd {
-#right-panel .hd {
     padding-bottom:4px;
     border-bottom:1px solid #ddd;
     margin-bottom:1em;
@@ -422,22 +421,22 @@ textarea:-moz-placeholder {/* for FF */
 .side-tabnav-tabs .tab a {
     display:block;
     font-size:14px;
-    padding:4px 4px 4px 35px;
+    padding:5px 4px 5px 47px;
     color:#333;
     font-weight:normal;
     border-radius:2px;
-    background:no-repeat scroll 6px 50%;
+    background:no-repeat scroll 10px 50%;
 }
 .side-tabnav-tabs .tab .lib {
     background-image:url('../img/lib.png');
-    background-position: 7px 50%;
+    background-position: 11px 50%;
 }
 .side-tabnav-tabs .tab-cur .lib {
     background-image:url('../img/lib_w.png');
 }
 .side-tabnav-tabs .tab .star {
     background-image:url('../img/star.png');
-    background-position: 4px 50%;
+    background-position: 8px 50%;
 }
 .side-tabnav-tabs .tab-cur .star {
     background-image:url('../img/star_w.png');
@@ -450,7 +449,7 @@ textarea:-moz-placeholder {/* for FF */
 }
 .side-tabnav-tabs .tab .wiki {
     background-image:url('../img/wiki.png');
-    background-position: 8px 50%;
+    background-position: 12px 50%;
 }
 .side-tabnav-tabs .tab-cur .wiki {
     background-image:url('../img/wiki_w.png');
@@ -475,14 +474,14 @@ textarea:-moz-placeholder {/* for FF */
 }
 .side-tabnav-tabs .tab .folders {
     background-image:url('../img/folders.png');
-    background-position: 5px 50%;
+    background-position: 9px 50%;
 }
 .side-tabnav-tabs .tab-cur .folders {
     background-image:url('../img/folders_w.png');
 }
 .side-tabnav-tabs .tab .files {
     background-image:url('../img/files.png');
-    background-position: 8px 50%;
+    background-position: 12px 50%;
 }
 .side-tabnav-tabs .tab-cur .files {
     background-image:url('../img/files_w.png');
@@ -495,14 +494,21 @@ textarea:-moz-placeholder {/* for FF */
 }
 .side-tabnav-tabs .tab .members {
     background-image:url('../img/members.png');
-    background-position: 9px 50%;
+    background-position: 13px 50%;
 }
 .side-tabnav-tabs .tab-cur .members {
     background-image:url('../img/members_w.png');
 }
+.side-tabnav-tabs .tab .admin {
+    background-image:url('../img/admin.png');
+    background-position: 9px 50%;
+}
+.side-tabnav-tabs .tab-cur .admin {
+    background-image:url('../img/admin_w.png');
+}
 .side-tabnav-tabs .tab .group {
     background-image:url('../img/groups.png');
-    background-position: 9px 50%;
+    background-position: 13px 50%;
 }
 .side-tabnav-tabs .tab-cur .group {
     background-image:url('../img/groups_w.png');
@@ -929,10 +935,9 @@ textarea:-moz-placeholder {/* for FF */
 #header {
     padding:16px 0;
     background:#f4f4f7 url('../img/nav.png') center top repeat-x;
-    /*border-bottom:1px solid #e3e4e5;*/
     width:100%;
     font-size: 14px;
-    margin-bottom:25px;
+    margin-bottom:40px;
 }
 #header-inner {
     height:32px;
@@ -959,10 +964,15 @@ textarea:-moz-placeholder {/* for FF */
     margin-top: 0px;
 }
 #right-panel .hd {
-    border-radius:0; /* rm radius when 'hd' is also '.ui-corner-all' */
+    padding:10px;
-    margin-bottom:1.5em;
+    background:#f2f2f2;
+    margin-bottom:.5em;
+    border-radius:2px;
 }
-#right-panel .hd h3 {
+#right-panel .hd h3,
+#right-panel h3.hd {
+    height:29px;
+    line-height:29px;
     margin-bottom:0;
 }
 #right-panel .hd .tab {
@@ -970,15 +980,23 @@ textarea:-moz-placeholder {/* for FF */
     margin-bottom:0;
 }
 #right-panel .hd .a {
-    border:0; /* rm 'border-bottom' for cur tab */
     padding:4px 0;
-    line-height:16px; /* for ff*/
+    font-size:14px;
+    color:#333;
+    line-height:1.5;
+    border:0; /* rm 'border-bottom' for cur tab */
+    margin:0 8px;
+}
+#right-panel .hd .ui-state-active .a,
+#right-panel .hd .a:hover {
+    color:#eb8205;
+    text-decoration:underline;
 }
 #right-panel .hd button {
-    padding-top:0;
+    height:29px;
-    padding-bottom:0;
+    padding-left:5px;
-    height:24px;
+    padding-right:5px;
-    line-height:24px;
+    background:#fff;
 }
 /* info-bar */
 #info-bar,
@@ -1097,6 +1115,11 @@ textarea:-moz-placeholder {/* for FF */
     color:#333;
     font-weight:normal;
 }
+#top-nav-grp-list .item {
+    font-size:14px;
+    padding:5px 10px;
+    border:none;
+}
 .top-info-popup a.item:hover {
     background:#fafafa;
     text-decoration:none;

seahub/group/templates/group/group_base.html

@@ -39,7 +39,7 @@
         {% endif %}
 
         {% if is_staff %}
-        <li class="tab {% block cur_admin %}{%endblock%}"><a href="{% url 'group_manage' group.id %}">{% trans "Admin" %}</a></li>
+        <li class="tab {% block cur_admin %}{%endblock%}"><a href="{% url 'group_manage' group.id %}" class="admin">{% trans "Admin" %}</a></li>
         {% endif %}
     </ul>
 </div>

seahub/settings.py

@@ -231,7 +231,7 @@ AUTO_GENERATE_AVATAR_SIZES = (16, 20, 28, 36, 40, 48, 60, 80)
 # Group avatar
 GROUP_AVATAR_STORAGE_DIR = 'avatars/groups'
 GROUP_AVATAR_DEFAULT_URL = 'avatars/groups/default.png'
-AUTO_GENERATE_GROUP_AVATAR_SIZES = (20, 24, 48, 56)
+AUTO_GENERATE_GROUP_AVATAR_SIZES = (20, 24, 36, 48, 56)
 
 LOG_DIR = os.environ.get('SEAHUB_LOG_DIR', '/tmp')
 CACHE_DIR = "/tmp"

seahub/templates/base.html

@@ -141,7 +141,7 @@ $('#top-nav-grp').click(function() {
             dataType: 'json', 
             success: function(data) {
                loading_tip.addClass('hide'); 
-               $('#grp-list').html(data['html']);
+               $('#top-nav-grp-list').html(data['html']);
             }
         });
     } else {

seahub/templates/myhome.html

@@ -24,7 +24,6 @@
 {% block cur_my_lib %}tab-cur{% endblock %}
 
 {% block right_panel %}
-<!--mine shared stared -->
 {% include "snippets/my_owned_repos.html" %}
 
 {% url 'share_repo' as repo_share_url %}

seahub/templates/myhome_base.html

@@ -9,7 +9,7 @@
     <li style="position:relative;" class="nav-item">
         <a href="{% url "groups" %}" class="a {% block cur_group %}{% endblock %}" id="top-nav-grp">{% trans "Groups" %} <span class="icon-caret-down"></span></a>
         <div id="top-nav-grp-info" class="top-info-popup hide">
-            <div id="grp-list">
+            <div id="top-nav-grp-list">
                 <img src="{{MEDIA_URL}}img/loading-icon.gif" alt=""  class="loading-tip" />
             </div>
             <a href="{% url 'group_list' %}" class="item">{% trans "Group List" %}</a>

seahub/templates/snippets/groups.html

@@ -4,7 +4,7 @@
 {% for grp in groups %}
 <li>
 <a href="{% url "group_info" grp.id %}" class="item">
-    {% grp_avatar grp.id 48 %} <span class="vam">{{ grp.group_name }}</span>
+    {% grp_avatar grp.id 36 %} <span class="vam">{{ grp.group_name }}</span>
 </a>
 </li>
 {% endfor %}

seahub/templates/snippets/repo_create_js.html

@@ -1,17 +1,8 @@
 {% load i18n %}
 //repo-create-form
-$('#repo-create')
+$('#repo-create').click(function() {
-.click(function() {
     $('#repo-create-form').modal({appendTo: '#main', autoResize: true});
-})
+});
-.hover(
-    function() {
-        $(this).css({'background-color': '#fff', 'cursor': 'pointer'});
-    },
-    function() {
-        $(this).css('background-color', '#f5f5f5');
-    }
-);
 $('#encrypt-switch').click(function () {
     var form = $('#repo-create-form'),
         pwd_input = $('input[type="password"]', form);