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 3a0f787..03a0b23 100644 (file)
--- a/qcg/templates/qcg/job.html
+++ b/qcg/templates/qcg/job.html
@@ -1,53 +1,75 @@
-{% extends 'qcg/base.html' %}
+{% extends 'qcg/details_base.html' %}
+{% load qcg_utils %}
 
 {% block container %}
-    <h1 class="page-header">{% block title %}Zadanie J1372950219798__8575{% endblock %}</h1>
+    <ol class="breadcrumb">
+        <li><a href="{% url 'jobs' %}">Zadania</a></li>
+        <li class="active">{{ job.job_id }}</li>
+    </ol>
 
-    <h2>Szczegóły</h2>
-
-    <div class="row">
-        <div class="col-sm-2 text-right text-muted">Note</div>
-        <div class="col-sm-10">urban</div>
-    </div>
-    <div class="row">
-        <div class="col-sm-2 text-right text-muted">TaskType</div>
-        <div class="col-sm-10">SINGLE</div>
-    </div>
-    <div class="row">
-        <div class="col-sm-2 text-right text-muted">SubmissionTime</div>
-        <div class="col-sm-10">Fri Jul 19 11:54:20 CEST 2013</div>
-    </div>
-    <div class="row">
-        <div class="col-sm-2 text-right text-muted">FinishTime</div>
-        <div class="col-sm-10">Fri Jul 19 12:02:33 CEST 2013</div>
-    </div>
-    <div class="row">
-        <div class="col-sm-2 text-right text-muted">Status</div>
-        <div class="col-sm-10">FINISHED</div>
-    </div>
-    <div class="row">
-        <div class="col-sm-2 text-right text-muted">Purged</div>
-        <div class="col-sm-10">false</div>
+    <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>
 
-    <h2>Alokacja</h2>
+    <div role="tabpanel">
+        <!-- Nav tabs -->
+        <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>
+        </ul>
 
-    <div class="row">
-        <div class="col-sm-2 text-right text-muted">HostName</div>
-        <div class="col-sm-10">hydra.icm.edu.pl</div>
-    </div>
-    <div class="row">
-        <div class="col-sm-2 text-right text-muted">ProcessesCount</div>
-        <div class="col-sm-10">16</div>
-    </div>
-    <div class="row">
-        <div class="col-sm-2 text-right text-muted">SubmissionTime</div>
-        <div class="col-sm-10">Fri Jul 19 11:54:20 CEST 2013</div>
-    </div>
-    <div class="row">
-        <div class="col-sm-2 text-right text-muted">FinishTime</div>
-        <div class="col-sm-10">Fri Jul 19 12:02:33 CEST 2013</div>
+        <!-- Tab panes -->
+        <div class="tab-content">
+            <div role="tabpanel" class="tab-pane active" id="details">
+                <h3>Atrybuty</h3>
+
+                {% 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>
+
+                {% if job.tasks.exists %}
+                    <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 %}
+                                {% display_attribute 'Data zakończenia' task.finish_time %}
+
+                                <div style="padding: 10px 0 0 50px">
+                                    <a href="{{ task.get_absolute_url }}">więcej&nbsp;&raquo;</a>
+                                </div>
+                            </li>
+                        {% endfor %}
+                    </ul>
+                {% else %}
+                    <div class="alert alert-info">Brak elementów</div>
+                {% endif %}
+
+            </div>
+            <div role="tabpanel" class="tab-pane" id="desc">
+                {% include 'qcg/job_description.html' %}
+            </div>
+        </div>
     </div>
 
 {% endblock container %}