diff --git a/.bzrignore b/.bzrignore index d67192d..a41572f 100644 --- a/.bzrignore +++ b/.bzrignore @@ -1,2 +1,3 @@ dev_setup/mmtest.db dev_setup/settings_local.py +src/postorius.egg-info diff --git a/dev_setup/urls.py b/dev_setup/urls.py index de87e62..a1a5e9f 100644 --- a/dev_setup/urls.py +++ b/dev_setup/urls.py @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License along with # GNU Mailman. If not, see . -import mailmanweb +import postorius from django.conf.urls.defaults import * from django.conf import settings @@ -32,7 +32,7 @@ # from mailman_django import urls as mailman_urls urlpatterns = patterns('', - url(r'^$', 'mailmanweb.views.list_index'), - (r'^mailmanweb/', include('mailmanweb.urls')), + url(r'^$', 'postorius.views.list_index'), + (r'^postorius/', include('postorius.urls')), url(r'', include('social_auth.urls')), ) diff --git a/src/postorius/context_processors.py b/src/postorius/context_processors.py index f94516d..ce1baeb 100644 --- a/src/postorius/context_processors.py +++ b/src/postorius/context_processors.py @@ -10,14 +10,14 @@ logger = logging.getLogger(__name__) -def mailmanweb(request): +def postorius(request): """Add template variables to context. """ # extend_template (no page header/footer when requested via AJAX) if request.is_ajax(): - extend_template = "mailmanweb/base_ajax.html" + extend_template = "postorius/base_ajax.html" else: - extend_template = "mailmanweb/base.html" + extend_template = "postorius/base.html" return { 'MAILMAN_THEME': settings.MAILMAN_THEME, diff --git a/src/postorius/templates/postorius/base.html b/src/postorius/templates/postorius/base.html index 00c55b7..645e280 100644 --- a/src/postorius/templates/postorius/base.html +++ b/src/postorius/templates/postorius/base.html @@ -8,12 +8,12 @@ - - + + - - - + + + @@ -21,7 +21,7 @@
- +
  • Lists
    • {% if user.is_superuser %} @@ -51,10 +51,10 @@ {% block footer %}{% endblock footer %}
- - - - + + + + {% block additionaljs %}{% endblock %} diff --git a/src/postorius/templates/postorius/domain_index.html b/src/postorius/templates/postorius/domain_index.html index 6f265c7..9c2f5c5 100644 --- a/src/postorius/templates/postorius/domain_index.html +++ b/src/postorius/templates/postorius/domain_index.html @@ -1,8 +1,8 @@ -{% extends "mailmanweb/base.html" %} +{% extends "postorius/base.html" %} {% load i18n %} {% block main %} - {% include 'mailmanweb/menu/settings_nav.html' %} + {% include 'postorius/menu/settings_nav.html' %}

{% trans "Domain Index" %}

diff --git a/src/postorius/templates/postorius/domain_new.html b/src/postorius/templates/postorius/domain_new.html index 331d299..d9c8e8e 100644 --- a/src/postorius/templates/postorius/domain_new.html +++ b/src/postorius/templates/postorius/domain_new.html @@ -2,7 +2,7 @@ {% load i18n %} {% block main %} - {% include 'mailmanweb/menu/settings_nav.html' %} + {% include 'postorius/menu/settings_nav.html' %}

{% trans "Add a new Domain" %}

{{ form.as_p }} diff --git a/src/postorius/templates/postorius/errors/generic.html b/src/postorius/templates/postorius/errors/generic.html index 774c8b3..446deba 100644 --- a/src/postorius/templates/postorius/errors/generic.html +++ b/src/postorius/templates/postorius/errors/generic.html @@ -1,4 +1,4 @@ -{% extends "mailmanweb/base.html" %} +{% extends "postorius/base.html" %} {% load i18n %} {% block header %} diff --git a/src/postorius/templates/postorius/lists/held_messages.html b/src/postorius/templates/postorius/lists/held_messages.html index ba1698b..5220207 100644 --- a/src/postorius/templates/postorius/lists/held_messages.html +++ b/src/postorius/templates/postorius/lists/held_messages.html @@ -1,10 +1,10 @@ -{% extends "mailmanweb/base.html" %} +{% extends "postorius/base.html" %} {% load i18n %} {% block body_class %}list_summary{% endblock %} {% block main %} - {% include 'mailmanweb/menu/list_nav.html' %} + {% include 'postorius/menu/list_nav.html' %}

