From: Olga Brani Date: Wed, 5 Dec 2012 13:23:25 +0000 (+0200) Subject: Resource usage new % style X-Git-Url: https://code.grnet.gr/git/astakos/commitdiff_plain/45ed77438f747e4fe8010287e4c65f28d1860f43 Resource usage new % style --- diff --git a/snf-astakos-app/astakos/im/static/im/css/modules.css b/snf-astakos-app/astakos/im/static/im/css/modules.css index 5fba7db..432cf9b 100644 --- a/snf-astakos-app/astakos/im/static/im/css/modules.css +++ b/snf-astakos-app/astakos/im/static/im/css/modules.css @@ -198,6 +198,7 @@ a.button:hover { background-color: #F89A1C; border:0 none; color:#fff;} .pagination .next-prev a { margin-left:15px; } .pagination .nums { text-align:left;} .pagination .nums span { color:#000;} +.pagination .next-prev a.disabled { text-decoration: none; color:#ccc; cursor:default; } .two-cols .lt .clients-wrapper p { padding:0; } @@ -437,7 +438,9 @@ form.quotas-form span.info span { width:285px; } .stats ul li { margin:0 0 1em 0; padding:0 0 1em 0; list-style:none outside none; background:url(../images/stats-line.jpg) repeat-x left bottom} .stats .bar { padding: 0; text-align:center; float:left; width:200px;} .stats .bar div { width:340px; height:30px; border:1px solid #000; margin-top:20px; overflow:hidden;} -.stats .bar span { text-align:right; display:block; height:100%; color:#222; line-height:30px; font-size:1.231em; text-indent:10px;} +.stats .bar span { text-align:right; display:block; height:100%; float:left; } +.stats .bar span em { color:#fff; float:right; } +.stats .bar em { font-style:normal; color:#222; line-height:30px; font-size:1.231em; padding-left:10px; float:left } .stats .red .bar span { background:#ef4f54; } .stats .yellow .bar span { background:#f6921e; } .stats .green .bar span { background:#55b577; } diff --git a/snf-astakos-app/astakos/im/templates/im/resource_usage.html b/snf-astakos-app/astakos/im/templates/im/resource_usage.html index 21b091e..c5efbf4 100644 --- a/snf-astakos-app/astakos/im/templates/im/resource_usage.html +++ b/snf-astakos-app/astakos/im/templates/im/resource_usage.html @@ -23,7 +23,17 @@

-
{{ rdata.ratio|floatformat }}%   
+
+ + {% if rdata.ratio > 18 %} + {{ rdata.ratio|floatformat }}%    + + {% else%} +   + + {{ rdata.ratio|floatformat }}%    + {% endif %} +
{% endfor%}