Merge branch 'master' of mmka.chem.univ.gda.pl:qcg-portal

diff --cc qcg/forms.py
Simple merge

diff --cc qcg/templates/qcg/job_submit.html
index a12bd95,eae0192..0afb982
--- 1/qcg/templates/qcg/job_submit.html
--- 2/qcg/templates/qcg/job_submit.html
+++ b/qcg/templates/qcg/job_submit.html
@@@ -95,7 -95,7 +95,9 @@@
                      }
                  }
              });
-             $('#id_modules,#id_hosts,#id_master_file,#id_pdb_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']
              });
  

diff --cc qcg/templates/qcg/job_submit_form.html
index c9d74fb,0267e03..ffbf92f
--- 1/qcg/templates/qcg/job_submit_form.html
--- 2/qcg/templates/qcg/job_submit_form.html
+++ b/qcg/templates/qcg/job_submit_form.html
@@@ -21,8 -21,12 +21,14 @@@
          {% bootstrap_field form.nrep layout="horizontal" %}
          {% bootstrap_field form.nstex layout="horizontal" form_group_class="form-group collapse" %}
          {% bootstrap_field form.pdb_file layout="horizontal" %}
++
+         {% bootstrap_field form.retmin layout="horizontal" form_group_class="form-group collapse" %}
+         {% bootstrap_field form.retmax layout="horizontal" form_group_class="form-group collapse" %}
+         
+         {% bootstrap_field form.application layout="horizontal" %}
++
          {% bootstrap_field form.master_file layout="horizontal" %}
 +        <!-- {% bootstrap_field form.application 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" %}