Dropped old threads list template from private threads, made threads list form smarter.

templates/cranefly/private_threads/list.html

@@ -134,82 +134,6 @@
     {% endif %}
   </div>
 
-  {# OLD Threads List
-  <div class="forum-threads-list">
-    <div class="header">
-      <div class="row-fluid">
-        <div class="span7">{% trans %}Thread{% endtrans %}</div>
-        <div class="span5 thread-activity">
-          <div class="thread-replies">{% trans %}Activity{% endtrans %}</div>
-          {% if list_form %}
-          <div class="pull-right check-cell">
-            <label class="checkbox"><input type="checkbox" class="checkbox-master"></label>
-          </div>
-          {% endif %}
-        </div>
-      </div>
-    </div>
-    {% for thread in threads %}
-    <div class="thread-row{% if not thread.is_read %} thread-new{% endif %}{% if loop.last %} thread-last{% endif %}">
-      <div class="row-fluid">
-        <div class="span7">
-          {% if thread.is_read %}
-          <a href="{{ url('private_thread_new', thread=thread.pk, slug=thread.slug) }}" class="thread-icon thread-icon-last tooltip-top" title="{% trans %}Click to see last post{% endtrans %}"><i class="icon-circle-blank"></i></a>
-          {% else %}
-          <a href="{{ url('private_thread_new', thread=thread.pk, slug=thread.slug) }}" class="thread-icon thread-icon-new tooltip-top" title="{% trans %}Click to see first unread post{% endtrans %}"><i class="icon-circle"></i></a>
-          {% endif %}
-
-          <a href="{{ url('private_thread', thread=thread.pk, slug=thread.slug) }}" class="thread-name{% if thread.name|length > 70 %} tooltip-top" title="{{ thread.name }}{% endif %}">{{ thread.name|short_string(70) }}</a>
-
-          {{ macros.thread_flags(thread) }}
-
-          <div class="thread-details">
-            {% trans user=thread_starter(thread), start=thread.start|reldate|low %}by {{ user }}, {{ start }}{% endtrans %}
-          </div>
-
-        </div>
-        <div class="span5 thread-activity">
-
-          {% if settings.avatars_on_threads_list %}
-          <div class="thread-last-avatar">
-            {% if thread.last_poster_id %}
-            <a href="{{ url('user', user=thread.last_poster.pk, username=thread.last_poster.username_slug) }}"><img src="{{ thread.last_poster.get_avatar(40) }}" alt=""></a>
-            {% else %}
-            <img src="{{ macros.avatar_guest(40) }}" alt="" class="user-avatar">
-            {% endif %}
-          </div>
-          {% endif %}
-
-          <div class="thread-replies">
-            <strong class="lead">{{ thread_reply(thread) }}, {{ thread.last|reldate|low }}</strong><br>
-            {{ replies(thread.replies) }}
-          </div>
-
-          {% if list_form %}
-          <label class="thread-select checkbox"><input form="threads_form" name="{{ list_form['list_items']['html_name'] }}" type="checkbox" class="checkbox-member" value="{{ thread.pk }}"{% if list_form['list_items']['has_value'] and ('' ~ thread.pk) in list_form['list_items']['value'] %} checked="checked"{% endif %}></label>
-          {% endif %}
-
-        </div>
-      </div>
-    </div>
-    {% else %}
-    <div class="thread-row threads-list-empty">
-      {% trans %}You are not participating in any private discussions.{% endtrans %}
-    </div>
-    {% endfor %}
-
-    {% if list_form %}
-    <div class="threads-actions">
-      <form id="threads_form" class="form-inline pull-right" action="{{ request_path }}" method="POST">
-        <input type="hidden" name="{{ csrf_id }}" value="{{ csrf_token }}">
-        {{ form_theme.field(list_form.list_action, attrs={'class': 'span3'}) }}
-        <button type="submit" class="btn btn-danger">{% trans %}Go{% endtrans %}</button>
-      </form>
-    </div>
-    {% endif %}
-  </div>
-  #}
-
   <div class="forum-threads-extra">
     {{ pager() }}
     {% if acl.threads.can_start_threads(forum) %}

templates/cranefly/threads/list.html

@@ -213,8 +213,13 @@
     <div class="threads-actions">
       <form id="threads_form" class="form-inline pull-right" action="{{ request_path }}" method="POST">
         <input type="hidden" name="{{ csrf_id }}" value="{{ csrf_token }}">
+        {% if list_form_context['optgroups'][0][1]|length > 1 %}
         {{ form_theme.field(list_form.list_action, attrs={'class': 'span3'}) }}
         <button type="submit" class="btn btn-danger">{% trans %}Go{% endtrans %}</button>
+        {% else %}
+        <input type="hidden" name="{{ list_form_context.name }}" value="{{ list_form_context['optgroups'][0][1][0][0] }}">
+        <button type="submit" class="btn btn-danger">{{ list_form_context['optgroups'][0][1][0][1] }}</button>
+        {% endif %}
       </form>
     </div>
     {% endif %}