X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/cfc1eb85823b39e0f767909ccd3a9709a5fd0ec2..8132fc186eb0c5fd02c86828c3a4735754296d02:/apps/catalogue/templates/catalogue/book_list/book_list.html

diff --git a/apps/catalogue/templates/catalogue/book_list/book_list.html b/apps/catalogue/templates/catalogue/book_list/book_list.html
index f1ed46f5..e238827b 100755
--- a/apps/catalogue/templates/catalogue/book_list/book_list.html
+++ b/apps/catalogue/templates/catalogue/book_list/book_list.html
@@ -1,8 +1,9 @@
 {% load i18n %}
 {% load pagination_tags %}
+{% load username from common_tags %}
 
 
-<form name='filter' action=''>
+<form name='filter' action='{{ request.path }}'>
 <input type='hidden' name="title" value="{{ request.GET.title }}" />
 <input type='hidden' name="stage" value="{{ request.GET.stage }}" />
 {% if not viewed_user %}
@@ -10,6 +11,7 @@
 {% endif %}
 <input type='hidden' name="all" value="{{ request.GET.all }}" />
 <input type='hidden' name="status" value="{{ request.GET.status }}" />
+<input type='hidden' name="project" value="{{ request.GET.project }}" />
 </form>
 
 
@@ -44,9 +46,11 @@
                         {% endif %}value="-">- {% trans "none" %} -</option>
                 {% for user in users %}
                     <option {% if request.GET.user == user.username %}selected="selected"
-                        {% endif %}value="{{ user.username }}">{{ user.first_name }} {{ user.last_name }} ({{ user.count }})</option>
+                        {% endif %}value="{{ user.username }}">{{ user|username }} ({{ user.count }})</option>
                 {% endfor %}
             </select></th>
+        {% else %}
+            <th style='display: none'></th>
         {% endif %}
 
         <th><select name="status" class="filter">
@@ -57,6 +61,16 @@
             {% endfor %}
         </select></th>
 
+        <th><select name="project" class="filter">
+            <option value=''>- {% trans "project" %} -</option>
+                <option {% if request.GET.project == '-' %}selected="selected"
+                        {% endif %}value="-">- {% trans "none" %} -</option>
+            {% for project in projects %}
+                <option {% if request.GET.project == project.pk|slugify %}selected="selected"
+                        {% endif %}value='{{ project.pk }}'>{{ project.name }}</option>
+            {% endfor %}
+        </select></th>
+
     </tr></thead>
 
     {% with cnt=books|length %}
@@ -72,7 +86,7 @@
             {% endif %}
         {% endwith %}
     {% endfor %}
-    <tr><th class='paginator' colspan="5">
+    <tr><th class='paginator' colspan="6">
         {% paginate %}
         {% blocktrans count c=cnt %}{{c}} book{% plural %}{{c}} books{% endblocktrans %}</th></tr>
     </tbody>
@@ -82,11 +96,19 @@
     <p>{% trans "No books found." %}</p>
 {% endif %}
 
-<form id='chunk_mass_edit' action='{% url catalogue_chunk_mass_edit %}' class="hidden">
+<form id='chunk_mass_edit' action='{% url "catalogue_chunk_mass_edit" %}' style="display:none;">
 {% csrf_token %}
 <input type="hidden" name="ids" />
-<input type="hidden" name="stage" />
-<input type="hidden" name="user" />
+<label for="mass_edit_stage">{% trans "Set stage" %}</label><input type="hidden" name="stage" id="mass_edit_stage"/>
+<label for="mass_edit_user">{% trans "Set user" %}</label><input type="hidden" name="user" id="mass_edit_user" />
 <input type="hidden" name="status" />
+<label for="mass_edit_project">{% trans "Project" %}</label><input type="hidden" name="project" id="mass_edit_project" />
+<label for="mass_edit_more_users">{% trans "More users" %}</label>
 </form>
 
+<select name="other-user" style="display:none;">
+  {% for user in other_users %}
+  <option {% if request.GET.user == user.username %}selected="selected"
+          {% endif %}value="{{ user.username }}">{{ user|username }} ({{ user.count }})</option>
+  {% endfor %}
+</select>