From caf8704143dc48015a4b59691f987ee55bd161d9 Mon Sep 17 00:00:00 2001
From: Noam Ben-Avi <nbenavi91@gmail.com>
Date: Thu, 15 Sep 2011 15:28:31 -0700
Subject: [PATCH] default layout and poll updates, finished last week forgot to
 commit, bugs fixed

---
 deme_django/cms/templates/default_layout.html |  49 ++-
 deme_django/modules/poll/models.py            |  40 +-
 .../poll/templates/poll/approvenpoll.html     |   4 +-
 .../poll/templates/poll/choosenpoll.html      | 392 +++++++++++++++---
 .../poll/pluralityapprovendecision.html       |   8 +-
 .../poll/pluralitychoosendecision.html        |  68 ++-
 .../poll/thresholdapprovendecision.html       |  70 +++-
 .../poll/thresholdchoosendecision.html        |  70 +++-
 .../poll/thresholdeapprovendecision.html      |  70 +++-
 .../poll/thresholdechoosendecision.html       |  70 +++-
 .../poll/unanimouschoosendecision.html        |  70 +++-
 deme_django/modules/poll/views.py             | 103 ++++-
 12 files changed, 854 insertions(+), 160 deletions(-)

diff --git a/deme_django/cms/templates/default_layout.html b/deme_django/cms/templates/default_layout.html
index 1fa4f58f..ccab30ca 100644
--- a/deme_django/cms/templates/default_layout.html
+++ b/deme_django/cms/templates/default_layout.html
@@ -34,6 +34,15 @@
     <link href="{% media_url "stylesheets/ui.jqgrid.css" %}" media="all" rel="Stylesheet" type="text/css" />
 
     <script type="text/javascript" src="{% media_url "javascripts/fg.menu.js" %}"></script>
+	<script type="text/javascript">
+	        $(document).ready(function () {
+	            $('#showhidetarget').hide();
+
+	            $('a#showhidetrigger').click(function () {
+	                $('#showhidetarget').toggle(400);
+	            });
+	        });
+	    </script>
     <link href="{% media_url "stylesheets/fg.menu.css" %}" media="screen" rel="stylesheet" type="text/css" />
 	<!-- style exceptions for IE 6 -->
 	<!--[if IE 6]>
@@ -105,12 +114,21 @@
     </script> 
     
 	<script type="text/javascript">
-	   function max()
-	   {
-	       self.moveTo(0,0);
-	       self.resizeTo(screen.availWidth,screen.availHeight);
 
-	   }
+	 function resizeText(multiplier) {
+	  if (document.body.style.fontSize == "") {
+	    document.body.style.fontSize = "1.0em";
+	  }
+	  document.body.style.fontSize = parseFloat(document.body.style.fontSize) + (multiplier * 0.2) + "em";
+	}
+	<script type="text/javascript">
+	 function unhide(divID) {
+	 var item = document.getElementById(divID);
+	 if (item) {
+	 item.className=(item.className=='hidden')?'unhidden':'hidden';
+	 }
+	 }
+	 </script>
 	</script>
 	
 
@@ -312,10 +330,6 @@ <h3><a href="#">Permissions</a></h3>
 
 </div>
 
-<input type="button" value="Open Fullscreen" onclick="max()" />
-<input type="button" value="Increase text size" onclick="resizeText(1)" />
-<input type="button" value="Decrease text size" onclick="resizeText(-1)" />
-
 <div class="footer">
     <p>
         <b>Desktop Browser</b>
@@ -328,6 +342,12 @@ <h3><a href="#">Permissions</a></h3>
         <a href="{% url item_type_url viewer=viewer_name,action="list",format="rss" %}?{{ query_string }}">RSS</a>
         {% endifequal %}
         |
+		<a href="#" onclick="resizeText(1)">Increase text size</a>
+		|
+		<a href="#" onclick="resizeText(-1)">Decrease text size</a>
+		|
+		<a href="#"id="showhidetrigger" href="#">Fullscreen</a>
+		|
         <a href="#" onclick="$('#google_translate_dialog').dialog({close: function(event, ui) {$('#google_translate_dialog').dialog('destroy')}}); return false;">Translate</a>
         <div id="google_translate_dialog" title="Translate" style="display: none;">
             <div id="google_translate_element">
@@ -344,10 +364,19 @@ <h3><a href="#">Permissions</a></h3>
     </p>
     <p>Copyright &copy;2008-{% now "Y" %} to Deme | <a href="http://github.com/mikemintz/deme/tree/master">Source Code</a> <span class="pipe">|</span> <a href="http://www.stanford.edu/~davies/">Authors</a> | <a href="{% url item_type_url viewer="item",action="admin" %}">Admin</a> | <a href="{% url item_type_url viewer="item",action="recentchanges" %}">Recent Changes</a></p>
 </div>
-
+  <div id="showhidetarget">
+    <p>For Internet Explorer users:
+		Click on the Tools menu, located at the top of your browser window. When the drop-down menu appears, select the option 		labeled Full Screen.
+	</p>
+		
+	<p>For Chrome users:Click on the Chrome "wrench" icon, located in the upper right hand corner of your browser window. When the drop-down menu appears, select the choice labeled Full Screen.</p>
+	<p>For Firefox user:Click on the View menu, located at the top of your browser window. When the drop-down menu appears, select the option labeled Full Screen.</p>
+	<p>For Safari users: Safari currently does not support the ability to go fullscreen.</p>
+  </div>
 </div>
 </div>
 
+
 </body>
 
 </html>
diff --git a/deme_django/modules/poll/models.py b/deme_django/modules/poll/models.py
index b1d3f60a..54db2be8 100644
--- a/deme_django/modules/poll/models.py
+++ b/deme_django/modules/poll/models.py
@@ -197,7 +197,7 @@ class Meta:
     
     #TODO: find out how to set max value in integer field
     quorum_choices = zip( range(0,101), range(0,101) )
-    quorum = models.IntegerField(blank=True, choices=quorum_choices)
+    quorum = models.IntegerField(_('Quorum %'),blank=True, choices=quorum_choices)
     poll = FixedForeignKey(Poll, related_name='polls_decision', null=True, blank=True, default=None)
     
 
@@ -210,8 +210,8 @@ class PluralityChooseNDecision(Decision):
     dyadic_relations = {}
 
     class Meta:    
-        verbose_name = _('PluralityChooseNDecision')
-        verbose_name_plural = _('PluralityChooseNDecision')
+        verbose_name = _('Choose Plurality Decision')
+        verbose_name_plural = _('Choose Plurality Decisions')
     
     #fields
     n_choices = zip( range(0,101), range(0,101) )
@@ -226,14 +226,14 @@ class ThresholdChooseNDecision(Decision):
     dyadic_relations = {}
 
     class Meta:    
-        verbose_name = _('ThresholdChooseNDecision')
-        verbose_name_plural = _('ThresholdChooseNDecision')
+        verbose_name = _('Choose Threshold Participants Decision')
+        verbose_name_plural = _('Choose Threshold Participants Decisions')
 
     #fields
     n_choices = zip( range(0,101), range(0,101) )
     num_decision = models.IntegerField(blank=True, choices=n_choices)
     p_choices = zip( range(0,101), range(0,101) )
-    p_decision = models.IntegerField(blank=True, choices=p_choices)
+    p_decision = models.IntegerField(_('Threshold %'),blank=True, choices=p_choices)
 
 class ThresholdEChooseNDecision(Decision):
     #Setup
