X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?a=blobdiff_plain;ds=sidebyside;f=qcg%2Ftemplates%2Fqcg%2Fjob_submit.html;h=0afb98219d0048a3458d408374e684be3bc8db8e;hb=169ad8dc3e17a7637808f402cba0fa5667b721c3;hp=77f6fc7cc004d88584c77f5a17c6a2ad4a41811c;hpb=8e788ac9ca0ebb6ff38d13bb6fd4bea8348c097f;p=qcg-portal.git diff --git a/qcg/templates/qcg/job_submit.html b/qcg/templates/qcg/job_submit.html index 77f6fc7..0afb982 100644 --- a/qcg/templates/qcg/job_submit.html +++ b/qcg/templates/qcg/job_submit.html @@ -1,5 +1,5 @@ {% extends 'qcg/base.html' %} -{% load staticfiles bootstrap3 qcg_utils %} +{% load staticfiles bootstrap3 %} {% block extra_css %} @@ -34,7 +34,7 @@ return res; } - $('#id_master_file,#id_executable,#id_input,#id_preprocess_script,#id_postprocess_script').before(function() { + $('#id_master_file,#id_pdb_file,#id_executable,#id_input,#id_preprocess_script,#id_postprocess_script').before(function() { var target = this; return gridftpButton.clone().click(function() { $('#select-btn').off().click(function() { @@ -77,7 +77,7 @@ }); }).wrap('
'); - $('#id_application').selectize(); + $('#id_application,#id_force_field').selectize(); $('#id_arguments,#id_properties,#id_native').selectize({ plugins: ['remove_button'], create: true, @@ -95,7 +95,9 @@ } } }); - $('#id_modules,#id_hosts,#id_master_file,#id_executable,#id_input,#id_stage_in,#id_preprocess_script,#id_postprocess_script').selectize({ + + $('#id_modules,#id_hosts,#id_pdb_file,#id_master_file,#id_executable,#id_input,#id_stage_in,#id_preprocess_script,#id_postprocess_script').selectize({ + plugins: ['remove_button'] }); @@ -114,8 +116,6 @@ $('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() { - $(this).parent().toggleClass('active', this.checked); - if (this.checked) $(this).tab('show'); }); @@ -128,196 +128,48 @@ $('#gridftp').one('show.bs.modal', function() { filex.initialLoad(); + $(this).find('.modal-body').css('height', window.innerHeight - 200 + 'px'); + }); + + $('#template').on('show.bs.modal', function() { + this.reset(); + }).on('shown.bs.modal', function() { + $(this).find('input[type="text"]')[0].focus(); + }).on('submit', function(e) { + e.preventDefault(); + + // copy this form's fields to description form and send it + $('#description').append($(this).find('input').clone().attr('type', 'hidden')).submit(); }); }); {% endblock %} {% block container %} -

{% block title %}Zleć zadanie{% endblock %}

+
+ {% if template %} + + + {% else %} + + {% endif %} +
+ +

{% block title %}Zleć zadanie{% endblock %} {{ template.name }}

{% if errors %}
Uwaga! Formularz zawiera błędy. {{ form.non_field_errors }} {{ env_formset.non_field_errors }} + {{ template_form.non_field_errors }}
{% endif %} -
+ {% csrf_token %} - - - -
-
- {% bootstrap_field form.application layout="horizontal" %} - {% bootstrap_field form.master_file layout="horizontal" %} - {% 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.note layout="horizontal" %} - {% bootstrap_field form.grant layout="horizontal" form_group_class="form-group collapse" %} -
- -
- {% 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" %} - {% 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" %} -
- -
- {% bootstrap_field form.input layout="horizontal" %} - {% bootstrap_field form.stage_in layout="horizontal" %} -{# {% bootstrap_field form.stage_out layout="horizontal" form_group_class="form-group collapse" %}#} -
- -
- {{ env_formset.management_form }} - -
- -
-
- {% for env_form in env_formset %} -
{% bootstrap_form env_form layout='inline' %}
- {% endfor %} -
-
- -
-
-
- -
- {% bootstrap_checkbox form.monitoring %} - -
- -
-
- {% for option in form.notify_type %} - - {% endfor %} -
-
-
- -
-
- -
- {% bootstrap_field form.notify_address layout="horizontal" %} -
-
- -
-
- -
-
- {% for option in form.watch_output_type %} - - {% endfor %} -
-
-
- -
-
- -
- {% bootstrap_field form.watch_output_address layout="horizontal" %} - {% bootstrap_field form.watch_output_pattern layout="horizontal" %} -
-
-
-
- -
-
- -
-
- {% for option in form.preprocess_type %} - - {% endfor %} -
-
-
- -
-
- -
- {% bootstrap_field form.preprocess_cmd layout="horizontal" %} -
- -
- {% bootstrap_field form.preprocess_script layout="horizontal" %} -
-
- -
- -
-
- {% for option in form.postprocess_type %} - - {% endfor %} -
-
-
- -
-
- -
- {% bootstrap_field form.postprocess_cmd layout="horizontal" %} -
- -
- {% bootstrap_field form.postprocess_script layout="horizontal" %} -
-
- - {% bootstrap_field form.native layout="horizontal" %} - {% bootstrap_checkbox form.persistent %} -
-
+ {% include 'qcg/job_submit_form.html' %}
@@ -330,12 +182,12 @@
-