Commit 18f0e3c9 authored by Stefano Alberto Russo's avatar Stefano Alberto Russo
Browse files

Naming fixes, minor url refactoring, minor fixes.

parent a68315ae

services/webapp/code/rosetta/core_app/management/commands/core_app_populate.py

+2 −2
Original line number Diff line number Diff line
@@ -233,9 +233,9 @@ class Command(BaseCommand): 
        #===================== 

        storages = Storage.objects.all()

        if storages:

            print('Not creating demo storages as they already exist')

            print('Not creating demo storage resources as they already exist')

        else:

            print('Creating demo storages...')

            print('Creating demo storage resources...')

 

            # Get demo computing resources

            demo_computing_resources = []

services/webapp/code/rosetta/core_app/templates/components/computing.html

+2 −2
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ 
        <!-- <div style="background:{{computing.color}}; height:24px"></div> -->

        

        <div style="padding:10px; margin-top:5px; text-align:center; border-bottom: #e0e0e0 solid 1px; ">

        <a href="/computings/?uuid={{ computing.uuid }}&details=True">{{ computing.name }}</a>

        <a href="/computing/?uuid={{ computing.uuid }}&details=True">{{ computing.name }}</a>

        </div>

        

        <div style="padding:10px;">
@@ -111,7 +111,7 @@ 
        {% if 'singularity' in computing.container_runtimes %}<img src="/static/img/singularity-logo.svg" style="height:18px; width:18px; margin-bottom:2px" />{% endif %}-->

        {% if container %}

        <div style="margin:0px; margin-top:2px; text-align:center; padding:5px">

        <form action="/create_task/" method="POST">

        <form action="/new_task/" method="POST">

        {% csrf_token %}

        <input type="hidden" name="step" value="{{ data.next_step }}" />

        <input type="hidden" name="task_container_uuid" value="{{container.uuid}}">

services/webapp/code/rosetta/core_app/templates/components/container.html

+6 −7
Original line number Diff line number Diff line
@@ -46,17 +46,17 @@ 
       <tr><td colspan=2><hr style="margin:5px"></td></tr>



       <tr>

        <td><b>Protocol</b></td>

        <td><b>Interface protocol</b></td>

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

       </tr>



       <tr>

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

        <td><b>Interface port</b></td>

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

       </tr>



       <tr>

        <td><b>Transport</b></td>

        <td><b>Interface transport</b></td>

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

       </tr>
@@ -65,9 +65,8 @@ 
        <td>{{ container.arch }}</td>

       </tr>





       <tr>

        <td><b>OS</b></td>

        <td><b>Operating System</b></td>

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

       </tr>
@@ -110,7 +109,7 @@ 


        

        <div style="padding:10px; margin-top:5px; text-align:center; border-bottom: {{container.color}} solid 10px; ">

        <a href="/containers/?uuid={{ container.uuid }}">{{ container.name }}</a>&nbsp; 

        <a href="/software/?uuid={{ container.uuid }}">{{ container.name }}</a>&nbsp; 

        </div>

        

        <div style="padding:10px; height: 110px; vertical-align: middle; ">
@@ -133,7 +132,7 @@ 
        

        <div style="margin-bottom:13px; margin-top: 3px; text-align:center">

        {% if not disable_play_button %}

        <a href="/create_task?task_container_uuid={{ container.uuid }}&step=two" class="btn btn-light" style="border: #c0c0c0 1px solid">&nbsp;<i class="fa fa-play" style="color:green"></i></a>

        <a href="/new_task?task_container_uuid={{ container.uuid }}&step=two" class="btn btn-light" style="border: #c0c0c0 1px solid">&nbsp;<i class="fa fa-play" style="color:green"></i></a>

        {% endif %}

        </div>

services/webapp/code/rosetta/core_app/templates/components/task.html

+3 −3
Original line number Diff line number Diff line
@@ -32,14 +32,14 @@ 
            <b>Computing:</b> {{ task.computing.name }} <span style="font-size:14px; background-color:{{task.computing.color}}">&nbsp;&nbsp;&nbsp;&nbsp;</span><br/> -->



            <b>Software:</b>

            <a href="/containers/?uuid={{ task.container.uuid }}" style="color:{{task.container.color}}">{{ task.container.name }}</a>

            <a href="/software/?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:</b> <a href="/computings/?uuid={{ task.computing.uuid }}">{{ task.computing.name }}</a>

            <!-- <a href="/computings/?uuid={{ task.computing.uuid }}" no_style="color:{{task.computing.color}}"><i class="fa fa-external-link" ></i></a><br/> -->           

            <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">

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