X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?a=blobdiff_plain;ds=sidebyside;f=qcg%2Ftemplates%2Fqcg%2Fjob.html;h=03a0b23f782bb56a1001b0e53bfbacc52205aa27;hb=c7166c1bd70f9a2b355a66bbcfc7046f446c061f;hp=d3c3922cc2cbaf25c100f3ba5c6fa71602b32023;hpb=f7057f1d6b31506eba169cd9db44f74a34a91f69;p=qcg-portal.git

diff --git a/qcg/templates/qcg/job.html b/qcg/templates/qcg/job.html
index d3c3922..03a0b23 100644
--- a/qcg/templates/qcg/job.html
+++ b/qcg/templates/qcg/job.html
@@ -1,5 +1,5 @@
-{% extends 'qcg/base.html' %}
-{% load qcg_utils bootstrap3 %}
+{% extends 'qcg/details_base.html' %}
+{% load qcg_utils %}
 
 {% block container %}
     <ol class="breadcrumb">
@@ -35,15 +35,13 @@
             <div role="tabpanel" class="tab-pane active" id="details">
                 <h3>Atrybuty</h3>
 
-                <p>
-                    {% display_attribute 'Status' job.get_status_display %}
-                    {% display_attribute 'Notatka' job.note %}
-                    {% display_attribute 'Projekt' job.project %}
-                    {% display_attribute 'Czas życia proxy' job.proxy_lifetime|timeuntil %}
-                    {% display_attribute 'Data zlecenia' job.submission_time %}
-                    {% display_attribute 'Data zakończenia' job.finish_time %}
-                    {% display_attribute 'Usunięty katalog roboczy?' job.purged %}
-                </p>
+                {% display_attribute 'Status' job.get_status_display %}
+                {% display_attribute 'Notatka' job.note %}
+                {% display_attribute 'Projekt' job.project %}
+                {% display_attribute 'Czas życia proxy' job.proxy_lifetime|timeuntil %}
+                {% display_attribute 'Data zlecenia' job.submission_time %}
+                {% display_attribute 'Data zakończenia' job.finish_time %}
+                {% display_attribute 'Usunięty katalog roboczy?' job.purged %}
 
                 <h3>Taski</h3>
 
@@ -69,37 +67,9 @@
 
             </div>
             <div role="tabpanel" class="tab-pane" id="desc">
-                <button class="btn btn-default btn-sm pull-right" data-toggle="modal" data-target="#template">Zapisz jako szablon</button>
-
-                {% if job.get_description_type_display != 'QCG' %}
-                    <h3>Opis użytkownika</h3>
-                    <pre>{{ job.description }}</pre>
-                {% endif %}
-
-                <h3>Opis QCG</h3>
-                <pre>{{ job.qcg_description|format_xml }}</pre>
+                {% include 'qcg/job_description.html' %}
             </div>
         </div>
     </div>
 
-    <form id="template" action="{% url 'job_save_template' job.job_id %}" method="post" class="modal fade form-horizontal" tabindex="-1"
-          role="dialog" aria-labelledby="template-modal-label" aria-hidden="true">
-        <div class="modal-dialog">
-            <div class="modal-content">
-                <div class="modal-header">
-                    <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-                    <h4 class="modal-title" id="template-modal-label">Podaj nazwę szablonu</h4>
-                </div>
-                <div class="modal-body">
-                    {% csrf_token %}
-                    {% bootstrap_field template_form.name layout="horizontal" %}
-                </div>
-                <div class="modal-footer">
-                    <button type="button" class="btn btn-default" data-dismiss="modal">Anuluj</button>
-                    <button type="submit" class="btn btn-primary" data-loading-text="Zapisywanie...">Zapisz</button>
-                </div>
-            </div>
-        </div>
-    </form>
-
 {% endblock container %}