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

UI fixes, mainly in software filtering.

parent cbc91515

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

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ 
    </tr>

    <tr>

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

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

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

    </tr>

    <tr>

      <td><b>Group</b></td>

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

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

    <tr>

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

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

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

    </tr>

    <tr>

      <td><b>Group</b></td>

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

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ 
    </tr>

    <tr>

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

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

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

    </tr>

    <tr>

      <td><b>Group</b></td>

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

+16 −21
Original line number Diff line number Diff line
@@ -25,24 +25,17 @@ 
      <div class="form-filter" style="margin-bottom:20px">

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

          <input type="hidden" name="mode" value="{{data.mode}}">

          <input type="text" class="form-control" id="search_text" name="search_text" placeholder="Search..." style="width:200px; margin:0; display:inline" value="{{data.search_text}}" autofocus>

          <input type="text" class="form-control" id="filter_text" name="filter_text" placeholder="Search..." style="width:200px; margin:0; display:inline" value="{{data.filter_text}}" autofocus>

          <!-- onchange="this.form.submit()"  -->

          <select class="form-control" id="search_owner" name="search_owner" style="width:120px; margin:0; display:inline">

            {% if data.search_owner == 'All' %}

            <option selected>All</option>

            {% else %}

            <option>All</option>

            {% endif %}

            {% if data.search_owner == 'Platform' %}

            <option selected>Platform</option>

            {% else %}

            <option>Platform</option>

            {% endif %}

            {% if data.search_owner == 'User' %}

            <option selected>User</option>

            {% else %}

            <option>User</option>

            {% endif %}

          <select class="form-control" id="filter_owner" name="filter_owner" style="width:120px; margin:0; display:inline">

            <option value="all" {% if data.filter_owner == 'all' %}selected{% endif %}>All</option>

            <option value="platform" {% if data.filter_owner == 'platform' %}selected{% endif %}>Platform</option>

            <option value="user" {% if data.filter_owner == 'user' %}selected{% endif %}>Personal</option>

            {% for group in user.groups.all %}

            {% with "group:"|add:group.name as group_identifier %}

            <option value="group:{{ group.name }}" {% if data.filter_owner == group_identifier %}selected{% endif %}>{{ group.name }}</option>

            {% endwith %}

            {% endfor %}

          </select>

          {% csrf_token %}

          <button type="submit" class="btn btn-secondary">Go</button>
@@ -63,6 +56,8 @@ 
      {% else %}

      {% for container in data.containers %}

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

      {% empty %}

      <p>No software found.</p>

      {% endfor %}

      {% endif  %}

      {% endif %}
@@ -76,10 +71,10 @@ 
<script>

$(document).ready(function() {



    var search_text_input = $("#search_text");

    var len = search_text_input.val().length;

    search_text_input[0].focus();

    search_text_input[0].setSelectionRange(len, len);

    var filter_text_input = $("#filter_text");

    var len = filter_text_input.val().length;

    filter_text_input[0].focus();

    filter_text_input[0].setSelectionRange(len, len);



});

</script>