[GITLAB] - A technical upgrade is planned on Thursday the 1st of July at noon on our GITLAB server.

Commit ad2e30df authored by Daniele Venzano's avatar Daniele Venzano

Update the look of the execution inspect page

parent e9b14a2a
...@@ -54,17 +54,20 @@ div.header { ...@@ -54,17 +54,20 @@ div.header {
clear: both; clear: both;
} }
table.app_list { table.app_list,
table.service-list{
border-collapse: collapse; border-collapse: collapse;
width: 95%; width: 95%;
} }
table.app_list tr { table.app_list tr,
table.service-list tr {
border-top: 1px #bad5e1 solid; border-top: 1px #bad5e1 solid;
text-align: left; text-align: left;
} }
table.app_list td, table.app_list th { table.app_list td, table.app_list th,
table.service-list td, table.service-list th {
padding-right: 1em; padding-right: 1em;
padding-bottom: 0.5em; padding-bottom: 0.5em;
padding-top: 0.5em; padding-top: 0.5em;
...@@ -186,6 +189,7 @@ div.status_line { ...@@ -186,6 +189,7 @@ div.status_line {
#footer { #footer {
font-size: smaller; font-size: smaller;
clear: both; clear: both;
margin-top: 2em;
} }
/* stats page */ /* stats page */
......
...@@ -14,14 +14,13 @@ ...@@ -14,14 +14,13 @@
{% endblock %} {% endblock %}
{% block content %} {% block content %}
<h1>Zoe - Analytics on demand</h1> <h2>Detailed information for execution {{ e.name }} ({{ e.id }})</h2>
<h2>Detailed information for execution {{ e.name }}</h2>
<div id="contents"> <div id="contents">
<ul> <ul>
<li>ID: {{ e.id }}</li>
<li>Application name: {{ e.description['name'] }}</li> <li>Application name: {{ e.description['name'] }}</li>
{% if role == "admin" %}
<li>Owner: {{ e.user_id }}</li> <li>Owner: {{ e.user_id }}</li>
<li>Status: {{ e.status }}</li> {% endif %}
<li>Time submitted: <script>format_timestamp("{{ e.time_submit }}")</script></li> <li>Time submitted: <script>format_timestamp("{{ e.time_submit }}")</script></li>
{% if e.time_start == None %} {% if e.time_start == None %}
<li>Time started: not yet</li> <li>Time started: not yet</li>
...@@ -33,6 +32,14 @@ ...@@ -33,6 +32,14 @@
{% else %} {% else %}
<li>Time finished: <script>format_timestamp("{{ e.time_end }}")</script></li> <li>Time finished: <script>format_timestamp("{{ e.time_end }}")</script></li>
{% endif %} {% endif %}
<li>Status: <span style="font-weight: bold;">{{ e.status }}</span></li>
<li>Actions:
{% if e.is_active %}
<a href="/executions/terminate/{{ e.id }}">Terminate</a>
{% else %}
<a href="/executions/restart/{{ e.id }}">Restart</a>
{% endif %}
</li>
</ul> </ul>
{% if e.status == 'error' %} {% if e.status == 'error' %}
<p>Error message: <code>{{ e.error_message }}</code></p> <p>Error message: <code>{{ e.error_message }}</code></p>
...@@ -55,20 +62,40 @@ ...@@ -55,20 +62,40 @@
{% if services_info|length > 0 %} {% if services_info|length > 0 %}
<h3>Services:</h3> <h3>Services:</h3>
{% endif %} {% endif %}
<ul> <table class="service-list">
{% for s in services_info %} <thead>
<li class="container_name">{{ s['name'] }} ({{ s['id'] }})</li> <tr>
<ul> <th>ID</th>
<li>Zoe status: {{ s['status'] }}</li> <th>Name</th>
<li>Backend status: {{ s['backend_status'] }}</li> <th>Zoe status</th>
{% if s['error_message'] is not none %} <th>Backend status</th>
<li>Error: {{ s['error_message'] }}</li> <th>Host</th>
{% endif %} <th>Output logs</th>
<li><a href="{{ reverse_url("service_logs", s['id']) }}">Log output</a></li> <th>Errors</th>
</ul> </tr>
{% endfor %} </thead>
</ul> <tbody>
{% for s in services_info %}
<tr>
<td>{{ s['id'] }}</td>
<td>{{ s['name'] }}</td>
<td>{{ s['status'] }}</td>
<td>{{ s['backend_status'] }}</td>
<td>{{ s['backend_host'] }}</td>
<td><a href="{{ reverse_url("service_logs", s['id']) }}">available</a></td>
<td>{{ s['error_message'] }}</td>
</tr>
{% endfor %}
</tbody>
</table>
</div> </div>
</div> </div>
<script>
function refresh_page() {
document.location.reload();
}
setInterval(refresh_page, 15000);
</script>
{% endblock %} {% endblock %}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment