X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?a=blobdiff_plain;f=qcg%2Ftemplates%2Fqcg%2Ftask.html;h=a610ea62f215800d0273ddaf03b808fa1b118826;hb=9e5d054782024094df0e880f5d52e8106b1fd8cb;hp=396b29e429025dc4f626a52dd800144a786be28f;hpb=f39849b03fbe8d6b5db0894dafc5010f5eab4f3f;p=qcg-portal.git

diff --git a/qcg/templates/qcg/task.html b/qcg/templates/qcg/task.html
index 396b29e..a610ea6 100644
--- a/qcg/templates/qcg/task.html
+++ b/qcg/templates/qcg/task.html
@@ -1,8 +1,9 @@
-{% extends 'qcg/base.html' %}
+{% extends 'qcg/details_base.html' %}
 {% load qcg_utils staticfiles %}
 
 {% block extra_js %}
     {% include 'filex/source.js.html' %}
+    {{ block.super }}
 
     <script>
         var filex = filex || {};
@@ -13,6 +14,10 @@
             $('.working-dir').on('click', function() {
                 filex.load($(this).data('url'));
             });
+
+            $('#gridftp').one('show.bs.modal', function() {
+                $(this).find('.modal-body').css('height', window.innerHeight - 120 + 'px');
+            });
         });
     </script>
 {% endblock extra_js %}
@@ -20,10 +25,24 @@
 {% block container %}
     <ol class="breadcrumb">
         <li><a href="{% url 'jobs' %}">Zadania</a></li>
-        <li><a href="{{ task.job.get_absolute_url }}">{{ task.job.job_id }}</a></li>
+        <li><a href="{{ job.get_absolute_url }}">{{ job.job_id }}</a></li>
         <li class="active">{{ task.task_id }}</li>
     </ol>
 
+    <div class="pull-right">
+        {% if not task.terminated %}
+            <form action="{% url 'task_cancel' job.job_id task.task_id %}" method="post">
+                {% csrf_token %}
+                <button type="submit" class="btn btn-default">Anuluj zadanie</button>
+            </form>
+        {% elif not task.purged %}
+            <form action="{% url 'task_clean' job.job_id task.task_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 %}Task {{ task.task_id }}{% endblock %}</h1>
 
     <div role="tabpanel">
@@ -31,7 +50,6 @@
         <ul class="nav nav-tabs" style="margin-bottom: 20px">
             <li role="presentation" class="active"><a href="#details" data-toggle="tab">Właściwości</a></li>
             <li role="presentation"><a href="#desc" data-toggle="tab">Opis</a></li>
-            <li role="presentation"><a href="#results" data-toggle="tab">Wyniki</a></li>
         </ul>
 
         <!-- Tab panes -->
@@ -76,7 +94,7 @@
                                 {% display_attribute 'Katalog roboczy' alloc.working_directory %}
                                 {% display_attribute 'Usunięty katalog roboczy?' task.purged %}
 
-                                {% if alloc.working_directory %}
+                                {% if alloc.working_directory and not task.purged %}
                                     <button class="btn btn-default working-dir"
                                             data-toggle="modal" data-target="#gridftp" data-url="{{ alloc.working_directory|cut:'gsiftp://'  }}">
                                         Przeglądaj katalog roboczy
@@ -92,14 +110,7 @@
             </div>
 
             <div role="tabpanel" class="tab-pane" id="desc">
-                <pre>{{ task.description|format_xml }}</pre>
-            </div>
-
-            <div role="tabpanel" class="tab-pane text-center" id="results">
-                <h3>Wizualizacja wyników</h3>
-                <img src="{% static 'qcg/results-mock-1.png' %}" alt="..." class="img-thumbnail" style="margin: 10px">
-                <img src="{% static 'qcg/results-mock-2.png' %}" alt="..." class="img-thumbnail" style="margin: 10px">
-                <img src="{% static 'qcg/results-mock-3.png' %}" alt="..." class="img-thumbnail" style="margin: 10px">
+                {% include 'qcg/job_description.html' %}
             </div>
         </div>
     </div>