Revision d6ea9b3d

b/snf-astakos-app/astakos/im/forms.py
242 242
    )
243 243
    email = forms.EmailField(
244 244
        label='Contact email',
245
        help_text = 'This is needed for contact purposes. It doesn't need to be the same with the one you provided to login previously. '
245
        help_text = 'This is needed for contact purposes. ' \
246
        'It doesn't need to be the same with the one you ' \
247
        'provided to login previously. '
246 248
    )
247 249

  
248 250
    class Meta:
......
432 434
    The class defines a save method which sets ``is_verified`` to True so as the
433 435
    user during the next login will not to be redirected to profile page.
434 436
    """
437
    email = forms.EmailField(label='E-mail address',help_text='email help_text')
435 438
    renew = forms.BooleanField(label='Renew token', required=False)
436 439
    uuid = forms.CharField(label='User id', required=False)
437 440

  
......
1020 1023
            self.fields.update(self.password_change_form.fields)
1021 1024
            self.fields['old_password'].required = False
1022 1025
            self.fields['old_password'].label = _('Password')
1026
            self.fields['old_password'].help_text = _('Password help_text')
1023 1027
            self.fields['old_password'].initial = 'password'
1024 1028
            self.fields['new_password1'].required = False
1025 1029
            self.fields['new_password2'].required = False
b/snf-astakos-app/astakos/im/messages.py
128 128
ADD_GROUP_MEMBERS_Q_HELP                =   'Add a comma separated list of user emails, eg. user1@user.com, user2@user.com'
129 129
ASTAKOSUSER_GROUPS_HELP                 =   'In addition to the permissions assigned manually, \
130 130
                                               this user will also get all permissions coming from his/her groups.'
131
EMAIL_CHANGE_NEW_ADDR_HELP              =   'Provide a new email address. Until you verify the new address by \
132
                                               following the activation link that will be sent to it, your old \
133
                                               email address will remain active.'
134 131

  
135 132
EMAIL_SEND_ERR                          =   'Failed to send %s.'
136 133
ADMIN_NOTIFICATION_SEND_ERR             =   EMAIL_SEND_ERR % 'admin notification'
b/snf-astakos-app/astakos/im/models.py
359 359
    invitations = models.IntegerField(
360 360
        _('Invitations left'), default=INVITATIONS_PER_LEVEL.get(user_level, 0))
361 361

  
362
    auth_token = models.CharField(_('Authentication Token'), max_length=32,
363
                  null=True, blank=True, help_text=_('Renew authentication token'))
364
    auth_token_created = models.DateTimeField(_('Token creation date'), null=True)
362
    auth_token = models.CharField(_('Authentication Token'), 
363
                                  max_length=32,
364
                                  null=True, 
365
                                  blank=True, 
366
                                  help_text = _( 'test' ))
367
    auth_token_created = models.DateTimeField(_('Token creation date'), 
368
                                              null=True)
365 369
    auth_token_expires = models.DateTimeField(
366 370
        _('Token expiration date'), null=True)
367 371

  
......
1129 1133
                                 null=True)
1130 1134
    affiliation = models.CharField('Affiliation', max_length=255, blank=True,
1131 1135
                                   null=True)
1132
    username = models.CharField(_('username'), max_length=30, unique=True, help_text=_("Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"))
1136
    username = models.CharField(_('username'), max_length=30, unique=True,  
1137
                                help_text=_("Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"))
1133 1138
    token = models.CharField(_('Token'), max_length=255, null=True, blank=True)
1134 1139
    created = models.DateTimeField(auto_now_add=True, null=True, blank=True)
1135 1140
    info = models.TextField(default="", null=True, blank=True)
b/snf-astakos-app/astakos/im/static/im/css/forms.css
79 79
form span.info:hover em 					{ background-position:-4px -3px; }
80 80
form span.info span  						{ position:absolute; left:29px; top:-2px; width:120px; padding-left:30px; background:url(../images/black-line.jpg ) no-repeat left 8px; min-height:50px; display:none; font-size:0.846em;}
81 81
form span.info:hover span 					{ display:block; }
82
form span.extra-img:hover +span.info span	{ display:block; }
82 83
form .with-errors span.info					{ display:none;}
83 84
form p										{ margin-bottom:0;position:relative;}
84 85
form input[readonly=true] 					{ /*background-color: #ddd;*/ color: #5e5e5e; }
b/snf-astakos-app/astakos/im/static/im/css/modules.css
430 430
.quotas-form .group fieldset					{ background:transparent; margin-bottom:1em; padding-bottom:1em; }
431 431
.quotas-form .group fieldset legend				{  }
432 432
.quotas-form fieldset ul li.rel+li.rel			{ background:url(../images/quota-related-bg.png) no-repeat left center; }
433

  
434

  
433 435
.quotas-form .double-checks label				{ font-size:1.077em; }
434 436
.quotas-form .double-checks .form-row			{ float:left; margin-right:10px;}
435 437
.quotas-form .double-checks .with-checkbox .checkbox-widget	{ left:0; }
......
471 473
/* stats */
472 474
.stats ul										{ margin:0; padding:0; list-style:none outside none; }
473 475
.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}
474
.stats .bar										{ padding: 0; text-align:center;  float:left; }
476
.stats .bar										{ padding: 0;   float:left; }
475 477
.stats .bar div									{ width:340px; height:30px; border:1px solid #000; margin-top:20px; overflow:hidden;}
476
.stats .bar span								{ text-align:right; display:block; height:100%; position: relative; overflow: visible; }
478
.stats .bar span								{ text-align:right; display:block; float:left; height:100%; position: relative; overflow: visible; }
479
.stats .bar span.hovered						{  }
477 480
.stats .bar span.value							{ background-color: transparent !important; }
478 481
.stats .bar span em								{ color:#000; }
479
.stats .bar span em.hovered 					{ color:#fff; }
482
.stats .bar span.hovered em 					{ color:#fff; }
480 483
.stats .bar em { 
481 484
    font-style:normal; 
482 485
    color:#222;  
483 486
    line-height:30px; 
484 487
    font-size:1.231em; 
485 488
    padding-left:10px; 
486
    position: absolute;
487
    right: 10px;
488
    left: 10px;
489
     
489 490
}
491

  
492
.stats .bar span + em							{ position: }
490 493
.stats .red .bar span							{ background:#ef4f54; }
491 494
.stats .yellow .bar span						{ background:#f6921e; }
492 495
.stats .green .bar span							{ background:#55b577; }
......
612 615
.extralogin a.icons:hover img					{ margin-top:-38px; }
613 616
.landing-page .dotted							{ padding-bottom:40px; margin-bottom:40px; }
614 617
.landing-page .cyclades a						{ color:#04a0af; }
615
.landing-page .dashboard a						{ color:#3780b0; }get_title_display
618
.landing-page .dashboard a						{ color:#3780b0; }
616 619
.landing-page .cms a							{ color:#3780b0; }
617 620
.landing-page .rt 								{ text-align:center;vertical-align:middle; } 
618 621
#signup-classic									{ clear:both; }
......
628 631
.content a:visited 		{ border:0 none; }
629 632

  
630 633
#hand											{ position:absolute; height:79px; width:61px; background:url(../images/xeraki_hover.png) no-repeat; overflow:hidden; display:none;  top:40px;}
631

  
632

  
633
@media screen and (max-width : 630px) 		{ 
634
 
635
    
636
}
b/snf-astakos-app/astakos/im/templates/im/resource_usage.html
42 42
					</div>
43 43
					<div class="bar" data-steps="">
44 44
						<div>
45
							{% if rdata.ratio > 18 %}
46
							<span style="width:{{ rdata.ratio_limited|floatformat }}%;" class="hovered">
47
                                <em data-value="{{ rdata.ratio }}" class="value">{{ rdata.ratio|floatformat }}&#37; &nbsp;&nbsp;</em>	
48
							</span>
49
							{% else %}
45 50
							<span style="width:{{ rdata.ratio_limited|floatformat }}%;">
46
                                <em data-value="{{ rdata.ratio }}" class="value {% if rdata.ratio > 18 %}hovered{% endif %}
47
">{{ rdata.ratio|floatformat }}&#37; &nbsp;&nbsp;</em>	
51
                                	&nbsp;
48 52
							</span>
53
							<em data-value="{{ rdata.ratio }}" class="value">
54
                                	{{ rdata.ratio|floatformat }}&#37; &nbsp;&nbsp;
55
                                </em>
56
							{% endif %}
49 57
						</div>
50 58
					</div>
51 59
		 		</li>

Also available in: Unified diff