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

added fileshare to repo page, improved fileshare in file_view, improved 'messages' & apply_form_error

Browse Source
This commit is contained in:
llj
2012-12-29 20:46:26 +08:00
parent 696b86c27c
commit c724b44386
6 changed files with 173 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
media/css/seahub.css
View File

@@ -481,7 +481,7 @@ textarea:-moz-placeholder {/* for FF */
}
/* for messages like 'contact added successfully' */
.messages {
position:absolute;
position:fixed;
border-radius: 2px;
-webkit-border-radius: 2px;
-moz-border-radius: 2px;
@@ -1365,7 +1365,6 @@ textarea:-moz-placeholder {/* for FF */
text-align:right;
}
#shared-link {
display: inline-block;
border:0;
}
.file-op {

27
media/js/utils.js
View File

@@ -277,17 +277,14 @@ function prepareCSRFToken(xhr, settings) {
}
function apply_form_error(formid, error_msg) {
var form_err = $("#" + formid + " .error"),
container = $("#simplemodal-container");
form_err.html(error_msg).attr('class', 'error').removeClass('hide');
container.css('height', $('#'+formid).height());
$("#" + formid + " .error").html(error_msg).removeClass('hide');
$("#simplemodal-container").css({'height':'auto'});
}
// handle messages
if ($('.messages')[0]) {
$('#main').append($('.messages')).css('position','relative');
$('.messages').css({'left':($('#main').width() - $('.messages').width())/2 + 'px', 'top':'-20px'}).removeClass('hide');
$('#main').append($('.messages'));
$('.messages').css({'left':($(window).width() - $('.messages').width())/2, 'top':10}).removeClass('hide');
setTimeout(function() { $('.messages').addClass('hide'); }, 10000);
}
@@ -300,14 +297,24 @@ function feedback(con, type, time) {
var html = '<ul class="messages"><li class="' + type + '">' + con + '</li></ul>';
$('#main').append(html);
}
$('#main').css('position','relative');
$('.messages').css({'left':($('#main').width() - $('.messages').width())/2 + 'px', 'top':'-20px'}).removeClass('hide');
$('.messages').css({'left':($(window).width() - $('.messages').width())/2, 'top':10}).removeClass('hide');
setTimeout(function() { $('.messages').addClass('hide'); }, time);
}
function disable(btn) {
btn.attr('disabled', 'disabled').addClass('btn-disabled');
}
function enable(btn) {
btn.removeAttr('disabled').removeClass('btn-disabled');
}
// get substr according to character numbers
function trimByChar(str, n) {
var len = str.length;
var new_str = '';
if (len > n) {
new_str = str.substr(0, n) + '...';
} else {
new_str = str;
}
return new_str;
}

7
share/views.py
View File

