Commit 995d6106 authored by Olga Brani's avatar Olga Brani

Text fixes

Style fixes
parent 82829937
...@@ -220,7 +220,7 @@ RESOURCES_PRESENTATION_DATA = getattr( ...@@ -220,7 +220,7 @@ RESOURCES_PRESENTATION_DATA = getattr(
'help_text':'This is the space on Pithos for storing files and VM Images. ', 'help_text':'This is the space on Pithos for storing files and VM Images. ',
'help_text_input_each':'This is the total amount of space on Pithos that will be granted to each user of this Project ', 'help_text_input_each':'This is the total amount of space on Pithos that will be granted to each user of this Project ',
'is_abbreviation':False, 'is_abbreviation':False,
'report_desc':'Pithos+ Diskspace', 'report_desc':'Storage Space',
'placeholder':'eg. 10GB', 'placeholder':'eg. 10GB',
'verbose_name':'Storage Space', 'verbose_name':'Storage Space',
}, },
...@@ -236,7 +236,7 @@ RESOURCES_PRESENTATION_DATA = getattr( ...@@ -236,7 +236,7 @@ RESOURCES_PRESENTATION_DATA = getattr(
'help_text':'This is the System Disk that the VMs have that run the OS ', 'help_text':'This is the System Disk that the VMs have that run the OS ',
'help_text_input_each':"This is the total amount of System Disk that will be granted to each user of this Project (this refers to the total System Disk of all VMs, not each VM's System Disk) ", 'help_text_input_each':"This is the total amount of System Disk that will be granted to each user of this Project (this refers to the total System Disk of all VMs, not each VM's System Disk) ",
'is_abbreviation':False, 'is_abbreviation':False,
'report_desc':'Disk', 'report_desc':'System Disk',
'placeholder':'eg. 5GB, 2GB etc', 'placeholder':'eg. 5GB, 2GB etc',
'verbose_name':'System Disk' 'verbose_name':'System Disk'
}, },
...@@ -260,7 +260,7 @@ RESOURCES_PRESENTATION_DATA = getattr( ...@@ -260,7 +260,7 @@ RESOURCES_PRESENTATION_DATA = getattr(
'help_text':'These are the Private Networks one can create on the Cyclades UI. ', 'help_text':'These are the Private Networks one can create on the Cyclades UI. ',
'help_text_input_each':'This is the total number of Private Networks that will be granted to each user of this Project ', 'help_text_input_each':'This is the total number of Private Networks that will be granted to each user of this Project ',
'is_abbreviation':False, 'is_abbreviation':False,
'report_desc':'Network', 'report_desc':'Private Networks',
'placeholder':'eg. 1', 'placeholder':'eg. 1',
'verbose_name':'private network' 'verbose_name':'private network'
} }
......
...@@ -398,8 +398,8 @@ form.quotas-form span.info span { width:285px; } ...@@ -398,8 +398,8 @@ form.quotas-form span.info span { width:285px; }
.quotas-form input[type="submit"]:focus { border-color: #B3B3B3} .quotas-form input[type="submit"]:focus { border-color: #B3B3B3}
.quotas-form input[type="submit"]:focus:hover { border-color: #55B577} .quotas-form input[type="submit"]:focus:hover { border-color: #55B577}
.quotas-form fieldset ul { padding:0; margin:0 0 1em; position:relative; } .quotas-form fieldset ul { padding:0; margin:0 0 1em; position:relative; }
.quotas-form fieldset ul li { list-style:none outside none; float:left; padding:0 0 0 60px; margin:0; } .quotas-form fieldset ul li { list-style:none outside none; float:left; margin:0 0 0 60px; padding:0; }
.quotas-form fieldset ul li:first-child { padding-left:0; } .quotas-form fieldset ul li:first-child { margin-left:0; }
.quotas-form fieldset ul li a { display:block; width:82px; height:82px; overflow:hidden; } .quotas-form fieldset ul li a { display:block; width:82px; height:82px; overflow:hidden; }
.quotas-form fieldset ul li a:hover img { margin-top:-84px; } .quotas-form fieldset ul li a:hover img { margin-top:-84px; }
.quotas-form fieldset ul li a.selected img { margin-top:-168px; } .quotas-form fieldset ul li a.selected img { margin-top:-168px; }
...@@ -489,7 +489,7 @@ form.withlabels.hidden-submit { margin-bottom:4em; } ...@@ -489,7 +489,7 @@ form.withlabels.hidden-submit { margin-bottom:4em; }
.content .how-it-works a.submit:hover { background:#55B577 } .content .how-it-works a.submit:hover { background:#55B577 }
.content .how-it-works a.submit:focus { border-color: #B3B3B3} .content .how-it-works a.submit:focus { border-color: #B3B3B3}
.content .how-it-works a.submit:focus:hover { border-color: #55B577} .content .how-it-works a.submit:focus:hover { border-color: #55B577}
.content .how-it-works .map { display:block; width:232px; height:261px; position:absolute; } .content .how-it-works .map { display:block; width:232px; height:261px; position:absolute; text-decoration:none;}
.content .how-it-works .link-13 { top:10px; right:14px; } .content .how-it-works .link-13 { top:10px; right:14px; }
.content .how-it-works .link-21 { top:273px; left:14px; } .content .how-it-works .link-21 { top:273px; left:14px; }
.content .how-it-works .link-22 { top:273px; left:251px; } .content .how-it-works .link-22 { top:273px; left:251px; }
......
...@@ -67,7 +67,7 @@ ...@@ -67,7 +67,7 @@
<div class="form-row"> <div class="form-row">
<p class="clearfix"> <p class="clearfix">
<label for="{{'id_'|add:rname|add:'_uplimit'}}_proxy" > <label for="{{'id_'|add:rname|add:'_uplimit'}}_proxy" >
Max {% if rdata.is_abbreviation %}{{ rdata.verbose_name|upper }}{% else %}{{ rdata.verbose_name }}{% endif %}{% if not rdata.unit %}s {% endif %} per user Amount to grant per user
</label> </label>
<input type="text" <input type="text"
id="{{'id_'|add:rname|add:'_uplimit'}}_proxy" id="{{'id_'|add:rname|add:'_uplimit'}}_proxy"
......
...@@ -7,17 +7,17 @@ ...@@ -7,17 +7,17 @@
<div class="stats clearfix"> <div class="stats clearfix">
<ul> <ul>
{% for rname, rdata in resource_catalog.resources.items %} {% for rname, rdata in resource_catalog.resources.items %}
<li class="clearfix {{ rdata.load_class }} {{ rdata.verbose_name}}"> <li class="clearfix {{ rdata.load_class }} {{ rname|get_value_after_dot }}">
<div class="img-wrap">&nbsp;</div> <div class="img-wrap">&nbsp;</div>
<div class="info"> <div class="info">
<h3>{{ rdata.report_desc }}</h3> <h3>{{ rdata.report_desc }}</h3>
<p> <p>
{{ rdata.ratio|floatformat }}% Used<br>
You are using
{% if rdata.unit == 'bytes' %} {% if rdata.unit == 'bytes' %}
{{ rdata.currValue|sizeof_fmt }} out of your {{ rdata.maxValue|sizeof_fmt }} {{ rdata.currValue|sizeof_fmt }} out of {{ rdata.maxValue|sizeof_fmt }}
{% else %} {% else %}
{{ rdata.currValue }} {{ rdata.unit }} out of your {{ rdata.maxValue }} {{ rdata.unit }} {{ rdata.currValue }} out of {{ rdata.maxValue }} {{ rdata.unit }}
{% endif %} {% endif %}
{% if rdata.is_abbreviation %}{{ rdata.verbose_name|upper }}{% else %}{{ rdata.verbose_name }}{% endif %}{% if rdata.maxValue|floatformat:"0" != "1" and not rdata.unit %}s {% endif %} {% if rdata.is_abbreviation %}{{ rdata.verbose_name|upper }}{% else %}{{ rdata.verbose_name }}{% endif %}{% if rdata.maxValue|floatformat:"0" != "1" and not rdata.unit %}s {% endif %}
</p> </p>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment