github-jwinterm/modoboa
1
0
Fork 0
mirror of https://github.com/jwinterm/modoboa.git synced 2026-10-18 05:51:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into d3js

Browse Source
This commit is contained in:
Antoine Nguyen
2014-02-14 08:45:27 +01:00
parent 5187f51cb8 3230bcc652
commit f0a8717591
4 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modoboa/extensions/webmail/static/webmail/css/attachments.css
+1 -1
View File
@@ -37,4 +37,4 @@ div.row label {
#id_attachment {
width: 290px;
}
}
modoboa/extensions/webmail/static/webmail/js/webmail.js
+1 -1
View File
@@ -945,7 +945,7 @@ Webmail.prototype = {
html: "<i class='icon-remove'></i>"
});
var $label = $("<label />", {html: fname});
var $div = $("<div />").append($delbtn, $label);
var $div = $("<div />", {'class': "row-fluid"}).append($delbtn, $label);
$delbtn.click(this.del_attachment);
$("#id_attachment").val("");
modoboa/extensions/webmail/templates/webmail/index.html
+1
View File
@@ -18,6 +18,7 @@ $(document).ready(function() {
poller_url: "{% url 'modoboa.extensions.webmail.views.check_unseen_messages' %}",
move_url: "{% url 'modoboa.extensions.webmail.views.move' %}",
submboxes_url: "{% url 'modoboa.extensions.webmail.views.submailboxes' %}",
delattachment_url: "{% url 'modoboa.extensions.webmail.views.delattachment' %}",
deflocation: "{{ deflocation }}",
defcallback: "{{ defcallback }}",
ro_mboxes: {% tolist ro_mboxes %},
modoboa/extensions/webmail/views.py
+1 -1
View File
@@ -184,7 +184,7 @@ def editfolder(request, tplname="webmail/folder.html"):
if form.cleaned_data["name"] != oldname \
or (pf != oldparent):
newname = form.cleaned_data["name"] if pf is None \
else "%s.%s" % (pf, form.cleaned_data["name"])
else mbc.hdelimiter.join([pf, form.cleaned_data["name"]])
mbc.rename_folder(request.POST["oldname"], newname)
res["oldmb"] = oldname
res["newmb"] = form.cleaned_data["name"]