Commit cbc91515 authored by Stefano Alberto Russo's avatar Stefano Alberto Russo
Browse files

Fixed some inconsistencies in the UI, mainly for storages.

parent 252f2d68

services/webapp/code/rosetta/core_app/templates/add_computing.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="/computing">Computing resources</a> <span style="font-size:18px"> / add</span></h1>

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

      <hr>



      {% if data.error %}

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

+9 −9
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="/storage/?manage=True">Storage resources</a> <span style="font-size:18px">/ add</span></h1>

      <h1><a href="/storage/?manage=True">Storage</a> <span style="font-size:18px">/ add</span></h1>

      <hr>



      {% if data.error %}
@@ -19,10 +19,6 @@ 
      <form action="#" method="POST">

      {% csrf_token %}

      <table class="dashboard" style="width:500px; margin-bottom:25px">

        <tr>

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

          <td><input type="text" name="name" value="" size="30" required /></td>

        </tr>

        <tr>

          <td><b>Computing</b></td>

          <td>
@@ -34,6 +30,10 @@ 
            </select>

          </td>

        </tr>

        <tr>

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

          <td><input type="text" name="name" value="" size="30" required /></td>

        </tr>

        <tr>

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

          <td>
@@ -70,10 +70,6 @@ 
            </select>

          </td>

        </tr>

        <tr>

          <td><b>Access via computing</b></td>

          <td><input type="checkbox" name="access_through_computing" value="True" /></td>

        </tr>

        <tr>

          <td><b>Access mode</b></td>

          <td>
@@ -83,6 +79,10 @@ 
            </select>

          </td>

        </tr>

        <tr>

          <td><b>Access via computing</b></td>

          <td><input type="checkbox" name="access_through_computing" value="True" /></td>

        </tr>

        <tr>

          <td><b>Auth mode</b></td>

          <td>

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

+11 −7
Original line number Diff line number Diff line 
{% if details %}

<div style="float:left; width:500px; margin:10px; margin-bottom:20px">

  <table class="dashboard" style="width:100%">

    <tr>

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

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

    </tr>

    <tr>

      <td><b>Computing</b></td>

      <td>{% if storage.computing %}{{ storage.computing.name }}{% else %}None{% endif %}</td>

    </tr>

    <tr>

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

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

    </tr>

    <tr>

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

      <td>{% if data.storage.user %}{{ data.storage.user }}{% else %}Platform{% endif %}</td>
@@ -25,7 +25,12 @@ 
      <td><b>Access mode</b></td>

      <td>{{ storage.access_mode }}</td>

    </tr>

      <tr><td><b>Auth mode</b></td>

    <tr>

      <td><b>Access via computing</b></td>

      <td>{{ storage.access_through_computing }}</td>

    </tr>

    <tr>

      <td><b>Auth mode</b></td>

      <td>{{ storage.auth_mode }}</td>

    </tr>

    <tr>
@@ -67,7 +72,7 @@ 
<div style="width:300px; float:left; border: #e0e0e0 solid 1px; margin:10px; background:#f8f8f8; margin-bottom:15px;">

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

    {% if storage.computing %}

      <a href="/storage/?manage=True&uuid={{ storage.uuid }}">{{ storage.name }}</a>

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

      <!-- <br/><font size=-1>@{{ storage.computing.name }}</font> -->

    {% else %}

      <a href="/storage/?manage=True&uuid={{ storage.uuid }}">{{ storage.name }}</a>
@@ -75,7 +80,6 @@ 
  </div>

  <div style="padding:10px;">

    <div class="image-version-box">

      <b>Computing</b>: {% if storage.computing %}{{ storage.computing.name }}{% else %}None{% endif %}<br/>

      <b>Type:</b> {{ storage.type }}<br/>

      <b>Base path:</b> <code>{{ storage.base_path }}</code><br/>

      <b>Bind path:</b> <code>{{ storage.bind_path }}</code><br/>

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

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

  <div class="dashboard">

    <div class="span8 offset2">

      <h1><a href="/storage">Storage</a> <span style="font-size:18px"> / <a href="/storage/?manage=True&uuid={{ data.storage.uuid }}">{{ data.storage.name }}</a> /edit</span></h1>

      <h1><a href="/storage">Storage</a> <span style="font-size:18px"> / 

           <a href="/storage/?manage=True&uuid={{ data.storage.uuid }}">{% if data.storage.computing %}{{ data.storage.computing.name }}:{% endif %}{{ data.storage.name }}</a> /edit</span></h1>

      <hr>

      {% if data.error %}

      <div class="alert alert-danger" style="width:500px;">{{ data.error }}</div>
@@ -20,10 +21,6 @@ 
      <form action="#" method="POST">

      {% csrf_token %}

      <table class="dashboard" style="width:500px; margin-bottom:25px">

        <tr>

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

          <td><input type="text" name="name" value="{{ data.storage.name }}" size="30" required /></td>

        </tr>

        <tr>

          <td><b>Computing</b></td>

          <td>
@@ -35,6 +32,10 @@ 
            </select>

          </td>

        </tr>

        <tr>

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

          <td><input type="text" name="name" value="{{ data.storage.name }}" size="30" required /></td>

        </tr>

        <tr>

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

          <td>
@@ -68,10 +69,6 @@ 
            </select>

          </td>

        </tr>

        <tr>

          <td><b>Access via computing</b></td>

          <td><input type="checkbox" name="access_through_computing" value="True" {% if data.storage.access_through_computing %}checked{% endif %} /></td>

        </tr>

        <tr>

          <td><b>Access mode</b></td>

          <td>
@@ -81,6 +78,10 @@ 
            </select>

          </td>

        </tr>

        <tr>

          <td><b>Access via computing</b></td>

          <td><input type="checkbox" name="access_through_computing" value="True" {% if data.storage.access_through_computing %}checked{% endif %} /></td>

        </tr>

        <tr>

          <td><b>Auth mode</b></td>

          <td>

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

+2 −1
Original line number Diff line number Diff line
@@ -7,7 +7,8 @@ 
  <div class="dashboard" style="height:100%;">

    <div class="span8 offset2" style="height:100%;">

      {% if data.storage %}

      <h1><a href="/storage/?manage=True">Storage</a> <span style="font-size:18px"> / <a href="/storage/?manage=True&uuid={{ data.storage.uuid }}">{{ data.storage.name }}</a></span></h1>

      <h1><a href="/storage/?manage=True">Storage</a> <span style="font-size:18px"> / 

          <a href="/storage/?manage=True&uuid={{ data.storage.uuid }}">{% if data.storage.computing %}{{ data.storage.computing.name }}:{% endif %}{{ data.storage.name }}</a></span></h1>

      {% else %}

      <h1>Storage</h1>

      {% endif %}