haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-01 15:09:14 +00:00
Code Issues Releases Wiki Activity

Merge branch '5.1'

Browse Source 
Conflicts:
	seahub/group/templates/group/group_base.html
	seahub/templates/home_base.html
	seahub/templates/js/sysadmin-templates.html
	seahub/templates/js/templates.html
	seahub/templates/libraries.html
	seahub/templates/pub_base.html
	static/scripts/app/views/group-discussions.js
This commit is contained in:
Daniel Pan
2016-05-21 13:42:04 +08:00
parent e8a60d3318 ce2648e646
commit ee99d7aad8
123 changed files with 26940 additions and 21385 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
static/scripts/app/views/repo.js
View File

@@ -63,9 +63,9 @@ define([
.replace('{lib_name}', '<span class="op-target">' + Common.HTMLescape(this.model.get('name')) + '</span>');
var confirm_popup = $(this.repoDelConfirmTemplate({
content: confirm_msg
}))
.appendTo(op_container)
.css({
}));
del_icon.after(confirm_popup);
confirm_popup.css({
'left': del_icon.position().left,
'top': del_icon.position().top + del_icon.height() + 2,
'width': 180
@@ -144,6 +144,7 @@ define([
}).append(form);
$op_td.hide();
$name_span.hide();
$('[name="newname"]', form).focus();
this.togglePopup();
app.ui.freezeItemHightlight = true;