X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?a=blobdiff_plain;f=qcg%2Ftemplates%2Fqcg%2Fjobs.html;h=4cc79d1da08dd61c7ae8371799d4f414a844ad13;hb=1b2a8480700fed22f8cb47709b4fcc1546af8c0b;hp=34e9ce5ae13cf01fc4a8e73960fd4f04310c6a85;hpb=b1f2eaf9a8779f9b8bcb6e396d535b6044667133;p=qcg-portal.git

diff --git a/qcg/templates/qcg/jobs.html b/qcg/templates/qcg/jobs.html
index 34e9ce5..4cc79d1 100644
--- a/qcg/templates/qcg/jobs.html
+++ b/qcg/templates/qcg/jobs.html
@@ -66,39 +66,45 @@
 {% endblock %}
 
 {% block container %}
-    <form id="simple-form" action="." role="search" 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>
+    <form action="." class="pull-right">
+        {% get_params_as_hidden 'host' 'purged' 'submission' 'finish' %}
+        <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">
@@ -111,7 +117,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>
@@ -174,6 +180,11 @@
                                     <span class="glyphicon glyphicon-file" aria-hidden="true"></span>
                                     {% if columns.JOB_ID in displayed %}{{ task }}{% endif %}
                                 </a>
+                                {% if not task.purged %}
+                                    <small class="text-muted" title="Istnieje katalog roboczy">
+                                        <span class="glyphicon glyphicon-paperclip" aria-hidden="true"></span>
+                                    </small>
+                                {% endif %}
                             </td>
                             {% if columns.DESCRIPTION in displayed %}<td>{{ task.note }}</td>{% endif %}
                             {% if columns.SUBMISSION in displayed %}<td>{{ task.submission_time|date:"CUSTOM_DATETIME_FORMAT" }}</td>{% endif %}
@@ -191,6 +202,9 @@
                                 <span class="glyphicon glyphicon-folder-close" aria-hidden="true"></span>
                                 {% if columns.JOB_ID in displayed %}{{ job.grouper }}{% endif %}
                             </a>
+                            {% if not job.grouper.purged %}
+                                <span class="glyphicon glyphicon-paperclip" aria-hidden="true"></span>
+                            {% endif %}
                         </td>
                         {% if columns.DESCRIPTION in displayed %}<td>{{ job.grouper.note }}</td>{% endif %}
                         {% if columns.SUBMISSION in displayed %}<td>{{ job.grouper.submission_time|date:"CUSTOM_DATETIME_FORMAT" }}</td>{% endif %}
@@ -208,6 +222,9 @@
                                     <span class="glyphicon glyphicon-file" aria-hidden="true"></span>
                                     {% if columns.JOB_ID in displayed %}{{ task }}{% endif %}
                                 </a>
+                                {% if not task.purged %}
+                                    <span class="glyphicon glyphicon-paperclip" aria-hidden="true"></span>
+                                {% endif %}
                             </td>
                             {% if columns.DESCRIPTION in displayed %}<td>{{ task.note }}</td>{% endif %}
                             {% if columns.SUBMISSION in displayed %}<td>{{ task.submission_time|date:"CUSTOM_DATETIME_FORMAT" }}</td>{% endif %}
@@ -305,6 +322,21 @@
                                 </div>
                             </div>
                         </div>
+
+                        <div class="form-group">
+                            <label class="col-sm-3 col-md-4 control-label">Istniejący katalog roboczy?</label>
+                            <div class="col-sm-9 col-md-6">
+                                <div class="btn-group" data-toggle="buttons">
+                                    {% for choice in filters.purged %}
+                                        <label class="btn btn-default{% if choice.is_checked %} active{% endif %}">
+                                            <input type="radio" name="{{ choice.name }}" value="{{ choice.choice_value }}"
+                                                   {% if choice.is_checked %}checked{% endif %}> {{ choice.choice_label }}
+                                        </label>
+                                    {% endfor %}
+                                </div>
+                            </div>
+                        </div>
+
                         {% bootstrap_field filters.submission layout='horizontal' bound_css_class=' ' %}
                         {% bootstrap_field filters.finish layout='horizontal' bound_css_class=' ' %}
                     </form>