From a0b015ba094c7217af2b3f4104101bdff193ba5e Mon Sep 17 00:00:00 2001
From: Magnus Hagander <magnus@hagander.net>
Date: Sat, 14 Sep 2013 14:00:47 +0200
Subject: [PATCH] Make the list-of-lists page more complete

Lift the code for showing it form the main website, and a later commit will
change the main website to redirect to this page instead.
---
 django/archives/mailarchives/models.py        |  6 +++
 .../archives/mailarchives/templates/base.html |  1 +
 .../mailarchives/templates/index.html         | 44 +++++++++++++++----
 3 files changed, 43 insertions(+), 8 deletions(-)

diff --git a/django/archives/mailarchives/models.py b/django/archives/mailarchives/models.py
index aaa7d61..c857a74 100644
--- a/django/archives/mailarchives/models.py
+++ b/django/archives/mailarchives/models.py
@@ -72,6 +72,12 @@ class List(models.Model):
 	active = models.BooleanField(null=False, blank=False)
 	group = models.ForeignKey(ListGroup, db_column='groupid')
 
+	@property
+	def maybe_shortdesc(self):
+		if self.shortdesc:
+			return self.shortdesc
+		return self.listname
+
 	class Meta:
 		db_table = 'lists'
 
diff --git a/django/archives/mailarchives/templates/base.html b/django/archives/mailarchives/templates/base.html
index b2e494b..ef4ba47 100644
--- a/django/archives/mailarchives/templates/base.html
+++ b/django/archives/mailarchives/templates/base.html
@@ -87,6 +87,7 @@
 	     <li><a href="http://www.postgresql.org/community/contributors/">Contributors</a></li>
 	     <li><a href="/list/">Mailing Lists</a>
 	       <ul>
+		 <li><a href="/community/lists/subscribe/">Subscribe</a></li>
 {%for g in listgroups%}
                 <li><a href="/{{g.homelink}}/">{{g.groupname}}</a>
 {%if g.lists%}
diff --git a/django/archives/mailarchives/templates/index.html b/django/archives/mailarchives/templates/index.html
index 86d554f..525dd3d 100644
--- a/django/archives/mailarchives/templates/index.html
+++ b/django/archives/mailarchives/templates/index.html
@@ -2,18 +2,46 @@
 {%block title%}PostgreSQL Mailing List Archives{%endblock%}
 {%load pgfilters%}
 {%block contents%}
-<h1>PostgreSQL Mailing List Archives</h1>
+<h1>PostgreSQL Mailing Lists</h1>
+
+<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 archives to see if
+your question has already been answered.</p>
+
 {%include "searchform.html" %}
-<ul>
+
+
 {%for g in groups%}
- <li>{{g.groupname}}
-   <ul>
+{%if not forloop.first%}
+ </table>
+</div>
+{%endif%}
+<h2>{{g.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>
+
 {%for l in g.lists%}
-     <li><a href="/list/{{l.listname}}/">{{l.listname}}</a></li>
+<tr>
+    <td class="colFirst"><a href="/list/{{l.listname}}/">{{l.maybe_shortdesc}}</a></td>
+    <td class="colLast">{{l.description|safe}}</td>
+</tr>
 {%endfor%}
-   </ul>
- </li>
 {%endfor%}
-</ul>
+ </table>
+</div>
 
 {%endblock%}
-- 
2.39.5