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

Improve group popovers

Browse Source
This commit is contained in:
Daniel Pan
2016-04-17 10:23:28 +08:00
parent 5172a9d25a
commit 3909d14983
6 changed files with 34 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
media/css/seahub.css
View File

@@ -1190,12 +1190,23 @@ textarea:-moz-placeholder {/* for FF */
margin:4px 0 0; margin:4px 0 0;
} }
.popover-con { .popover-con {
padding:0 10px;
overflow:auto; overflow:auto;
} }
a.popover-item {
color:#444;
font-weight:normal;
text-decoration:none;
display:block;
padding-left:10px;
padding-right:10px;
line-height:31px;
cursor:pointer;
margin:5px 0;
}
/**** user-item ****/ /* e.g. group member in 'group members' panel */ /**** user-item ****/ /* e.g. group member in 'group members' panel */
.user-item { .user-item {
margin:5px 0; margin:5px 0;
padding-left:10px;
} }
.user-item .txt { .user-item .txt {
margin-left:40px; margin-left:40px;
@@ -3371,11 +3382,6 @@ img.thumbnail {
.group-setting-list { .group-setting-list {
border-bottom:1px solid #e3e3e5; border-bottom:1px solid #e3e3e5;
} }
.group-setting-item {
line-height:31px;
cursor:pointer;
margin:5px 0;
}
#add-group-members-form .submit { #add-group-members-form .submit {
margin:0 0 0 5px; margin:0 0 0 5px;
} }

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

@@ -1004,37 +1004,37 @@
<script type="text/template" id="group-settings-content-tmpl"> <script type="text/template" id="group-settings-content-tmpl">
<% if (is_owner) { %> <% if (is_owner) { %>
<ul class="group-setting-list"> <ul class="group-setting-list">
<li class="group-setting-item" data-op="rename">{% trans "Rename" %}</li> <li><a href="#" class="group-setting-item popover-item" data-op="rename">{% trans "Rename" %}</a></li>
<li class="group-setting-item" data-op="transfer">{% trans "Transfer" %}</li> <li><a href="#" class="group-setting-item popover-item" data-op="transfer">{% trans "Transfer" %}</a></li>
<% if (!wiki_enabled) { %> <% if (!wiki_enabled) { %>
<li class="group-setting-item" data-op="add-wiki">{% trans "Add Wiki" %}</li> <li><a href="#" class="group-setting-item popover-item" data-op="add-wiki">{% trans "Add Wiki" %}</a></li>
<% } else { %> <% } else { %>
<li class="group-setting-item" data-op="remove-wiki">{% trans "Remove Wiki" %}</li> <li><a href="#" class="group-setting-item popover-item" data-op="remove-wiki">{% trans "Remove Wiki" %}</a></li>
<% } %> <% } %>
</ul> </ul>
<ul class="group-setting-list"> <ul class="group-setting-list">
<li class="group-setting-item" data-op="import-members">{% trans "Import Members" %}</li> <li><a href="#" class="group-setting-item popover-item" data-op="import-members">{% trans "Import Members" %}</a></li>
<li class="group-setting-item" data-op="manage-members">{% trans "Manage Members" %}</li> <li><a href="#" class="group-setting-item popover-item" data-op="manage-members">{% trans "Manage Members" %}</a></li>
</ul> </ul>
<ul class="last-group-setting-list"> <ul class="last-group-setting-list">
<li class="group-setting-item" data-op="dismiss">{% trans "Dismiss" %}</li> <li><a href="#" class="group-setting-item popover-item" data-op="dismiss">{% trans "Dismiss" %}</a></li>
</ul> </ul>
<% } else if (is_admin) { %> <% } else if (is_admin) { %>
<ul class="group-setting-list"> <ul class="group-setting-list">
<li class="group-setting-item" data-op="rename">{% trans "Rename" %}</li> <li><a href="#" class="group-setting-item popover-item" data-op="rename">{% trans "Rename" %}</a></li>
<% if (!wiki_enabled) { %> <% if (!wiki_enabled) { %>
<li class="group-setting-item" data-op="add-wiki">{% trans "Add Wiki" %}</li> <li><a href="#" class="group-setting-item popover-item" data-op="add-wiki">{% trans "Add Wiki" %}</a></li>
<% } else { %> <% } else { %>
<li class="group-setting-item" data-op="remove-wiki">{% trans "Remove Wiki" %}</li> <li><a href="#" class="group-setting-item popover-item" data-op="remove-wiki">{% trans "Remove Wiki" %}</a></li>
<% } %> <% } %>
</ul> </ul>
<ul class="last-group-setting-list"> <ul class="last-group-setting-list">
<li class="group-setting-item" data-op="import-members">{% trans "Import Members" %}</li> <li><a href="#" class="group-setting-item popover-item" data-op="import-members">{% trans "Import Members" %}</a></li>
<li class="group-setting-item" data-op="manage-members">{% trans "Manage Members" %}</li> <li><a href="#" class="group-setting-item popover-item" data-op="manage-members">{% trans "Manage Members" %}</a></li>
</ul> </ul>
<% } else { %> <% } else { %>
<ul class="last-group-setting-list"> <ul class="last-group-setting-list">
<li class="group-setting-item" data-op="leave">{% trans "Leave group" %}</li> <li><a href="#" class="group-setting-item popover-item" data-op="leave">{% trans "Leave group" %}</a></li>
</ul> </ul>
<% } %> <% } %>
</script> </script>

10
seahub/templates/libraries.html
View File

@@ -116,7 +116,7 @@
<script type="text/template" id="group-settings-tmpl"> <script type="text/template" id="group-settings-tmpl">
<div class="outer-caret up-outer-caret"><div class="inner-caret"></div></div> <div class="outer-caret up-outer-caret"><div class="inner-caret"></div></div>
<div class="popover-hd ovhd"> <div class="popover-hd ovhd">
<span class="popover-close close sf2-icon-x1 op-icon fright" title="{% trans "Close" %}"></span> <a href="#" title="{% trans "Close" %}" aria-label="{% trans "Close" %}" class="popover-close close sf2-icon-x1 op-icon fright"></a>
<h3 class="popover-title">{% trans "Settings" %}</h3> <h3 class="popover-title">{% trans "Settings" %}</h3>
</div> </div>
<div class="popover-con"> <div class="popover-con">
@@ -126,11 +126,11 @@
<script type="text/template" id="group-members-tmpl"> <script type="text/template" id="group-members-tmpl">
<div class="outer-caret up-outer-caret"><div class="inner-caret"></div></div> <div class="outer-caret up-outer-caret"><div class="inner-caret"></div></div>
<div class="popover-hd ovhd"> <div class="popover-hd ovhd">
<span class="popover-close close sf2-icon-x1 op-icon fright" title="{% trans "Close" %}"></span> <a href="#" title="{% trans "Close" %}" aria-label="{% trans "Close" %}" class="popover-close close sf2-icon-x1 op-icon fright"></a>
<h3 class="popover-title">{% trans "Members" %}</h3> <h3 class="popover-title">{% trans "Members" %}</h3>
</div> </div>
<div class="popover-con"> <div class="popover-con">
<span class="loading-icon loading-tip"></span> <div class="loading-icon loading-tip"></div>
<ul id="group-member-list" class="hide"></ul> <ul id="group-member-list" class="hide"></ul>
<p class="error hide"></p> <p class="error hide"></p>
</div> </div>
@@ -139,11 +139,11 @@
<script type="text/template" id="group-discussions-tmpl"> <script type="text/template" id="group-discussions-tmpl">
<div class="outer-caret up-outer-caret"><div class="inner-caret"></div></div> <div class="outer-caret up-outer-caret"><div class="inner-caret"></div></div>
<div class="popover-hd ovhd"> <div class="popover-hd ovhd">
<span class="popover-close close sf2-icon-x1 op-icon fright" title="{% trans "Close" %}"></span> <a href="#" title="{% trans "Close" %}" aria-label="{% trans "Close" %}" class="popover-close close sf2-icon-x1 op-icon fright"></a>
<h3 class="popover-title">{% trans "Discussions" %}</h3> <h3 class="popover-title">{% trans "Discussions" %}</h3>
</div> </div>
<div class="popover-con"> <div class="popover-con">
<span class="loading-icon loading-tip"></span> <div class="loading-icon loading-tip"></div>
<p class="load-more-discussion hide js-load-more">{% trans "More..." %}</p> <p class="load-more-discussion hide js-load-more">{% trans "More..." %}</p>
<ul id="group-discussion-list" class="hide"></ul> <ul id="group-discussion-list" class="hide"></ul>
<p class="no-discussion-tip hide">{% trans "No discussion in this group yet." %}</p> <p class="no-discussion-tip hide">{% trans "No discussion in this group yet." %}</p>

2
static/scripts/app/views/group-discussions.js
View File

@@ -116,6 +116,7 @@ define([
}); });
$("#group").append(this.$el); $("#group").append(this.$el);
this.$(".msg-input").focus();
app.router.navigate('group/' + this.groupView.group.id + '/discussions/'); app.router.navigate('group/' + this.groupView.group.id + '/discussions/');
}, },
@@ -133,6 +134,7 @@ define([
hide: function() { hide: function() {
PopoverView.prototype.hide.call(this); PopoverView.prototype.hide.call(this);
app.router.navigate('group/' + this.groupView.group.id + '/'); app.router.navigate('group/' + this.groupView.group.id + '/');
return false;
}, },
replyTo: function(to_user) { replyTo: function(to_user) {

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

@@ -92,6 +92,7 @@ define([
break; break;
} }
this.hide(); this.hide();
return false;
}, },
rename: function() { rename: function() {

1
static/scripts/app/views/widgets/popover.js
View File

@@ -60,6 +60,7 @@ define([
hide: function() { hide: function() {
app.ui.currentPopover = null; app.ui.currentPopover = null;
this.$el.detach(); this.$el.detach();
return false;
}, },
show: function() { show: function() {