diff --git a/src/postorius/templates/postorius/lists/subscriptions.html b/src/postorius/templates/postorius/lists/subscriptions.html deleted file mode 100644 index 9372d44..0000000 --- a/src/postorius/templates/postorius/lists/subscriptions.html +++ /dev/null @@ -1,25 +0,0 @@ -{% extends postorius_base_template %} -{% load url from future %} -{% load i18n %} - -{% block main %} - {{list.list_name}} {{list.display_name}} - {% if form_subscribe %} -
{% csrf_token %} - {{ form_subscribe.as_div }} -
- -
- -
- {% endif %} - {% if form_unsubscribe %} -
{% csrf_token %} - {{ form_unsubscribe.as_div }} -
- -
- -
- {% endif %} -{% endblock main %} diff --git a/src/postorius/templates/postorius/menu/subscriptions.html b/src/postorius/templates/postorius/menu/subscriptions.html deleted file mode 100644 index 6148195..0000000 --- a/src/postorius/templates/postorius/menu/subscriptions.html +++ /dev/null @@ -1,44 +0,0 @@ -{% load url from future %} -{% load i18n %} - -{% block menu_subscriptions %} - {% if fqdn_listname %} - {% trans "Subscriptions" %} -
- {%endif%} -{% endblock%} diff --git a/src/postorius/templates/postorius/more_info_display.html b/src/postorius/templates/postorius/more_info_display.html deleted file mode 100644 index 8bd6f5c..0000000 --- a/src/postorius/templates/postorius/more_info_display.html +++ /dev/null @@ -1,10 +0,0 @@ -{% load url from future %} -{% load i18n %} - -{% block main %} - -

{% trans "More Info" %} : {{helpid}}

-

- {{help_text}} -

-{% endblock main %} diff --git a/src/postorius/templates/postorius/site_settings.html b/src/postorius/templates/postorius/site_settings.html deleted file mode 100644 index cf3bdb0..0000000 --- a/src/postorius/templates/postorius/site_settings.html +++ /dev/null @@ -1,7 +0,0 @@ -{% extends postorius_base_template %} -{% load i18n %} - -{% block main %} - {% include 'postorius/menu/settings_nav.html' %} -

{% trans "General Settings" %}

