From 4720489a755809bc90b0e3f4ab598cb7227a36c1 Mon Sep 17 00:00:00 2001
From: Aurélien Bompard <aurelien@bompard.org>
Date: Wed, 17 Oct 2012 13:33:23 +0200
Subject: Fix settings access from the templates

---
 hyperkitty/templates/messages/message.html  | 4 ++--
 hyperkitty/templates/month_view.html        | 2 +-
 hyperkitty/templates/recent_activities.html | 4 ++--
 hyperkitty/templates/threads/right_col.html | 2 +-
 hyperkitty/templates/user_profile.html      | 2 +-
 hyperkitty/views/accounts.py                | 1 +
 hyperkitty/views/list.py                    | 2 ++
 hyperkitty/views/message.py                 | 1 +
 hyperkitty/views/thread.py                  | 1 +
 9 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/hyperkitty/templates/messages/message.html b/hyperkitty/templates/messages/message.html
index ae111d3..6ff6c15 100644
--- a/hyperkitty/templates/messages/message.html
+++ b/hyperkitty/templates/messages/message.html
@@ -19,7 +19,7 @@
 		<span class="name"> <a href="{% url message_index mlist_fqdn=list_address, hashid=email.message_id_hash %}">{{email.sender_name}}</a> </span>
 		<br />
 		<span class="rank">
-        {% if settings.USE_MOCKUPS == True %}
+        {% if use_mockups %}
             Rank 8
         {% else %}
             &nbsp;
@@ -48,7 +48,7 @@
 {% endif %}
 
 <ul class="email_info inline" messageid="{{email.message_id_hash}}">
-{% if settings.USE_MOCKUPS == True %}
+{% if use_mockups %}
 	<li class="likestatus {{email.likestatus}}">
 		+{{email.likes}}/-{{email.dislikes}}
 	</li>
diff --git a/hyperkitty/templates/month_view.html b/hyperkitty/templates/month_view.html
index 27f9f99..9f3a857 100644
--- a/hyperkitty/templates/month_view.html
+++ b/hyperkitty/templates/month_view.html
@@ -76,7 +76,7 @@
 					{{email.answers}} comments
 				</li>
 			</ul>
-            {% if settings.USE_MOCKUPS == True %}
+            {% if use_mockups %}
 			<ul class="inline-block" messageid="{{email.message_id_hash}}">
 				<li class="likestatus {{email.likestatus}}">
 					+{{email.avglike}}/-{{email.avgdislike}}
diff --git a/hyperkitty/templates/recent_activities.html b/hyperkitty/templates/recent_activities.html
index b22784f..50e9057 100644
--- a/hyperkitty/templates/recent_activities.html
+++ b/hyperkitty/templates/recent_activities.html
@@ -99,7 +99,7 @@
 						<a href="{% url search_tag mlist_fqdn=list_address, tag=email.category|lower %}">{{email.category}}</a>
 					</li>
 					{% endif %}
-                    {% if settings.USE_MOCKUPS == True %}
+                    {% if use_mockups %}
 					<li class="likestatus neutral">
 						+0/-0
 					</li>
@@ -137,7 +137,7 @@
 						<a href="{% url search_tag mlist_fqdn=list_address, tag=email.category|lower %}">{{email.category}}</a>
 					</li>
 					{% endif %}
-                    {% if settings.USE_MOCKUPS == True %}
+                    {% if use_mockups %}
 					<li class="likestatus neutral">
 						+0/-0
 					</li>
diff --git a/hyperkitty/templates/threads/right_col.html b/hyperkitty/templates/threads/right_col.html
index 4534dae..253aa10 100644
--- a/hyperkitty/templates/threads/right_col.html
+++ b/hyperkitty/templates/threads/right_col.html
@@ -21,7 +21,7 @@
 			old
 		</div>
 	</div>
-    {% if settings.USE_MOCKUPS == True %}
+    {% if use_mockups %}
 	<p id="add_to_fav">
 		<a href="#AddFav" class="notsaved">Add to favorite discussions</a>
 	</p>
diff --git a/hyperkitty/templates/user_profile.html b/hyperkitty/templates/user_profile.html
index f5bca76..e7a3c19 100644
--- a/hyperkitty/templates/user_profile.html
+++ b/hyperkitty/templates/user_profile.html
@@ -34,7 +34,7 @@
     	</tbody>
     </table>
 
-    {% if settings.USE_MOCKUPS == True %}
+    {% if use_mockups %}
 
     <h3> Up Votes : </h3>
 	<ul>
diff --git a/hyperkitty/views/accounts.py b/hyperkitty/views/accounts.py
index 26568e5..3dcfa2e 100644
--- a/hyperkitty/views/accounts.py
+++ b/hyperkitty/views/accounts.py
@@ -111,6 +111,7 @@ def user_profile(request, user_email=None):
         'user_profile' : user_profile,
         'votes_up': votes_up,
         'votes_down': votes_down,
+        'use_mockups': settings.USE_MOCKUPS,
     })
 
     return HttpResponse(t.render(c))
diff --git a/hyperkitty/views/list.py b/hyperkitty/views/list.py
index 91caa99..9fde8dc 100644
--- a/hyperkitty/views/list.py
+++ b/hyperkitty/views/list.py
@@ -185,6 +185,7 @@ def archives(request, mlist_fqdn, year=None, month=None, day=None):
         'threads': threads,
         'pages' : paginator.object_list,
         'archives_length': archives_length,
+        'use_mockups': settings.USE_MOCKUPS,
     })
     return HttpResponse(t.render(c))
 
@@ -275,6 +276,7 @@ def list(request, mlist_fqdn=None):
         'archives_length': archives_length,
         'evolution': evolution,
         'dates_string': dates_string,
+        'use_mockups': settings.USE_MOCKUPS,
     })
     return HttpResponse(t.render(c))
 
diff --git a/hyperkitty/views/message.py b/hyperkitty/views/message.py
index a1ca917..98abfd8 100644
--- a/hyperkitty/views/message.py
+++ b/hyperkitty/views/message.py
@@ -83,6 +83,7 @@ def index(request, mlist_fqdn, hashid):
         'list_address': mlist_fqdn,
         'message': message,
         'hashid' : hashid,
+        'use_mockups': settings.USE_MOCKUPS,
     })
     return HttpResponse(t.render(c))
 
diff --git a/hyperkitty/views/thread.py b/hyperkitty/views/thread.py
index d392936..06997a4 100644
--- a/hyperkitty/views/thread.py
+++ b/hyperkitty/views/thread.py
@@ -119,6 +119,7 @@ def thread_index (request, mlist_fqdn, threadid):
         'archives_length': archives_length,
         'days_inactive': days_inactive.days,
         'days_old': days_old.days,
+        'use_mockups': settings.USE_MOCKUPS,
     })
     return HttpResponse(t.render(c))
 
-- 
cgit