From 6a5ffc2be512e507fac65ac9b4c5fa87b68a6c69 Mon Sep 17 00:00:00 2001
From: Aurélien Bompard <aurelien@bompard.org>
Date: Tue, 5 Feb 2013 04:46:04 +0100
Subject: Normalize some variable names

---
 hyperkitty/templates/messages/like_form.html  |  2 +-
 hyperkitty/templates/messages/message.html    | 10 +++++-----
 hyperkitty/templates/messages/reply_form.html |  2 +-
 hyperkitty/templates/month_view.html          |  2 +-
 hyperkitty/templates/search.html              |  2 +-
 hyperkitty/templates/user_profile.html        |  8 ++++----
 6 files changed, 13 insertions(+), 13 deletions(-)

(limited to 'hyperkitty/templates')

diff --git a/hyperkitty/templates/messages/like_form.html b/hyperkitty/templates/messages/like_form.html
index 3b99987..40b85c0 100644
--- a/hyperkitty/templates/messages/like_form.html
+++ b/hyperkitty/templates/messages/like_form.html
@@ -1,5 +1,5 @@
 	<form method="post" class="likeform"
-	      action="{% url message_vote mlist_fqdn=list_address, hashid=hashid %}">
+	      action="{% url message_vote mlist_fqdn=list_address, message_id_hash=message_id_hash %}">
 	{% csrf_token %}
 	<li class="likestatus {{ object.likestatus }}">
 		+<span class="likecount">{{ object.likes }}</span>/-<span class="dislikecount">{{ object.dislikes }}</span>
diff --git a/hyperkitty/templates/messages/message.html b/hyperkitty/templates/messages/message.html
index a47d831..89ecda7 100644
--- a/hyperkitty/templates/messages/message.html
+++ b/hyperkitty/templates/messages/message.html
@@ -19,7 +19,7 @@
 		{% gravatar email.sender_email 40 %}
 	</div>
 	<div class="email_author inline-block">
-		<span class="name"><a href="{% url message_index mlist_fqdn=list_address, hashid=email.message_id_hash %}">{{email.sender_name|escapeemail}}</a></span>
+		<span class="name"><a href="{% url message_index mlist_fqdn=list_address, message_id_hash=email.message_id_hash %}">{{email.sender_name|escapeemail}}</a></span>
 		{% if use_mockups %}
 		<br />
 		<span class="rank">
@@ -36,7 +36,7 @@
 <p class="attachments">Attachments:</p>
 <ul class="attachments-list">
 {% for attachment in email.attachments %}
-	<li><a href="{% url message_attachment mlist_fqdn=list_address, hashid=email.message_id_hash, counter=attachment.counter, filename=attachment.name %}">{{attachment.name}}</a>
+	<li><a href="{% url message_attachment mlist_fqdn=list_address, message_id_hash=email.message_id_hash, counter=attachment.counter, filename=attachment.name %}">{{attachment.name}}</a>
 		({{attachment.content_type}} &mdash; {{attachment.size|filesizeformat}})
 	</li>
 {% endfor %}
@@ -44,20 +44,20 @@
 {% endif %}
 
 <ul class="email_info inline">
-	{% include "messages/like_form.html" with hashid=email.message_id_hash object=email %}
+	{% include "messages/like_form.html" with message_id_hash=email.message_id_hash object=email %}
 	{% if not unfolded and email.attachments|count %}
 	<li class="attachments">
 		<a class="attachments" href="#attachments">{{ email.attachments|count }} attachment(s)</a>
 		<ul class="attachments-list">
 		{% for attachment in email.attachments %}
-			<li><a href="{% url message_attachment mlist_fqdn=list_address, hashid=email.message_id_hash, counter=attachment.counter, filename=attachment.name %}">{{attachment.name}}</a>
+			<li><a href="{% url message_attachment mlist_fqdn=list_address, message_id_hash=email.message_id_hash, counter=attachment.counter, filename=attachment.name %}">{{attachment.name}}</a>
 				({{attachment.content_type}} &mdash; {{attachment.size|filesizeformat}})
 			</li>
 		{% endfor %}
 		</ul>
 	</li>
 	{% endif %}
