diff --git a/media/css/seahub.css b/media/css/seahub.css index d238a2ba48..42834d9421 100644 --- a/media/css/seahub.css +++ b/media/css/seahub.css @@ -3759,11 +3759,27 @@ img.thumbnail { } #groups .group-name { font-size:16px; - margin:15px 0 10px; + padding-left:3px; + border-bottom:1px solid #e6e6e6; + margin:15px 0 0; } #groups .group-name .a { color:#322; } -#groups .empty-tips { - margin:10px 0 40px; +#groups table { + margin:0 0 32px; +} +#groups th { + font-size:0; + padding:0; +} +#groups th, +#groups td { + border-bottom:0; +} +#groups .empty-tip { + color:#a4a4a4; + padding:4px 0; + border-bottom:1px solid #e5e5e5; + margin:0 0 32px; } diff --git a/seahub/templates/js/templates.html b/seahub/templates/js/templates.html index 6c548e181e..c9df5015dd 100644 --- a/seahub/templates/js/templates.html +++ b/seahub/templates/js/templates.html @@ -66,7 +66,9 @@ <%= size_formatted %> <%= mtime_relative %> + <% if (show_shared_by) { %> <%- owner_nickname %> + <% } %> diff --git a/static/scripts/app/views/group-item.js b/static/scripts/app/views/group-item.js index 796babbd86..a1fa90370e 100644 --- a/static/scripts/app/views/group-item.js +++ b/static/scripts/app/views/group-item.js @@ -39,7 +39,8 @@ define([ var view = new GroupRepoView({ model: new Backbone.Model(item, {collection: groupRepos}), group_id: group_id, - is_staff: is_staff + is_staff: is_staff, + show_shared_by: false // don't show 'Shared By' }); $listContainer.append(view.render().el); }); diff --git a/static/scripts/app/views/group-repo.js b/static/scripts/app/views/group-repo.js index 63505cd62b..b39c17a250 100644 --- a/static/scripts/app/views/group-repo.js +++ b/static/scripts/app/views/group-repo.js @@ -21,6 +21,11 @@ define([ this.group_id = options.group_id; this.is_staff = options.is_staff; + this.show_shared_by = true; // default + if (options.show_shared_by !== undefined) { // e.g. views/group-item.js + this.show_shared_by = options.show_shared_by; + } + this.listenTo(this.model, 'destroy', this.remove); }, @@ -28,7 +33,8 @@ define([ var obj = this.model.toJSON(); $.extend(obj, { group_id: this.group_id, - is_staff: this.is_staff + is_staff: this.is_staff, + show_shared_by: this.show_shared_by }); this.$el.html(this.template(obj)); return this;