@@ -244,14 +244,14 @@ class ThresholdEChooseNDecision(Decision):
     dyadic_relations = {}
 
     class Meta:    
-        verbose_name = _('ThresholdEChooseNDecision')
-        verbose_name_plural = _('ThresholdEChooseNDecision')
+        verbose_name = _('Choose Threshold Eligibles Decision')
+        verbose_name_plural = _('Choose Threshold Eligibles Decisions')
 
     #fields
     n_choices = zip( range(0,101), range(0,101) )
     num_decision = models.IntegerField(blank=True, choices=n_choices)
     e_choices = zip( range(0,101), range(0,101) )
-    e_decision = models.IntegerField(blank=True, choices=e_choices)
+    e_decision = models.IntegerField(_('Threshold for eligibles %'),blank=True, choices=e_choices)
 
 class UnanimousChooseNDecision(Decision):
     #Setup
@@ -262,14 +262,14 @@ class UnanimousChooseNDecision(Decision):
     dyadic_relations = {}
 
     class Meta:    
-        verbose_name = _('UnanimousChooseNDecision')
-        verbose_name_plural = _('UnanimousChooseNDecision')
+        verbose_name = _('Choose Unanimous Decision')
+        verbose_name_plural = _('Choose Unanimous Decisions')
 
     #fields
     n_choices = zip( range(0,101), range(0,101) )
     num_decision = models.IntegerField(blank=True, choices=n_choices)
     m_choices = zip( range(0,101), range(0,101) )
-    m_decision = models.IntegerField(blank=True, choices=m_choices)
+    m_decision = models.IntegerField(_('Unanimous minus'),blank=True, choices=m_choices)
 
 class PluralityApproveNDecision(Decision):
     #Setup
@@ -280,8 +280,8 @@ class PluralityApproveNDecision(Decision):
     dyadic_relations = {}
 
     class Meta:    
-        verbose_name = _('PluralityApproveNDecision')
-        verbose_name_plural = _('PluralityApproveNDecision')
+        verbose_name = _(' Approve Plurality Decision')
+        verbose_name_plural = _('Approve Plurality Decisions')
 
     #fields
     n_choices = zip( range(0,101), range(0,101) )
@@ -296,14 +296,14 @@ class ThresholdApproveNDecision(Decision):
     dyadic_relations = {}
 
     class Meta:    
-        verbose_name = _('ThresholdApproveNDecision')
-        verbose_name_plural = _('ThresholdApproveNDecision')
+        verbose_name = _('Approve Threshold Decision')
+        verbose_name_plural = _('Approve Threshold Decisions')
 
     #fields
     n_choices = zip( range(0,101), range(0,101) )
     num_decision = models.IntegerField(blank=True, choices=n_choices)
     p_choices = zip( range(0,101), range(0,101) )
-    p_decision = models.IntegerField(blank=True, choices=p_choices)
+    p_decision = models.IntegerField(_('Threshold Participants %'),blank=True, choices=p_choices)
 
 class ThresholdEApproveNDecision(Decision):
     #Setup
@@ -314,14 +314,14 @@ class ThresholdEApproveNDecision(Decision):
     dyadic_relations = {}
 
     class Meta:    
-        verbose_name = _('ThresholdEApproveNDecision')
-        verbose_name_plural = _('ThresholdEApproveNDecision')
+        verbose_name = _('Approve Threshold Eligible Decision')
+        verbose_name_plural = _('Approve Threshold Eligible Decisions')
 
     #fields
     n_choices = zip( range(0,101), range(0,101) )
     num_decision = models.IntegerField(blank=True, choices=n_choices)
     e_choices = zip( range(0,101), range(0,101) )
-    e_decision = models.IntegerField(blank=True, choices=e_choices)
+    e_decision = models.IntegerField(_('Threshold eligible %'),blank=True, choices=e_choices)
     
     
     
diff --git a/deme_django/modules/poll/templates/poll/approvenpoll.html b/deme_django/modules/poll/templates/poll/approvenpoll.html
index f48f1e27..ce75a519 100644
--- a/deme_django/modules/poll/templates/poll/approvenpoll.html
+++ b/deme_django/modules/poll/templates/poll/approvenpoll.html
@@ -162,10 +162,10 @@
 			<p><a href="{% url item_type_url viewer='pluralityapprovendecision',action='new'%}?populate_poll={{ item.pk }}&amp;redirect={{ full_path|urlencode }}">Plurality Aggregation</a></p>
 			{% endifagentcanglobal %}
 			{% ifagentcanglobal 'create ThresholdApproveNDecision' %}
-			 <p><a  href="{% url item_type_url viewer='thresholdapprovendecision',action='new'%}?populate_poll={{ item.pk }}&amp;redirect={{ full_path|urlencode }}">Threshold Aggregation</a></p>
+			 <p><a  href="{% url item_type_url viewer='thresholdapprovendecision',action='new'%}?populate_poll={{ item.pk }}&amp;redirect={{ full_path|urlencode }}">Threshold Participant Aggregation</a></p>
 			{% endifagentcanglobal %}
 			{% ifagentcanglobal 'create ThresholdEApproveNDecision' %}
-			 <p><a  href="{% url item_type_url viewer='thresholdeapprovendecision',action='new'%}?populate_poll={{ item.pk }}&amp;redirect={{ full_path|urlencode }}">ThresholdE Aggregation</a></p>
+			 <p><a  href="{% url item_type_url viewer='thresholdeapprovendecision',action='new'%}?populate_poll={{ item.pk }}&amp;redirect={{ full_path|urlencode }}">Threshold Eligible Aggregation</a></p>
 			{% endifagentcanglobal %}
 		</div>
 	</div>
diff --git a/deme_django/modules/poll/templates/poll/choosenpoll.html b/deme_django/modules/poll/templates/poll/choosenpoll.html
index f906213c..e9d7450e 100644
--- a/deme_django/modules/poll/templates/poll/choosenpoll.html
+++ b/deme_django/modules/poll/templates/poll/choosenpoll.html
@@ -1,16 +1,212 @@
 {% extends layout %}
 {% load item_tags %}
 {% block content %}
