diff --git a/dev_setup/settings.py b/dev_setup/settings.py index b2d948e..51941ca 100644 --- a/dev_setup/settings.py +++ b/dev_setup/settings.py @@ -102,6 +102,7 @@ TEMPLATE_CONTEXT_PROCESSORS = ( "django.contrib.auth.context_processors.auth", + "django.contrib.messages.context_processors.messages", "django.core.context_processors.debug", "django.core.context_processors.i18n", "django.core.context_processors.media", @@ -138,6 +139,7 @@ INSTALLED_APPS = ( 'django.contrib.auth', + 'django.contrib.messages', 'django.contrib.contenttypes', 'django.contrib.sessions', 'django.contrib.sites', diff --git a/src/mailmanweb/templates/mailmanweb/base.html b/src/mailmanweb/templates/mailmanweb/base.html index b95c546..039c858 100644 --- a/src/mailmanweb/templates/mailmanweb/base.html +++ b/src/mailmanweb/templates/mailmanweb/base.html @@ -50,6 +50,13 @@ </header> <div class="mm_main mm_canvas"> + {% if messages %} + <ul class="mm_messages"> + {% for message in messages %} + <li{% if message.tags %} class="{{ message.tags }}"{% endif %}>{{ message }}</li> + {% endfor %} + </ul> + {% endif %} {% block main %}{% endblock main %} </div> <div id="mm_footer"> diff --git a/src/mailmanweb/templates/mailmanweb/lists/summary.html b/src/mailmanweb/templates/mailmanweb/lists/summary.html index d06ec71..30e5144 100644 --- a/src/mailmanweb/templates/mailmanweb/lists/summary.html +++ b/src/mailmanweb/templates/mailmanweb/lists/summary.html @@ -20,9 +20,9 @@ {{unsubscribe_form.as_p}} </form> - <h2>{% trans "Edit list options" %}</h2> + <!--h2>{% trans "Edit list options" %}</h2> <form action"url_options" method="post" class="member_options mm_clear"> - </form> + </form--> {% endblock %} diff --git a/src/mailmanweb/views.py b/src/mailmanweb/views.py index 8a79397..7b0249f 100644 --- a/src/mailmanweb/views.py +++ b/src/mailmanweb/views.py @@ -23,6 +23,7 @@ from django.conf import settings +from django.contrib import messages from django.contrib.auth import logout, authenticate, login from django.contrib.auth.decorators import login_required, permission_required from django.contrib.auth.forms import AuthenticationForm @@ -73,7 +74,9 @@ except MailmanApiError: return utils.render_api_error(request) except HTTPError, e: - message=e + messages.error(request,e) + else: + messages.success(request,_("New Domain registered")) return redirect("domain_index") else: form = DomainNew() @@ -92,8 +95,6 @@ filled in before the last POST request is returned. The user must be logged in to create a new list. """ - error = None - message = None mailing_list = None if request.method == 'POST': try: @@ -118,12 +119,16 @@ #settings["???"] = form.cleaned_data['languages'] #TODO not found in REST: list_settings["advertised"] = form.cleaned_data['advertised'] list_settings.save() + messages.success(request, _("List created")) return redirect("list_summary",fqdn_listname=mailing_list.fqdn_listname) #TODO catch correct Error class: except HTTPError, e: + messages.error(request,e) return render_to_response('mailmanweb/errors/generic.html', {'error':e}, context_instance=RequestContext(request)) + else: + messages.success(_("New List created")) else: try: domains = Domain.objects.all() @@ -133,7 +138,7 @@ for domain in domains: choosable_domains.append((domain.mail_host,domain.mail_host)) form = ListNew(choosable_domains,initial={'list_owner': request.user.username}) - return render_to_response(template, {'form': form, error:None}, + return render_to_response(template, {'form': form}, context_instance=RequestContext(request)) def list_index(request, template = 'mailmanweb/lists/index.html'):