Changeset 7596


Ignore:
Timestamp:
Feb 22, 2019, 8:45:09 AM (5 years ago)
Author:
Nicklas Nordborg
Message:

References #2135: Remove support for secondary storage

More Location.SECONDARY that should be removed.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/www/my_base/index.jsp

    r7430 r7596  
    389389      }
    390390      %>
    391       <table style="width: 100%;">
     391      <table style="width: 100%; border-bottom-width: 1px; border-bottom-style: dotted; margin-bottom: 0.5em;">
    392392      <tr style="text-align: center;">
    393393        <th></th>
    394394        <th colspan="2">Primary location</th>
    395         <th colspan="2">Secondary location</th>
    396395        <th>External</th>
    397396      </tr>
    … …  
    401400        <th>Assigned</th>
    402401        <th>Used</th>
    403         <th>Assigned</th>
    404         <th>Used</th>
    405402      </tr>
    406403      <%
    … …  
    408405        long myPrimaryQuota = quota.getQuotaValue(totalQuotaType, Location.PRIMARY);
    409406        long groupPrimaryQuota = groupQuota == null ? Quota.UNDEFINED : groupQuota.getQuotaValue(totalQuotaType, Location.PRIMARY);
    410         long mySecondaryUsage = user.getDiskUsage(totalQuotaType, Location.SECONDARY);
    411         long mySecondaryQuota = quota.getQuotaValue(totalQuotaType, Location.SECONDARY);
    412         long groupSecondaryQuota = groupQuota == null ? Quota.UNDEFINED : groupQuota.getQuotaValue(totalQuotaType, Location.SECONDARY);
    413407        long myExternalUsage = user.getDiskUsage(totalQuotaType, Location.EXTERNAL);
    414408      %>
    415       <tr style="text-align: center;">
     409      <tr style="text-align: center; border-bottom-width: 1px; border-bottom-style: dotted;">
    416410        <th>Total</th>
    417411        <td><%=getPrintableQuota(myPrimaryUsage, Quota.UNDEFINED)%></td>
    418412        <td><%=getPrintableQuota(myPrimaryQuota, groupPrimaryQuota)%></td>
    419         <td><%=getPrintableQuota(mySecondaryUsage, Quota.UNDEFINED)%></td>
    420         <td><%=getPrintableQuota(mySecondaryQuota, groupSecondaryQuota)%></td>
    421413        <td><%=getPrintableQuota(myExternalUsage, Quota.UNDEFINED)%></td>
    422       </tr>
    423       <tr>
    424         <td colspan="6" style="border-top-width: 1px; border-top-style: dotted;"></td>
    425414      </tr>
    426415      <%
    … …  
    430419        myPrimaryQuota = quota.getQuotaValue(qt, Location.PRIMARY);
    431420        groupPrimaryQuota = groupQuota == null ? Quota.UNDEFINED : groupQuota.getQuotaValue(qt, Location.PRIMARY);
    432         mySecondaryUsage = user.getDiskUsage(qt, Location.SECONDARY);
    433         mySecondaryQuota = quota.getQuotaValue(qt, Location.SECONDARY);
    434         groupSecondaryQuota = groupQuota == null ? Quota.UNDEFINED : groupQuota.getQuotaValue(qt, Location.SECONDARY);
    435421        myExternalUsage = user.getDiskUsage(qt, Location.EXTERNAL);
    436422        %>
    … …  
    439425          <td><%=getPrintableQuota(myPrimaryUsage, Quota.UNDEFINED)%></td>
    440426          <td><%=getPrintableQuota(myPrimaryQuota, groupPrimaryQuota)%></td>
    441           <td><%=getPrintableQuota(mySecondaryUsage, Quota.UNDEFINED)%></td>
    442           <td><%=getPrintableQuota(mySecondaryQuota, groupSecondaryQuota)%></td>
    443427          <td><%=getPrintableQuota(myExternalUsage, Quota.UNDEFINED)%></td>
    444428        </tr>
    … …  
    446430      }
    447431      %>
    448       <tr>
    449         <td colspan="6" style="border-top-width: 1px; border-top-style: dotted;"></td>
    450       </tr>
    451432      </table>
    452433      <base:buttongroup>
Note: See TracChangeset for help on using the changeset viewer.