+<style>
+div {
+ margin-right: 5px;
+}
+
+div p {
+  font-size: 14px;
+  margin-top: 0;
+  margin-bottom: 0;
+}
+
+#label {
+  font-size: 12px;
+  font-weight: bold;
+  margin: 0;
+}
+
+div.Question {
+  margin-right: 6em;
+}
+
+div.Deadline p{
+	font-size: 20px;
+}
+
+div.Instructions p{
+	font-size: 12px;
+}
+
+#No_Permission {
+	font-size: 12px;
+}
+
+div.submit_button a.poll {
+}
+
+div #Results {
+    width: 20%;
+	padding: 0;
+	margin: .2em;
+	margin-left: .5em;
+	float: right;
+}
+
+div.container.propositions div.row.odd span{
+	background-color: #CCF;
+}
+
+div.container.propositions div.row.even span{
+	background-color: #F0F0F0;
+}
+
+div.container div.row.even{
+	background-color: #F0F0F0;
+	height: 3em;
+	border: 1px solid gray
+}
+
+div.container div.row.odd{
+	background-color: #CCF;
+	height: 3em;
+	border: 1px solid gray
+}
+
+
+div.container.propositions a{
+	margin-right: 2em;
+}
+
+div.container span span{
+	float: right;
+	margin-left: 1em;
+}
+
+div.container div.implementation{
+	height: 16em;
+	width: 30%;
+	overflow-y: hidden;
+	overflow-x: hidden;
+	margin: 0em;
+	display: none;
+}
+
+#hiddenDecisionButtons p{
+	font-size: 10px;
+}
+
+</style>
+
+<script type="text/javascript">
+	function toggleImplementation(pk){
+		var button = "#hide" + pk;
+		var implementation = "#" + pk;
+		if ($(implementation).is(":hidden")) {
+			$(implementation).slideDown("slow");
+			$(button).val(" Hide Details");
+		} else {
+			$(implementation).slideUp("slow");
+			$(button).val("Show Details");
+		}
+	};
+</script>
+<script type="text/javascript">
+	function toggleResponses(pk){
+		var response = "#responses" + pk;
+		var button = "#hide" + pk;
+		if ($(response).is(":hidden")) {
+			$(response).slideDown("slow");
+			$(button).val(" Hide Responses");
+		} else {
+			$(response).slideUp("slow");
+			$(button).val("Show Responses");
+		}
+	};
+	
+	function toggleButtons(className){
+		var buttons = "#" + className;
+		if ($(buttons).is(":hidden")) {
+			$(buttons).slideDown("slow");
+		} else {
+			$(buttons).slideUp("slow");
+		}
+	};
+	
+	function removeMember(pk){
+		$("#removeInput").val(pk);
+		$("#removemember").submit();
+	};
+	
+    
+</script>
+<form id="removemember" style="display: inline;" method="post" enctype="multipart/form-data" action="{% url item_url viewer=viewer_name,action="removemember",noun=item.pk %}?redirect={{ full_path|urlencode }}" class="item_form">
+    <input id="removeInput"type="hidden" name="item" value="{{ membership.item.pk }}" />
+</form>
+
+<div id='Results'>
+	<div style="font-size: 16px; padding-left: .6em; margin: 0; background-color: #CCF; outline: 1px solid black;">View Results</div>
+	<div style="overflow-x: hidden; overflow-y: scroll; padding: 0; margin: 0; height: 100px; background-color: #CCF; outline: 1px solid black;">
+	{% if decisions %}
+		{% for decision in decisions %}
+			{% ifagentcan 'view Decision.poll' decision %}
+	 		<p><a href="{{ decision.get_absolute_url }}">{% viewable_name decision %}</a></p>
+			{% endifagentcan %}
+		{% endfor %}
+	{% else %}
+		<p>No Results Yet<p>
+	{% endif %}
+	</div>
+	<div style="float:right;">
+		{% if cur_agent_can_make_a_decision %}
+		<div class="submit_button" id="NewDecision" style="margin-top: .5em; ">
+		    <a class="fg-button fg-button-icon-right ui-widget ui-state-default ui-corner-all poll" onclick="toggleButtons('hiddenDecisionButtons')" style="float: right; width: 110%; font-size: 13px; margin-right:0;">Calculate Result</a>
+		</div>
+		{% endif %}
+		<br>
+		<br>
+		<div id="hiddenDecisionButtons" style="display: none; width: 150%;">
+			{% ifagentcanglobal 'create PluralityChooseNDecision' %} 
+			<p><a href="{% url item_type_url viewer='pluralitychoosendecision',action='new'%}?populate_poll={{ item.pk }}&amp;redirect={{ full_path|urlencode }}">Plurality Aggregation</a></p>
+			{% endifagentcanglobal %}
+			{% ifagentcanglobal 'create ThresholdChooseNDecision' %}
+			 <p><a  href="{% url item_type_url viewer='thresholdchoosendecision',action='new'%}?populate_poll={{ item.pk }}&amp;redirect={{ full_path|urlencode }}">Threshold Participant Aggregation</a></p>
+			{% endifagentcanglobal %}
+			{% ifagentcanglobal 'create ThresholdEChooseNDecision' %}
+			 <p><a  href="{% url item_type_url viewer='thresholdechoosendecision',action='new'%}?populate_poll={{ item.pk }}&amp;redirect={{ full_path|urlencode }}">Threshold Eligibles Aggregation</a></p>
+			{% endifagentcanglobal %}
+			{% ifagentcanglobal 'create UnanimousChooseNDecision' %}
+			 <p><a  href="{% url item_type_url viewer='unanimouschoosendecision',action='new'%}?populate_poll={{ item.pk }}&amp;redirect={{ full_path|urlencode }}">Unanimous Aggregation</a></p>
+			{% endifagentcanglobal %}
+		</div>
+	</div>
+</div>
+
+
+<div class='Question' style="width: 50%"> 
+	{% ifagentcan 'view Poll.question' item %}
+	<p>{{ item.question }}</p>
+	{% else %}
+	<p> YOU CANNOT VIEW THIS FIELD </p>
+	{% endifagentcan %}
+	<p id='label'> Question </p>
+</div>
+<div class='Deadline' style="width: 50%">
+	<p>{% ifagentcan 'view Poll.deadline' item %} {{ item.deadline }} {% endifagentcan %} </p>
+	<p id='label'> Deadline </p>
+</div>
+<div class='timezone'>
+	<p>{% ifagentcan 'view Poll.time_zone' item %} {{ item.time_zone }} {% endifagentcan %}</p>
+	<p id='label'> Timezone </p>
+</div>
+<div class='Beginning'>
+	{% ifagentcan 'view Poll.begins' item %}
+	<p>{{ item.begins }}</p>
+	{% endifagentcan %}
+	<p id='label'> Poll Started </p>
+</div>
+
+
+<br />
+<br />
+<div class='Instructions'>
+	{% ifagentcan 'view ChooseNPoll.n' item %}
+	<p style="font-size: 16px;">Choose {{ item.n }} propositions.</p>
+	{% endifagentcan %}
+</div>
 
-<p>Title:  {{item.name}}</p>
-<p>Question: {{ item.question }}</p>
-<p>Response Format: {{ item.response_format }}</p>
-<p>Beginning Date: {{ item.begins }} </p>
-<p>Deadline: {{ item.deadline }}</p>
-<p>Eligibles: {{ item.eligibles }}</p>
-<p>Visibility {{item.visibility}}</p>
-<p>Write in visibility: {{ item.display_write_ins }}</p>
-<p> N : {{ item.n }} </p>
 
 
 <script type="text/javascript">
@@ -24,69 +220,141 @@
             close: function(event, ui) {dialogBox.dialog('destroy')}
         });
         dialogBox.dialog('open');
-    }   
+    }   =me
 </script>
