diff --git a/media/css/seahub.css b/media/css/seahub.css index c5c4c60861..c6399117d3 100644 --- a/media/css/seahub.css +++ b/media/css/seahub.css @@ -1657,6 +1657,9 @@ textarea:-moz-placeholder {/* for FF */ width:330px; margin:0 17px 30px 0; } +.group-list .group { + margin-bottom:25px; +} .group-list .group, .user-list .user { *display:inline; /* for ie 6,7 */ diff --git a/seahub/group/templates/group/groups.html b/seahub/group/templates/group/groups.html index 20105c8f65..e495a2b01f 100644 --- a/seahub/group/templates/group/groups.html +++ b/seahub/group/templates/group/groups.html @@ -19,5 +19,14 @@ {% with post_url=group_add_url %} {% include "snippets/group_add_js.html" %} {% endwith %} + +$('.group').hover( + function() { + $('.fast', $(this)).removeClass('vh'); + }, + function() { + $('.fast', $(this)).addClass('vh'); + } +); {% endblock %} diff --git a/seahub/group/templates/group/groups_right_panel.html b/seahub/group/templates/group/groups_right_panel.html index 8c2297f2a9..9c46105be2 100644 --- a/seahub/group/templates/group/groups_right_panel.html +++ b/seahub/group/templates/group/groups_right_panel.html @@ -12,8 +12,8 @@

{{ group.props.group_name }}

{% trans "Creator: " %}{{ group.props.creator_name }}

{% trans "Time: "%}{{ group.props.timestamp|tsstr_sec }}

-
- +
+ {% if group.wiki_enabled %} diff --git a/seahub/settings.py b/seahub/settings.py index 088d21594c..e0a595f6d1 100644 --- a/seahub/settings.py +++ b/seahub/settings.py @@ -211,7 +211,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) +AUTO_GENERATE_GROUP_AVATAR_SIZES = (20, 24, 48, 56) LOG_DIR = os.environ.get('SEAHUB_LOG_DIR', '/tmp') CACHE_DIR = "/tmp"