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

[share/perm popup] fix

Browse Source
This commit is contained in:
llj
2016-08-22 15:15:55 +08:00
parent 83cb128b82
commit f5042956ce
5 changed files with 24 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
media/css/seahub.css
View File

@@ -740,9 +740,15 @@ textarea:-moz-placeholder {/* for FF */
background:#feac74;
color:#fff;
}
.left-right-tabs-content {
width:550px;
padding:0 1.4em 1em;
min-height:150px;
max-height:250px;
overflow:auto;
}
.left-right-tabs .tabs-panel {
padding-top:0;
min-width:400px;
padding:0;
}
/**** side-tabnav ****/
.side-textnav .hd,
@@ -2387,13 +2393,6 @@ button.sf-dropdown-toggle:focus {
padding:2px;
}
/* file/dir share popup */
#repo-folder-perm-popup,
#repo-share-link-admin-dialog,
#folder-perm-popup,
#file-share,
#share-popup {
min-height:200px;
}
#file-share .tip,
#share-popup .tip {
max-width:400px;
@@ -3175,15 +3174,7 @@ button.sf-dropdown-toggle:focus {
}
/* user & group folder perm */
#share-popup .tabs-panel,
#folder-perm-tabs .tabs-panel,
#repo-shared-links .tabs-panel,
#repo-folder-perm .tabs-panel {
width:550px;
max-height:250px;
overflow:auto;
}
#repo-folder-perm .tabs-panel {/* for the case that the scrollbar appears */
#repo-folder-perm .left-right-tabs-content {/* for the case that the scrollbar appears */
width:630px;
padding-right:0;
}
@@ -3192,12 +3183,15 @@ button.sf-dropdown-toggle:focus {
}
.repo-folder-perm-folder-path {
width:150px;
padding:1px 33px 1px 5px;
padding:3px 33px 3px 5px;
border:1px solid #ddd;
border-radius:2px;
margin:0;
}
.repo-folder-perm-add-folder {
position:absolute;
right:0;
top:4px;
top:1px;
width:29px;
height:28px;
line-height:28px;
@@ -3209,7 +3203,7 @@ button.sf-dropdown-toggle:focus {
margin:0;
}
.repo-folder-perm-content {
width:610px; /* for the table in it. */
width:612px; /* for the table in it. */
}
#share-popup .share-permission-select,
.folder-perm-select {

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

@@ -607,7 +607,7 @@
<li class="tab"><a href="#dir-group-share" class="a">{% trans "Share to group" %}</a></li>
</ul>
<div class="fright">
<div class="left-right-tabs-content fright">
<span class="loading-icon loading-tip"></span>
<div id="dir-user-share" class="tabs-panel">
<table>

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

@@ -438,7 +438,7 @@
<% } %>
</ul>
<div class="fright">
<div class="left-right-tabs-content fright">
<span class="loading-icon loading-tip"></span>
<% if (!repo_encrypted && can_generate_share_link) { %>
<div id="download-link-share" class="tabs-panel">
@@ -812,7 +812,7 @@
<li class="tab"><a href="#user-folder-perm" class="a">{% trans "User Permission" %}</a></li>
<li class="tab"><a href="#group-folder-perm" class="a">{% trans "Group Permission" %}</a></li>
</ul>
<div class="fright">
<div class="left-right-tabs-content fright">
<div id="user-folder-perm" class="tabs-panel">
<table>
<thead>
@@ -1233,7 +1233,7 @@
<% } %>
</ul>
<div class="fright">
<div class="left-right-tabs-content fright">
<% if (can_generate_share_link) { %>
<div id="js-download-links" class="tabs-panel">
<table>
@@ -1308,7 +1308,7 @@
<li class="tab"><a href="#js-repo-group-folder-perm" class="a">{% trans "Group Permission" %}</a></li>
</ul>
<div class="fright">
<div class="left-right-tabs-content fright">
<div id="js-repo-user-folder-perm" class="tabs-panel">
<div class="js-folder-perm-content repo-folder-perm-content">
<table>
@@ -1330,7 +1330,7 @@
</div>
</td>
<td>
<select name="permission" class="w100">
<select name="permission" class="folder-perm-select w100">
<option value="rw" selected="selected">{% trans "Read-Write"%}</option>
<option value="r">{% trans "Read-Only"%}</option>
</select>
@@ -1376,7 +1376,7 @@
</div>
</td>
<td>
<select name="permission" class="w100">
<select name="permission" class="folder-perm-select w100">
<option value="rw" selected="selected">{% trans "Read-Write"%}</option>
<option value="r">{% trans "Read-Only"%}</option>
</select>

2
seahub/templates/snippets/file_share_popup.html
View File

@@ -6,7 +6,7 @@
<li class="tab"><a href="#link-share" class="a">{% trans "Download Link" %}</a></li>
</ul>
<div class="fright">
<div class="left-right-tabs-content fright">
<div id="link-share" class="tabs-panel">
<div id="link-options">

2
static/scripts/app/views/share.js
View File

@@ -24,7 +24,7 @@ define([
this.render();
this.$el.modal();
this.$el.modal({focus: false});
$('#simplemodal-container').css({'width':'auto', 'height':'auto'});
this.$("#share-tabs").tabs();