X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?a=blobdiff_plain;f=qcg%2Ftemplates%2Fqcg%2Fjob_new.html;h=6ed34c4ee3256c1646cf93431f4b961faede12b9;hb=1547dbc536b4848a93ce0a39493c0c69b853c576;hp=d5b7344f488da749afe80d7571e3495b0d115fd9;hpb=7c9392626226b7d859c5bc321ab15326fa1a17c6;p=qcg-portal.git

diff --git a/qcg/templates/qcg/job_new.html b/qcg/templates/qcg/job_new.html
index d5b7344..6ed34c4 100644
--- a/qcg/templates/qcg/job_new.html
+++ b/qcg/templates/qcg/job_new.html
@@ -3,19 +3,15 @@
 
 {% block extra_css %}
     <link href="{% static 'qcg/selectize/selectize.bootstrap3.css' %}" rel="stylesheet">
-    <link href="{% static 'qcg/datetimepicker/bootstrap-datetimepicker.min.css' %}" rel="stylesheet">
 {% endblock %}
 
 {% block extra_js %}
     <script src="{% static 'qcg/selectize/selectize.min.js' %}"></script>
     <script src="{% static 'qcg/formset/jquery.formset.js' %}"></script>
-    <script src="{% static 'qcg/moment/moment.min.js' %}"></script>
-    <script src="{% static 'qcg/moment/pl.js' %}"></script>
-    <script src="{% static 'qcg/datetimepicker/bootstrap-datetimepicker.min.js' %}"></script>
 
     <script>
         $(function() {
-            $('#id_application, #id_host').selectize();
+            $('#id_application').selectize();
             $('#id_arguments,#id_properties,#id_native').selectize({
                 plugins: ['remove_button'],
                 create: true,
@@ -33,7 +29,7 @@
                     }
                 }
             });
-            $('#id_modules').selectize({
+            $('#id_modules, #id_hosts').selectize({
                 plugins: ['remove_button']
             });
 
@@ -49,11 +45,6 @@
                 deleteCssClass: 'delete-btn btn btn-xs btn-danger'
             });
 
-            $('#id_not_before,#id_not_after').datetimepicker({
-                locale: 'pl',
-                minDate: moment()
-            });
-
             $('input[name="notify_type"],input[name="watch_output_type"],input[name="preprocess_type"],input[name="postprocess_type"]').on('change', function () {
                 $(this).tab('show');
             }).each(function() {
@@ -87,6 +78,14 @@
 {% block container %}
     <h1 class="page-header">{% block title %}Zleć zadanie{% endblock %}</h1>
 
+    {% if errors %}
+        <div class="alert alert-danger">
+            <strong>Uwaga!</strong> Formularz zawiera błędy.
+            {{ form.non_field_errors }}
+            {{ env_formset.non_field_errors }}
+        </div>
+    {% endif %}
+
     <form action="." method="post" class="form-horizontal">
         {% csrf_token %}
 
@@ -114,17 +113,17 @@
                 {% bootstrap_field form.script layout="horizontal" form_group_class="form-group collapse" %}
                 {% bootstrap_field form.arguments layout="horizontal" %}
                 {% bootstrap_field form.note layout="horizontal" %}
-                {% bootstrap_field form.grant layout="horizontal" %}
+                {% bootstrap_field form.grant layout="horizontal" form_group_class="form-group collapse" %}
             </fieldset>
 
             <fieldset id="resources" class="tab-pane" role="tabpanel">
-                {% bootstrap_field form.host layout="horizontal" %}
+                {% bootstrap_field form.hosts layout="horizontal" %}
                 {% bootstrap_field form.queue layout="horizontal" %}
                 {% bootstrap_field form.properties layout="horizontal" form_group_class="form-group collapse" %}
                 {% bootstrap_field form.modules layout="horizontal" form_group_class="form-group collapse" %}
                 {% bootstrap_field form.procs layout="horizontal" %}
                 {% bootstrap_field form.nodes layout="horizontal" form_group_class="form-group collapse" %}
-                {% include 'qcg/time_range_field.html' with field_name='wall_time' field=form.wall_time %}
+                {% bootstrap_field form.wall_time layout="horizontal" form_group_class="form-group timerange" %}
                 {% bootstrap_field form.memory layout="horizontal" form_group_class="form-group collapse" %}
                 {% bootstrap_field form.memory_per_slot layout="horizontal" form_group_class="form-group collapse" %}
                 {% bootstrap_field form.reservation layout="horizontal" form_group_class="form-group collapse" %}
@@ -166,7 +165,7 @@
                                 <label class="btn btn-default">
                                     <input type="radio" autocomplete="off" name="{{ option.name }}" value="{{ option.choice_value }}"
                                             {% if option.is_checked %}checked{% endif %}
-                                            data-target=".notify-type-{{ option.choice_value }}"> {{ option.choice_label }}
+                                            data-target=".notify-type-{{ forloop.counter0 }}"> {{ option.choice_label }}
                                 </label>
                             {% endfor %}
                         </div>
@@ -190,7 +189,7 @@
                                     <label class="btn btn-default">
                                         <input type="radio" autocomplete="off" name="{{ option.name }}" value="{{ option.choice_value }}"
                                                 {% if option.is_checked %}checked{% endif %}
-                                                data-target=".watch-output-type-{{ option.choice_value }}"> {{ option.choice_label }}
+                                                data-target=".watch-output-type-{{ forloop.counter0 }}"> {{ option.choice_label }}
                                     </label>
                                 {% endfor %}
                             </div>
@@ -217,7 +216,7 @@
                                 <label class="btn btn-default">
                                     <input type="radio" autocomplete="off" name="{{ option.name }}" value="{{ option.choice_value }}"
                                             {% if option.is_checked %}checked{% endif %}
-                                            data-target=".preprocess-type-{{ option.choice_value }}"> {{ option.choice_label }}
+                                            data-target=".preprocess-type-{{ forloop.counter0 }}"> {{ option.choice_label }}
                                 </label>
                             {% endfor %}
                         </div>
@@ -244,7 +243,7 @@
                                 <label class="btn btn-default">
                                     <input type="radio" autocomplete="off" name="{{ option.name }}" value="{{ option.choice_value }}"
                                             {% if option.is_checked %}checked{% endif %}
-                                            data-target=".postprocess-type-{{ option.choice_value }}"> {{ option.choice_label }}
+                                            data-target=".postprocess-type-{{ forloop.counter0 }}"> {{ option.choice_label }}
                                 </label>
                             {% endfor %}
                         </div>