-{% subclassfields %}
-
-
-
-{% if memberships %}
-<table cellspacing="0" class="list">
-    <tr>
-        <th>Name</th>
-        <th>Membership</th>
-    </tr>
-    {% for membership in memberships %}
-    <tr class="{% cycle 'even' 'odd' %}">
-        <td>
-            <a href="{{ membership.item.get_absolute_url }}">{% viewable_name membership.item %}</a>
-        </td>
-        <td>
-            <a href="{{ membership.get_absolute_url }}">{{ membership.pk }}</a>
-            {% ifagentcan 'modify_membership' item %}
-            <form style="display: inline;" method="post" enctype="multipart/form-data" action="{% url item_url viewer=viewer_name,action="removemember",noun=item.pk %}?redirect={{ full_path|urlencode }}" class="item_form">
-                <input type="hidden" name="item" value="{{ membership.item.pk }}" />
-                <button type="submit"><img src="{{ "delete"|icon_url:16 }}" /> <span>Remove from collection</span></button>
-            </form>
-            {% endifagentcan %}
-        </td>
-    </tr>
+
+
+
+{% if propositions %}
+<form method="post" enctype="multipart/form-data" 
+	action="{% url item_url viewer=viewer_name,action="respondtopropositions",noun=item.pk %}?redirect={{ full_path|urlencode }}">
+<div class="container propositions" id="Propcontainer" style="width: 78%; margin-left: 0; ">
+    
+	
+	{% for proposition in propositions %}
+    <div class="{% cycle 'even' 'odd' %} row ">
+           <div class='description' style="float:left"><span class="row"> <a style="width=100px; overflow:hidden;" href="{{ proposition.get_absolute_url }}?crumb_filter=memberships.collection.{{ item.pk }}">{% viewable_name proposition %}</a><br>
+	 {% ifagentcan 'view Proposition.summary_text' proposition %}{{proposition.summary_text}}{% endifagentcan %}</div>
+			<div style="float: right">
+				{% if cur_agent_in_eligbles %}
+				<select name="{{ proposition.pk }}">
+	        	<option value="not chosen">Not Chosen</option>
+				<option value="chosen">Chosen</option>
+				</select> 
+				{% endif %}
+			<input type="button" value="Show Details" id="hide{{ proposition.pk }}" onclick="toggleImplementation('{{ proposition.pk }}')" />				 	
+					{% ifagentcan 'modify_membership' item %}
+		                <button type="button" onclick="removeMember('{{ proposition.pk }}')"><img src="{{ "delete"|icon_url:16 }}" /> Remove</button>
+		            {% endifagentcan %}<div style="clear: both;"></div>		
+				
+			</div></span></div>
+			
+    <div class="implementation"id="{{ proposition.pk }}">
+	<a href="{{ proposition.get_absolute_url }}">View as an item</a>{{proposition.body|safe}} 
+	</div>
     {% endfor %}
-</table>
+{% if cur_agent_in_eligbles %}
+<div style="margin-left:40%; margin-bottom:1em;">
+    <input type="submit" value="Submit" /><br><br>
+</div>
+{% endif %}
+</div>
+</form>
 {% else %}
-    No Items In This Collection
+    No propositions in this poll
 {% endif %}
 
+
 {% ifagentcan 'modify_membership' item %}
-<div>
-    <a class="fg-button fg-button-icon-right ui-widget ui-state-default ui-corner-all" onclick="openDialog('addmember{{ item.pk }}'); return false;"><img src="{{ "new"|icon_url:16 }}" />Add an item to collection</a><br><br>
+<div class="submit_button">  
+	<a class="fg-button fg-button-icon-right ui-widget ui-state-default ui-corner-all poll" onclick="toggleButtons('hiddenPropositionButtons')">Add a Proposition</a>
 </div>
-{% newmemberdialog %}
 {% endifagentcan %}
