Revision 2db258bf

b/snf-astakos-app/astakos/im/settings.py
220 220
                'help_text':'This is the space on Pithos for storing files and VM Images. ',
221 221
                'help_text_input_each':'This is the total amount of space on Pithos that will be granted to each user of this Project ',
222 222
                'is_abbreviation':False,
223
                'report_desc':'Pithos+ Diskspace',
223
                'report_desc':'Storage Space',
224 224
                'placeholder':'eg. 10GB',
225 225
                'verbose_name':'Storage Space',
226 226
            },
......
236 236
                'help_text':'This is the System Disk that the VMs have that run the OS ',
237 237
                '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)  ",
238 238
                'is_abbreviation':False,
239
                'report_desc':'Disk',
239
                'report_desc':'System Disk',
240 240
                'placeholder':'eg. 5GB, 2GB etc',
241 241
                'verbose_name':'System Disk'
242 242
            },
......
260 260
                'help_text':'These are the Private Networks one can create on the Cyclades UI. ',
261 261
                'help_text_input_each':'This is the total number of Private Networks that will be granted to each user of this Project ',
262 262
                'is_abbreviation':False,
263
                'report_desc':'Network',
263
                'report_desc':'Private Networks',
264 264
                'placeholder':'eg. 1',
265 265
                'verbose_name':'private network'
266 266
            }
b/snf-astakos-app/astakos/im/static/im/css/modules.css
398 398
.quotas-form input[type="submit"]:focus			{ border-color: #B3B3B3}
399 399
.quotas-form input[type="submit"]:focus:hover	{ border-color: #55B577}
400 400
.quotas-form fieldset ul						{ padding:0; margin:0 0 1em; position:relative; }
401
.quotas-form fieldset ul li						{ list-style:none outside none; float:left; padding:0 0 0 60px; margin:0; }
402
.quotas-form fieldset ul li:first-child			{ padding-left:0; }
401
.quotas-form fieldset ul li						{ list-style:none outside none; float:left; margin:0 0 0 60px; padding:0; }
402
.quotas-form fieldset ul li:first-child			{ margin-left:0; }
403 403
.quotas-form fieldset ul li a					{ display:block; width:82px; height:82px; overflow:hidden; }
404 404
.quotas-form fieldset ul li a:hover	img			{ margin-top:-84px; }
405 405
.quotas-form fieldset ul li a.selected img		{ margin-top:-168px; }
......
489 489
.content .how-it-works a.submit:hover			{ background:#55B577 }
490 490
.content .how-it-works a.submit:focus			{ border-color: #B3B3B3}
491 491
.content .how-it-works a.submit:focus:hover		{ border-color: #55B577}
492
.content .how-it-works .map						{ display:block; width:232px; height:261px; position:absolute; }
492
.content .how-it-works .map						{ display:block; width:232px; height:261px; position:absolute; text-decoration:none;}
493 493
.content .how-it-works .link-13					{ top:10px; right:14px; }
494 494
.content .how-it-works .link-21					{ top:273px; left:14px; }
495 495
.content .how-it-works .link-22					{ top:273px; left:251px; }
b/snf-astakos-app/astakos/im/templates/im/astakosgroup_form.html
67 67
			    	<div class="form-row">
68 68
			    		<p class="clearfix">
69 69
			    			<label for="{{'id_'|add:rname|add:'_uplimit'}}_proxy" >
70
								Max {% if rdata.is_abbreviation %}{{ rdata.verbose_name|upper }}{% else %}{{ rdata.verbose_name }}{% endif %}{% if not rdata.unit %}s {% endif  %} per user
70
								 Amount to grant per user
71 71
							</label>
72 72
			    			<input 	type="text" 
73 73
			       						id="{{'id_'|add:rname|add:'_uplimit'}}_proxy" 
b/snf-astakos-app/astakos/im/templates/im/resource_usage.html
7 7
	<div class="stats clearfix">
8 8
		<ul>
9 9
			{% for rname, rdata in resource_catalog.resources.items %}
10
		 		<li class="clearfix  {{ rdata.load_class }} {{ rdata.verbose_name}}">
10
		 		<li class="clearfix  {{ rdata.load_class }} {{ rname|get_value_after_dot }}">
11 11
		 			<div class="img-wrap">&nbsp;</div>
12 12
		 			<div class="info">
13 13
						<h3>{{ rdata.report_desc }}</h3>
14 14
						<p>
15
						{{ rdata.ratio|floatformat }}% Used<br>
16
						You are using 
15
						 
16
						 
17 17
						{% if rdata.unit == 'bytes' %}
18
							{{ rdata.currValue|sizeof_fmt  }} out of your {{ rdata.maxValue|sizeof_fmt }}
18
							{{ rdata.currValue|sizeof_fmt  }} out of  {{ rdata.maxValue|sizeof_fmt }}
19 19
						{% else %}
20
							{{ rdata.currValue }} {{ rdata.unit }} out of your {{ rdata.maxValue }} {{ rdata.unit }}
20
							{{ rdata.currValue }}  out of  {{ rdata.maxValue }} {{ rdata.unit }}
21 21
						{% endif %}		
22 22
						{% 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  %}
23 23
						</p>

Also available in: Unified diff