From c12400641a77ddf9e9ea390772276ff18a32f03d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emilio=20A=2E=20S=C3=A1nchez=20L=C3=B3pez?=
 <esanchez@yaco.es>
Date: Wed, 5 Jun 2013 06:32:17 +0000
Subject: [PATCH] Redesign the feedback pending template. See #975  -
 Legacy-Id: 5774

---
 ietf/nomcom/forms.py                          |  2 +-
 ietf/nomcom/views.py                          |  1 +
 .../nomcom/inc.feedback_pending_header.html   | 11 ++++
 .../nomcom/view_feedback_pending.html         | 65 ++++++++++++++-----
 static/css/base2.css                          | 11 ++++
 5 files changed, 74 insertions(+), 16 deletions(-)
 create mode 100644 ietf/templates/nomcom/inc.feedback_pending_header.html

diff --git a/ietf/nomcom/forms.py b/ietf/nomcom/forms.py
index bd7154284..b154ae35b 100644
--- a/ietf/nomcom/forms.py
+++ b/ietf/nomcom/forms.py
@@ -718,7 +718,7 @@ class PrivateKeyForm(BaseNomcomForm, forms.Form):
 
 class PendingFeedbackForm(BaseNomcomForm, forms.ModelForm):
 
-    type = forms.ModelChoiceField(queryset=FeedbackType.objects.all(), widget=forms.RadioSelect, empty_label='Unclassified', required=False)
+    type = forms.ModelChoiceField(queryset=FeedbackType.objects.all().order_by('pk'), widget=forms.RadioSelect, empty_label='Unclassified', required=False)
 
     class Meta:
         model = Feedback
diff --git a/ietf/nomcom/views.py b/ietf/nomcom/views.py
index 0fd107f2e..7ddcc7185 100644
--- a/ietf/nomcom/views.py
+++ b/ietf/nomcom/views.py
@@ -511,6 +511,7 @@ def view_feedback_pending(request, year):
                                'message': message,
                                'extra_step': extra_step,
                                'default_type': default_type,
+                               'types': FeedbackType.objects.all().order_by('pk'),
                                'nomcom': nomcom}, RequestContext(request))
 
 
diff --git a/ietf/templates/nomcom/inc.feedback_pending_header.html b/ietf/templates/nomcom/inc.feedback_pending_header.html
new file mode 100644
index 000000000..64dda04d4
--- /dev/null
+++ b/ietf/templates/nomcom/inc.feedback_pending_header.html
@@ -0,0 +1,11 @@
+<tr>
+  {% if not extra_step %}<th></th>{% endif %}
+  <th>Date</th>
+  {% if extra_step %}
+    <th>Type</th>
+  {% else %}
+    <th>Unclassified</th>{% for t in types %}<th>{{ t }}</th>{% endfor %}
+  {% endif %}
+  <th>Author</th>
+  <th>Subject</th>
+</tr>
diff --git a/ietf/templates/nomcom/view_feedback_pending.html b/ietf/templates/nomcom/view_feedback_pending.html
index ca8387d99..c5af75899 100644
--- a/ietf/templates/nomcom/view_feedback_pending.html
+++ b/ietf/templates/nomcom/view_feedback_pending.html
@@ -5,6 +5,24 @@
 
 {% block subtitle %} - Feeback pending{% endblock %}
 
+{% block scripts %}
+{{ block.super }}
+(function($) {
+    $(document).ready(function() {
+        $('.toggle .trigger').click(function() {
+            if ($(this).hasClass('closed')) {
+                $(this).removeClass('closed').addClass('open');
+                $(this).parent().parent().next().show();
+            } else {
+                $(this).removeClass('open').addClass('closed');
+                $(this).parent().parent().next().hide();
+            }
+            return false;
+        });
+    });
+})(jQuery);
+{% endblock %}
+
 {% block nomcom_content %}
 
 <p>Back to <a href="{% url nomcom_view_feedback year %}">feedback index</a></p>
@@ -32,11 +50,27 @@
     {% endif %}
     </div>
     {{ formset.management_form }}
