Commit 2e22d3c3 authored by Stefano Alberto Russo's avatar Stefano Alberto Russo
Browse files

Shortened all section names to a single word. Minor changes and improvements.

parent 98097869

services/webapp/code/rosetta/core_app/computing_managers.py

+1 −1
Original line number Diff line number Diff line
@@ -603,7 +603,7 @@ class SlurmSSHClusterComputingManager(ClusterComputingManager, SSHComputingManag 


        # Set status (only fi we get here before the agent which sets the status as running via the API)

        if task.status != TaskStatuses.running:

            task.status = TaskStatuses.sumbitted

            task.status = TaskStatuses.submitted



        # Save

        task.save()

services/webapp/code/rosetta/core_app/models.py

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ logger = logging.getLogger(__name__) 
# Task statuses

class TaskStatuses(object):

    created = 'created'

    sumbitted = 'sumbitted' # TODO: fix me!

    submitted = 'submitted'

    running = 'running'

    stopped = 'stopped'

    exited = 'exited'

services/webapp/code/rosetta/core_app/templates/account.html

+8 −52
Original line number Diff line number Diff line
@@ -6,15 +6,11 @@ 
<div class="container">

  <div class="dashboard">

    <div class="span8 offset2">

      <h1>Account and profile</h1>

      <h1>Account</h1>

      <hr>



      <br />

      <h3>Account</h3>

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

      {% csrf_token %}

      <table class="dashboard">



       <tr>

        <td>

        <b>ID</b>
@@ -23,7 +19,6 @@ 
        {{data.user.username}}

        </td>

       </tr>



       <tr>

        <td>

        <b>Email</b>
@@ -41,7 +36,6 @@ 
        {% endif %}

        </td>

       </tr>



       {% if data.user.profile.auth == 'local' %}

       <tr>

        <td>
@@ -61,8 +55,6 @@ 
        </td>

       </tr>

       {% endif %}





       <tr>

        <td>

        <b>Auth</b>
@@ -77,8 +69,6 @@ 
        {% endif %}

        </td>

       </tr>





       <tr>

        <td>

        <b>Groups</b>
@@ -89,37 +79,29 @@ 
        {% endfor %}

        </td>

       </tr>





      </table>

      <br />



      <h3>Profile</h3>

      <table class="dashboard">



       <tr>

        <td>

        <b>Time Zone</b>

        </td>

        <td>



        {% if data.edit == 'timezone' %}

          {% include "components/tzselect.html" %}

          <input type='hidden' name='edit' value='timezone' />

          <input type="submit" value="Go">

        {% else %}

         {{data.profile.timezone}} | <a href="/account/?edit=timezone">Change</a>

         {{data.user.profile.timezone}} | <a href="/account/?edit=timezone">Change</a>

        {% endif %}

        </td>

       </tr>





      </table>

      <br />

      <table class="dashboard">

       <tr>

        <td valign=top>

        <b>Extra configurations</b>

        </td>

        <td>

        {% for conf_uuid, conf_data in data.profile.extra_confs.items %}

        {% for conf_uuid, conf_data in data.user.profile.extra_confs.items %}

        <code>{{ conf_data.type }}</code>

        {% if conf_data.object_uuid %}

        {% for computing in data.computings %}
@@ -128,23 +110,15 @@ 
        {% endif %}

        {% endfor %}

        {% endif %}



        : <code>{{conf_data.value}}</code> |  <a href='?delete_extra_conf_uuid={{conf_uuid}}'>delete</a>

        <br/>

        {% endfor %}







        <span style="margin:3px"><a href="/add_profile_conf" style="line-height:2em">Add new...</a></span>

        </td>

       </tr>



      </table>



      <br />

      <h3>KeyPair</h3>

      <table class="dashboard">



       <tr>

        <td valign="top">

        <b>Default public key</b>
@@ -153,11 +127,9 @@ 
          <textarea style="width:100%; max-width:500px; word-wrap:break-word; display:inline-block; font-family:monospace" rows=3 cols=41>{{ data.default_public_key}}</textarea>

        </td>

       </tr>



      </table>

      </form>



      <div style="margin-left:10px; margin-top:40px">

      <div style="margin-left:10px; margin-top:30px">

        {% if data.user.profile.auth == 'oidc' %}

        <form action="{% url 'oidc_logout' %}" method="post">

        {% csrf_token %}
@@ -169,24 +141,8 @@ 
        </form>

        {% endif %}

      </div>





      <br/>

      <br/>

      <br/>

      <br/>

      <br/>

      <br/>



    </div>

  </div>

</div>





{% include "footer.html" %}

services/webapp/code/rosetta/core_app/templates/add_computing.html

+1 −1
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ 
          <td><textarea name="supported_archs" rows="2" cols="30"></textarea></td>

        </tr>

        <tr>

          <td><b>Emulated archs</b><br/><span style="font-size:0.8em">(JSON dict)</span></td>

          <td><b>Emulated archs</b><br/><span style="font-size:0.8em">(JSON list)</span></td>

          <td><textarea name="emulated_archs" rows="2" cols="30"></textarea></td>

        </tr>

        <tr>

services/webapp/code/rosetta/core_app/templates/add_software.html

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
<div class="container">

  <div class="dashboard">

    <div class="span8 offset2">

      <h1><a href="/software">Software containers</a> <span style="font-size:18px"> / add</span></h1>

      <h1><a href="/software">Software</a> <span style="font-size:18px"> / add</span></h1>

      <br/>



      {% if not data.added %}