diff --git a/media/css/seahub.css b/media/css/seahub.css index f1e30137f9..0f29f07949 100644 --- a/media/css/seahub.css +++ b/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, -#right-panel .hd { +.side-info .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' */ - margin-bottom:1.5em; + padding:10px; + 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; - padding-bottom:0; - height:24px; - line-height:24px; + height:29px; + padding-left:5px; + padding-right:5px; + 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; diff --git a/media/img/admin.png b/media/img/admin.png new file mode 100644 index 0000000000..fffba930c6 Binary files /dev/null and b/media/img/admin.png differ diff --git a/media/img/admin_w.png b/media/img/admin_w.png new file mode 100644 index 0000000000..dbce5d9f7a Binary files /dev/null and b/media/img/admin_w.png differ diff --git a/seahub/group/templates/group/group_base.html b/seahub/group/templates/group/group_base.html index fb6fc8f3e0..0b02c51617 100644 --- a/seahub/group/templates/group/group_base.html +++ b/seahub/group/templates/group/group_base.html @@ -39,7 +39,7 @@ {% endif %} {% if is_staff %} -
  • {% trans "Admin" %}
    • +
  • {% trans "Admin" %}
    • {% endif %} diff --git a/seahub/settings.py b/seahub/settings.py index b9d429eb4c..027a051b4a 100644 --- a/seahub/settings.py +++ b/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" diff --git a/seahub/templates/base.html b/seahub/templates/base.html index 6095598e19..0cf8171c81 100644 --- a/seahub/templates/base.html +++ b/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 { diff --git a/seahub/templates/myhome.html b/seahub/templates/myhome.html index 9c97f04ec7..abea3f3c8e 100644 --- a/seahub/templates/myhome.html +++ b/seahub/templates/myhome.html @@ -24,7 +24,6 @@ {% block cur_my_lib %}tab-cur{% endblock %} {% block right_panel %} - {% include "snippets/my_owned_repos.html" %} {% url 'share_repo' as repo_share_url %} diff --git a/seahub/templates/myhome_base.html b/seahub/templates/myhome_base.html index 6136855ba8..bc8072a4e1 100644 --- a/seahub/templates/myhome_base.html +++ b/seahub/templates/myhome_base.html @@ -9,7 +9,7 @@
  • {% trans "Groups" %}
    -
    +
    {% trans "Group List" %} diff --git a/seahub/templates/snippets/groups.html b/seahub/templates/snippets/groups.html index 2fa710feee..d0b29dd62b 100644 --- a/seahub/templates/snippets/groups.html +++ b/seahub/templates/snippets/groups.html @@ -4,7 +4,7 @@ {% for grp in groups %}
  • - {% grp_avatar grp.id 48 %} {{ grp.group_name }} + {% grp_avatar grp.id 36 %} {{ grp.group_name }}
    • {% endfor %} diff --git a/seahub/templates/snippets/repo_create_js.html b/seahub/templates/snippets/repo_create_js.html index 590d8930e6..1a88ebd809 100644 --- a/seahub/templates/snippets/repo_create_js.html +++ b/seahub/templates/snippets/repo_create_js.html @@ -1,17 +1,8 @@ {% load i18n %} //repo-create-form -$('#repo-create') -.click(function() { +$('#repo-create').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);