@@ -379,7 +379,6 @@ def get_shared_link(request):
content_type = 'application/json; charset=utf-8'
repo_id = request.GET.get('repo_id')
obj_id = request.GET.get('obj_id')
path = request.GET.get('p', '/')
if path[-1] == '/':
path = path[:-1]
@@ -401,7 +400,7 @@ def get_shared_link(request):
try:
fs.save()
except IntegrityError, e:
err = _('Failed to get shared link, please retry.')
err = _('Failed to get the link, please retry it.')
data = json.dumps([{'error': err}])
return HttpResponse(data, status=500, content_type=content_type)
@@ -466,11 +465,11 @@ def send_shared_link(request):
}
try:
send_mail(_(u'Your friend sharing a file to you on Seafile'),
send_mail(_(u'Your friend shared a file to you on Seafile'),
t.render(Context(c)), None, [to_email],
fail_silently=False)
except:
data = json.dumps({'error':_(u'Failed to send mail')})
data = json.dumps({'error':_(u'Send failed.')})
return HttpResponse(data, status=500, content_type=content_type)
data = json.dumps("success")

25
templates/file_view.html
View File

@@ -25,7 +25,7 @@
<div class="file-op fright">
<input id="shared-link" class="hide" type="text" readonly="readonly" value="{{ file_shared_link }}" />
<button data="{% url 'get_shared_link' %}?repo_id={{ repo.id }}&p={{ path|urlencode }}&file_name={{ file_name }}" id="get-shared-link">{% trans "Share link"%}</button>
<button data="{% url 'get_shared_link' %}?repo_id={{ repo.id }}&p={{ path|urlencode }}" id="get-shared-link">{% trans "Share link"%}</button>
<button id="send-shared-link" class="hide">{% trans "Send"%}</button>
<button data="{% url 'remove_shared_link' %}?t={{ fileshare.token }}" id="rm-shared-link" class="hide">{% trans "Delete"%}</button>
{% if is_starred %}
@@ -82,7 +82,7 @@
<form id="link-send-form" action="" method="post" class="hide">
<h3>Send Link</h3>
<label>{% trans "Send to:"%}</label><br />
<textarea id="link-send-input" name="email" placeholder="{% trans "Emails, Seperate by ','"%}"></textarea><br />
<textarea id="link-send-input" name="email" placeholder="{% trans "Emails, Seperated by ','"%}"></textarea><br />
<input type="hidden" name="file_shared_link" value="{{ file_shared_link }}" />
<input type="submit" value="{% trans "Submit"%}" class="submit" />
<p class="error hide"></p>
@@ -182,19 +182,16 @@ $('#get-shared-link').click(function() {
contentType: 'application/json; charset=utf-8',
success: function(data) {
if (data.length > 0) {
var t = data[0]['token'],
shared_link = '{{ protocol }}://{{ domain }}{{ SITE_ROOT }}f/' + t + '/';
$('#shared-link').val(shared_link);
var t = data[0]['token'];
$('#rm-shared-link').attr('data', '{% url 'remove_shared_link' %}?t=' + t);
$('#shared-link, input[name="file_shared_link"]').val('{{ protocol }}://{{ domain }}{{ SITE_ROOT }}f/' + t + '/');
setLinkWidth();
var remove_link = '{% url 'remove_shared_link' %}';
$('#rm-shared-link').attr('data', remove_link + '?t=' + t);
$('input[name="file_shared_link"]').val(shared_link);
showLink();
}
},
error: function(xhr, ajaxOptions, thrownError) {
var jsonVal = jQuery.parseJSON(xhr.responseText);
$('#get-shared-link').replaceWith('<span class="error">' + jsonVal[0]['error'] + '</span>');
feedback(jsonVal[0]['error'], 'error');
}
});
});
@@ -213,15 +210,13 @@ $('#rm-shared-link').click(function() {
});
});
var share_list = [];
{% for contact in contacts %}
share_list.push({value:'{{ contact.contact_email }}', label:'{{ contact.contact_email }}'});
{% endfor %}
$('#send-shared-link').click(function() {
$("#link-send-form").modal({appendTo: "#main", focus: false});
$('#simplemodal-container').css('height', 'auto');
// link-send-form email autocomplete
var share_list = [], contact_email;
{% for contact in contacts %}
contact_email = '{{ contact.contact_email }}';
share_list.push({value:contact_email, label:contact_email});
{% endfor %}
addAutocomplete('#link-send-input', '#link-send-form', share_list);
});

125
templates/repo.html
View File

