Move raw and flat URLs to be /raw/<messageid> and /flat/<messageid>

This will make it easier to do prefix based exclusion in e.g. robots.txt

diff --git a/django/archives/mailarchives/templates/message.html b/django/archives/mailarchives/templates/message.html
index 7b1577bf9a5e5ee94fef941ca47443bfd11ee8de..4fea998d465d9626c00c353baf9aa5dad19074e2 100644 (file)
--- a/django/archives/mailarchives/templates/message.html
+++ b/django/archives/mailarchives/templates/message.html
@@ -40,7 +40,7 @@ span.listname {
 {%if msg.cc%}<strong>Cc:</strong> {{msg.cc|hidemail}}<br/>{%endif%}
 <strong>Subject:</strong> {{msg.subject}}<br/>
 <strong>Date:</strong> {{msg.printdate}}<br/>
-<strong>Message-ID:</strong> <a href="http://archives.postgresql.org/message-id/{{msg.messageid}}">{{msg.messageid}}</a> (view <a href="/message-id/{{msg.messageid}}/raw">raw</a>)<br/>
+<strong>Message-ID:</strong> <a href="http://archives.postgresql.org/message-id/{{msg.messageid}}">{{msg.messageid}}</a> (view <a href="/raw/{{msg.messageid}}">raw</a>)<br/>
 <strong>Thread:</strong> <select id="thread_select" onChange="onThreadSelect()">
 {%for m in threadstruct%}{%if m.id%}<option value="{{m.messageid}}"{%if m.id = msg.id%} SELECTED{%endif%}>{{m.indent|safe}}{{m.printdate}} from {{m.mailfrom}}</option>{%endif%}
 {%endfor%}

diff --git a/django/archives/mailarchives/templates/message_flat.html b/django/archives/mailarchives/templates/message_flat.html
index a17d89952afab4cf643de0d8d13456dd7e498b73..7ce00e143ba3b5b5c2abba4d0cca0293a83fc20f 100644 (file)
--- a/django/archives/mailarchives/templates/message_flat.html
+++ b/django/archives/mailarchives/templates/message_flat.html
@@ -29,7 +29,7 @@ div.msgwrap {
 {%if m.cc%}<strong>Cc:</strong> {{m.cc|hidemail}}<br/>{%endif%}
 <strong>Subject:</strong> {{m.subject}}<br/>
 <strong>Date:</strong> {{m.printdate}}<br/>
-<strong>Message-ID:</strong> <a href="http://archives.postgresql.org/message-id/{{m.messageid}}">{{m.messageid}}</a> (view <a href="/message-id/{{m.messageid}}/raw">raw</a>)<br/>
+<strong>Message-ID:</strong> <a href="http://archives.postgresql.org/message-id/{{m.messageid}}">{{m.messageid}}</a> (view <a href="/raw/{{m.messageid}}">raw</a>)<br/>
 <hr/>
 <div class="bodywrapper">
 <pre>{{m.bodytxt|urlize}}</pre>

diff --git a/django/archives/urls.py b/django/archives/urls.py
index 26cd68b63942197d380b26eaa2195314d2dca70a..d8e6551bbe6ba8a41c3e50cf718fd40bd228b177 100644 (file)
--- a/django/archives/urls.py
+++ b/django/archives/urls.py
@@ -20,8 +20,8 @@ urlpatterns = patterns('',
 
     (r'^$', 'archives.mailarchives.views.index'),
     (r'^message-id/([^/]+)$', 'archives.mailarchives.views.message'),
-    (r'^message-id/([^/]+)/flat$', 'archives.mailarchives.views.message_flat'),
-    (r'^message-id/([^/]+)/raw$', 'archives.mailarchives.views.message_raw'),
+    (r'^flat/([^/]+)$', 'archives.mailarchives.views.message_flat'),
+    (r'^raw/([^/]+)$', 'archives.mailarchives.views.message_raw'),
     (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'),