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 000000000..66f7f57b7 Binary files /dev/null and b/static/pics/progressbar.gif differ diff --git a/static/pics/progressbar_bg.gif b/static/pics/progressbar_bg.gif new file mode 100644 index 000000000..d84f65378 Binary files /dev/null and b/static/pics/progressbar_bg.gif differ diff --git a/templates/common/email_listing.html b/templates/common/email_listing.html index 2c1ef4717..f5319f660 100644 --- a/templates/common/email_listing.html +++ b/templates/common/email_listing.html @@ -74,7 +74,6 @@ window.addEvent("domready", function() {
{% 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'):