-{% endblock main %} diff --git a/src/postorius/urls.py b/src/postorius/urls.py index ed5b82b..a91020a 100644 --- a/src/postorius/urls.py +++ b/src/postorius/urls.py @@ -50,9 +50,6 @@ url(r'^unsubscribe/(?P[^/]+)$', ListUnsubscribeView.as_view( ), name='list_unsubscribe'), - url(r'^subscriptions$', - 'list_subscriptions', - name='list_subscriptions'), url(r'^subscription_requests$', 'list_subscription_requests', name='list_subscription_requests'), @@ -115,7 +112,6 @@ UserMailmanSettingsView.as_view(), name='user_mailmansettings'), # /settings/ - url(r'^settings/$', 'site_settings', name="site_settings"), url(r'^domains/$', 'domain_index', name='domain_index'), url(r'^domains/new/$', 'domain_new', name='domain_new'), url(r'^domains/(?P[^/]+)/delete$', diff --git a/src/postorius/views/list.py b/src/postorius/views/list.py index 769f9f5..303562a 100644 --- a/src/postorius/views/list.py +++ b/src/postorius/views/list.py @@ -532,107 +532,6 @@ @login_required -def list_subscriptions(request, option=None, list_id=None, - user_email=None, - template='postorius/lists/subscriptions.html', - *args, **kwargs): - """ - Display the information there is available for a list. This - function also enables subscribing or unsubscribing a user to a - list. For the latter two different forms are available for the - user to fill in which are evaluated in this function. - """ - # create Values for Template usage - message = None - error = None - form_subscribe = None - form_unsubscribe = None - if request.POST.get('list_id', ''): - list_id = request.POST.get('list_id', '') - # connect REST and catch issues getting the list - try: - the_list = List.objects.get_or_404(fqdn_listname=list_id) - except AttributeError, e: - return render_to_response('postorius/errors/generic.html', - {'error': 'Mailman REST API not available.' - ' Please start Mailman core.'}, - context_instance=RequestContext(request)) - # process submitted form - if request.method == 'POST': - form = False - # The form enables both subscribe and unsubscribe. As a result - # we must find out which was the case. - if request.POST.get('name', '') == "subscribe": - form = ListSubscribe(request.POST) - if form.is_valid(): - # the form was valid so try to subscribe the user - try: - email = form.cleaned_data['email'] - the_list.subscribe( - address=email, - display_name=form.cleaned_data.get('display_name', '')) - 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( - 'postorius/errors/generic.html', - {'error': e}, - context_instance=RequestContext(request)) - else: # invalid subscribe form - form_subscribe = form - form_unsubscribe = ListUnsubscribe( - initial={'fqdn_listname': fqdn_listname, - 'name': 'unsubscribe'}) - elif request.POST.get('name', '') == "unsubscribe": - form = ListUnsubscribe(request.POST) - if form.is_valid(): - # the form was valid so try to unsubscribe the user - try: - email = form.cleaned_data["email"] - the_list.unsubscribe(address=email) - 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( - 'postorius/errors/generic.html', - {'error': e}, - context_instance=RequestContext(request)) - else: # invalid unsubscribe form - form_subscribe = ListSubscribe( - initial={'fqdn_listname': fqdn_listname, - 'option': option, - 'name': 'subscribe'}) - form_unsubscribe = ListUnsubscribe(request.POST) - else: - # the request was a GET request so set the two forms to empty - # forms - if option == "subscribe" or not option: - form_subscribe = ListSubscribe( - initial={'fqdn_listname': fqdn_listname, - 'email': request.user.username, - 'name': 'subscribe'}) - if option == "unsubscribe" or not option: - form_unsubscribe = ListUnsubscribe( - initial={'fqdn_listname': fqdn_listname, - 'email': request.user.username, - 'name': 'unsubscribe'}) - the_list = List.objects.get_or_404(fqdn_listname=list_id) - return render_to_response(template, - {'form_subscribe': form_subscribe, - 'form_unsubscribe': form_unsubscribe, - 'message': message, - 'error': error, - 'list': the_list}, - context_instance=RequestContext(request)) - - -@login_required @list_owner_required def list_delete(request, list_id): """Deletes a list but asks for confirmation first. diff --git a/src/postorius/views/settings.py b/src/postorius/views/settings.py index 68bdf07..52eb560 100644 --- a/src/postorius/views/settings.py +++ b/src/postorius/views/settings.py @@ -48,13 +48,6 @@ @login_required @user_passes_test(lambda u: u.is_superuser) -def site_settings(request): - return render_to_response('postorius/site_settings.html', - context_instance=RequestContext(request)) - - -@login_required -@user_passes_test(lambda u: u.is_superuser) def domain_index(request): try: existing_domains = Domain.objects.all() diff --git a/src/postorius/views/user.py b/src/postorius/views/user.py index 451316b..0376189 100644 --- a/src/postorius/views/user.py +++ b/src/postorius/views/user.py @@ -197,22 +197,6 @@ context_instance=RequestContext(request)) -class UserSummaryView(MailmanUserView): - - """Shows a summary of a user. - """ - - @method_decorator(user_passes_test(lambda u: u.is_superuser)) - def get(self, request, user_id): - settingsform = MembershipSettings() - memberships = self._get_memberships() - return render_to_response('postorius/users/summary.html', - {'mm_user': self.mm_user, - 'settingsform': settingsform, - 'memberships': memberships}, - context_instance=RequestContext(request)) - - class UserSubscriptionsView(MailmanUserView): """Shows the subscriptions of a user.