From 4f15c6810299a91c61a8eddb063e6528ae4d4835 Mon Sep 17 00:00:00 2001
From: Maciej Tronowski <mtro@man.poznan.pl>
Date: Fri, 24 Apr 2015 15:35:19 +0200
Subject: [PATCH] fixes in jobs list view

---
 qcg/templates/qcg/jobs.html |   68 +++++++++++++++++++++++--------------------
 1 file changed, 37 insertions(+), 31 deletions(-)

diff --git a/qcg/templates/qcg/jobs.html b/qcg/templates/qcg/jobs.html
index 52698aa..d9bc667 100644
--- a/qcg/templates/qcg/jobs.html
+++ b/qcg/templates/qcg/jobs.html
@@ -70,39 +70,45 @@
         <div class="{{ message.tags }}">{{ message }}</div>
     {% endfor %}
 
-    <form id="simple-form" action="." role="search" class="pull-right">
+    <form action="." class="pull-right">
         {% get_params_as_hidden 'host' 'submission' 'finish' %}
-        <div style="display: inline-block; vertical-align: middle;">
-            <div class="input-group">
-                <input type="search" name="keywords" value="{{ filters.keywords.value|default:'' }}"
-                       maxlength="500" class="form-control" placeholder="Wyszukaj frazę">
-                <span class="input-group-btn">
-                    <button class="btn btn-default" type="submit" title="Szukaj">
-                        <span class="glyphicon glyphicon-search"></span>
-                    </button>
-                </span>
+        <div class="btn-toolbar" role="toolbar">
+            <div class="btn-group" role="group">
+                <div class="input-group">
+                    <input type="search" name="keywords" value="{{ filters.keywords.value|default:'' }}"
+                           maxlength="500" class="form-control" placeholder="Wyszukaj frazę">
+                    <span class="input-group-btn">
+                        <button class="btn btn-default" type="submit" title="Szukaj">
+                            <span class="glyphicon glyphicon-search"></span>
+                        </button>
+                    </span>
+                </div>
+            </div>
+            <div class="btn-group" data-toggle="buttons">
+                <label class="btn btn-default{% if checked_status.0 %} active{% endif %}" title="Aktywne">
+                    <input name="status" value="0" type="checkbox" {% if checked_status.0 %}checked{% endif %} onchange="this.form.submit()">
+                    <span class="glyphicon glyphicon-hourglass" aria-hidden="true"></span>
+                </label>
+                <label class="btn btn-default{% if checked_status.1 %} active{% endif %}" title="Zakończone">
+                    <input name="status" value="1" type="checkbox" {% if checked_status.1 %}checked{% endif %} onchange="this.form.submit()">
+                    <span class="glyphicon glyphicon-saved" aria-hidden="true"></span>
+                </label>
+                <label class="btn btn-default{% if checked_status.2 %} active{% endif %}" title="Niepowodzenia">
+                    <input name="status" value="2" type="checkbox" {% if checked_status.2 %}checked{% endif %} onchange="this.form.submit()">
+                    <span class="glyphicon glyphicon-alert" aria-hidden="true"></span>
+                </label>
+            </div>
+            <div class="btn-group" role="group">
+                <a href="#advanced" data-toggle="modal" class="btn btn-default" title="Filtry zaawansowane">
+                    <span class="glyphicon glyphicon-option-horizontal"></span>
+                </a>
+            </div>
+            <div class="btn-group" role="group">
+                <a href="#columns" data-toggle="modal" class="btn btn-default" title="Kolumny">
+                    <span class="glyphicon glyphicon-list"></span>
+                </a>
             </div>
         </div>
-        <div class="btn-group" data-toggle="buttons">
-            <label class="btn btn-default{% if checked_status.0 %} active{% endif %}" title="Aktywne">
-                <input name="status" value="0" type="checkbox" {% if checked_status.0 %}checked{% endif %} onchange="this.form.submit()">
-                <span class="glyphicon glyphicon-hourglass" aria-hidden="true"></span>
-            </label>
-            <label class="btn btn-default{% if checked_status.1 %} active{% endif %}" title="Zakończone">
-                <input name="status" value="1" type="checkbox" {% if checked_status.1 %}checked{% endif %} onchange="this.form.submit()">
-                <span class="glyphicon glyphicon-saved" aria-hidden="true"></span>
-            </label>
-            <label class="btn btn-default{% if checked_status.2 %} active{% endif %}" title="Niepowodzenia">
-                <input name="status" value="2" type="checkbox" {% if checked_status.2 %}checked{% endif %} onchange="this.form.submit()">
-                <span class="glyphicon glyphicon-alert" aria-hidden="true"></span>
-            </label>
-        </div>
-        <a href="#advanced" data-toggle="modal" class="btn btn-default" title="Filtry zaawansowane" style="margin-left: 4px">
-            <span class="glyphicon glyphicon-option-horizontal"></span>
-        </a>
-        <a href="#columns" data-toggle="modal" class="btn btn-default" title="Kolumny" style="margin-left: 4px">
-            <span class="glyphicon glyphicon-list"></span>
-        </a>
     </form>
 
     <h1 class="page-header">
@@ -115,7 +121,7 @@
                 <a href="." class="pull-right"><span class="text-muted small">Wyczyść wszystkie filtry</span></a>
                 <strong>Wybrane filtry:</strong>
                 {% for label, param, val in selected_filters %}
-                    <span class="label label-primary">{{ label }}&nbsp;<a href="{% query_string param-=val %}" style="color: white"><span class="glyphicon glyphicon-remove"></span></a></span>
+                    <span class="label label-primary">{{ label }}&nbsp;<a href=".{% query_string param-=val %}" style="color: white"><span class="glyphicon glyphicon-remove"></span></a></span>
                 {% endfor %}
             </div>
         </div>
-- 
1.7.9.5