+<br>
+<br>
+<div id="hiddenPropositionButtons" style="margin: 4px; height 2em; display:none;">
+	{% ifagentcanglobal 'create Proposition' %}
+	 <a class="fg-button fg-button-icon-right ui-widget ui-state-default ui-corner-all poll" href="{% url item_type_url viewer='proposition',action='new'%}?populate_poll={{ item.pk }}&amp;add_to_collection={{ item.pk }}&amp;redirect={{ full_path|urlencode }}">Make New Proposition</a>
+	{% endifagentcanglobal %}
+	{% ifagentcan 'modify_membership' item %}
+	<a class="fg-button fg-button-icon-right ui-widget ui-state-default ui-corner-all" onclick="openDialog('addmember{{ item.pk }}'); return false;">Add Existing Proposition to Poll</a>
+	{% endifagentcan %}
+	<a class="fg-button fg-button-icon-right ui-widget ui-state-default ui-corner-all poll" onclick="toggleButtons('hiddenPropositionButtons')">Cancel</a><br><br>
+</div>
+<br>
+<br>
+
+<p style="font-size:16px;">Responses:</p>
+{# make this a bulleted list with hidden divs #}
+<div class="container responses" id="Propcontainer" style="width: 60%; margin-left: 0;">
+    {% if can_view_response_names_and_values %}
+        {% for key,value in responses.items %}
+        	<div class="{% cycle 'even' 'odd' %} row " >
+        	<span class="row"><a href="{{ key.get_absolute_url }}">{% viewable_name key %}</a>
+     		{% if value %}
+            	has responded 
+                <input type="button" style="float:right;"
+                value="Show Responses" id="hide{{ key.pk }}" onclick="toggleResponses('{{ key.pk }}')" />
+				</div>
+               	<div id="responses{{ key.pk }}" style="display: none">
+                {% for response in value %}
+                     <p><a href="{{ response.proposition.get_absolute_url }}" style="margin-left:1em;">
+                     {% viewable_name response.proposition %}</a>: {{ response.value }}</p>
+                {% endfor %}
+                </div></span>
+        	{% else %}
+            	has not responded </span></div>
+        	{% endif %}
+        {% endfor %}
+	</div>
+    {% else %}{% if can_view_response_names %}
+	{% for key,value in responses.items %}
+    <div class="{% cycle 'even' 'odd' %} row " >
+    <span class="row"><a href="{{ key.get_absolute_url }}">{% viewable_name key %}</a>
+    {% if value %} has responded {% else %} has not responded {% endif %}
+	{% ifequal cur_agent key %} 
+		<input type="button" style="float:right;"
+        value="Show Responses" id="hide{{ key.pk }}" onclick="toggleResponses('{{ key.pk }}')" />
+		</div>
+       	<div id="responses{{ key.pk }}" style="display: none">
+        {% for response in value %}
+             <p><a href="{{ response.proposition.get_absolute_url }}" style="margin-left:1em;">
+             {% viewable_name response.proposition %}</a>: {{ response.value }}</p>
+        {% endfor %}
+	{% endifequal %}
+    </span></div>
+    {% endfor %}
+    {% else %}
+		Responses are not visible
+		<p>You're response:</p>
+		 {% for key,value in responses.items %}
+			
+			{% ifequal cur_agent.pk key.pk %}
+	        	<div class="{% cycle 'even' 'odd' %} row " >
+	        	<span class="row"><a href="{{ key.get_absolute_url }}">{% viewable_name key %}</a>
+	     		{% if value %}
+	            	has responded 
+	                <input type="button" style="float:right;"
+	                value="Show Responses" id="hide{{ key.pk }}" onclick="toggleResponses('{{ key.pk }}')" />
+					</div>
+	               	<div id="responses{{ key.pk }}" style="display: none">
+	                {% for response in value %}
+	                     <p><a href="{{ response.proposition.get_absolute_url }}" style="margin-left:1em;">
+	                     {% viewable_name response.proposition %}</a>: {{ response.value }}</p>
+	                {% endfor %}
+	                </div></span>
+	        	{% else %}
+	            	has not responded </span></div>
+	        	{% endif %}
+			{% endifequal %}
+	       {% endfor %}
+    {% endif %}{% endif %}
+</div>
+
+
+
 
-{% if cur_agent_in_collection %}
-{% ifagentcan 'remove_self' item %}
-<form method="post" enctype="multipart/form-data" action="{% url item_url viewer=viewer_name,action="removemember",noun=item.pk %}?redirect={{ full_path|urlencode }}" class="item_form">
-    <input type="hidden" name="item" value="{{ cur_agent.pk }}" />
-    <button type="submit" class="fg-button fg-button-icon-right ui-widget ui-state-default ui-corner-all"><img src="{{ "delete"|icon_url:16 }}" /> <span>Remove my membership in {% viewable_name item %}</span></button>
-</form>
-{% endifagentcan %}
-{% else %}
-{% ifagentcan 'add_self' item %}
-<form method="post" enctype="multipart/form-data" action="{% url item_url viewer=viewer_name,action="addmember",noun=item.pk %}?redirect={{ full_path|urlencode }}" class="item_form">
-    <input type="hidden" name="item" value="{{ cur_agent.pk }}" />
-    <button type="submit" class="fg-button fg-button-icon-right ui-widget ui-state-default ui-corner-all"><img src="{{ "new"|icon_url:16 }}" /> <span>Become a member of {% viewable_name item %}</span></button>
-</form>
-{% endifagentcan %}
-{% endif %}
 
-{% if responses %}
-    {% for response in responses %}
-        <p> participant: {{ response.participant }} response: {{ response.proposition }}  </p>
-    {% endfor %}
-{% else %}
-    <p>There are no responses for this poll yet.</p>
-{% endif %}
 
 {% endblock content %}
 
diff --git a/deme_django/modules/poll/templates/poll/pluralityapprovendecision.html b/deme_django/modules/poll/templates/poll/pluralityapprovendecision.html
index 096999f3..e2958bcc 100644
--- a/deme_django/modules/poll/templates/poll/pluralityapprovendecision.html
+++ b/deme_django/modules/poll/templates/poll/pluralityapprovendecision.html
@@ -32,13 +32,19 @@
 </style>
 <div id="results">
 	<table cellspacing="0" class="list">
-		{% for result in mostPopular %}
+		{% for result in propositions %}
 			<tr class="{% cycle 'even' 'odd' %} top">
 				<td><a href="{{ result.get_absolute_url }}">{% viewable_name result %}</a></td>
+				{% if result in mostPopular %}
+				<td>approved</td>
+				{% else %}
+				<td>not approved</td>
+				{% endif %}
 			</tr>
 		{% endfor %}
 	</table>
 </div>
+
 <div id='linkToPoll'>
 	<a href="{{ item.poll.get_absolute_url }}">View Poll</a>
 </div>
diff --git a/deme_django/modules/poll/templates/poll/pluralitychoosendecision.html b/deme_django/modules/poll/templates/poll/pluralitychoosendecision.html
index 38e5a69f..e2958bcc 100644
--- a/deme_django/modules/poll/templates/poll/pluralitychoosendecision.html
+++ b/deme_django/modules/poll/templates/poll/pluralitychoosendecision.html
@@ -2,13 +2,65 @@
 {% load item_tags %}
 {% block content %}
 
-<p>Name: {{ item.name }}
-<p>Poll:  {{ item.poll }}</p>
-<p>Quorum: {{ item.quorum }} %</p>
-<p>Max Poll Takers: {{ maxPollTakers }}</p>
-<p>Number of responses: {{ numResponses }} </p>
-<p>Number needed for response: {{ minResponses }}</p>
-<p>Most popular: {{ mostPopular }}  </p>
-<p>N: {{ item.num_decision }}</p>
+<style>
+div p{
+	font-size:13px;
+}
 
+div #results{
+	align: center;
+	font-size: 20px;
+}
+
+div #results table {
+	width: 50%;
+	position:relative;
+	margin-left:auto;
+	margin-right:auto;
+}
+
+div #results table tr.header {
+	font-size:15px;
+}
+
+div #linkToPoll a{
+	font-size: 15px;
+	position: relative;
+	left: 250px;
+}
+
+</style>
+<div id="results">
+	<table cellspacing="0" class="list">
+		{% for result in propositions %}
+			<tr class="{% cycle 'even' 'odd' %} top">
+				<td><a href="{{ result.get_absolute_url }}">{% viewable_name result %}</a></td>
+				{% if result in mostPopular %}
+				<td>approved</td>
+				{% else %}
+				<td>not approved</td>
+				{% endif %}
+			</tr>
+		{% endfor %}
+	</table>
+</div>
+
+<div id='linkToPoll'>
+	<a href="{{ item.poll.get_absolute_url }}">View Poll</a>
+</div>
+<div>
+	<p>Quorum: {{ item.quorum }} %</p>
+</div>
+<div>
+	<p>Max Poll Takers: {{ maxPollTakers }}</p>
+</div>
+<div>
+	<p>Number of responses: {{ numResponses }} </p>
+</div>
+<div>
+<p>Number of responses needed for quorum: {{ minResponses }}</p>
+</div>
+<div>
+	<p>Decision Rule: Will approve of {{item.num_decisions}} proposition(s) with the most approvals among all propositions in poll.</p>
+</div>
 {% endblock content %}
\ No newline at end of file
diff --git a/deme_django/modules/poll/templates/poll/thresholdapprovendecision.html b/deme_django/modules/poll/templates/poll/thresholdapprovendecision.html
index a9316f7c..868727c3 100644
--- a/deme_django/modules/poll/templates/poll/thresholdapprovendecision.html
+++ b/deme_django/modules/poll/templates/poll/thresholdapprovendecision.html
@@ -2,15 +2,65 @@
 {% load item_tags %}
 {% block content %}
 
-<p>Name: {{ item.name }}
-<p>Poll:  {{ item.poll }}</p>
-<p>Quorum: {{ item.quorum }} %</p>
-<p>Max Poll Takers: {{ maxPollTakers }}</p>
-<p>Number of responses: {{ numResponses }} </p>
-<p>Number needed for response out of participants: {{ minpeoplefordecision }}</p>
-<p>Most popular: {{ mostPopular }}  </p>
-<p>N: {{ item.num_decision }}</p>
-<p>p% {{ item.p_decision }}</p>
-<p>Participants {{participants}}</p>
+<style>
+div p{
+	font-size:13px;
+}
 
+div #results{
+	align: center;
+	font-size: 20px;
+}
+
+div #results table {
+	width: 50%;
+	position:relative;
+	margin-left:auto;
+	margin-right:auto;
+}
+
+div #results table tr.header {
+	font-size:15px;
+}
+
+div #linkToPoll a{
+	font-size: 15px;
+	position: relative;
+	left: 250px;
+}
+
+</style>
+<div id="results">
+	<table cellspacing="0" class="list">
+		{% for result in propositions %}
+			<tr class="{% cycle 'even' 'odd' %} top">
+				<td><a href="{{ result.get_absolute_url }}">{% viewable_name result %}</a></td>
+				{% if result in mostPopular %}
+				<td>approved</td>
+				{% else %}
+				<td>not approved</td>
+				{% endif %}
+			</tr>
+		{% endfor %}
+	</table>
+</div>
+
+<div id='linkToPoll'>
+	<a href="{{ item.poll.get_absolute_url }}">View Poll</a>
+</div>
+<div>
+	<p>Quorum: {{ item.quorum }} %</p>
+</div>
+<div>
+	<p>Max Poll Takers: {{ maxPollTakers }}</p>
+</div>
+<div>
+	<p>Number of responses: {{ numResponses }} </p>
+</div>
+<div>
+<p>Number of responses needed for quorum: {{ minResponses }}</p>
+</div>
+<div>
+	<p>Decision Rule: Will approve of {{item.num_decisions}} proposition(s) with the most approvals among all propositions in poll and surpasses threshold {{ item.p_decision}} % of participants.</p>
+</div>
 {% endblock content %}
