Switch to new namespace, preparing for site integration

diff --git a/django/archives/mailarchives/templates/base.html b/django/archives/mailarchives/templates/base.html
index 84343d6b7cd7d6be1df6e179935935263db0c15d..b68b994a9f722615b89442e25702a518e5e17c3e 100644 (file)
--- a/django/archives/mailarchives/templates/base.html
+++ b/django/archives/mailarchives/templates/base.html
@@ -94,7 +94,7 @@
 {%if g.lists%}
                 <ul>
 {%for l in g.lists%}
-                  <li><a href="/{{l.listname}}/">{{l.shortdesc}}</a></li>
+                  <li><a href="/list/{{l.listname}}/">{{l.shortdesc}}</a></li>
 {%endfor%}
                 </ul>
 {%endif%}

diff --git a/django/archives/mailarchives/templates/datelist.html b/django/archives/mailarchives/templates/datelist.html
index 73135d36529a68773d9fecd8013895e10c397b18..cb7dca144caf68886c154ff9554bb47e3c7086ed 100644 (file)
--- a/django/archives/mailarchives/templates/datelist.html
+++ b/django/archives/mailarchives/templates/datelist.html
@@ -17,14 +17,14 @@
 {%endif%}
 {%endfor%}
 {%with messages|first as firstmsg%}
-<a href="/{{list.listname}}/before/{{firstmsg.shortdate}}">Prev</a>
+<a href="/list/{{list.listname}}/before/{{firstmsg.shortdate}}">Prev</a>
 {%endwith%}
 |
 {%with messages|last as lastmsg%}
-<a href="/{{list.listname}}/since/{{lastmsg.shortdate}}">Next</a>
+<a href="/list/{{list.listname}}/since/{{lastmsg.shortdate}}">Next</a>
 {%endwith%}
 
 {%if daysinmonth%}
-<div class="daylinks">Jump to day: {%for d in daysinmonth%}<a href="/{{list.listname}}/since/{{yearmonth}}{{d|stringformat:"02d"}}0000/">{{d}}</a> {%endfor%}</div>
+<div class="daylinks">Jump to day: {%for d in daysinmonth%}<a href="/list/{{list.listname}}/since/{{yearmonth}}{{d|stringformat:"02d"}}0000/">{{d}}</a> {%endfor%}</div>
 {%endif%}
 {%endblock%}

diff --git a/django/archives/mailarchives/templates/index.html b/django/archives/mailarchives/templates/index.html
index 091fb2c95da8fbd778dcdfb49014541e7f631efa..b6f0216dde490cde36c30351bc5930180ab4318f 100644 (file)
--- a/django/archives/mailarchives/templates/index.html
+++ b/django/archives/mailarchives/templates/index.html
@@ -10,7 +10,7 @@
  <li>{{g.groupname}}
    <ul>
 {%for l in g.lists%}
-     <li><a href="/{{l.listname}}/">{{l.listname}}</a></li>
+     <li><a href="/list/{{l.listname}}/">{{l.listname}}</a></li>
 {%endfor%}
    </ul>
  </li>

