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=37a4fc56edd3b41dad369104930a631a5c1c442a;hpb=9a6f1362b7cee897421fff89c53862558e6c73ca;p=qcg-portal.git

diff --git a/qcg/templates/qcg/job_new.html b/qcg/templates/qcg/job_new.html
index 37a4fc5..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 %}
 
@@ -96,7 +95,6 @@
             <li role="presentation"><a href="#resources" data-toggle="tab">Zasoby</a></li>
             <li role="presentation"><a href="#files" data-toggle="tab">Pliki</a></li>
             <li role="presentation"><a href="#environment" data-toggle="tab">Środowisko</a></li>
-            <li role="presentation"><a href="#reservation" data-toggle="tab">Rezerwacja</a></li>
             <li role="presentation"><a href="#monitoring" data-toggle="tab">Powiadomienia</a></li>
             <li role="presentation"><a href="#other" data-toggle="tab">Inne</a></li>
         </ul>
@@ -111,33 +109,33 @@
                     </div>
                 </div>
 
-                {% bootstrap_field form.executable layout="horizontal" form_group_class="form-group collapse"  %}
+                {% bootstrap_field form.executable layout="horizontal" form_group_class="form-group collapse" %}
+                {% bootstrap_field form.script layout="horizontal" form_group_class="form-group collapse" %}
                 {% bootstrap_field form.arguments layout="horizontal" %}
-                {% bootstrap_field form.name 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.memory layout="horizontal" %}
-                {% bootstrap_field form.memory_per_slot layout="horizontal" %}
+                {% 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" %}
             </fieldset>
 
             <fieldset id="files" class="tab-pane" role="tabpanel">
                 {% bootstrap_field form.input layout="horizontal" %}
-                {% bootstrap_field form.output layout="horizontal" %}
-                {% bootstrap_field form.error layout="horizontal" %}
                 {% bootstrap_field form.stage_in layout="horizontal" %}
-                {% bootstrap_field form.stage_out layout="horizontal" %}
+                {% bootstrap_field form.stage_out layout="horizontal" form_group_class="form-group collapse" %}
             </fieldset>
 
             <fieldset id="environment" class="tab-pane" role="tabpanel">
-                {% bootstrap_field form.properties layout="horizontal" %}
                 {{ env_formset.management_form }}
 
                 <div class="form-group">
@@ -154,15 +152,6 @@
                         </div>
                     </div>
                 </div>
-
-                {% bootstrap_field form.modules layout="horizontal" %}
-            </fieldset>
-
-            <fieldset id="reservation" class="tab-pane" role="tabpanel">
-                {% bootstrap_field form.not_before layout="horizontal" %}
-                {% bootstrap_field form.not_after layout="horizontal" %}
-                {% include 'qcg/time_range_field.html' with field_name='deadline' field=form.deadline %}
-                {% bootstrap_field form.reservation layout="horizontal" form_group_class="form-group collapse" %}
             </fieldset>
 
             <fieldset id="monitoring" class="tab-pane" role="tabpanel">
@@ -176,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>
@@ -191,27 +180,29 @@
                     </div>
                 </div>
 
-                <div class="form-group">
-                    <label class="col-sm-3 col-md-4 control-label">Monitorowanie wyjścia</label>
-                    <div class="col-sm-9 col-md-6">
-                        <div class="btn-group" data-toggle="buttons">
-                            {% for option in form.watch_output_type %}
-                                <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 }}
-                                </label>
-                            {% endfor %}
+                <div class="collapse">
+                    <div class="form-group">
+                        <label class="col-sm-3 col-md-4 control-label">Monitorowanie wyjścia</label>
+                        <div class="col-sm-9 col-md-6">
+                            <div class="btn-group" data-toggle="buttons">
+                                {% for option in form.watch_output_type %}
+                                    <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-{{ forloop.counter0 }}"> {{ option.choice_label }}
+                                    </label>
+                                {% endfor %}
+                            </div>
                         </div>
                     </div>
-                </div>
 
-                <div class="tab-content">
-                    <div class="tab-pane watch-output-type-0"></div>
+                    <div class="tab-content">
+                        <div class="tab-pane watch-output-type-0"></div>
 
-                    <div class="tab-pane watch-output-type-1 watch-output-type-2" style="margin-top: 15px">
-                        {% bootstrap_field form.watch_output_address layout="horizontal" %}
-                        {% bootstrap_field form.watch_output_pattern layout="horizontal" %}
+                        <div class="tab-pane watch-output-type-1 watch-output-type-2" style="margin-top: 15px">
+                            {% bootstrap_field form.watch_output_address layout="horizontal" %}
+                            {% bootstrap_field form.watch_output_pattern layout="horizontal" %}
+                        </div>
                     </div>
                 </div>
             </fieldset>
@@ -225,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>
@@ -252,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>
@@ -273,7 +264,6 @@
 
                 {% bootstrap_field form.native layout="horizontal" %}
                 {% bootstrap_checkbox form.persistent %}
-                {% bootstrap_checkbox form.use_scratch %}
             </fieldset>
         </div>