+    <table class="ietf-table">
+    {% include "nomcom/inc.feedback_pending_header.html" %}
     {% for form in formset.forms %}
-     {% if form.errors %}<div class="info-message-error">Please correct the following errors</div>{% endif %}
-     <div class="baseform">
-        <div class="fieldset">
-        <h2>{{ form.instance.time|date:"Y-m-d" }} id:{{ form.instance.id }}</h2>
+     {% if forloop.counter|divisibleby:"20" %}{% include "nomcom/inc.feedback_pending_header.html" %}{% endif %}
+     {% if form.errors %}<tr><td colspan="5" class="info-message-error">Please correct the following errors</td></tr>{% endif %}
+        <tr class="{% cycle "evenrow" "oddrow" %}">
+        {% if not extra_step %}<td class="toggle"><a href="#" class="trigger closed"></a></td>{% endif %}
+        <td>{{ form.instance.time|date:"Y-m-d" }} id:{{ form.instance.id }}</td>
+        {% if extra_step %}
+          <td>{{ form.feedback_type }}</td>
+        {% else %}
+          {{ form.id }}
+          {% for choice in form.type.field.choices %}
+            <td class="{% cycle "evenradio" "oddradio" %}"><input type="radio" name="{{ form.type.html_name }}" value="{{ choice.0 }}" {% if not choice.0 %}checked="checked"{% endif %} title="{{ choice.1 }}" /></td>
+          {% endfor %}
+        {% endif %}
+        <td>{{ form.instance.author }}</th>
+        <td>{{ form.instance.subject }}</td>
+        </tr>
+        {% if extra_step %}
+        <tr class="body bodyform"><td colspan="2" class="baseform">
         {% for field in form %}
         <div id="baseform-fieldname-{{ field.html_name }}"
           {% if field.field.widget.is_hidden %}style="display: none;"{% endif %}
@@ -54,19 +88,20 @@
         {{ field.errors }}
         </div>
         <div class="endfield"></div>
-      </div>
-        {% endfor %}
-           <h3>Type</h3>
-           <pre>{{ form.feedback_type }}</pre>
-           <h3>Author</h3>
-           <pre>{{ form.instance.author }}</pre>
-           <h3>Subject</h3>
-           <pre>{{ form.instance.subject }}</pre>
-           <h3>Feedback body</h3>
-           <pre>{% decrypt form.instance.comments request year 1 %}</pre>
         </div>
-    </div>
+        {% endfor %}
+        </td>
+        <td colspan="3">
+           <pre>{% decrypt form.instance.comments request year 1 %}</pre>
+        </td></tr>
+        {% else %}
+        <tr class="body" style="display: none;"><td colspan="{{ types.count|add:"5" }}">
+           <pre>{% decrypt form.instance.comments request year 1 %}</pre>
+        </td></tr>
+        {% endif %}
+        </tr>
     {% endfor %}
+    </table>
     <div class="sumit-row">
     {% if extra_step %}
     <input type="submit" value="Save feedback" name="end" />
diff --git a/static/css/base2.css b/static/css/base2.css
index 7b9dfeb63..db98d8540 100644
--- a/static/css/base2.css
+++ b/static/css/base2.css
@@ -280,6 +280,17 @@ div.info-message-error { border: 1px solid red; background-color: #ffeebb; paddi
     margin: 12px;
 }
 
+#feedbackformset table {width: 100%;}
+#feedbackformset .oddradio { background-color: white; text-align: center;}
+#feedbackformset .evenradio { background-color: #EDF5FF; text-align: center;}
+#feedbackformset .toggle { padding: 0px; }
+#feedbackformset .toggle a.trigger { display: block; width: 22px; height: 22px;}
+#feedbackformset .toggle a.closed { background: url(../images/plus.png) no-repeat center center;}
+#feedbackformset .toggle a.open { background: url(../images/minus.png) no-repeat center center;}
+#feedbackformset tr.body td { border-bottom: 1px solid #cbcbcb;}
+#feedbackformset tr.bodyform td { border-top: 1px solid #cbcbcb;}
+
+
 .baseform select,
 .baseform textarea,
 .baseform input {