From 9894ca9b04f8ca6c0b6102d479b3968cfe039463 Mon Sep 17 00:00:00 2001 From: Tonio Date: Sun, 18 Jul 2010 12:12:53 +0200 Subject: [PATCH] wip: #69: new progressbar gif, better display, new code position. --- extensions/webmail/static/css/webmail.css | 19 +++++++++++-------- extensions/webmail/templates/index.html | 5 +++++ static/pics/progressbar.gif | Bin 0 -> 10819 bytes static/pics/progressbar_bg.gif | Bin 0 -> 10819 bytes templates/common/email_listing.html | 1 - urls.py | 19 ++----------------- 6 files changed, 18 insertions(+), 26 deletions(-) create mode 100644 static/pics/progressbar.gif create mode 100644 static/pics/progressbar_bg.gif diff --git a/extensions/webmail/static/css/webmail.css b/extensions/webmail/static/css/webmail.css index d42bf35dd..705868656 100644 --- a/extensions/webmail/static/css/webmail.css +++ b/extensions/webmail/static/css/webmail.css @@ -176,27 +176,30 @@ textarea:hover { /* Progress bar */ #quotabox { + display: none; float: left; margin: 5px; - width: 250px; + width: 300px; padding: 0; } #box { - border: 1px solid #ccc; - width: 200px; - height: 15px; + /*border: 1px solid #ccc; */ + width: 200px; + background: url(../pics/progressbar_bg.gif) right center no-repeat; + height: 19px; + float: left; } #perc { - background: green; - height: 15px; + background: url(../pics/ajax-loader.gif) right center no-repeat; + height: 19px; } #quotatext { font-family:tahoma, arial, sans-serif; font-size:11px; - color:#000; - + color:#000; padding: 3px 0 0 10px; + float: left; } \ No newline at end of file diff --git a/extensions/webmail/templates/index.html b/extensions/webmail/templates/index.html index 9783109ed..65eb8ac8f 100644 --- a/extensions/webmail/templates/index.html +++ b/extensions/webmail/templates/index.html @@ -20,6 +20,7 @@ } if ($defined(resp.quota) && resp.quota != "-1") { quota_pb.set(resp.quota); + $("quotabox").setStyle("display", "block"); } $$("a[name=loadfolder]").addEvent("click", foldercallback); $$("a[name=compose]").addEvent("click", loadCompose); @@ -304,3 +305,7 @@
{% endblock %} +{% block footer %} +
+{{ block.super }} +{% endblock %} diff --git a/static/pics/progressbar.gif b/static/pics/progressbar.gif new file mode 100644 index 0000000000000000000000000000000000000000..66f7f57b74a53c36b0f78c41b8c23ab4e3afe03f GIT binary patch literal 10819 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 HpWpuhS$8$8 literal 0 HcmV?d00001 diff --git a/static/pics/progressbar_bg.gif b/static/pics/progressbar_bg.gif new file mode 100644 index 0000000000000000000000000000000000000000..d84f653789e5008da64ff04ee109471284a9e284 GIT binary patch literal 10819 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 {% endblock %} {% block footer %} -
{% endblock %} diff --git a/urls.py b/urls.py index 66a8dcb43..677c58c37 100644 --- a/urls.py +++ b/urls.py @@ -1,39 +1,24 @@ from django.conf.urls.defaults import * from django.conf import settings - -# Uncomment the next two lines to enable the admin: -# from django.contrib import admin -# admin.autodiscover() - from modoboa.extensions import * from modoboa.lib import parameters urlpatterns = patterns('', - # Example: - # (r'^modoboa/', include('modoboa.foo.urls')), - - # Uncomment the admin/doc line below and add 'django.contrib.admindocs' - # to INSTALLED_APPS to enable admin documentation: - # (r'^admin/doc/', include('django.contrib.admindocs.urls')), - - # Uncomment the next line to enable the admin: - # (r'^admin/(.*)', admin.site.root), - (r'^modoboa/admin/', include('modoboa.admin.urls')), (r'^modoboa/userprefs/', include('modoboa.userprefs.urls')), (r'^accounts/login/$', 'modoboa.auth.views.dologin'), (r'^accounts/logout/$', 'modoboa.auth.views.dologout'), (r'^jsi18n/$', 'django.views.i18n.javascript_catalog', {'packages': ('modoboa',),}), - *loadextensions() ) if settings.DEBUG: + print "debug" urlpatterns += patterns( '', (r'^static/(?P.*)$', 'django.views.static.serve', - {'document_root': settings.STATIC_ROOTDIR}) + {'document_root': settings.MEDIA_ROOT}) ) # Stats if isenabled('stats'):