diff --git a/django/archives/mailarchives/templates/message.html b/django/archives/mailarchives/templates/message.html
index 9b691dc3111f1c8d00212f9cf5bf0a76e07b8715..599d827ebb6ab7b4ed5a9eb3b028b9ff9a4a724c 100644 (file)
--- a/django/archives/mailarchives/templates/message.html
+++ b/django/archives/mailarchives/templates/message.html
@@ -62,7 +62,7 @@ span.listname {
  </tr>
  <tr>
   <th>Message-ID:</th>
-  <td><a href="http://archives.postgresql.org/message-id/{{msg.messageid}}">{{msg.messageid}}</a> (view <a href="/raw/{{msg.messageid}}">raw</a> or <a href="/flat/{{msg.messageid}}">flat</a>)</td>
+  <td><a href="/message-id/{{msg.messageid}}">{{msg.messageid}}</a> (view <a href="/message-id/raw/{{msg.messageid}}">raw</a> or <a href="/message-id/flat/{{msg.messageid}}">flat</a>)</td>
  </tr>
  <tr>
   <th>Thread:</th>
@@ -75,7 +75,7 @@ span.listname {
  </tr>
  <tr>
   <th>Lists:</th>
-  <td>{%for l in lists %}<span class="listname"><a href="/{{l.listname}}/since/{{msg.shortdate}}">{{l.listname}}</a></span>{%endfor%}</td>
+  <td>{%for l in lists %}<span class="listname"><a href="/list/{{l.listname}}/since/{{msg.shortdate}}">{{l.listname}}</a></span>{%endfor%}</td>
  </tr>
 </table>
 <div class="bodywrapper">
@@ -84,7 +84,7 @@ span.listname {
 {%if msg.has_attachment%}
 {%for a in msg.attachment_set.all%}
 <div>
-<b>Attachment: <a href="/attachment/{{a.id}}/{{a.filename}}">{{a.filename}}</a></b><br/>
+<b>Attachment: <a href="/message-id/attachment/{{a.id}}/{{a.filename}}">{{a.filename}}</a></b><br/>
 Description: {{a.contenttype}}
 </div>
 {%endfor%}

diff --git a/django/archives/mailarchives/templates/message_flat.html b/django/archives/mailarchives/templates/message_flat.html
index 65171ba2cd96a23ddeb11de2dbb9f39cb8146086..820d50682c1bdcf89448cbb34e466dd8d88c8a4f 100644 (file)
--- a/django/archives/mailarchives/templates/message_flat.html
+++ b/django/archives/mailarchives/templates/message_flat.html
@@ -48,7 +48,7 @@ div.msgwrap {
  </tr>
  <tr>
   <th>Message-ID:</th>
-  <td><a href="/message-id/{{m.messageid}}">{{m.messageid}}</a> (view <a href="/raw/{{m.messageid}}">raw</a>)</td>
+  <td><a href="/message-id/{{m.messageid}}">{{m.messageid}}</a> (view <a href="/message-id/raw/{{m.messageid}}">raw</a>)</td>
  </tr>
 </table>
 <div class="bodywrapper">
@@ -57,7 +57,7 @@ div.msgwrap {
 {%if m.has_attachment%}
 {%for a in m.attachment_set.all%}
 <div>
-<b>Attachment: <a href="/attachment/{{a.id}}/{{a.filename}}">{{a.filename}}</a></b><br/>
+<b>Attachment: <a href="/message-id/attachment/{{a.id}}/{{a.filename}}">{{a.filename}}</a></b><br/>
 Description: {{a.contenttype}}
 </div>
 {%endfor%}

diff --git a/django/archives/mailarchives/templates/monthlist.html b/django/archives/mailarchives/templates/monthlist.html
index 380acd11d13bdc7784261f0e6bc1551420524381..304b56d9370507ac27412551b3c7a7a259a21f6b 100644 (file)
--- a/django/archives/mailarchives/templates/monthlist.html
+++ b/django/archives/mailarchives/templates/monthlist.html
@@ -9,7 +9,7 @@
  <li>{{year.grouper}}
   <ul>
    {%for month in year.list%}
-    <li><a href="/{{list.listname}}/{{month.year}}-{{month.month|stringformat:"02d"}}/">{{month.date|date:"F"}}</a></li>
+    <li><a href="/list/{{list.listname}}/{{month.year}}-{{month.month|stringformat:"02d"}}/">{{month.date|date:"F"}}</a></li>
    {%endfor%}
   </ul>
  </li>

diff --git a/django/archives/mailarchives/views.py b/django/archives/mailarchives/views.py
index fbe1492ea7ca5287b73cf7dbfa7a6dc57eb5eea0..d8c7c3ede67b8350f3df8d9f80cca4113ae185af 100644 (file)
--- a/django/archives/mailarchives/views.py
+++ b/django/archives/mailarchives/views.py
@@ -32,7 +32,7 @@ def get_all_groups_and_lists(listid=None):
                                'groupname': l.group.groupname,
                                'sortkey': l.group.sortkey,
                                'lists': [l,],
-                               'homelink': l.listname,
+                               'homelink': 'list/%s' % l.listname,
                                }
 
        return (sorted(groups.values(), key=lambda g: g['sortkey']), listgroupid)

diff --git a/django/archives/urls.py b/django/archives/urls.py
index 98411759779d07a1f521d6d5ce5ce4a020fd6003..195d237450fd5c73e1758b2007f4feaceb15586e 100644 (file)
--- a/django/archives/urls.py
+++ b/django/archives/urls.py
@@ -15,24 +15,21 @@ urlpatterns = patterns('',
     # Uncomment the next line to enable the admin:
     # url(r'^admin/', include(admin.site.urls)),
 
-    (r'^test/(\d+)/$', 'archives.mailarchives.views.testview'),
-    (r'^test/oldsite/([^/]+)/$', 'archives.mailarchives.views.oldsite'),
-
     (r'^$', 'archives.mailarchives.views.index'),
     (r'^message-id/([^/]+)$', 'archives.mailarchives.views.message'),
-    (r'^flat/([^/]+)$', 'archives.mailarchives.views.message_flat'),
-    (r'^raw/([^/]+)$', 'archives.mailarchives.views.message_raw'),
-    (r'^search/', 'archives.mailarchives.views.search'),
+    (r'^message-id/flat/([^/]+)$', 'archives.mailarchives.views.message_flat'),
+    (r'^message-id/raw/([^/]+)$', 'archives.mailarchives.views.message_raw'),
+    (r'^archives-search/', 'archives.mailarchives.views.search'),
 
     # Date etc indexes
-    (r'^([\w-]+)/$', 'archives.mailarchives.views.monthlist'),
-    (r'^([\w-]+)/(\d+)-(\d+)/$', 'archives.mailarchives.views.datelist'),
-    (r'^([\w-]+)/since/(\d{4})(\d{2})(\d{2})(\d{2})(\d{2})', 'archives.mailarchives.views.datelistsincetime'),
-    (r'^([\w-]+)/since/([^/]+)/$', 'archives.mailarchives.views.datelistsince'),
-    (r'^([\w-]+)/before/(\d{4})(\d{2})(\d{2})(\d{2})(\d{2})', 'archives.mailarchives.views.datelistbeforetime'),
-    (r'^([\w-]+)/before/([^/]+)$', 'archives.mailarchives.views.datelistbefore'),
-
-    (r'^attachment/(\d+)/.*$', 'archives.mailarchives.views.attachment'),
+    (r'^list/([\w-]+)/$', 'archives.mailarchives.views.monthlist'),
+    (r'^list/([\w-]+)/(\d+)-(\d+)/$', 'archives.mailarchives.views.datelist'),
+    (r'^list/([\w-]+)/since/(\d{4})(\d{2})(\d{2})(\d{2})(\d{2})', 'archives.mailarchives.views.datelistsincetime'),
+    (r'^list/([\w-]+)/since/([^/]+)/$', 'archives.mailarchives.views.datelistsince'),
+    (r'^list/([\w-]+)/before/(\d{4})(\d{2})(\d{2})(\d{2})(\d{2})', 'archives.mailarchives.views.datelistbeforetime'),
+    (r'^list/([\w-]+)/before/([^/]+)$', 'archives.mailarchives.views.datelistbefore'),
+
+    (r'^message-id/attachment/(\d+)/.*$', 'archives.mailarchives.views.attachment'),
 
     # Normally served by the webserver, but needed for development installs
     (r'^media/(.*)$', 'django.views.static.serve', {