Fork: 0
kalle / postorius
Browse code
changed error message → message and hide list selector if no list exists
master
1 parent 7ab7636 commit 47d202ea00081cb8bb502ba6984905f685883d6c
@benste benste authored on 9 Jul 2011
Patch
Unified Split
Showing 7 changed files
View
2
■■■■■
 forms.py
self.layout = [section]
if settings:
for section in self.layout:
for option in section[1:]:
#raise Exception(settings)
self.fields[option].initial = settings[option]
#raise Exception(self.fields[option].initial)
class Meta:
"""Class to handle the automatic insertion of fieldsets and divs.
View
8
■■■■■
 static/mailman_django/css/basics.css
 
light_blue #cfdcec → rgba(207, 220, 236, 0.6)
blue #186aaf → rgba(24, 106, 175, 1)
dark_blue #40486f
 
**/
@media screen, projection {
 
/*************************
}
 
}
 
#message {
background-color:rgba(207, 220, 236, 0.6);
border:1px solid rgba(24, 106, 175, 1);
padding:3px;
border-radius:5px;
}
 
@media screen and (max-width: 600px) {
}
View
3
■■■■■
 templates/mailman-django/base.html
 
<div class="menu">
{% include "mailman-django/menu/index.html" %}
</div>
{% if message %}
<p id="message">{{ message }}</p>
{% endif %}
<div id="content">
{% block content %}{% endblock %}
</div>
</div>
View
1
■■■■■
 templates/mailman-django/domains.html
 
{% block content %}
 
<h1>{% trans "Add a new Domain" %}</h1>
 
<p id=logout><a href="{% url logout %}">{% trans "Logout" %}</a></p>
<table cellpadding="0" cellspacing="0">
<tr>
<th>{% trans "Domain" %}</th>
View
3
■■■■■
 templates/mailman-django/list_selector.html
{% load i18n %}
 
{% block selector %}
 
{%if lists %}
<form id=list_selector method="post" action="/lists/">
<select name="list">
{% for list in lists %}
<option selected="" value="{{list.fqdn_listname}}">{{list.real_name}}</option>
</select>
<input type="submit" value="Go to">
</div></form>
</form>
 
{%endif%}
{% endblock %}
View
5
■■■■■
 templates/mailman-django/lists/settings.html
<p id=logout><a href="{% url logout %}">Logout</a></p>
 
<p>{% trans "This page visualizes all list settings. Currently the page is not connected to the rest server so the settings will not be saved when changing them. However, this gives an idea of what the settings page could look like." %}</p>
 
 
{% if message %}
<p id="message">{{ message }}</p>
{% endif %}
 
<form action="{% url list_settings fqdn_listname %}?section={{visible_section}}&option={{visible_option}}" method="post" class="list_settings">
{{ form.as_div }}
 
<div class="field">
View
31
■■■■■
 views.py
return _login_decorator
 
@login_required
def domains(request, template = 'mailman-django/domains.html'):
message=""
if request.method == 'POST':
form = DomainNew(request.POST)
try:
c = Client('http://localhost:8001/3.0', API_USER, API_PASS)
description = form.cleaned_data['description']
try:
domain = c.create_domain(mail_host,web_host,description)
except Exception, e:
form._errors["NON_FIELD_ERRORS"]=forms.util.ErrorList()
form._errors["NON_FIELD_ERRORS"].append(e)
message=e
else:
try:
c = Client('http://localhost:8001/3.0', API_USER, API_PASS)
except Exception, e:
except Exception, e:
return HttpResponse(e)
return render_to_response(template, {'form': form,'domains':existing_domains},context_instance=RequestContext(request))
return render_to_response(template, {'form': form,
'domains':existing_domains,
'message':message,
},context_instance=RequestContext(request))
 
@login_required
def administration(request, template = 'mailman-django/lists/new.html'):
"""
#Save a Form Processed by POST
if request.method == 'POST':
form = ListSettings(request.POST,visible_section,visible_option)
if form.is_valid():
the_list.update_config(request.POST)
message = "The list has been updated."
#Provide a form with existing values
else:
the_list.update_config(request.POST)#TODO
message = _("The list has been updated.")
else:
message = _("Validation Error - The list has not been updated.")
else:#Provide a form with existing values
#create form to get layout
form = ListSettings(None,visible_section,visible_option)
#create a Dict of all settings which are used in the form
used_settings={}
for option in section[1:]:
used_settings[option] = the_list.settings[option]
#recreate the form using the settings
form = ListSettings(used_settings,visible_section,visible_option)
#TODO
# USE different Forms for each fieldset NO META SETTINGS !!
# querry settings when creating the fields not parsing the whole settings
#
#raise Exception(form)#debug
return render_to_response(template, {'form': form,
'message': message,
'fqdn_listname': the_list.settings['fqdn_listname'],
'visible_option':visible_option,