Bhavesh Goyal has proposed merging
lp:~bhavesh-goyal093/postorius/fixed-unsubscribe-redirection into lp:postorius.
Requested reviews:
Mailman Coders (mailman-coders)
For more details, see:
https://code.launchpad.net/~bhavesh-goyal093/postorius/fixed-unsubscribe-redirection/+merge/256330
Fixed Bug #1444486.
Now postorius redirects to Members Index page instead of the list_summary page,
everytime a member is usubscribed.
--
Your team Mailman Coders is requested to review the proposed merge of
lp:~bhavesh-goyal093/postorius/fixed-unsubscribe-redirection into lp:postorius.
=== modified file 'src/postorius/templates/postorius/base.html'
--- src/postorius/templates/postorius/base.html 2015-04-14 21:52:33 +0000
+++ src/postorius/templates/postorius/base.html 2015-04-15 14:33:29 +0000
@@ -3,7 +3,11 @@
<meta charset="UTF-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
- <title>Mailman/Postorius</title>
+ <title>
+ {% block title %}
+ {% block subtitle %}{% endblock %}{{ subtitle|add:"-Mailman/Postorius" }}
+ {% endblock %}
+ </title>
<meta name="description" content="">
<meta name="author" content="">
=== modified file 'src/postorius/templates/postorius/domain_confirm_delete.html'
--- src/postorius/templates/postorius/domain_confirm_delete.html 2013-05-31 02:21:03 +0000
+++ src/postorius/templates/postorius/domain_confirm_delete.html 2015-04-15 14:33:29 +0000
@@ -1,6 +1,11 @@
{% extends postorius_base_template %}
{% load url from future %}
{% load i18n %}
+
+{% block subtitle %}
+{% trans "Confirm Domain Removal | " as page_title %}{{ page_title|add:domain}}
+{% endblock %}
+
{% load nav_helpers %}
{% block main %}
=== modified file 'src/postorius/templates/postorius/domain_index.html'
--- src/postorius/templates/postorius/domain_index.html 2015-04-14 14:09:25 +0000
+++ src/postorius/templates/postorius/domain_index.html 2015-04-15 14:33:29 +0000
@@ -2,6 +2,10 @@
{% load url from future %}
{% load i18n %}
+{% block subtitle %}
+{% trans "Domains" as page_title %}{{ page_title }}
+{% endblock %}
+
{% block main %}
<h1>{% trans "Domain Index" %}</h1>
<p>
=== modified file 'src/postorius/templates/postorius/domain_new.html'
--- src/postorius/templates/postorius/domain_new.html 2014-10-15 20:59:52 +0000
+++ src/postorius/templates/postorius/domain_new.html 2015-04-15 14:33:29 +0000
@@ -2,6 +2,10 @@
{% load url from future %}
{% load i18n %}
+{% block subtitle %}
+{% trans "Add Domain" as page_title %}{{ page_title }}
+{% endblock %}
+
{% block main %}
{% include 'postorius/menu/settings_nav.html' %}
=== modified file 'src/postorius/templates/postorius/lists/archival_options.html'
--- src/postorius/templates/postorius/lists/archival_options.html 2015-04-14 15:35:35 +0000
+++ src/postorius/templates/postorius/lists/archival_options.html 2015-04-15 14:33:29 +0000
@@ -1,6 +1,11 @@
{% extends postorius_base_template %}
{% load url from future %}
{% load i18n %}
+
+{% block subtitle %}
+{% trans "Archival Options | " as page_title %}{{ page_title|add:list.fqdn_listname}}
+{% endblock %}
+
{% load nav_helpers %}
{% block main %}
=== modified file 'src/postorius/templates/postorius/lists/confirm_delete.html'
--- src/postorius/templates/postorius/lists/confirm_delete.html 2015-01-19 15:03:09 +0000
+++ src/postorius/templates/postorius/lists/confirm_delete.html 2015-04-15 14:33:29 +0000
@@ -1,6 +1,11 @@
{% extends postorius_base_template %}
{% load url from future %}
{% load i18n %}
+
+{% block subtitle %}
+{% trans "Delete | " as page_title %}{{ page_title|add:list.fqdn_listname}}
+{% endblock %}
+
{% load nav_helpers %}
{% block main %}
=== modified file 'src/postorius/templates/postorius/lists/confirm_remove_role.html'
--- src/postorius/templates/postorius/lists/confirm_remove_role.html 2015-01-19 15:03:09 +0000
+++ src/postorius/templates/postorius/lists/confirm_remove_role.html 2015-04-15 14:33:29 +0000
@@ -1,6 +1,11 @@
{% extends "postorius/base.html" %}
{% load url from future %}
{% load i18n %}
+
+{% block subtitle %}
+{% trans "Confirm Remove Role | " as page_title %}{{ page_title|add:address}}
+{% endblock %}
+
{% load nav_helpers %}
{% block main %}
=== modified file 'src/postorius/templates/postorius/lists/held_messages.html'
--- src/postorius/templates/postorius/lists/held_messages.html 2015-02-06 15:50:56 +0000
+++ src/postorius/templates/postorius/lists/held_messages.html 2015-04-15 14:33:29 +0000
@@ -1,6 +1,11 @@
{% extends postorius_base_template %}
{% load url from future %}
{% load i18n %}
+
+{% block subtitle %}
+{% trans "Held Messages | " as page_title %}{{ page_title|add:list.fqdn_listname}}
+{% endblock %}
+
{% load nav_helpers %}
{% block body_class %}list_summary{% endblock %}
=== modified file 'src/postorius/templates/postorius/lists/index.html'
--- src/postorius/templates/postorius/lists/index.html 2015-04-14 22:03:38 +0000
+++ src/postorius/templates/postorius/lists/index.html 2015-04-15 14:33:29 +0000
@@ -1,6 +1,11 @@
{% extends postorius_base_template %}
{% load url from future %}
{% load i18n %}
+
+{% block subtitle %}
+{% trans "List Index" as page_title %}{{ page_title }}
+{% endblock %}
+
{% block main %}
<div class="mm_subHeader">
=== modified file 'src/postorius/templates/postorius/lists/mass_subscribe.html'
--- src/postorius/templates/postorius/lists/mass_subscribe.html 2015-01-17 17:23:59 +0000
+++ src/postorius/templates/postorius/lists/mass_subscribe.html 2015-04-15 14:33:29 +0000
@@ -1,6 +1,11 @@
{% extends postorius_base_template %}
{% load url from future %}
{% load i18n %}
+
+{% block subtitle %}
+{% trans "Mass Subscribe | "%}{{ page_title|add:list.fqdn_listname}}
+{% endblock %}
+
{% load nav_helpers %}
{% block main %}
=== modified file 'src/postorius/templates/postorius/lists/memberoptions.html'
--- src/postorius/templates/postorius/lists/memberoptions.html 2015-04-13 20:39:48 +0000
+++ src/postorius/templates/postorius/lists/memberoptions.html 2015-04-15 14:33:29 +0000
@@ -3,6 +3,10 @@
{% load i18n %}
{% load nav_helpers %}
+{% block subtitle %}
+{% trans "Member Options | " as page_title %}{{ page_title|add:user.username}}
+{% endblock %}
+
{% block main %}
{% list_nav '' 'Member Options' %}
=== modified file 'src/postorius/templates/postorius/lists/members.html'
--- src/postorius/templates/postorius/lists/members.html 2015-01-17 17:23:59 +0000
+++ src/postorius/templates/postorius/lists/members.html 2015-04-15 14:33:29 +0000
@@ -1,6 +1,11 @@
{% extends postorius_base_template %}
{% load url from future %}
{% load i18n %}
+
+{% block subtitle %}
+{% trans "Members | " as page_title %}{{ page_title|add:list.fqdn_listname}}
+{% endblock %}
+
{% load nav_helpers %}
{% block main %}
=== modified file 'src/postorius/templates/postorius/lists/metrics.html'
--- src/postorius/templates/postorius/lists/metrics.html 2015-01-17 17:35:04 +0000
+++ src/postorius/templates/postorius/lists/metrics.html 2015-04-15 14:33:29 +0000
@@ -1,6 +1,11 @@
{% extends postorius_base_template %}
{% load url from future %}
{% load i18n %}
+
+{% block subtitle %}
+{% trans "List Metrics | " as page_title %}{{ page_title|add:list.fqdn_listname }}
+{% endblock %}
+
{% load nav_helpers %}
{% block main %}
=== modified file 'src/postorius/templates/postorius/lists/new.html'
--- src/postorius/templates/postorius/lists/new.html 2013-05-31 02:21:03 +0000
+++ src/postorius/templates/postorius/lists/new.html 2015-04-15 14:33:29 +0000
@@ -2,6 +2,10 @@
{% load url from future %}
{% load i18n %}
+{% block subtitle %}
+{% trans "Create List" as page_title %}{{ page_title }}
+{% endblock %}
+
{% block main %}
<h1>{% trans "Create a new List" %} {{ block.super }}</h1>
<form action="{% url 'list_new' %}" method="post" class="well"> {% csrf_token %}
=== modified file 'src/postorius/templates/postorius/lists/settings.html'
--- src/postorius/templates/postorius/lists/settings.html 2015-01-19 15:03:09 +0000
+++ src/postorius/templates/postorius/lists/settings.html 2015-04-15 14:33:29 +0000
@@ -1,6 +1,11 @@
{% extends postorius_base_template %}
{% load url from future %}
{% load i18n %}
+
+{% block subtitle %}
+{% trans "Settings | " as page_title %}{{ page_title|add:list.fqdn_listname}}
+{% endblock %}
+
{% load nav_helpers %}
{% block main %}
=== modified file 'src/postorius/templates/postorius/lists/subscribe.html'
--- src/postorius/templates/postorius/lists/subscribe.html 2013-05-31 02:21:03 +0000
+++ src/postorius/templates/postorius/lists/subscribe.html 2015-04-15 14:33:29 +0000
@@ -2,6 +2,10 @@
{% load url from future %}
{% load i18n %}
+{% block subtitle %}
+{% trans "Subscribe | " as page_title %}{{ page_title|add:list.fqdn_listname }}
+{% endblock %}
+
{% block main %}
<h1>{% trans 'Subscribe' %} <span>{{ list.fqdn_listname}}</span></h1>
<form action="{% url 'list_subscribe' list.fqdn_listname %}" method="post" class="list_subscribe"> {% csrf_token %}
=== modified file 'src/postorius/templates/postorius/lists/summary.html'
--- src/postorius/templates/postorius/lists/summary.html 2015-03-22 14:57:17 +0000
+++ src/postorius/templates/postorius/lists/summary.html 2015-04-15 14:33:29 +0000
@@ -1,6 +1,11 @@
{% extends postorius_base_template %}
{% load url from future %}
{% load i18n %}
+
+{% block subtitle %}
+{% trans "Info | " as page_title %}{{ page_title|add:list.fqdn_listname}}
+{% endblock %}
+
{% load nav_helpers %}
{% block body_class %}list_summary{% endblock %}
=== modified file 'src/postorius/templates/postorius/lists/unsubscribe.html'
--- src/postorius/templates/postorius/lists/unsubscribe.html 2013-05-31 02:21:03 +0000
+++ src/postorius/templates/postorius/lists/unsubscribe.html 2015-04-15 14:33:29 +0000
@@ -2,6 +2,10 @@
{% load url from future %}
{% load i18n %}
+{% block subtitle %}
+{% trans "Confirm List Delete" as page_title %}{{ page_title|add:list.fqdn_listname}}
+{% endblock %}
+
{% block main %}
<h1>{% trans 'Delete List' %} <span>{{ list.fqdn_listname}}</span></h1>
<p>{% trans 'Are you sure you want to delete' %} {{ list.fqdn_listname }}?</p>
=== modified file 'src/postorius/templates/postorius/login.html'
--- src/postorius/templates/postorius/login.html 2015-04-10 21:06:10 +0000
+++ src/postorius/templates/postorius/login.html 2015-04-15 14:33:29 +0000
@@ -3,6 +3,11 @@
{% load i18n %}
{% load staticfiles %}
{% load browserid %}
+
+{% block subtitle %}
+{% trans "Login" as page_title %}{{ page_title }}
+{% endblock %}
+
{% block main %}
{% browserid_info %}
=== modified file 'src/postorius/templates/postorius/user_address_activation.html'
--- src/postorius/templates/postorius/user_address_activation.html 2014-04-17 22:12:20 +0000
+++ src/postorius/templates/postorius/user_address_activation.html 2015-04-15 14:33:29 +0000
@@ -2,6 +2,10 @@
{% load url from future %}
{% load i18n %}
+{% block subtitle %}
+{% trans "Add Email | " as page_title %}{{ page_title|add:user.username }}
+{% endblock %}
+
{% block main %}
{% include 'postorius/menu/user_nav.html' %}
=== modified file 'src/postorius/templates/postorius/user_address_activation_sent.html'
--- src/postorius/templates/postorius/user_address_activation_sent.html 2015-04-13 14:44:05 +0000
+++ src/postorius/templates/postorius/user_address_activation_sent.html 2015-04-15 14:33:29 +0000
@@ -1,6 +1,11 @@
{% extends postorius_base_template %}
{% load url from future %}
{% load i18n %}
+
+{% block subtitle %}
+{% trans "Confirmation Sent" as page_title %}{{ page_title }}
+{% endblock %}
+
{% block main %}
{% include 'postorius/menu/user_nav.html' %}
=== modified file 'src/postorius/templates/postorius/user_address_preferences.html'
--- src/postorius/templates/postorius/user_address_preferences.html 2015-01-09 15:40:51 +0000
+++ src/postorius/templates/postorius/user_address_preferences.html 2015-04-15 14:33:29 +0000
@@ -1,6 +1,12 @@
{% extends postorius_base_template %}
+
{% load url from future %}
{% load i18n %}
+
+{% block subtitle %}
+{% trans "Subscription Preferences | " as page_title %}{{ page_title|add:user.username }}
+{% endblock %}
+
{% block main %}
{% include 'postorius/menu/user_nav.html' %}
<ul class="nav nav-tabs">
=== modified file 'src/postorius/templates/postorius/user_mailmansettings.html'
--- src/postorius/templates/postorius/user_mailmansettings.html 2015-01-09 15:40:51 +0000
+++ src/postorius/templates/postorius/user_mailmansettings.html 2015-04-15 14:33:29 +0000
@@ -1,6 +1,11 @@
{% extends postorius_base_template %}
{% load url from future %}
{% load i18n %}
+
+{% block subtitle %}
+{% trans "Subscription Preferences | " as page_title %}{{ page_title|add:user.username }}
+{% endblock %}
+
{% block main %}
{% include 'postorius/menu/user_nav.html' %}
<ul class="nav nav-tabs">
=== modified file 'src/postorius/templates/postorius/user_profile.html'
--- src/postorius/templates/postorius/user_profile.html 2014-10-15 20:59:52 +0000
+++ src/postorius/templates/postorius/user_profile.html 2015-04-15 14:33:29 +0000
@@ -2,6 +2,10 @@
{% load url from future %}
{% load i18n %}
+{% block subtitle %}
+{% trans "Profile | " as page_title %}{{ page_title|add:user.username }}
+{% endblock %}
+
{% block main %}
{% include 'postorius/menu/user_nav.html' %}
<h1>{% trans "User Profile" %} <span>- {{ user }}</span></h1>
=== modified file 'src/postorius/templates/postorius/user_settings.html'
--- src/postorius/templates/postorius/user_settings.html 2015-01-09 15:45:45 +0000
+++ src/postorius/templates/postorius/user_settings.html 2015-04-15 14:33:29 +0000
@@ -2,6 +2,9 @@
{% load url from future %}
{% load i18n %}
+{% block subtitle %}
+{% trans "User Settings | " as page_title %}{{ page_title|add:list.fqdn_listname}}
+{% endblock %}
{% block main %}
{% include 'postorius/menu/user_nav.html' %}
=== modified file 'src/postorius/templates/postorius/user_subscription_preferences.html'
--- src/postorius/templates/postorius/user_subscription_preferences.html 2015-01-09 16:07:56 +0000
+++ src/postorius/templates/postorius/user_subscription_preferences.html 2015-04-15 14:33:29 +0000
@@ -1,6 +1,11 @@
{% extends postorius_base_template %}
{% load url from future %}
{% load i18n %}
+
+{% block subtitle %}
+{% trans "Subscription Preferences | " as page_title %}{{ page_title|add:user.username }}
+{% endblock %}
+
{% block main %}
{% include 'postorius/menu/user_nav.html' %}
<ul class="nav nav-tabs">
=== modified file 'src/postorius/templates/postorius/user_subscriptions.html'
--- src/postorius/templates/postorius/user_subscriptions.html 2014-10-15 20:50:09 +0000
+++ src/postorius/templates/postorius/user_subscriptions.html 2015-04-15 14:33:29 +0000
@@ -1,7 +1,12 @@
{% extends postorius_base_template %}
+
{% load url from future %}
{% load i18n %}
+{% block subtitle %}
+{% trans "Subscriptions | " as page_title %}{{ page_title|add:user.username }}
+{% endblock %}
+
{% block main %}
{% include 'postorius/menu/user_nav.html' %}
<h1>{% trans "List Subscriptions" %} <span></span></h1>
=== modified file 'src/postorius/templates/postorius/user_tasks.html'
--- src/postorius/templates/postorius/user_tasks.html 2014-10-15 20:59:52 +0000
+++ src/postorius/templates/postorius/user_tasks.html 2015-04-15 14:33:29 +0000
@@ -2,6 +2,10 @@
{% load url from future %}
{% load i18n %}
+{% block subtitle %}
+{% trans "To Do" as page_title %}{{ page_title }}
+{% endblock %}
+
{% block main %}
<h1>{% trans "To Do" %}</h1>
<p>{% trans "There are no pending tasks at the present time." %}</p>
=== modified file 'src/postorius/views/list.py'
--- src/postorius/views/list.py 2015-04-14 18:40:12 +0000
+++ src/postorius/views/list.py 2015-04-15 14:33:29 +0000
@@ -228,7 +228,7 @@
return utils.render_api_error(request)
except ValueError, e:
messages.error(request, e)
- return redirect('list_summary', self.mailing_list.list_id)
+ return redirect('list_members', self.mailing_list.list_id)
class ListMassSubscribeView(MailingListView):
_______________________________________________
Mailman-coders mailing list
[email protected]
https://mail.python.org/mailman/listinfo/mailman-coders
