diff --git a/media/css/seahub.css b/media/css/seahub.css index 9d1068e75e..7a5133d41a 100644 --- a/media/css/seahub.css +++ b/media/css/seahub.css @@ -2162,11 +2162,13 @@ textarea:-moz-placeholder {/* for FF */ padding:2px; } /* file/dir share popup */ +#folder-perm-popup, #file-share, #share-popup { padding:15px; min-height:200px; } +#folder-perm-popup .hd, #file-share .hd, #share-popup .hd { margin:0 0 8px 4px; @@ -2827,7 +2829,10 @@ textarea:-moz-placeholder {/* for FF */ display: inline-block; } .perm-add-perm, +.user-perm-add-perm, +.group-perm-add-perm, .perm-toggle-select, +#folder-perm-tabs .perm-select, .share-permission-select, .user-role-select, .user-status-select { @@ -3394,17 +3399,6 @@ textarea:-moz-placeholder {/* for FF */ .group-perm-add-tr input { padding:2px 5px; } - -.user-perm-add-perm, -.group-perm-add-perm, -.perm-toggle-select, -.share-permission-select { - position:relative;/*for long text in other lang in 'share admin'*/ - padding:3px 2px; - background:#fff; - border:1px solid #ddd; - border-radius:2px; -} .perm-add-select-folder { position:relative; right:18px; @@ -3493,7 +3487,6 @@ textarea:-moz-placeholder {/* for FF */ #multi-dirents-op .del-dirents { background-position: -57px -5px; } - #dir-private-share .label { margin:6px 0 8px; } @@ -3520,3 +3513,21 @@ textarea:-moz-placeholder {/* for FF */ height:36px; margin:21px 0 10px; } + +/* user & group folder perm */ +#folder-perm-tabs .tabs-panel { + width:400px; +} +#folder-perm-tabs .perm-select { + height:30px; +} +#folder-perm-tabs .submit { + margin-top:2px; + height:30px; +} +#folder-perm-tabs .select2-choices { + border-radius:2px; +} +#folder-perm-tabs table { + margin-top:0; +} diff --git a/seahub/templates/js/templates.html b/seahub/templates/js/templates.html index 6ec1c67b46..0047208c27 100644 --- a/seahub/templates/js/templates.html +++ b/seahub/templates/js/templates.html @@ -195,6 +195,9 @@
  • {% trans "Rename" %}
  • {% trans "Move" %}
  • {% trans "Copy" %}
  • + <% if (is_repo_owner) { %> +
  • {% trans "Permission" %}
  • + <% } %> <% } %> @@ -303,7 +306,6 @@
    -