Remove subject from hidden messages

Spotted by Tom.

diff --git a/django/archives/mailarchives/templates/message.html b/django/archives/mailarchives/templates/message.html
index d678121e83ebc70bfa5886e03910cacc732dfda9..9ff5f939ec2bf859d9dd096a63ab8d2a71c05f9b 100644 (file)
--- a/django/archives/mailarchives/templates/message.html
+++ b/django/archives/mailarchives/templates/message.html
@@ -1,5 +1,5 @@
 {%extends "base.html"%}
-{%block title%}{{msg.subject}}{%endblock%}
+{%block title%}{%if not msg.hiddenstatus%}{{msg.subject}}{%endif%}{%endblock%}
 {%load pgfilters%}
 {%block extrahead%}
 <script type="text/javascript">
@@ -19,7 +19,7 @@ $(function(){
 </script>
 {%endblock%}
 {%block contents%}
-<h2>{{msg.subject}}</h2>
+<h2>{%if not msg.hiddenstatus%}{{msg.subject}}{%endif%}</h2>
 <table class="message">
  <tr>
   <th>From:</th>
@@ -37,7 +37,7 @@ $(function(){
 {%endif%}
  <tr>
   <th>Subject:</th>
-  <td>{{msg.subject}}</td>
+  <td>{%if not msg.hiddenstatus%}{{msg.subject}}{%endif%}</td>
  </tr>
  <tr>
   <th>Date:</th>

diff --git a/django/archives/mailarchives/templates/message_flat.html b/django/archives/mailarchives/templates/message_flat.html
index ae3a5a90a5ff346858b0480a0c65db880f0ff8fe..fe04ede596fc9be8797e8e67ea2b8976907d01da 100644 (file)
--- a/django/archives/mailarchives/templates/message_flat.html
+++ b/django/archives/mailarchives/templates/message_flat.html
@@ -1,5 +1,5 @@
 {%extends "base.html"%}
-{%block title%}{{msg.subject}}{%endblock%}
+{%block title%}{%if not msg.hiddenstatus%}{{msg.subject}}{%endif%}{%endblock%}
 {%load pgfilters%}
 {%block extrahead%}
 <meta name="robots" content="noindex" />
@@ -13,7 +13,7 @@ window.onload = load;
 </script>
 {%endblock%}
 {%block contents%}
-<h2>{{msg.subject}}</h2>
+<h2>{%if not msg.hiddenstatus%}{{msg.subject}}{%endif%}</h2>
 {%for m in allmsg %}
 <div class="msgwrap">
 <a name="{{m.messageid|urlencode}}"></a>
@@ -34,7 +34,7 @@ window.onload = load;
 {%endif%}
  <tr>
   <th>Subject:</th>
-  <td>{{m.subject}}</td>
+  <td>{%if not msg.hiddenstatus%}{{m.subject}}{%endif%}</td>
  </tr>
  <tr>
   <th>Date:</th>