\ No newline at end of file
diff --git a/deme_django/modules/poll/templates/poll/thresholdchoosendecision.html b/deme_django/modules/poll/templates/poll/thresholdchoosendecision.html
index a9316f7c..868727c3 100644
--- a/deme_django/modules/poll/templates/poll/thresholdchoosendecision.html
+++ b/deme_django/modules/poll/templates/poll/thresholdchoosendecision.html
@@ -2,15 +2,65 @@
 {% load item_tags %}
 {% block content %}
 
-<p>Name: {{ item.name }}
-<p>Poll:  {{ item.poll }}</p>
-<p>Quorum: {{ item.quorum }} %</p>
-<p>Max Poll Takers: {{ maxPollTakers }}</p>
-<p>Number of responses: {{ numResponses }} </p>
-<p>Number needed for response out of participants: {{ minpeoplefordecision }}</p>
-<p>Most popular: {{ mostPopular }}  </p>
-<p>N: {{ item.num_decision }}</p>
-<p>p% {{ item.p_decision }}</p>
-<p>Participants {{participants}}</p>
+<style>
+div p{
+	font-size:13px;
+}
 
+div #results{
+	align: center;
+	font-size: 20px;
+}
+
+div #results table {
+	width: 50%;
+	position:relative;
+	margin-left:auto;
+	margin-right:auto;
+}
+
+div #results table tr.header {
+	font-size:15px;
+}
+
+div #linkToPoll a{
+	font-size: 15px;
+	position: relative;
+	left: 250px;
+}
+
+</style>
+<div id="results">
+	<table cellspacing="0" class="list">
+		{% for result in propositions %}
+			<tr class="{% cycle 'even' 'odd' %} top">
+				<td><a href="{{ result.get_absolute_url }}">{% viewable_name result %}</a></td>
+				{% if result in mostPopular %}
+				<td>approved</td>
+				{% else %}
+				<td>not approved</td>
+				{% endif %}
+			</tr>
+		{% endfor %}
+	</table>
+</div>
+
+<div id='linkToPoll'>
+	<a href="{{ item.poll.get_absolute_url }}">View Poll</a>
+</div>
+<div>
+	<p>Quorum: {{ item.quorum }} %</p>
+</div>
+<div>
+	<p>Max Poll Takers: {{ maxPollTakers }}</p>
+</div>
+<div>
+	<p>Number of responses: {{ numResponses }} </p>
+</div>
+<div>
+<p>Number of responses needed for quorum: {{ minResponses }}</p>
+</div>
+<div>
+	<p>Decision Rule: Will approve of {{item.num_decisions}} proposition(s) with the most approvals among all propositions in poll and surpasses threshold {{ item.p_decision}} % of participants.</p>
+</div>
 {% endblock content %}
\ No newline at end of file
diff --git a/deme_django/modules/poll/templates/poll/thresholdeapprovendecision.html b/deme_django/modules/poll/templates/poll/thresholdeapprovendecision.html
index ad2f6ebe..b0d596e0 100644
--- a/deme_django/modules/poll/templates/poll/thresholdeapprovendecision.html
+++ b/deme_django/modules/poll/templates/poll/thresholdeapprovendecision.html
@@ -2,15 +2,65 @@
 {% load item_tags %}
 {% block content %}
 
-<p>Name: {{ item.name }}
-<p>Poll:  {{ item.poll }}</p>
-<p>Quorum: {{ item.quorum }} %</p>
-<p>Max Poll Takers: {{ maxPollTakers }}</p>
-<p>Number of responses: {{ numResponses }} </p>
-<p>Number needed for response out of participants: {{ minpeoplefordecision }}</p>
-<p>Most popular: {{ mostPopular }}  </p>
-<p>N: {{ item.num_decision }}</p>
-<p>e% {{ item.e_decision }}</p>
-<p>Participants {{participants}}</p>
+<style>
+div p{
+	font-size:13px;
+}
 
+div #results{
+	align: center;
+	font-size: 20px;
+}
+
+div #results table {
+	width: 50%;
+	position:relative;
+	margin-left:auto;
+	margin-right:auto;
+}
+
+div #results table tr.header {
+	font-size:15px;
+}
+
+div #linkToPoll a{
+	font-size: 15px;
+	position: relative;
+	left: 250px;
+}
+
+</style>
+<div id="results">
+	<table cellspacing="0" class="list">
+		{% for result in propositions %}
+			<tr class="{% cycle 'even' 'odd' %} top">
+				<td><a href="{{ result.get_absolute_url }}">{% viewable_name result %}</a></td>
+				{% if result in mostPopular %}
+				<td>approved</td>
+				{% else %}
+				<td>not approved</td>
+				{% endif %}
+			</tr>
+		{% endfor %}
+	</table>
+</div>
+
+<div id='linkToPoll'>
+	<a href="{{ item.poll.get_absolute_url }}">View Poll</a>
+</div>
+<div>
+	<p>Quorum: {{ item.quorum }} %</p>
+</div>
+<div>
+	<p>Max Poll Takers: {{ maxPollTakers }}</p>
+</div>
+<div>
+	<p>Number of responses: {{ numResponses }} </p>
+</div>
+<div>
+<p>Number of responses needed for quorum: {{ minResponses }}</p>
+</div>
+<div>
+	<p>Decision Rule: Will approve of {{item.num_decisions}} proposition(s) with the most approvals among all propositions in poll and surpasses threshold {{ item.e_decision}} % of eligibles.</p>
+</div>
 {% endblock content %}
\ No newline at end of file
diff --git a/deme_django/modules/poll/templates/poll/thresholdechoosendecision.html b/deme_django/modules/poll/templates/poll/thresholdechoosendecision.html
index ad2f6ebe..b0d596e0 100644
--- a/deme_django/modules/poll/templates/poll/thresholdechoosendecision.html
+++ b/deme_django/modules/poll/templates/poll/thresholdechoosendecision.html
@@ -2,15 +2,65 @@
 {% load item_tags %}
 {% block content %}
 
-<p>Name: {{ item.name }}
-<p>Poll:  {{ item.poll }}</p>
-<p>Quorum: {{ item.quorum }} %</p>
-<p>Max Poll Takers: {{ maxPollTakers }}</p>
-<p>Number of responses: {{ numResponses }} </p>
-<p>Number needed for response out of participants: {{ minpeoplefordecision }}</p>
-<p>Most popular: {{ mostPopular }}  </p>
-<p>N: {{ item.num_decision }}</p>
-<p>e% {{ item.e_decision }}</p>
-<p>Participants {{participants}}</p>
+<style>
+div p{
+	font-size:13px;
+}
 