{{list.display_name}}

diff --git a/src/postorius/templates/postorius/lists/index.html b/src/postorius/templates/postorius/lists/index.html index e108b6a..99561c4 100644 --- a/src/postorius/templates/postorius/lists/index.html +++ b/src/postorius/templates/postorius/lists/index.html @@ -1,4 +1,4 @@ -{% extends "mailmanweb/base.html" %} +{% extends "postorius/base.html" %} {% load i18n %} {% block main %} diff --git a/src/postorius/templates/postorius/lists/mass_subscribe.html b/src/postorius/templates/postorius/lists/mass_subscribe.html index ba76647..e32359a 100644 --- a/src/postorius/templates/postorius/lists/mass_subscribe.html +++ b/src/postorius/templates/postorius/lists/mass_subscribe.html @@ -1,9 +1,9 @@ -{% extends "mailmanweb/base.html" %} +{% extends "postorius/base.html" %} {% load i18n %} {% block main %} {% if user.is_superuser %} - {% include 'mailmanweb/menu/list_nav.html' %} + {% include 'postorius/menu/list_nav.html' %} {% endif %}

{% trans "Mass Subscribe" %} - {{list.fqdn_listname}}

diff --git a/src/postorius/templates/postorius/lists/metrics.html b/src/postorius/templates/postorius/lists/metrics.html index c66c1bb..082cc31 100644 --- a/src/postorius/templates/postorius/lists/metrics.html +++ b/src/postorius/templates/postorius/lists/metrics.html @@ -1,9 +1,9 @@ -{% extends "mailmanweb/base.html" %} +{% extends "postorius/base.html" %} {% load i18n %} {% block main %} {% if user.is_superuser %} - {% include 'mailmanweb/menu/list_nav.html' %} + {% include 'postorius/menu/list_nav.html' %} {% endif %}

{% trans "List metrics" %}: {{list.fqdn_listname}}

diff --git a/src/postorius/templates/postorius/lists/settings.html b/src/postorius/templates/postorius/lists/settings.html index 115f4d2..fa43ffa 100644 --- a/src/postorius/templates/postorius/lists/settings.html +++ b/src/postorius/templates/postorius/lists/settings.html @@ -2,7 +2,7 @@ {% load i18n %} {% block main %} - {% include 'mailmanweb/menu/list_nav.html' %} + {% include 'postorius/menu/list_nav.html' %}

