Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Replace /community/lists/ page with a redirect to /list/

This new page is served from the archives backend, and has been enhanced
to contain the combination of the contents of both pages.
  • Loading branch information...
commit 8e317528ee68253fced7465019a72d4f3e744a87 1 parent a1c89c0
@mhagander mhagander authored
View
7 pgweb/lists/views.py
@@ -14,13 +14,6 @@
from models import MailingList, MailingListGroup
from forms import SubscribeForm
-def root(request):
- lists = MailingList.objects.all().order_by('group__sortkey', 'listname')
-
- return render_to_response('lists/root.html', {
- 'lists': lists,
- }, NavContext(request, 'community'))
-
@csrf_exempt
def subscribe(request):
if request.POST:
View
2  pgweb/urls.py
@@ -48,7 +48,7 @@
(r'^community/$', 'core.views.community'),
(r'^community/contributors/$', 'contributors.views.completelist'),
- (r'^community/lists/$', 'lists.views.root'),
+ (r'^community/lists/$', redirect_to, {'url': '/list/'}),
(r'^community/lists/subscribe/$', 'lists.views.subscribe'),
(r'^community/lists/listinfo/$', 'lists.views.listinfo'),
(r'^community/survey/vote/(\d+)/$', 'survey.views.vote'),
View
5 pgweb/util/contexts.py
@@ -46,10 +46,7 @@
'community': [
{'title': 'Community', 'link':'/community/'},
{'title': 'Contributors', 'link':'/community/contributors/'},
- {'title': 'Mailing Lists', 'link':'/community/lists/', 'submenu': [
- {'title': 'Subscribe', 'link':'/community/lists/subscribe/'},
- {'title': 'Archives', 'link':'/list/'},
- ]},
+ {'title': 'Mailing Lists', 'link':'/list/'},
{'title': 'IRC', 'link':'/community/irc/'},
{'title': 'Local User Groups', 'link':'/community/user-groups/'},
{'title': 'Featured Users', 'link':'/about/users/'},
View
48 templates/lists/root.html
@@ -1,48 +0,0 @@
-{%extends "base/page.html"%}
-{%block title%}Mailing Lists{%endblock%}
-{%block contents%}
-
-<h1>Mailing Lists</h1>
-
-<p>The following is a list of PostgreSQL related mailing lists.</p>
-
-<h3>How to Subscribe or Unsubscribe</h3>
-
-<p>Fill out this <a href="/community/lists/subscribe">form</a>.</p>
-
-<!-- this text is duplicated in system/form/subscribe.php -->
-<p>Please do not subscribe to mailing lists using e-mail accounts protected by
-mail-back anti-spam systems. These are extremely annoying to the list
-maintainers and other members, and you may be automatically unsubscribed.
-</p>
-
-<h3>Archives</h3>
-
-<p>Before posting to a list, you may wish to search the <a href="/list/">archives</a>.</p>
-
-{% for l in lists %}
-{%ifchanged l.group %}
-{%if not forloop.first %}
- </table>
-</div>
-
-{%endif%}
-<h2>{{l.group.groupname}}</h2>
-<div class="tblBasic">
-<table border="0" cellpadding="0" cellspacing="0" class="tblBasicGrey">
-<tr>
- <th class="colFirst">List</th>
- <th class="colLast">Description</th>
-</tr>
-
-{%endifchanged%}
-<tr>
- <td class="colFirst"><a href="/list/{{l.listname}}/">{{l.maybe_shortdesc}}</a></td>
- <td class="colLast">{{l.description|safe}}</td>
-</tr>
-{%endfor%}
- </table>
-</div>
-
-{%endblock%}
-
Please sign in to comment.
Something went wrong with that request. Please try again.