haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-03 07:55:36 +00:00
Code Issues Releases Wiki Activity

[group discussion] fixup for 'enable' option

Browse Source
This commit is contained in:
llj
2018-04-18 16:39:20 +08:00
parent 876fa2e138
commit b383846e87
5 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
media/css/seahub.css
View File

@@ -3680,12 +3680,6 @@ img.thumbnail {
top:90px; top:90px;
right:0; right:0;
} }
#group-members .outer-caret {
right:66px;
}
#group-settings .outer-caret {
right:106px;
}
.group-setting-list { .group-setting-list {
border-bottom:1px solid #e3e3e5; border-bottom:1px solid #e3e3e5;
} }

2
seahub/templates/js/templates.html
View File

@@ -1437,8 +1437,6 @@
<a href="#" class="sf2-icon-user2 op-icon group-top-op-icon" title="{% trans "Members" %}" id="group-members-icon" aria-label="{% trans "Members" %}"></a> <a href="#" class="sf2-icon-user2 op-icon group-top-op-icon" title="{% trans "Members" %}" id="group-members-icon" aria-label="{% trans "Members" %}"></a>
<% if (app.pageOptions.enable_group_discussion) { %> <% if (app.pageOptions.enable_group_discussion) { %>
<a href="#" class="sf2-icon-msgs2 op-icon group-top-op-icon" title="{% trans "Discussion" %}" id="group-discussions-icon" aria-label="{% trans "Discussion" %}"></a> <a href="#" class="sf2-icon-msgs2 op-icon group-top-op-icon" title="{% trans "Discussion" %}" id="group-discussions-icon" aria-label="{% trans "Discussion" %}"></a>
<% } else { %>
<a href="#" class="sf2-icon-msgs2 op-icon group-top-op-icon vh" id="group-discussions-icon"></a>
<% } %> <% } %>
</div> </div>
</div> </div>

7
static/scripts/app/router.js
View File

@@ -237,7 +237,12 @@ define([
}, },
showGroupDiscussions: function(group_id) { showGroupDiscussions: function(group_id) {
this.showGroup(group_id, {showDiscussions: true}); if (app.pageOptions.enable_group_discussion) {
this.showGroup(group_id, {showDiscussions: true});
} else {
this.showGroup(group_id);
app.router.navigate('group/' + group_id + '/');
}
}, },
showOrgRepos: function() { showOrgRepos: function() {

7
static/scripts/app/views/group-members.js
View File

@@ -82,7 +82,12 @@ define([
_this.$error.html(err_msg).show(); _this.$error.html(err_msg).show();
} }
}); });
$("#group-members-icon").after(this.$el);
var $icon = $("#group-members-icon");
$icon.after(this.$el);
$('.outer-caret', this.$el).css({
'right': $('#group').width() - $icon.position().left - $icon.width()
});
} }
}); });

6
static/scripts/app/views/group-settings.js
View File

@@ -53,7 +53,11 @@ define([
'wiki_enabled': this.groupView.group.wiki_enabled 'wiki_enabled': this.groupView.group.wiki_enabled
})); }));
$("#group-settings-icon").after(this.$el); var $icon = $("#group-settings-icon");
$icon.after(this.$el);
$('.outer-caret', this.$el).css({
'right': $('#group').width() - $icon.position().left - $icon.width()
});
}, },
highlightItem: function(e) { highlightItem: function(e) {