{{list.real_name}} - {{list.fqdn_listname}}

    diff --git a/src/postorius/templates/postorius/lists/summary.html b/src/postorius/templates/postorius/lists/summary.html index cce023d..7d51851 100644 --- a/src/postorius/templates/postorius/lists/summary.html +++ b/src/postorius/templates/postorius/lists/summary.html @@ -1,11 +1,11 @@ -{% extends "mailmanweb/base.html" %} +{% extends "postorius/base.html" %} {% load i18n %} {% block body_class %}list_summary{% endblock %} {% block main %} {% if user.is_superuser %} - {% include 'mailmanweb/menu/list_nav.html' %} + {% include 'postorius/menu/list_nav.html' %} {% endif %}

    {{list.display_name}}

    diff --git a/src/postorius/templates/postorius/login.html b/src/postorius/templates/postorius/login.html index 4a26679..8bcc986 100644 --- a/src/postorius/templates/postorius/login.html +++ b/src/postorius/templates/postorius/login.html @@ -29,7 +29,7 @@ - Login using BrowserID + Login using BrowserID {% endblock %} diff --git a/src/postorius/templates/postorius/site_settings.html b/src/postorius/templates/postorius/site_settings.html index 1caec3b..076effd 100644 --- a/src/postorius/templates/postorius/site_settings.html +++ b/src/postorius/templates/postorius/site_settings.html @@ -2,6 +2,6 @@ {% load i18n %} {% block main %} - {% include 'mailmanweb/menu/settings_nav.html' %} + {% include 'postorius/menu/settings_nav.html' %}

    General Settings

    {% endblock main %} diff --git a/src/postorius/templates/postorius/user_mailmansettings.html b/src/postorius/templates/postorius/user_mailmansettings.html index 59ebc19..eed6e18 100644 --- a/src/postorius/templates/postorius/user_mailmansettings.html +++ b/src/postorius/templates/postorius/user_mailmansettings.html @@ -2,7 +2,7 @@ {% load i18n %} {% block main %} - {% include 'mailmanweb/menu/user_nav.html' %} + {% include 'postorius/menu/user_nav.html' %}

    {{ user }}'s List Settings

    Mailman display name: {{ mm_user.display_name}}

    diff --git a/src/postorius/templates/postorius/user_profile.html b/src/postorius/templates/postorius/user_profile.html index 70966ae..50a9ace 100644 --- a/src/postorius/templates/postorius/user_profile.html +++ b/src/postorius/templates/postorius/user_profile.html @@ -2,7 +2,7 @@ {% load i18n %} {% block main %} - {% include 'mailmanweb/menu/user_nav.html' %} + {% include 'postorius/menu/user_nav.html' %}

    {{ user }}'s Profile

    Mailman display name: {{ mm_user.display_name}}

    diff --git a/src/postorius/templates/postorius/user_settings.html b/src/postorius/templates/postorius/user_settings.html index 5b0e90a..1d5a8ff 100644 --- a/src/postorius/templates/postorius/user_settings.html +++ b/src/postorius/templates/postorius/user_settings.html @@ -3,7 +3,7 @@ {% block main %} - {% include 'mailmanweb/menu/user_nav.html' %} + {% include 'postorius/menu/user_nav.html' %}

    Membership

    {% ifequal tab "membership"%} {% trans "Membership Settings" %} diff --git a/src/postorius/templates/postorius/user_todos.html b/src/postorius/templates/postorius/user_todos.html index 617c8a7..9bcd92c 100644 --- a/src/postorius/templates/postorius/user_todos.html +++ b/src/postorius/templates/postorius/user_todos.html @@ -2,6 +2,6 @@ {% load i18n %} {% block main %} - {% include 'mailmanweb/menu/user_nav.html' %} + {% include 'postorius/menu/user_nav.html' %}

    Your Todos

    {% endblock main %} diff --git a/src/postorius/urls.py b/src/postorius/urls.py index ded55ca..28a4759 100644 --- a/src/postorius/urls.py +++ b/src/postorius/urls.py @@ -21,7 +21,7 @@ from django.conf.urls.static import static -urlpatterns = patterns('mailmanweb.views', +urlpatterns = patterns('postorius.views', (r'^$', 'list_index'), # /account/ url(r'^accounts/login/$', 'user_login', name='user_login'), diff --git a/src/postorius/utils.py b/src/postorius/utils.py index 823354d..f00ecd4 100644 --- a/src/postorius/utils.py +++ b/src/postorius/utils.py @@ -31,7 +31,7 @@ """Renders an error template. Use if MailmanApiError is catched. """ - return render_to_response('mailmanweb/errors/generic.html', + return render_to_response('postorius/errors/generic.html', {'error': "REST API not found / Offline"}, context_instance=RequestContext(request)) diff --git a/src/postorius/views.py b/src/postorius/views.py index 89daeeb..0ec9496 100644 --- a/src/postorius/views.py +++ b/src/postorius/views.py @@ -48,7 +48,7 @@ @login_required @permission_required('server_admin') def site_settings(request): - return render_to_response('mailmanweb/site_settings.html', + return render_to_response('postorius/site_settings.html', context_instance=RequestContext(request)) @login_required @@ -58,7 +58,7 @@ existing_domains = Domain.objects.all() except MailmanApiError: return utils.render_api_error(request) - return render_to_response('mailmanweb/domain_index.html', {'domains':existing_domains,}, + return render_to_response('postorius/domain_index.html', {'domains':existing_domains,}, context_instance=RequestContext(request)) @login_required @@ -82,12 +82,12 @@ return redirect("domain_index") else: form = DomainNew() - return render_to_response('mailmanweb/domain_new.html', + return render_to_response('postorius/domain_new.html', {'form': form,'message': message}, context_instance=RequestContext(request)) @login_required -def list_new(request, template = 'mailmanweb/lists/new.html'): +def list_new(request, template = 'postorius/lists/new.html'): """ Add a new mailing list. If the request to the function is a GET request an empty form for @@ -124,7 +124,7 @@ #TODO catch correct Error class: except HTTPError, e: messages.error(request,e) - return render_to_response('mailmanweb/errors/generic.html', + return render_to_response('postorius/errors/generic.html', {'error':e}, context_instance=RequestContext(request)) else: @@ -141,7 +141,7 @@ return render_to_response(template, {'form': form}, context_instance=RequestContext(request)) -def list_index(request, template = 'mailmanweb/lists/index.html'): +def list_index(request, template = 'postorius/lists/index.html'): """Show a table of all public mailing lists. """ lists = [] @@ -162,7 +162,7 @@ 'lists': lists,}, context_instance=RequestContext(request)) -def list_metrics(request,fqdn_listname=None,option=None,template='mailmanweb/lists/metrics.html'): +def list_metrics(request,fqdn_listname=None,option=None,template='postorius/lists/metrics.html'): """ PUBLIC an entry page for each list which displays additional (non-editable) @@ -190,7 +190,7 @@ }, context_instance=RequestContext(request) ) -def list_summary(request, fqdn_listname, option=None ,template='mailmanweb/lists/summary.html'): +def list_summary(request, fqdn_listname, option=None ,template='postorius/lists/summary.html'): """ an entry page for each lists which allows some simple tasks per LIST """ @@ -226,7 +226,7 @@ except HTTPError, e: messages.error(request,e.msg) return redirect('list_summary', the_list.fqdn_listname) - return render_to_response('mailmanweb/lists/subscribe.html', + return render_to_response('postorius/lists/subscribe.html', {'form': form, 'list': the_list,}, context_instance=RequestContext(request)) @@ -246,7 +246,7 @@ return redirect('list_summary', the_list.fqdn_listname) def list_subscriptions(request, option=None, fqdn_listname=None, user_email = None, - template = 'mailmanweb/lists/subscriptions.html', *args, **kwargs):#TODO **only kwargs ? + template = 'postorius/lists/subscriptions.html', *args, **kwargs):#TODO **only kwargs ? """ Display the information there is available for a list. This function also enables subscribing or unsubscribing a user to a @@ -264,7 +264,7 @@ try: the_list = List.objects.get_or_404(fqdn_listname=fqdn_listname) except AttributeError, e: - return render_to_response('mailmanweb/errors/generic.html', + return render_to_response('postorius/errors/generic.html', {'error': "REST API not found / Offline"}, context_instance=RequestContext(request)) #process submitted form @@ -279,12 +279,12 @@ try: email = form.cleaned_data['email'] response = the_list.subscribe(address=email,real_name=form.cleaned_data.get('real_name', '')) - return render_to_response('mailmanweb/lists/summary.html', + return render_to_response('postorius/lists/summary.html', {'list': the_list, 'option':option, 'message':_("Subscribed ")+ email },context_instance=RequestContext(request)) except HTTPError, e: - return render_to_response('mailmanweb/errors/generic.html', + return render_to_response('postorius/errors/generic.html', {'error':e}, context_instance=RequestContext(request)) else: #invalid subscribe form form_subscribe = form @@ -296,10 +296,10 @@ try: email = form.cleaned_data["email"] response = the_list.unsubscribe(address=email) - return render_to_response('mailmanweb/lists/summary.html', + return render_to_response('postorius/lists/summary.html', {'list': the_list, 'message':_("Unsubscribed ")+ email },context_instance=RequestContext(request)) except ValueError, e: - return render_to_response('mailmanweb/errors/generic.html', + return render_to_response('postorius/errors/generic.html', {'error':e}, context_instance=RequestContext(request)) else:#invalid unsubscribe form form_subscribe = ListSubscribe(initial = {'fqdn_listname': fqdn_listname, @@ -340,7 +340,7 @@ else: submit_url = reverse('list_delete',kwargs={'fqdn_listname':fqdn_listname}) cancel_url = reverse('list_index',) - return render_to_response('mailmanweb/confirm_dialog.html', + return render_to_response('postorius/confirm_dialog.html', {'submit_url': submit_url, 'cancel_url': cancel_url, 'list':the_list,}, @@ -354,7 +354,7 @@ the_list = List.objects.get_or_404(fqdn_listname=fqdn_listname) except MailmanApiError: return utils.render_api_error(request) - return render_to_response('mailmanweb/lists/held_messages.html', + return render_to_response('postorius/lists/held_messages.html', {'list':the_list,}, context_instance=RequestContext(request)) @@ -420,7 +420,7 @@ @login_required def list_settings(request, fqdn_listname=None, visible_section=None, visible_option=None, - template='mailmanweb/lists/settings.html'): + template='postorius/lists/settings.html'): """ View and edit the settings of a list. The function requires the user to be logged in and have the @@ -483,7 +483,7 @@ @login_required def mass_subscribe(request, fqdn_listname=None, - template='mailmanweb/lists/mass_subscribe.html'): + template='postorius/lists/mass_subscribe.html'): """ Mass subscribe users to a list. This functions is part of the settings for a list and requires the @@ -509,7 +509,7 @@ the_list.subscribe(address=email, real_name="") message = "The mass subscription was successful." except Exception, e: #TODO find right exception and catch only this one - return render_to_response('mailmanweb/errors/generic.html', + return render_to_response('postorius/errors/generic.html', {'error': str(e)}) else: @@ -536,13 +536,13 @@ return utils.render_api_error(request) settingsform = MembershipSettings() - return render_to_response('mailmanweb/user_mailmansettings.html', + return render_to_response('postorius/user_mailmansettings.html', {'mm_user': the_user, 'settingsform': settingsform}, context_instance=RequestContext(request)) @login_required def user_settings(request, tab = "membership", - template = 'mailmanweb/user_settings.html', + template = 'postorius/user_settings.html', fqdn_listname = None,): """ Change the user or the membership settings. @@ -577,15 +577,15 @@ raise Exception("WORK in PROGRRESS needs REST Auth Middleware! - TODO") address_choices = [[addr, addr] for addr in user_object.address] except AttributeError, e: - return render_to_response('mailmanweb/errors/generic.html', + return render_to_response('postorius/errors/generic.html', {'error': str(e)+"REST API not found / Offline"}, context_instance=RequestContext(request)) except ValueError, e: - return render_to_response('mailmanweb/errors/generic.html', + return render_to_response('postorius/errors/generic.html', {'error': e}, context_instance=RequestContext(request)) except HTTPError,e : - return render_to_response('mailmanweb/errors/generic.html', + return render_to_response('postorius/errors/generic.html', {'error': _("List ")+fqdn_listname+_(" does not exist")}, context_instance=RequestContext(request)) #----------------------------------------------------------------- @@ -655,7 +655,7 @@ logout(request) return redirect('user_login') -def user_login(request,template = 'mailmanweb/login.html'): +def user_login(request,template = 'postorius/login.html'): if request.method == 'POST': form = AuthenticationForm(request.POST) user = authenticate(username=request.POST.get('username'), @@ -677,11 +677,11 @@ # the_user = User.objects.get(email=user_email) #except MailmanApiError: # return utils.render_api_error(request) - return render_to_response('mailmanweb/user_profile.html', + return render_to_response('postorius/user_profile.html', # {'mm_user': the_user}, context_instance=RequestContext(request)) def user_todos(request): - return render_to_response('mailmanweb/user_todos.html', + return render_to_response('postorius/user_todos.html', context_instance=RequestContext(request))