1
0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-14 14:21:23 +00:00

modified some ui (fileshare & grpmember-add popup, path of shared dir's file

This commit is contained in:
llj
2013-01-09 21:14:11 +08:00
parent 238041d651
commit 7f8edd0358
5 changed files with 6 additions and 8 deletions

View File

@@ -267,6 +267,7 @@ $('.grp-admin-add').click(function() {
$('#grp-member-add').click(function() { $('#grp-member-add').click(function() {
$("#member-add-form").modal({appendTo: "#main", focus: false}); $("#member-add-form").modal({appendTo: "#main", focus: false});
$('#simplemodal-container').css({'height':'auto'});
addAutocomplete('#added-member-name', '#member-add-form', contact_list); addAutocomplete('#added-member-name', '#member-add-form', contact_list);
return false; return false;
}); });

View File

@@ -1141,9 +1141,6 @@ textarea:-moz-placeholder {/* for FF */
height:80px; height:80px;
padding:2px; padding:2px;
} }
#added-member-name {
width:97%;
}
#repo-share-form { #repo-share-form {
width:266px; width:266px;
} }

View File

@@ -656,7 +656,7 @@ $('.file-share').click(function() {
$('#shared-link-text').css({'width':$('#linkwidth').width() + 2}); $('#shared-link-text').css({'width':$('#linkwidth').width() + 2});
$('#file-share').modal({'focus':false}); // in ff: if 'focus' is true, 'shared-link-text' gets the focus $('#file-share').modal({'focus':false}); // in ff: if 'focus' is true, 'shared-link-text' gets the focus
$('#linkwidth').remove(); $('#linkwidth').remove();
$('#simplemodal-container').css({'width':'auto', 'height':'auto'}); $('#simplemodal-container').css({'height':'auto'});
} }
if ($(this).data('link')) { if ($(this).data('link')) {
showPopup($(this).data('link')); showPopup($(this).data('link'));

View File

@@ -13,8 +13,8 @@
<h2 id="view-hd">{{ file_name }}</h2> <h2 id="view-hd">{{ file_name }}</h2>
<div id="file"> <div id="file">
<div id="file-op"> <div id="file-op">
<p class="fleft">
{% if zipped %} {% if zipped %}
<p class="path fleft">
{% trans "Current path: "%} {% trans "Current path: "%}
{% for name, link in zipped %} {% for name, link in zipped %}
{% if not forloop.last %} {% if not forloop.last %}
@@ -23,10 +23,10 @@
{{ name }} {{ name }}
{% endif %} {% endif %}
{% endfor %} {% endfor %}
</p>
{% else %} {% else %}
<p class="fleft">{% trans "Shared by: " %}{{ username|email2nickname }}</p> {% trans "Shared by: " %}{{ username|email2nickname }}
{% endif %} {% endif %}
</p>
{% if filetype == 'Text' or filetype == 'Image' or filetype == 'SVG' or filetype == 'Markdown' %} {% if filetype == 'Text' or filetype == 'Image' or filetype == 'SVG' or filetype == 'Markdown' %}
<button data="{{ SITE_ROOT }}repo/{{ repo.id }}/{{ obj_id }}/?file_name={{ file_name }}&op=view&t={{ shared_token }}" id="view-original">{% trans "Raw" %}</button> <button data="{{ SITE_ROOT }}repo/{{ repo.id }}/{{ obj_id }}/?file_name={{ file_name }}&op=view&t={{ shared_token }}" id="view-original">{% trans "Raw" %}</button>

View File

@@ -74,7 +74,7 @@ $('#send-shared-link').click(function() { // for file_view.html and subdir page
$('#send-link').click(function() { // for 'file-share' in repo.html $('#send-link').click(function() { // for 'file-share' in repo.html
$(this).addClass('hide'); $(this).addClass('hide');
var input = $('#link-send-input'); var input = $('#link-send-input');
input.css({'min-width':input.css('width'), 'width': $('#file-share').width() - parseInt(input.css('padding-left')) - parseInt(input.css('padding-right')) - parseInt(input.css('border-left-width')) - parseInt(input.css('border-right-width'))}); input.css({'width': $('#file-share').width() - parseInt(input.css('padding-left')) - parseInt(input.css('padding-right')) - parseInt(input.css('border-left-width')) - parseInt(input.css('border-right-width'))});
$('#link-send-form').removeClass('hide'); $('#link-send-form').removeClass('hide');
addAutocomplete('#link-send-input', '#link-send-form', share_list); addAutocomplete('#link-send-input', '#link-send-form', share_list);
}); });