fixes to conform html spec

[qcg-portal.git] / qcg / templates / qcg / jobs.html

diff --git a/qcg/templates/qcg/jobs.html b/qcg/templates/qcg/jobs.html
index d9bc667..1b37616 100644 (file)
--- a/qcg/templates/qcg/jobs.html
+++ b/qcg/templates/qcg/jobs.html
@@ -66,12 +66,8 @@
 {% endblock %}
 
 {% block container %}
-    {% for message in messages %}
-        <div class="{{ message.tags }}">{{ message }}</div>
-    {% endfor %}
-
     <form action="." class="pull-right">
-        {% get_params_as_hidden 'host' 'submission' 'finish' %}
+        {% get_params_as_hidden 'host' 'purged' 'submission' 'finish' %}
         <div class="btn-toolbar" role="toolbar">
             <div class="btn-group" role="group">
                 <div class="input-group">
@@ -184,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 %}
@@ -201,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 %}
@@ -218,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 %}
@@ -278,12 +285,12 @@
     </nav>
 
     <!-- Modal -->
-    <div class="modal fade" id="advanced" tabindex="-1" role="dialog" aria-labelledby="modal-label" aria-hidden="true">
+    <div class="modal fade" id="advanced" tabindex="-1" role="dialog" aria-labelledby="filters-modal-label" aria-hidden="true">
         <div class="modal-dialog modal-lg">
             <div class="modal-content">
                 <div class="modal-header">
                     <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-                    <h4 class="modal-title" id="modal-label">Filtry zaawansowane</h4>
+                    <h4 class="modal-title" id="filters-modal-label">Filtry zaawansowane</h4>
                 </div>
                 <div class="modal-body">
                     <form id="advanced-form" action="." class="form-horizontal">
@@ -315,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>
@@ -329,12 +351,12 @@
     </div>
 
     {# Column selection modal #}
-    <div class="modal fade" id="columns" tabindex="-1" role="dialog" aria-labelledby="modal-label" aria-hidden="true">
+    <div class="modal fade" id="columns" tabindex="-1" role="dialog" aria-labelledby="columns-modal-label" aria-hidden="true">
         <div class="modal-dialog">
             <div class="modal-content">
                 <div class="modal-header">
                     <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-                    <h4 class="modal-title" id="modal-label">Wybór kolumn</h4>
+                    <h4 class="modal-title" id="columns-modal-label">Wybór kolumn</h4>
                 </div>
                 <div class="modal-body">
                     <form id="columns-form" action=".">