Commit 5c91a77a authored by Stefano Alberto Russo's avatar Stefano Alberto Russo
Browse files

Decoupled task and container html templates. Added support for Docker logs. Minor fixes.

parent 3ef27a50

images/webapp/code/rosetta/base_app/templates/add_container.html

+2 −2
Original line number Diff line number Diff line
@@ -34,9 +34,9 @@ 
           <tr>

            <td><b>Registry</b></td><td>

              <select name="container_registry" >

              <option value="docker_local" selected>Local</option>

              <option value="docker_local" selected>Docker Local</option>

              <option value="docker_hub">Docker Hub</option>

              <option value="singularityhub">Singularity Hub</option>

              <option value="singularity_hub">Singularity Hub</option>

              </select>

            </td>

           </tr>

images/webapp/code/rosetta/base_app/templates/components/container.html

0 → 100644
+40 −0
Original line number Diff line number Diff line 
      <table class="dashboard">



       <tr>

        <td><b>ID</b></td>

        <td><a href="?uuid={{ container.uuid }}">{{ container.id }}</a></td>

       </tr>



       <tr>

        <td><b>Image</b></td>

        <td>{{ container.image }}</td>

       </tr>



       <tr>

        <td><b>Type</b></td>

        <td>{{ container.type }}</td>

       </tr>



       <tr>

        <td><b>Owner</b></td>

        <td>{% if container.user %}{{ container.user }}{% else %}Platform{% endif %}</td>

       </tr>



       <tr>

        <td><b>Registry</b></td>

        <td>{{ container.registry }}</td>

       </tr>



       <tr>

        <td><b>Service port(s)</b></td>

        <td>{{ container.service_ports}}</td>

       </tr>

       

       {% if container.user %}

       <tr>

        <td><b>Operations</b></td>

        <td><a href="?action=delete&uuid={{ container.uuid }}">Delete</a></td>

       </tr>

       {% endif %}

      </table>

      <br/>
 
 No newline at end of file

images/webapp/code/rosetta/base_app/templates/components/task.html

0 → 100644
+77 −0
Original line number Diff line number Diff line 
          

          <table class="dashboard">



           <tr>

            <td><b>ID</b></td>

            <td><a href="?uuid={{ task.uuid }}">{{ task.id }}</a></td>

           </tr>



           <tr>

            <td><b>Name</b></td>

            <td>{{ task.name }}</td>

           </tr>



           <tr>

            <td><b>Container</b></td>

            <td><a href="/containers/?uuid={{ task.container.uuid }}">{{ task.container.image }}</a></td>

           </tr>



           <tr>

            <td><b>Status</b></td>

            <td>{{ task.status }}</td>

           </tr>



           <tr>

            <td><b>Created at</b></td>

            <td>{{ task.created }}</td>

           </tr>



           <!-- <tr>

            <td><b>Task pid</b></td>

            <td>{{ task.pid}}</td>

           </tr> -->



           <tr>

            <td><b>IP</b></td>

            <td>{{ task.ip}}</td>

           </tr>



           <tr>

            <td><b>Port</b></td>

            <td>{{ task.port }}</td>

           </tr>

           

           <tr>

            <td><b>Task tunnel port</b></td>

            <td>{{ task.tunnel_port }}</td>

           </tr>

           

           <tr>

            <td><b>Operations</b></td>

            

            <td>

            {% if task.status == "running" %}

            <a href="?uuid={{task.uuid}}&action=stop&details={{details}}">Stop</a> | 

            {% else %}

            <!-- <a href=?uuid={{task.uuid}}&action=start>Start</a> |  -->

            <font color="#c0c0c0">Stop</font> | 

            

            {% endif %}

            {% if task.status == "exited" or task.status == "stopped" %}

            <a href="?uuid={{task.uuid}}&action=delete&details=False">Delete</a>

            {% else %}

            <font color="#c0c0c0">Delete</font>

            {% endif %}

            {% if task.status == "running" %}

             | <a href="?uuid={{task.uuid}}&action=connect">Connect</a>

             | <a href="/task_log/?uuid={{task.uuid}}&action=viewlog">View Log</a>

            {% else %}

             | <font color="#c0c0c0">Connect</font>

             | <font color="#c0c0c0">View Log</font>

            {% endif%}

            </td>

  

           </tr>



          </table>

          <br/>
 
 No newline at end of file

images/webapp/code/rosetta/base_app/templates/containers.html

