diff --git a/services/webapp/code/rosetta/core_app/templates/components/task.html b/services/webapp/code/rosetta/core_app/templates/components/task.html index fe72829e4927e1bcd4de043466bdde0ca722d481..624b72f7105cf9689267c347ac8110dee699518d 100644 --- a/services/webapp/code/rosetta/core_app/templates/components/task.html +++ b/services/webapp/code/rosetta/core_app/templates/components/task.html @@ -3,7 +3,7 @@ <center> <div style="width:350px; display:block; border: #e0e0e0 solid 1px; margin:10px; background:#f8f8f8; margin-bottom:20px"> <div style="margin-top:5px; padding:10px; text-align:center; border-bottom: #f8f8f8 solid 1px; "> - Task <b>{{data.task.name}}</b> summary + <b>{{data.task.name}}</b> </div> <hr style="margin:0"> @@ -33,14 +33,14 @@ <!-- <b>Container:</b> {{ task.container.name }} <span style="font-size:14px; background-color:{{task.container.color}}"> </span> <br/> <b>Computing:</b> {{ task.computing.name }} <span style="font-size:14px; background-color:{{task.computing.color}}"> </span><br/> --> - <b>Software container:</b> + <b>Software:</b> <a href="/software/?container_uuid={{ task.container.uuid }}" style="color:{{task.container.color}}">{{ task.container.name }}</a> {% if task.container.type == 'docker' %}<img src="/static/img/docker-logo.svg" style="height:18px; width:18px; margin-bottom:4px" />{% endif %} {% if task.container.type == 'singularity' %}<img src="/static/img/singularity-logo.svg" style="height:18px; width:18px; margin-bottom:4px" />{% endif %} <br/> - <b>Computing resource:</b> <a href="/computing/?uuid={{ task.computing.uuid }}">{{ task.computing.name }}</a> + <b>Computing:</b> <a href="/computing/?uuid={{ task.computing.uuid }}">{{ task.computing.name }}</a> <!-- <a href="/computing/?uuid={{ task.computing.uuid }}" no_style="color:{{task.computing.color}}"><i class="fa fa-external-link" ></i></a><br/> --> <div style="margin-top:2px"> @@ -85,6 +85,14 @@ {% if data.task %} <br/> + + <a href="javascript:void(0);" id="show_button" onclick="toggle_visibility('details_div')">Details..</a> + + + <div id="details_div" style="display:none; width:400px;"> + <b>Details <font size=-1>| <a href="javascript:void(0);" id="hide_button" onclick="toggle_visibility('details_div')" style="display:none">hide</a></font></b> + + <div style="display:block"; max-width:450px"> <table class="dashboard" style="margin:10px"> @@ -98,10 +106,6 @@ </tr> --> - <tr> - <td colspan="2" align="center" style="padding:15px"><b>Details</b></td> - </tr> - <!-- <tr> <td><b>Name</b></td> <td>{{ task.name }}</td> @@ -158,13 +162,15 @@ <!-- <tr><td style="padding-right:0"><b>Direct link</b> - <td>{% if task.status == "running" %}<a href="{{ task.sharable_link }}">{{ task.sharable_link }}</a>{% else %}N.A. (task not running) {% endif %}</td> --> - </tr> + <td>{% if task.status == "running" %}<a href="{{ task.sharable_link }}">{{ task.sharable_link }}</a>{% else %}N.A. (task not running) {% endif %}</td> + </tr>--> </table> + </div> + <!-- <p style="margin-left:10px; font-size:0.9em; color:#484848"> <i class="fa fa-info-circle" style="color:#337ab7"></i> You can share a direct link with other people, but remember that if you have no authentication in place anyone will be able to access. </p> --> diff --git a/services/webapp/code/rosetta/core_app/templates/new_task.html b/services/webapp/code/rosetta/core_app/templates/new_task.html index 78d8cffb5ffb500db7a06ab4b19b7aed9e9f3b87..9a84c2e8bb8f944667630f0464410d82f65ea9e7 100644 --- a/services/webapp/code/rosetta/core_app/templates/new_task.html +++ b/services/webapp/code/rosetta/core_app/templates/new_task.html @@ -200,7 +200,7 @@ {% else %} - Ok, task created. Go back to your <a href="/tasks">task list</a>. + Ok, task created. Go to your <a href="/tasks">task list</a>. {% endif %} diff --git a/services/webapp/code/rosetta/core_app/templates/tasks.html b/services/webapp/code/rosetta/core_app/templates/tasks.html index 67cec1136a78be71decc8d7628fadbca60d8b413..c1b580a0faf14c29c601bfe3b59275e7e0e222f6 100644 --- a/services/webapp/code/rosetta/core_app/templates/tasks.html +++ b/services/webapp/code/rosetta/core_app/templates/tasks.html @@ -46,6 +46,22 @@ {% include "footer.html" %} - +<script> +function toggle_visibility(id) { + var x = document.getElementById(id); + var y = document.getElementById('show_button'); + var z = document.getElementById('hide_button'); + if (x.style.display === "none") { + x.style.display = "block"; + y.style.display = "none" + z.style.display= "inline" + + } else { + x.style.display = "none"; + y.style.display= "inline" + z.style.display = "none" + } + } +</script>