fixes to conform html spec

[qcg-portal.git] / qcg / templates / qcg / job.html

diff --git a/qcg/templates/qcg/job.html b/qcg/templates/qcg/job.html
index 114a329..03a0b23 100644 (file)
--- 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>
 
@@ -55,7 +67,7 @@
 
             </div>
             <div role="tabpanel" class="tab-pane" id="desc">
-                <pre>{{ job.description }}</pre>
+                {% include 'qcg/job_description.html' %}
             </div>
         </div>
     </div>