+div #results{
+	align: center;
+	font-size: 20px;
+}
+
+div #results table {
+	width: 50%;
+	position:relative;
+	margin-left:auto;
+	margin-right:auto;
+}
+
+div #results table tr.header {
+	font-size:15px;
+}
+
+div #linkToPoll a{
+	font-size: 15px;
+	position: relative;
+	left: 250px;
+}
+
+</style>
+<div id="results">
+	<table cellspacing="0" class="list">
+		{% for result in propositions %}
+			<tr class="{% cycle 'even' 'odd' %} top">
+				<td><a href="{{ result.get_absolute_url }}">{% viewable_name result %}</a></td>
+				{% if result in mostPopular %}
+				<td>approved</td>
+				{% else %}
+				<td>not approved</td>
+				{% endif %}
+			</tr>
+		{% endfor %}
+	</table>
+</div>
+
+<div id='linkToPoll'>
+	<a href="{{ item.poll.get_absolute_url }}">View Poll</a>
+</div>
+<div>
+	<p>Quorum: {{ item.quorum }} %</p>
+</div>
+<div>
+	<p>Max Poll Takers: {{ maxPollTakers }}</p>
+</div>
+<div>
+	<p>Number of responses: {{ numResponses }} </p>
+</div>
+<div>
+<p>Number of responses needed for quorum: {{ minResponses }}</p>
+</div>
+<div>
+	<p>Decision Rule: Will approve of {{item.num_decisions}} proposition(s) with the most approvals among all propositions in poll and surpasses threshold {{ item.e_decision}} % of eligibles.</p>
+</div>
 {% endblock content %}
\ No newline at end of file
diff --git a/deme_django/modules/poll/templates/poll/unanimouschoosendecision.html b/deme_django/modules/poll/templates/poll/unanimouschoosendecision.html
index 5c62adf6..7ff77f01 100644
--- a/deme_django/modules/poll/templates/poll/unanimouschoosendecision.html
+++ b/deme_django/modules/poll/templates/poll/unanimouschoosendecision.html
@@ -2,15 +2,65 @@
 {% load item_tags %}
 {% block content %}
 
-<p>Name: {{ item.name }}
-<p>Poll:  {{ item.poll }}</p>
-<p>Quorum: {{ item.quorum }} %</p>
-<p>Max Poll Takers: {{ maxPollTakers }}</p>
-<p>Number of responses: {{ numResponses }} </p>
-<p>Number needed for response out of participants: {{ minpeoplefordecision }}</p>
-<p>Most popular: {{ mostPopular }}  </p>
-<p>N: {{ item.num_decision }}</p>
-<p>m: {{ item.m_decision }}</p>
-<p>Participants {{participants}}</p>
+<style>
+div p{
+	font-size:13px;
+}
 
+div #results{
+	align: center;
+	font-size: 20px;
+}
+
+div #results table {
+	width: 50%;
+	position:relative;
+	margin-left:auto;
+	margin-right:auto;
+}
+
+div #results table tr.header {
+	font-size:15px;
+}
+
+div #linkToPoll a{
+	font-size: 15px;
+	position: relative;
+	left: 250px;
+}
+
+</style>
+<div id="results">
+	<table cellspacing="0" class="list">
+		{% for result in propositions %}
+			<tr class="{% cycle 'even' 'odd' %} top">
+				<td><a href="{{ result.get_absolute_url }}">{% viewable_name result %}</a></td>
+				{% if result in mostPopular %}
+				<td>approved</td>
+				{% else %}
+				<td>not approved</td>
+				{% endif %}
+			</tr>
+		{% endfor %}
+	</table>
+</div>
+
+<div id='linkToPoll'>
+	<a href="{{ item.poll.get_absolute_url }}">View Poll</a>
+</div>
+<div>
+	<p>Quorum: {{ item.quorum }} %</p>
+</div>
+<div>
+	<p>Max Poll Takers: {{ maxPollTakers }}</p>
+</div>
+<div>
+	<p>Number of responses: {{ numResponses }} </p>
+</div>
+<div>
+<p>Number of responses needed for quorum: {{ minResponses }}</p>
+</div>
+<div>
+	<p>Decision Rule: Will approve of {{item.num_decisions}} proposition(s) with the most approvals among all propositions in poll and reaches a unanimous approval minus {{ item.m_decision}}.</p>
+</div>
 {% endblock content %}
\ No newline at end of file
diff --git a/deme_django/modules/poll/views.py b/deme_django/modules/poll/views.py
index bfaed095..5f25ba2c 100644
--- a/deme_django/modules/poll/views.py
+++ b/deme_django/modules/poll/views.py
@@ -54,16 +54,53 @@ def item_show_html(self):
         self.context['action_title'] = ''
         self.require_ability('view ', self.item, wildcard_suffix=True)
         memberships = self.item.child_memberships
-        memberships = memberships.filter(active=True)
-        memberships = memberships.filter(item__active=True)
+        memberships = memberships.filter(active=True, item__active=True)
         memberships = self.permission_cache.filter_items('view Membership.item', memberships)
         memberships = memberships.select_related('item')
         if memberships:
             self.permission_cache.filter_items('view Item.name', Item.objects.filter(pk__in=[x.item_id for x in memberships]))
-        self.context['memberships'] = sorted(memberships, key=lambda x: (not self.permission_cache.agent_can('view Item.name', x.item), x.item.name))
-        self.context['cur_agent_in_collection'] = bool(self.item.child_memberships.filter(active=True, item=self.cur_agent))
+        self.context['responses'] = PropositionResponseChoose.objects.filter(poll=self.item)
+        eligible_agent_memberships = self.item.eligibles.child_memberships
+        eligible_agent_memberships = eligible_agent_memberships.filter(active=True, item__active=True)
+        eligible_agent_memberships = self.permission_cache.filter_items('view Membership.item', eligible_agent_memberships)
+        eligible_agent_memberships = eligible_agent_memberships.select_related('item')
+        if eligible_agent_memberships:
+            self.permission_cache.filter_items('view Item.name', Item.objects.filter(pk__in=[x.item_id for x in eligible_agent_memberships]))
+        responses = {}
+        for agent_membership in eligible_agent_memberships:
+            responses[agent_membership.item] = PropositionResponseChoose.objects.filter(poll=self.item).filter(participant=agent_membership.item)
+        self.context['responses'] = responses
+        self.context['decisions'] = Decision.objects.filter(poll=self.item)
+        self.context['propositions'] = Proposition.objects.filter(memberships__in=memberships)
+        self.context['can_view_response_names'] = self.item.visibility != 'closed' or self.permission_cache.agent_can('access_proposition_responses', self.item)
+        self.context['can_view_response_names_and_values'] = self.item.visibility == 'responses visible' or self.permission_cache.agent_can('access_proposition_responses', self.item)
+        self.context['cur_agent_in_eligbles'] = self.item.agent_eligible_to_vote(self.cur_agent)
+        self.context['cur_agent_can_make_a_decision'] = self.permission_cache.agent_can_global('create ThresholdChooseNDecision') or self.permission_cache.agent_can_global('create ThresholdEChooseNDecision')  or self.permission_cache.agent_can_global('create PluralityChooseNDecision') or self.permission_cache.agent_can_global('create UnanimousChooseNDecision')
         template = loader.get_template('poll/choosenpoll.html')
         return HttpResponse(template.render(self.context))
+    
+    def item_respondtopropositions_html(self):
+        propositions = self.request.POST
+        #verify that the cur agent is in the eligbles
+        self.verifyCurAgentIsEligible()
+        #verify that it is not before or after the deadline
+
+        #verify that there are only n or less responses
+        counter=0
+        for response in propositions:    
+            if propositions[response]=="chosen":
+                counter=counter+1
+        if counter!=self.item.n: #this needs to be changed for chooseN
+            return self.render_error('Incorect input of votes', "Choose "+str(self.item.n)+".")
+
+        #delete old response (even if one doesn't exist)
+        PropositionResponseChoose.objects.filter(poll=self.item, participant=self.cur_agent).delete()
+        #make a new response
+        for response in propositions:
+            newResponse = PropositionResponseChoose(poll=self.item, participant= self.cur_agent, proposition = Proposition.objects.get(pk=response), value = propositions[response])
+            newResponse.save()
+        redirect = self.request.GET.get('redirect', reverse('item_url', kwargs={'viewer': self.viewer_name, 'noun': self.item.pk}))
+        return HttpResponseRedirect(redirect)
         
 
 class ApproveNPollViewer(PollViewer):
