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

diff --git a/qcg/templates/qcg/job_new.html b/qcg/templates/qcg/job_new.html
index 37a4fc5..d5b7344 100644
--- a/qcg/templates/qcg/job_new.html
+++ b/qcg/templates/qcg/job_new.html
@@ -96,7 +96,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,9 +110,9 @@
                     </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" %}
             </fieldset>
@@ -121,23 +120,23 @@
             <fieldset id="resources" class="tab-pane" role="tabpanel">
                 {% bootstrap_field form.host 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.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 +153,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">
@@ -191,27 +181,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-{{ option.choice_value }}"> {{ 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>
@@ -273,7 +265,6 @@
 
                 {% bootstrap_field form.native layout="horizontal" %}
                 {% bootstrap_checkbox form.persistent %}
-                {% bootstrap_checkbox form.use_scratch %}
             </fieldset>
         </div>