X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?a=blobdiff_plain;f=qcg%2Ftemplates%2Fqcg%2Fjobs.html;h=52698aaa258cbfcbe0f4b875202a478a459ad4f1;hb=7bda7a06e0ff0c0159e355b3777e9f7b3f719f1b;hp=bc2138e5d9c854f06bf8b01a649dc44bd7928abf;hpb=e9fc0805462fd07aeb8897d0be4e972944ae46a0;p=qcg-portal.git

diff --git a/qcg/templates/qcg/jobs.html b/qcg/templates/qcg/jobs.html
index bc2138e..52698aa 100644
--- a/qcg/templates/qcg/jobs.html
+++ b/qcg/templates/qcg/jobs.html
@@ -4,16 +4,6 @@
 {% block extra_css %}
     <link href="{% static 'qcg/treegrid/css/jquery.treegrid.css' %}" rel="stylesheet">
     <link href="{% static 'qcg/daterangepicker/daterangepicker-bs3.css' %}" rel="stylesheet" />
-
-    <style>
-        .treegrid-expander {
-            opacity: 0.5;
-        }
-
-        .treegrid-expander:hover {
-            opacity: 1;
-        }
-    </style>
 {% endblock %}
 
 {% block extra_js %}
@@ -76,6 +66,10 @@
 {% endblock %}
 
 {% block container %}
+    {% for message in messages %}
+        <div class="{{ message.tags }}">{{ message }}</div>
+    {% endfor %}
+
     <form id="simple-form" action="." role="search" class="pull-right">
         {% get_params_as_hidden 'host' 'submission' 'finish' %}
         <div style="display: inline-block; vertical-align: middle;">
@@ -186,7 +180,7 @@
                                 </a>
                             </td>
                             {% if columns.DESCRIPTION in displayed %}<td>{{ task.note }}</td>{% endif %}
-                            {% if columns.SUBMISSION in displayed %}<td>{{ task.submission_time|timesince }} temu</td>{% endif %}
+                            {% if columns.SUBMISSION in displayed %}<td>{{ task.submission_time|date:"CUSTOM_DATETIME_FORMAT" }}</td>{% endif %}
                             {% if columns.START in displayed %}<td>{{ task.start_time|date:"CUSTOM_DATETIME_FORMAT" }}</td>{% endif %}
                             {% if columns.END in displayed %}<td>{{ task.finish_time|date:"CUSTOM_DATETIME_FORMAT" }}</td>{% endif %}
                             {% if columns.STATUS in displayed %}<td>{{ task.get_status_display }}</td>{% endif %}
@@ -203,7 +197,7 @@
                             </a>
                         </td>
                         {% if columns.DESCRIPTION in displayed %}<td>{{ job.grouper.note }}</td>{% endif %}
-                        {% if columns.SUBMISSION in displayed %}<td>{{ job.grouper.submission_time|timesince  }} temu</td>{% endif %}
+                        {% if columns.SUBMISSION in displayed %}<td>{{ job.grouper.submission_time|date:"CUSTOM_DATETIME_FORMAT" }}</td>{% endif %}
                         {% if columns.START in displayed %}<td>-</td>{% endif %}
                         {% if columns.END in displayed %}<td>{{ job.grouper.finish_time|date:"CUSTOM_DATETIME_FORMAT" }}</td>{% endif %}
                         {% if columns.STATUS in displayed %}<td>{{ job.grouper.get_status_display }}</td>{% endif %}
@@ -220,7 +214,7 @@
                                 </a>
                             </td>
                             {% if columns.DESCRIPTION in displayed %}<td>{{ task.note }}</td>{% endif %}
-                            {% if columns.SUBMISSION in displayed %}<td>{{ task.submission_time|timesince  }} temu</td>{% endif %}
+                            {% if columns.SUBMISSION in displayed %}<td>{{ task.submission_time|date:"CUSTOM_DATETIME_FORMAT" }}</td>{% endif %}
                             {% if columns.START in displayed %}<td>{{ task.start_time|date:"CUSTOM_DATETIME_FORMAT" }}</td>{% endif %}
                             {% if columns.END in displayed %}<td>{{ task.finish_time|date:"CUSTOM_DATETIME_FORMAT" }}</td>{% endif %}
                             {% if columns.STATUS in displayed %}<td>{{ task.get_status_display }}</td>{% endif %}