@@ -194,7 +231,13 @@ class PluralityChooseNDecisionViewer(DecisionViewer):
     def item_show_html(self):
         self.context['action_title'] = 'Show'
         self.context['item'] = self.item
-
+        memberships = self.item.poll.child_memberships
+        memberships = memberships.filter(active=True, item__active=True)
+        memberships = self.permission_cache.filter_items('view Membership.item', memberships)
+        memberships = memberships.select_related('item')
+        if memberships:
+            self.permission_cache.filter_items('view Item.name', Item.objects.filter(pk__in=[x.item_id for x in memberships]))
+        self.context['propositions'] = Proposition.objects.filter(memberships__in=memberships)
         maxPollTakers = len(Membership.objects.all().filter(collection=self.item.poll.eligibles))
         responses = PropositionResponseChoose.objects.all().filter(poll=self.item.poll.pk).filter(value='chosen')
         mostPopular = None
@@ -234,6 +277,13 @@ class ThresholdChooseNDecisionViewer(DecisionViewer):
     def item_show_html(self):
         self.context['action_title'] = 'Show'
         self.context['item'] = self.item
+        memberships = self.item.poll.child_memberships
+        memberships = memberships.filter(active=True, item__active=True)
+        memberships = self.permission_cache.filter_items('view Membership.item', memberships)
+        memberships = memberships.select_related('item')
+        if memberships:
+            self.permission_cache.filter_items('view Item.name', Item.objects.filter(pk__in=[x.item_id for x in memberships]))
+        self.context['propositions'] = Proposition.objects.filter(memberships__in=memberships)
         pollTakers = Membership.objects.all().filter(collection=self.item.poll.eligibles)
         participants = Agent.objects.filter(poll_participant__poll=self.item.poll)
         minForDecision = int(math.ceil(len(participants) * (self.item.p_decision/100.0)))
@@ -279,6 +329,14 @@ class ThresholdEChooseNDecisionViewer(DecisionViewer):
     def item_show_html(self):
         self.context['action_title'] = 'Show'
         self.context['item'] = self.item
+        memberships = self.item.poll.child_memberships
+        memberships = memberships.filter(active=True, item__active=True)
+        memberships = self.permission_cache.filter_items('view Membership.item', memberships)
+        memberships = memberships.select_related('item')
+        if memberships:
+            self.permission_cache.filter_items('view Item.name', Item.objects.filter(pk__in=[x.item_id for x in memberships]))
+        self.context['propositions'] = Proposition.objects.filter(memberships__in=memberships)
+            
         pollTakers = Membership.objects.all().filter(collection=self.item.poll.eligibles)
         minForDecision = int(math.ceil(len(pollTakers) * (self.item.e_decision/100.0)))
         maxPollTakers = len(pollTakers)
@@ -324,6 +382,13 @@ class UnanimousChooseNDecisionViewer(DecisionViewer):
     def item_show_html(self):
         self.context['action_title'] = 'Show'
         self.context['item'] = self.item
+        memberships = self.item.poll.child_memberships
+        memberships = memberships.filter(active=True, item__active=True)
+        memberships = self.permission_cache.filter_items('view Membership.item', memberships)
+        memberships = memberships.select_related('item')
+        if memberships:
+            self.permission_cache.filter_items('view Item.name', Item.objects.filter(pk__in=[x.item_id for x in memberships]))
+        self.context['propositions'] = Proposition.objects.filter(memberships__in=memberships)
         pollTakers = Membership.objects.all().filter(collection=self.item.poll.eligibles)
         minForDecision = len(pollTakers) - self.item.m_decision
         maxPollTakers = len(pollTakers)
@@ -368,7 +433,13 @@ class PluralityApproveNDecisionViewer(DecisionViewer):
     def item_show_html(self):
         self.context['action_title'] = 'Show'
         self.context['item'] = self.item
-
+        memberships = self.item.poll.child_memberships
+        memberships = memberships.filter(active=True, item__active=True)
+        memberships = self.permission_cache.filter_items('view Membership.item', memberships)
+        memberships = memberships.select_related('item')
+        if memberships:
+            self.permission_cache.filter_items('view Item.name', Item.objects.filter(pk__in=[x.item_id for x in memberships]))
+        self.context['propositions'] = Proposition.objects.filter(memberships__in=memberships)
         maxPollTakers = len(Membership.objects.all().filter(collection=self.item.poll.eligibles))
         responses = PropositionResponseApprove.objects.all().filter(poll=self.item.poll.pk).filter(value='approve')
         mostPopular = None
@@ -408,6 +479,15 @@ class ThresholdApproveNDecisionViewer(DecisionViewer):
     def item_show_html(self):
         self.context['action_title'] = 'Show'
         self.context['item'] = self.item
+        self.context['action_title'] = 'Show'
+        self.context['item'] = self.item
+        memberships = self.item.poll.child_memberships
+        memberships = memberships.filter(active=True, item__active=True)
+        memberships = self.permission_cache.filter_items('view Membership.item', memberships)
+        memberships = memberships.select_related('item')
+        if memberships:
+            self.permission_cache.filter_items('view Item.name', Item.objects.filter(pk__in=[x.item_id for x in memberships]))
+        self.context['propositions'] = Proposition.objects.filter(memberships__in=memberships)
         pollTakers = Membership.objects.all().filter(collection=self.item.poll.eligibles)
         participants = Agent.objects.filter(poll_participant__poll=self.item.poll)
         minForDecision = int(math.ceil(len(participants) * (self.item.p_decision/100.0)))
@@ -454,6 +534,15 @@ class ThresholdEApproveNDecisionViewer(DecisionViewer):
     def item_show_html(self):
         self.context['action_title'] = 'Show'
         self.context['item'] = self.item
+        self.context['action_title'] = 'Show'
+        self.context['item'] = self.item
+        memberships = self.item.poll.child_memberships
+        memberships = memberships.filter(active=True, item__active=True)
+        memberships = self.permission_cache.filter_items('view Membership.item', memberships)
+        memberships = memberships.select_related('item')
+        if memberships:
+            self.permission_cache.filter_items('view Item.name', Item.objects.filter(pk__in=[x.item_id for x in memberships]))
+        self.context['propositions'] = Proposition.objects.filter(memberships__in=memberships)
         pollTakers = Membership.objects.all().filter(collection=self.item.poll.eligibles)
         minForDecision = int(math.ceil(len(pollTakers) * (self.item.e_decision/100.0)))
         maxPollTakers = len(pollTakers)
@@ -489,7 +578,7 @@ def item_show_html(self):
         self.context['minpeoplefordecision'] = minForDecision
         self.context['participants'] = Agent.objects.filter(poll_participant__poll=self.item.poll)
         
-        template = loader.get_template('poll/thresholdechoosendecision.html')
+        template = loader.get_template('poll/thresholdeapprovendecision.html')
         return HttpResponse(template.render(self.context))
 
 # class WriteInPropositionsViewer(CollectionViewer):