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

diff --git a/qcg/templates/qcg/job.html b/qcg/templates/qcg/job.html
index 6a2a466..03a0b23 100644
--- a/qcg/templates/qcg/job.html
+++ b/qcg/templates/qcg/job.html
@@ -1,4 +1,4 @@
-{% extends 'qcg/base.html' %}
+{% extends 'qcg/details_base.html' %}
 {% load qcg_utils %}
 
 {% block container %}
@@ -7,6 +7,20 @@
         <li class="active">{{ job.job_id }}</li>
     </ol>
 
+    <div class="pull-right">
+        {% if not job.terminated %}
+            <form action="{% url 'job_cancel' job.job_id %}" method="post">
+                {% csrf_token %}
+                <button type="submit" class="btn btn-default">Anuluj zadanie</button>
+            </form>
+        {% elif not job.purged %}
+            <form action="{% url 'job_clean' job.job_id %}" method="post">
+                {% csrf_token %}
+                <button type="submit" class="btn btn-default">Usuń katalog roboczy</button>
+            </form>
+        {% endif %}
+    </div>
+
     <h1 class="page-header">{% block title %}Job {{ job.job_id }}{% endblock %}</h1>
 
     <div role="tabpanel">
@@ -21,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>
 
@@ -37,6 +49,7 @@
                     <ul class="list-group">
                         {% for task in job.tasks.all %}
                             <li class="list-group-item">
+                                {% display_attribute 'Identyfikator' task.task_id %}
                                 {% display_attribute 'Status' task.get_status_display %}
                                 {% display_attribute 'Opis statusu' task.status_description %}
                                 {% display_attribute 'Data rozpoczęcia' task.start_time %}
@@ -49,14 +62,12 @@
                         {% endfor %}
                     </ul>
                 {% else %}
-                    <div class="panel-body">
-                        <div class="alert alert-info">Brak elementów</div>
-                    </div>
+                    <div class="alert alert-info">Brak elementów</div>
                 {% endif %}
 
             </div>
             <div role="tabpanel" class="tab-pane" id="desc">
-                <pre>{{ job.description }}</pre>
+                {% include 'qcg/job_description.html' %}
             </div>
         </div>
     </div>