@@ -93,9 +93,9 @@
<tr>
<th width="3%"></th>
<th width="5%"></th>
<th width="55%">{% trans "Name"%}</th>
<th width="53%">{% trans "Name"%}</th>
<th width="10%">{% trans "Size"%}</th>
<th width="27%">{% trans "Operations"%}</th>
<th width="29%">{% trans "Operations"%}</th>
</tr>
{% for dirent in dir_list %}
@@ -149,6 +149,7 @@
<a class="op" href="{{ SITE_ROOT }}repo/{{ repo.props.id }}/{{ dirent.props.obj_id }}/?file_name={{ dirent.props.obj_name }}&op=download">{% trans "Download"%}</a>
{% if user_perm == 'rw' %}
<a class="op update-file" data-target="{{ path }}{{dirent.obj_name}}" href="#">{% trans "Update"%}</a>
<a class="op file-share" href="#" data-name="{{ dirent.obj_name }}" data-link="{{ dirent.sharelink }}" data-token="{{ dirent.sharetoken }}">{% trans "Share" %}</a>
{% endif %}
</div>
{% if user_perm == 'rw' %}
@@ -280,6 +281,20 @@
<button class="simplemodal-close">{% trans "Cancel"%}</button>
</form>
<div id="file-share" class="hide">
<h3>{% trans 'Share' %} <span class="op-target"></span></h3>
<p>{% trans 'Link: ' %}<input type="text" readonly="readonly" id="shared-link" /></p>
<button id="send-link">{% trans 'Send' %}</button>
<form id="link-send-form" class="hide">
<label>{% trans "Send to:"%}</label><br />
<textarea id="link-send-input" name="email" placeholder="{% trans "Emails, Seperated by ','"%}"></textarea><br />
<input type="hidden" name="file_shared_link" value="" />
<input type="submit" value="{% trans "Submit"%}" class="submit" />
<p class="error hide"></p>
<p id="sending" class="hide">{% trans "Sending..."%}</p>
</form>
</div>
{% with attach_type='dir' %}
{% include "snippets/group_recommend_form.html" %}
{% endwith %}
@@ -704,6 +719,112 @@ $('.file-star').click(function() {
}
});
});
//file share
function trimFilename(name, n) {
var len = name.length;
var ext = '';
var str = '';
if (len > n) {
if (name.lastIndexOf('.') != -1) { // with extension
ext = name.split('.').reverse()[0];
str = name.substr(0, n - ext.length - 3) + '...' + name.substr(name.lastIndexOf('.') - 2);
} else {
str = name.substr(0, n) + '...';
}
} else {
str = name;
}
return str;
}
$('.file-share').click(function() {
var filename = $(this).data('name');
function showPopup(link) {
$('#file-share .op-target').html(trimFilename(filename, 30));
$('#shared-link, #link-send-form input[name="file_shared_link"]').val(link);
$('#main').append('<p id="linkwidth" class="hide">' + link + '</p>');
$('#shared-link').css({'width':$('#linkwidth').width() + 2});
$('#file-share').modal({'focus':false}); // in ff: if 'focus' is true, 'shared-link' gets the focus
$('#linkwidth').remove();
$('#simplemodal-container').css({'width':'auto', 'height':'auto'});
}
if ($(this).data('link')) {
showPopup($(this).data('link'));
} else {
$.ajax({
url: '{% url 'get_shared_link' %}?repo_id={{ repo.id }}&p={{ path|urlencode }}' + e(filename),
dataType: 'json',
cache: false,
contentType: 'application/json; charset=utf-8',
success: function(data) {
if (data.length > 0) {
showPopup('{{ protocol }}://{{ domain }}{{ SITE_ROOT }}f/' + data[0]['token'] + '/');
}
},
error: function(xhr, ajaxOptions, thrownError) {
var jsonVal = jQuery.parseJSON(xhr.responseText);
feedback(jsonVal[0]['error'], 'error');
}
});
}
return false;
});
var share_list = [];
{% for contact in contacts %}
share_list.push({value:'{{ contact.contact_email }}', label:'{{ contact.contact_email }}'});
{% endfor %}
$('#send-link').click(function() {
$(this).addClass('hide');
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'))});
$('#link-send-form').removeClass('hide');
addAutocomplete('#link-send-input', '#link-send-form', share_list);
});
$("#link-send-form").submit(function() {
var form = $(this),
file_shared_link = form.children('input[name="file_shared_link"]').val(),
email = $.trim(form.children('textarea[name="email"]').val()),
submit_btn = form.children('input[type="submit"]'),
err = form.children('.error');
if (!email) {
err.html('{% trans "Please input at least an email." %}').removeClass('hide');
return false;
}
disable(submit_btn);
err.addClass('hide');
$('#sending').removeClass('hide');
$.ajax({
type: "POST",
url: "{% url 'send_shared_link' %}",
dataType: 'json',
cache: false,
contentType: 'application/json; charset=utf-8',
beforeSend: prepareCSRFToken,
data: {file_shared_link: file_shared_link, email: email},
success: function(data) {
$.modal.close();
feedback('{% trans "Successfully shared." %}', "success");
},
error: function(data, textStatus, jqXHR) {
$('#sending').addClass('hide');
enable(submit_btn);
var errors = $.parseJSON(data.responseText);
$.each(errors, function(index, value) {
if (index == 'error') {
err.html(value);
} else {
err.html(value[0]);
}
err.removeClass('hide');
});
}
});
return false;
});
$('#shared-link').click(function() { $(this).select(); });
{% include "snippets/list_commit_detail.html" %}
{% include "snippets/bottom_bar.html" %}
</script>