+10 −108
Original line number Diff line number Diff line
@@ -8,125 +8,27 @@ 
<div class="container">

  <div class="dashboard">

    <div class="span8 offset2">

      <h1><a href="/containers">Container List</a> {% if data.container %}&gt; {{ data.container.id }} {% endif %} </h1>

      <hr/>

      

      {% if data.container %}

      <table class="dashboard">



       <tr>

        <td><b>ID</b></td>

        <td>{{ data.container.id }}</td>

       </tr>



       <tr>

        <td><b>Image</b></td>

        <td>{{ data.container.image }}</td>

       </tr>



       <tr>

        <td><b>Type</b></td>

        <td>{{ data.container.type }}</td>

       </tr>



       <tr>

        <td><b>Owner</b></td>

        <td>{% if data.container.user %}{{data.container.user}}{% else %}Platform{% endif %}</td>

       </tr>



       <tr>

        <td><b>Registry</b></td>

        <td>{{ data.container.registry }}</td>

       </tr>



       <tr>

        <td><b>Service port(s)</b></td>

        <td>{{ data.container.service_ports}}</td>

       </tr>



      </table>

      <br />

      

      <h1><a href="/containers">Container List</a> &gt; {{ data.container.id }}  </h1>      

      {% else %}

      <h1>Container List</h1>

      {% endif %}

      

      {% for container in data.platform_containers %}

      

      <table class="dashboard">



       <tr>

        <td><b>ID</b></td>

        <td><a href="?uuid={{ container.uuid }}">{{ container.id }}</a></td>

       </tr>



       <tr>

        <td><b>Image</b></td>

        <td>{{ container.image }}</td>

       </tr>



       <tr>

        <td><b>Type</b></td>

        <td>{{ container.type }}</td>

       </tr>



       <tr>

        <td><b>Owner</b></td>

        <td>Platform</td>

       </tr>



       <tr>

        <td><b>Registry</b></td>

        <td>{{ container.registry }}</td>

       </tr>

      <hr/>



       <tr>

        <td><b>Service port(s)</b></td>

        <td>{{ container.service_ports}}</td>

       </tr>

      {% if data.container %}

      {% include "components/container.html" with container=data.container %}

      {% else %}

      

      </table>

      {% for container in data.platform_containers %}

      {% include "components/container.html" with container=container %}

      <br />

      {% endfor %}





      {% for container in data.user_containers %}

      <table class="dashboard">



       <tr>

        <td><b>ID</b></td>

        <td><a href="?uuid={{ container.uuid }}">{{ container.id }}</a></td>

       </tr>



       <tr>

        <td><b>Image</b></td>

        <td>{{ container.image }}</td>

       </tr>



       <tr>

        <td><b>Type</b></td>

        <td>{{ container.type }}</td>

       </tr>



       <tr>

        <td><b>Owner</b></td>

        <td>{{container.user}}</td>

       </tr>



       <tr>

        <td><b>Registry</b></td>

        <td>{{ container.registry }}</td>

       </tr>



       <tr>

        <td><b>Service port(s)</b></td>

        <td>{{ container.service_ports}}</td>

       </tr>



       <tr>

        <td><b>Operations</b></td>

        <td><a href="?action=delete&uuid={{ container.uuid }}">Delete</a></td>

       </tr>



      </table>

      {% include "components/container.html" with container=container %}

      <br />

      {% endfor %}

images/webapp/code/rosetta/base_app/templates/tasks.html

+15 −85
Original line number Diff line number Diff line
@@ -8,95 +8,25 @@ 
<div class="container">

  <div class="dashboard">

    <div class="span8 offset2">

      <h1>Task List</h1>



      <hr>



          

          {% for task in data.tasks %}

          <table class="dashboard">



           <tr>

            <td><b>ID</b></td>

            <td>{{ task.id }}</td>

           </tr>



           <tr>

            <td><b>Name</b></td>

            <td>{{ task.name }}</td>

           </tr>



           <tr>

            <td><b>Container</b></td>

            <td><a href="">{{ task.container.image }}</a></td>

           </tr>



           <tr>

            <td><b>Status</b></td>

            <td>{{ task.status }}</td>

           </tr>



           <tr>

            <td><b>Created at</b></td>

            <td>{{ task.created }}</td>

           </tr>



           <!-- <tr>

            <td><b>Task pid</b></td>

            <td>{{ task.pid}}</td>

           </tr> -->



           <tr>

            <td><b>IP</b></td>

            <td>{{ task.ip}}</td>

           </tr>



           <tr>

            <td><b>Port</b></td>

            <td>{{ task.port }}</td>

           </tr>

           

           <tr>

            <td><b>Task tunnel port</b></td>

            <td>{{ task.tunnel_port }}</td>

           </tr>

      

           <tr>

            <td><b>Operations</b></td>



            <td>

            {% if task.status == "running" %}

            <a href=?uuid={{task.uuid}}&action=stop>Stop</a> | 

      {% if data.task %}

      <h1><a href="/tasks">Task List</a> &gt; {{ data.task.id }}  </h1>      

      {% else %}

            <!-- <a href=?uuid={{task.uuid}}&action=start>Start</a> |  -->

            <font color="#c0c0c0">Stop</font> | 

            

            {% endif %}

            {% if task.status == "exited" or task.status == "stopped" %}

            <a href=?uuid={{task.uuid}}&action=delete>Delete</a>

            {% else %}

            <font color="#c0c0c0">Delete</font>

            {% endif %}

            {% if task.status == "running" %}

             | <a href=?uuid={{task.uuid}}&action=connect>Connect</a>

             | <a href=/task_log/?uuid={{task.uuid}}&action=viewlog>View Log</a>

            {% else %}

             | <font color="#c0c0c0">Connect</font>

             | <font color="#c0c0c0">View Log</font>

      <h1>Task List</h1>

      {% endif %}

            </td>

  

           </tr>



          </table>

          <br />

      <hr>

      {% if data.task %}

      {% include "components/task.html" with task=data.task details=True %}

      {% else %}

      {% for task in data.tasks %}

      {% include "components/task.html" with task=task %}

      {% endfor %}

          

          

      <br />

          {% if not data.sid %}

      <a href="/create_task">Add new...</a>

      {% endif %}

           

      <br/>

      <br/>

      <br/>