fix: #69, per user quota display

fix: No body modification is signature is empty
fix: added missing images for SqueezeBox and Calendar
This commit is contained in:
tonio
2010-07-19 11:20:07 +02:00
parent 9894ca9b04
commit f7807c5436
13 changed files with 23 additions and 14 deletions
+17 -8
View File
@@ -19,9 +19,9 @@ html > body #listing {
/*thead tr {
position: relative;
top: expression(offsetParent.scrollTop); /*IE5+ only*/
z-index: 1;
padding: 0;
top: expression(offsetParent.scrollTop);
z-index: 1;
padding: 0;
}*/
/*table#emails > tbody {
@@ -175,6 +175,18 @@ textarea:hover {
}
/* Progress bar */
#footer {
color: white;
font-weight: bold;
font-size: 1em;
}
#quotalabel {
float: left;
padding: 7px 2px 0 5px;
display: none;
}
#quotabox {
display: none;
float: left;
@@ -192,14 +204,11 @@ textarea:hover {
}
#perc {
background: url(../pics/ajax-loader.gif) right center no-repeat;
background: url(../pics/progressbar.gif) right center no-repeat;
height: 19px;
}
#quotatext {
font-family:tahoma, arial, sans-serif;
font-size:11px;
color:#000;
padding: 3px 0 0 10px;
padding: 2px 0 0 2px;
float: left;
}
+1 -2
View File
@@ -5,8 +5,7 @@
{% include "common/genericform.html" %}
</div>
{% if body %}
<textarea id="id_body" name="id_body">{% if bodyheader %}{{ bodyheader }}{% endif %}
{{ body }}
<textarea id="id_body" name="id_body">{% if bodyheader %}{{ bodyheader }}{% endif %}{{ body }}
</textarea>
{% else %}
<textarea id="id_body" name="id_body"></textarea>
+2
View File
@@ -21,6 +21,7 @@
if ($defined(resp.quota) && resp.quota != "-1") {
quota_pb.set(resp.quota);
$("quotabox").setStyle("display", "block");
$("quotalabel").setStyle("display", "block");
}
$$("a[name=loadfolder]").addEvent("click", foldercallback);
$$("a[name=compose]").addEvent("click", loadCompose);
@@ -306,6 +307,7 @@
</div>
{% endblock %}
{% block footer %}
<div id="quotalabel">{% trans "Mailbox quota" %}</div>
<div id="quotabox"></div>
{{ block.super }}
{% endblock %}
+3 -4
View File
@@ -207,10 +207,9 @@ def render_compose(request, form, posturl, bodyheader=None, body=None,
if insert_signature:
if body == None:
body = ""
body += """
---
%s
""" % parameters.get_user(request.user, "webmail", "SIGNATURE")
signature = parameters.get_user(request.user, "webmail", "SIGNATURE")
if signature != "":
body += "\n---\n%s" % signature
content = render_to_string("webmail/compose.html", {
"form" : form, "bodyheader" : bodyheader, "body" : body,
Binary file not shown.

After

Width:  |  Height:  |  Size: 990 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 986 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 985 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 981 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 546 B