20
views.py
View File

@@ -168,6 +168,10 @@ def get_repo_dirents(request, repo_id, commit, path):
org_id = request.user.org['org_id']
starred_files = get_dir_starred_files(request.user.username, repo_id, path, org_id)
fileshares = FileShare.objects.filter(repo_id=repo_id).filter(username=request.user.username)
http_or_https = request.is_secure() and 'https' or 'http'
domain = RequestSite(request).domain
for dirent in dirs:
if stat.S_ISDIR(dirent.props.mode):
dir_list.append(dirent)
@@ -175,9 +179,15 @@ def get_repo_dirents(request, repo_id, commit, path):
file_list.append(dirent)
dirent.file_size = get_file_size(dirent.obj_id)
dirent.starred = False
dirent.sharelink = ''
fpath = os.path.join(path, dirent.obj_name)
if fpath in starred_files:
dirent.starred = True
for share in fileshares:
if fpath == share.path:
dirent.sharelink = '%s://%s%sf/%s/' % (http_or_https, domain, settings.SITE_ROOT, share.token)
dirent.sharetoken = share.token
break
dir_list.sort(lambda x, y : cmp(x.obj_name.lower(),
y.obj_name.lower()))
@@ -254,6 +264,9 @@ class RepoMixin(object):
self.file_list, self.dir_list = get_repo_dirents(self.request, self.repo_id, self.current_commit, self.path)
self.zipped = self.get_nav_path()
self.applet_root = self.get_applet_root()
self.protocol = self.request.is_secure() and 'https' or 'http'
self.domain = RequestSite(self.request).domain
self.contacts = Contact.objects.filter(user_email=self.request.user.username)
def get(self, request, *args, **kwargs):
self.prepare_property()
@@ -359,6 +372,9 @@ class RepoView(LoginRequiredMixin, CtxSwitchRequiredMixin, RepoMixin,
kwargs['update_url'] = self.get_update_url()
kwargs['httpserver_root'] = self.get_httpserver_root()
kwargs['head_id'] = self.repo.head_cmmt_id
kwargs['protocol'] = self.protocol
kwargs['domain'] = self.domain
kwargs['contacts'] = self.contacts
return kwargs
@@ -1277,9 +1293,7 @@ def repo_view_file(request, repo_id):
http_or_https = request.is_secure() and 'https' or 'http'
domain = RequestSite(request).domain
if fileshare:
file_shared_link = '%s://%s%sf/%s/' % (http_or_https, domain,
settings.SITE_ROOT,
fileshare.token)
file_shared_link = '%s://%s%sf/%s/' % (http_or_https, domain, settings.SITE_ROOT, fileshare.token)
else:
file_shared_link = ''