-	{% include "messages/reply_form.html" with mlist_fqdn=list_address message_id=email.message_id_hash %}
+	{% include "messages/reply_form.html" with mlist_fqdn=list_address message_id_hash=email.message_id_hash %}
 </ul>
 
 {# vim: set noet: #}
diff --git a/hyperkitty/templates/messages/reply_form.html b/hyperkitty/templates/messages/reply_form.html
index 29bd15b..eca1dc6 100644
--- a/hyperkitty/templates/messages/reply_form.html
+++ b/hyperkitty/templates/messages/reply_form.html
@@ -1,7 +1,7 @@
 	<a class="reply icon-envelope" href="#">Reply</a>
 	<div class="reply-form dropdown">
 		<form method="post"
-			  action="{% url message_reply mlist_fqdn=mlist_fqdn, message_id=message_id %}">
+			  action="{% url message_reply mlist_fqdn=mlist_fqdn, message_id_hash=message_id_hash %}">
 			{% csrf_token %}
 			{{ reply_form.as_p }}
 			<p class="buttons">
diff --git a/hyperkitty/templates/month_view.html b/hyperkitty/templates/month_view.html
index 526eb15..3484a2b 100644
--- a/hyperkitty/templates/month_view.html
+++ b/hyperkitty/templates/month_view.html
@@ -92,7 +92,7 @@
 					</li>
 				</ul>
 				<ul class="inline-block">
-					{% include "messages/like_form.html" with hashid=thread.thread_id object=thread %}
+					{% include "messages/like_form.html" with message_id_hash=thread.starting_email.message_id_hash object=thread %}
 				</ul>
 				<a href="{% url thread threadid=thread.thread_id, mlist_fqdn=list_address %}"
 				   class="btn">Show discussion</a>
diff --git a/hyperkitty/templates/search.html b/hyperkitty/templates/search.html
index da464b2..facc733 100644
--- a/hyperkitty/templates/search.html
+++ b/hyperkitty/templates/search.html
@@ -68,7 +68,7 @@
 			</li>
 		</ul>
 		<ul class="inline-block">
-			{% include "messages/like_form.html" with hashid=email.message_id_hash object=email %}
+			{% include "messages/like_form.html" with message_id_hash=email.message_id_hash object=email %}
 		</ul>
 	</div>
 </div>
diff --git a/hyperkitty/templates/user_profile.html b/hyperkitty/templates/user_profile.html
index c967be6..8052bce 100644
--- a/hyperkitty/templates/user_profile.html
+++ b/hyperkitty/templates/user_profile.html
@@ -65,11 +65,11 @@
 		{% for vote in votes_up %}
 			<li>
 			{% if vote.message.content|trimString|length > 0 %}
-				<a href="{% url message_index mlist_fqdn=vote.list_address, hashid=vote.messageid %}"
+				<a href="{% url message_index mlist_fqdn=vote.list_address, message_id_hash=vote.messageid %}"
 					>{{ vote.message.subject }}</a> by {{ vote.message.sender_name }}
 					({{ vote.message|viewer_date|date:"l, j F Y H:i:s" }})
 			{% else %}
-				<a href="{% url message_index mlist_fqdn=vote.list_address, hashid=vote.messageid %}">Message is empty</a>
+				<a href="{% url message_index mlist_fqdn=vote.list_address, message_id_hash=vote.messageid %}">Message is empty</a>
 			{% endif %}
 			</li>
 		{% endfor %}
@@ -84,11 +84,11 @@
 		{% for vote in votes_down %}
 			<li>
 			{% if vote.message.content|trimString|length > 0 %}
-				<a href="{% url message_index mlist_fqdn=vote.list_address, hashid=vote.messageid %}"
+				<a href="{% url message_index mlist_fqdn=vote.list_address, message_id_hash=vote.messageid %}"
 					>{{ vote.message.subject }}</a> by {{ vote.message.sender_name }}
 					({{ vote.message|viewer_date|date:"l, j F Y H:i:s" }})
 			{% else %}
-				<a href="{% url message_index mlist_fqdn=vote.list_address, hashid=vote.messageid %}">Message is empty</a>
+				<a href="{% url message_index mlist_fqdn=vote.list_address, message_id_hash=vote.messageid %}">Message is empty</a>
 			{% endif %}
 			</li>
 		{% endfor %}
-- 
cgit