From 47f0e07a00c1f14797c8fe6f7432da47557afe4c Mon Sep 17 00:00:00 2001
From: Sanj <b@pad.ma>
Date: Sun, 1 Jan 2012 16:10:03 +0530
Subject: [PATCH] try and fix object_id / sort weirdness

---
 itf/static/js/insidepage.js                   |  5 ++
 .../modules/emailer/emailerissue.html         | 57 ++++++++++++++++++-
 2 files changed, 60 insertions(+), 2 deletions(-)

diff --git a/itf/static/js/insidepage.js b/itf/static/js/insidepage.js
index 30132c6..8b6ec87 100755
--- a/itf/static/js/insidepage.js
+++ b/itf/static/js/insidepage.js
@@ -11,6 +11,10 @@ $('#listLeft ul li a').live("click", function() {
     $('#bottomRight').text("Loading...");
     formData.object_id = objId;
     var urlString = JSONtoQueryString(formData);
+    var urlString = JSONtoQueryString({
+        'tab': tab,
+        'object_id': objId
+    });
     History.pushState(formData, "", urlString);
     $.getJSON("/m/get_details", {
         'tab': tab,
@@ -254,6 +258,7 @@ $(function() {
         doListLoading();
 //        var urlString = "?tab_id=" + $('.innerSelected').attr("data-id") + "&sort=" + sortString + "&search=" + searchTerm;
         var formData = getSearchFormJSON();
+        delete(formData.object_id);
         var urlString = JSONtoQueryString(formData);
 //        console.log(urlString);
         History.pushState(formData, "", urlString);
diff --git a/itf/templates/modules/emailer/emailerissue.html b/itf/templates/modules/emailer/emailerissue.html
index 53b47ea..2f5c858 100755
--- a/itf/templates/modules/emailer/emailerissue.html
+++ b/itf/templates/modules/emailer/emailerissue.html
@@ -14,8 +14,8 @@
 		<!--<p id="emailerDescription">A fortnightly theatre e-journal from the India Theatre Forum<br>Co-Editors: Vikram Iyengar, Joyoti Roy</p><!-- EMAILER DESCRIPTION CLOSING -->
         
 		<div id="navEmailer">
-			<li><a href="">Subscribe |</a></li>
-			<li><a href="">Feedback </a></li>
+			<li><a href="#subscribe">Subscribe |</a></li>
+			<li><a href="#comments">Feedback </a></li>
 			<!--<li><a href="">Bulletin Board |</a></li>
 			<li><a href="">Links</a></li>-->
 		</div><!--NAV EMAILER CLOSING -->
@@ -102,3 +102,56 @@ association of theatre people coming together in the larger interests of theatre
     </div><!-- FOOTER EMAILER CLOSING -->
 
 </div>
+
+
+    <div id="commentWrapper">
+      {% load comments %}
+      <h3>Comments and Feedback</h3>
+      <a name="comments"></a>
+      {% get_comment_list for issue as comment_list %}
+
+      {% ifnotequal comment_list|length 0 %}
+        <div id="comments_list">
+<!--
+          <h4 class="responsesHeader">
+            Responses:
+          </h4>
+-->
+          {% for comment in comment_list %}
+            <div class="comment {% cycle 'commentOdd' 'commentEven' %}">
+              <div class="comment_user">
+              {{ comment.user_name }}:
+              </div>
+              <div class="comment_comment">
+              {{ comment.comment }}
+              </div>
+            </div>
+          {% endfor %}
+        </div>
+      {% endifnotequal %}
+
+
+      {% get_comment_form for issue as form %}
+
+      <div id="comment_form">
+        <h4 class="formHeader">
+          Leave a Response:
+        </h4>
+        <form action="{% comment_form_target %}" method="POST">{% csrf_token %}
+          <input type="hidden" name="next" value="{{ issue.get_absolute_url }}" />
+          <table id="form_table">
+            <tr class="leave_response">
+              <th></th>
+              <td>
+               
+              </td>
+            </tr>
+        {{ form }}
+            <tr>
+              <th></th>
+              <td><input type="submit" name="post" class="submit-post" value="Post"></td>
+            </tr>
+          </table>
+        </form>
+      </div>
+    </div>