Skip to content

GitLab

Commit e8d067b8 authored by Olga Brani's avatar Olga Brani Committed by Georgios D. Tsoukalas
Browse files

Style fixes 

New style for resource usage page
Temporary help_text for profile form
Css fixes
parent da118918
Hide whitespace changes
Inline Side-by-side
snf-astakos-app/astakos/im/forms.py
View file @ e8d067b8
......@@ -242,7 +242,9 @@ class ThirdPartyUserCreationForm(forms.ModelForm, StoreUserMixin):
)
email = forms.EmailField(
label='Contact email',
help_text = 'This is needed for contact purposes. It doesn't need to be the same with the one you provided to login previously. '
help_text = 'This is needed for contact purposes. ' \
'It doesn't need to be the same with the one you ' \
'provided to login previously. '
)
class Meta:
......@@ -432,6 +434,7 @@ class ProfileForm(forms.ModelForm):
The class defines a save method which sets ``is_verified`` to True so as the
user during the next login will not to be redirected to profile page.
"""
email = forms.EmailField(label='E-mail address',help_text='email help_text')
renew = forms.BooleanField(label='Renew token', required=False)
uuid = forms.CharField(label='User id', required=False)
......@@ -1020,6 +1023,7 @@ class ExtendedProfileForm(ProfileForm):
self.fields.update(self.password_change_form.fields)
self.fields['old_password'].required = False
self.fields['old_password'].label = _('Password')
self.fields['old_password'].help_text = _('Password help_text')
self.fields['old_password'].initial = 'password'
self.fields['new_password1'].required = False
self.fields['new_password2'].required = False
......
snf-astakos-app/astakos/im/messages.py
View file @ e8d067b8
......@@ -128,9 +128,6 @@ SWITCH_ACCOUNT_SUCCESS = 'Account successfully switched to %(
ADD_GROUP_MEMBERS_Q_HELP = 'Add a comma separated list of user emails, eg. user1@user.com, user2@user.com'
ASTAKOSUSER_GROUPS_HELP = 'In addition to the permissions assigned manually, \
this user will also get all permissions coming from his/her groups.'
EMAIL_CHANGE_NEW_ADDR_HELP = 'Provide a new email address. Until you verify the new address by \
following the activation link that will be sent to it, your old \
email address will remain active.'
EMAIL_SEND_ERR = 'Failed to send %s.'
ADMIN_NOTIFICATION_SEND_ERR = EMAIL_SEND_ERR % 'admin notification'
......
snf-astakos-app/astakos/im/models.py
View file @ e8d067b8
......@@ -359,9 +359,13 @@ class AstakosUser(User):
invitations = models.IntegerField(
_('Invitations left'), default=INVITATIONS_PER_LEVEL.get(user_level, 0))
auth_token = models.CharField(_('Authentication Token'), max_length=32,
null=True, blank=True, help_text=_('Renew authentication token'))
auth_token_created = models.DateTimeField(_('Token creation date'), null=True)
auth_token = models.CharField(_('Authentication Token'),
max_length=32,
null=True,
blank=True,
help_text = _( 'test' ))
auth_token_created = models.DateTimeField(_('Token creation date'),
null=True)
auth_token_expires = models.DateTimeField(
_('Token expiration date'), null=True)
......@@ -1129,7 +1133,8 @@ class PendingThirdPartyUser(models.Model):
null=True)
affiliation = models.CharField('Affiliation', max_length=255, blank=True,
null=True)
username = models.CharField(_('username'), max_length=30, unique=True, help_text=_("Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"))
username = models.CharField(_('username'), max_length=30, unique=True,
help_text=_("Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"))
token = models.CharField(_('Token'), max_length=255, null=True, blank=True)
created = models.DateTimeField(auto_now_add=True, null=True, blank=True)
info = models.TextField(default="", null=True, blank=True)
......
snf-astakos-app/astakos/im/static/im/css/forms.css
View file @ e8d067b8
......@@ -79,6 +79,7 @@ form span.info em { display:block; overflow:hidden; position:absolute; l
form span.info:hover em { background-position:-4px -3px; }
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;}
form span.info:hover span { display:block; }
form span.extra-img:hover +span.info span { display:block; }
form .with-errors span.info { display:none;}
form p { margin-bottom:0;position:relative;}
form input[readonly=true] { /*background-color: #ddd;*/ color: #5e5e5e; }
......
snf-astakos-app/astakos/im/static/im/css/modules.css
View file @ e8d067b8
......@@ -430,6 +430,8 @@ form.quotas-form span.info span { width:285px; }
.quotas-form .group fieldset { background:transparent; margin-bottom:1em; padding-bottom:1em; }
.quotas-form .group fieldset legend { }
.quotas-form fieldset ul li.rel+li.rel { background:url(../images/quota-related-bg.png) no-repeat left center; }
.quotas-form .double-checks label { font-size:1.077em; }
.quotas-form .double-checks .form-row { float:left; margin-right:10px;}
.quotas-form .double-checks .with-checkbox .checkbox-widget { left:0; }
......@@ -471,22 +473,23 @@ form input[type="text"]:-ms-input-placeholder,
/* stats */
.stats ul { margin:0; padding:0; list-style:none outside none; }
.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; }
.stats .bar { padding: 0; float:left; }
.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%; position: relative; overflow: visible; }
.stats .bar span { text-align:right; display:block; float:left; height:100%; position: relative; overflow: visible; }
.stats .bar span.hovered { }
.stats .bar span.value { background-color: transparent !important; }
.stats .bar span em { color:#000; }
.stats .bar span em.hovered { color:#fff; }
.stats .bar span.hovered em { color:#fff; }
.stats .bar em {
font-style:normal;
color:#222;
line-height:30px;
font-size:1.231em;
padding-left:10px;
position: absolute;
right: 10px;
left: 10px;
}
.stats .bar span + em { position: }
.stats .red .bar span { background:#ef4f54; }
.stats .yellow .bar span { background:#f6921e; }
.stats .green .bar span { background:#55b577; }
......@@ -612,7 +615,7 @@ h2 span.subtitle { font-size: 0.9em; color: #55B577;}
.extralogin a.icons:hover img { margin-top:-38px; }
.landing-page .dotted { padding-bottom:40px; margin-bottom:40px; }
.landing-page .cyclades a { color:#04a0af; }
.landing-page .dashboard a { color:#3780b0; }get_title_display
.landing-page .dashboard a { color:#3780b0; }
.landing-page .cms a { color:#3780b0; }
.landing-page .rt { text-align:center;vertical-align:middle; }
#signup-classic { clear:both; }
......@@ -628,9 +631,3 @@ h2 span.subtitle { font-size: 0.9em; color: #55B577;}
.content a:visited { border:0 none; }
#hand { position:absolute; height:79px; width:61px; background:url(../images/xeraki_hover.png) no-repeat; overflow:hidden; display:none; top:40px;}
@media screen and (max-width : 630px) {
}
snf-astakos-app/astakos/im/templates/im/resource_usage.html
View file @ e8d067b8
......@@ -42,10 +42,18 @@
</div>
<div class="bar" data-steps="">
<div>
{% if rdata.ratio > 18 %}
<span style="width:{{ rdata.ratio_limited|floatformat }}%;" class="hovered">
<em data-value="{{ rdata.ratio }}" class="value">{{ rdata.ratio|floatformat }}&#37; &nbsp;&nbsp;</em>
</span>
{% else %}
<span style="width:{{ rdata.ratio_limited|floatformat }}%;">
<em data-value="{{ rdata.ratio }}" class="value {% if rdata.ratio > 18 %}hovered{% endif %}
">{{ rdata.ratio|floatformat }}&#37; &nbsp;&nbsp;</em>
&nbsp;
</span>
<em data-value="{{ rdata.ratio }}" class="value">
{{ rdata.ratio|floatformat }}&#37; &nbsp;&nbsp;
</em>
{% endif %}
</div>
</div>
</li>
......
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