Commit 6a917617 authored by Olga Brani's avatar Olga Brani
Browse files

Bug fixes

parent 9a202bf4
......@@ -239,6 +239,10 @@ class ThirdPartyUserCreationForm(forms.ModelForm, StoreUserMixin):
widget=forms.HiddenInput(),
label=''
)
email = forms.EmailField(
label='Contact email',
help_text = 'We will use this email to contact you'
)
class Meta:
model = AstakosUser
......
......@@ -7,11 +7,11 @@ input, textarea, .form-widget { background-color: #ffffff; color: #000;borde
#forms input:focus label { z-index: 300; }
form.withlabels label { width: 224px; display: block; float: left; padding-top: 0.8em; }
form.withlabels input[type=text],
form.withlabels input[type=password] { width: 270px; }
form.withlabels input[type=password] { width: 228px; }
form.withlabels input[type=text].long,
form.withlabels input[type=password].long,
form.withlabels textarea.long { width: 224px; }
form.withlabels textarea { width:270px; }
form.withlabels textarea { width:228px; }
.login-section a.button { margin-bottom: 12px; }
.login-section a.button:last-child { margin-bottom: none;}
.login-section a.button.withicon { background-repeat: no-repeat; background-position: 15px 50%; padding-left: 40px; }
......@@ -21,7 +21,7 @@ form h2 span { padding-bottom: 3px; }
form .form-row { min-height: 30px; position: relative;}
form .form-row.submit { margin: 22px 0 ;}
form .form-row .extra-link { color: #808080; text-decoration: none; border: none; margin-top:15px; line-height:98%; display:inline-block; padding-top:15px; float: right; position:absolute; right:0; top:0; }
form .form-row .extra-link:hover { border-bottom:1px solid #808080;}
form .form-row .extra-link:hover { border-bottom:1px solid #9e9e9e;}
form .form-row label { font-size: 1.077em; }
form.innerlabels label { position: absolute; bottom: 11px; left: 1.5em; color: #808080 ; }
form.innerlabels p { margin:0; position: relative;}
......@@ -33,8 +33,8 @@ form.innerlabels a:hover { }
form textarea,
form input.text,
form input[type="text"],
form input[type="password"] { color:#808080; font-family: 'Didact Gothic', Verdana, sans-serif; font-weight: normal; line-height: 22px; letter-spacing: 1px;border: 1px solid #9e9e9e; height: 21px; display: inline-block; margin-bottom: -1px; padding: 0.8em; padding-left: 1.5em; z-index: 2; width:300px; }
form select { font-family: 'Didact Gothic', Verdana, sans-serif; font-weight: normal; line-height: 22px; letter-spacing: 1px; border: 1px solid #808080; display:block; margin-bottom: -1px; padding: 0.8em; padding-left: 1.5em; z-index: 2; width:301px; }
form input[type="password"] { color:#808080; font-family: 'Didact Gothic', Verdana, sans-serif; font-weight: normal; line-height: 22px; letter-spacing: 1px;border: 1px solid #9e9e9e; height: 21px; display: inline-block; margin-bottom: -1px; padding: 0.8em; padding-left: 1.5em; padding-right: 4em;z-index: 2; width:258px; }
form select { font-family: 'Didact Gothic', Verdana, sans-serif; font-weight: normal; line-height: 22px; letter-spacing: 1px; border: 1px solid #9e9e9e; display:block; margin-bottom: -1px; padding: 0.8em; padding-left: 1.5em; z-index: 2; width:301px; }
form textarea:focus,
form input.text:focus,
form input[type="text"]:focus,
......@@ -108,7 +108,7 @@ form .with-hidden { display:none; }
/* custom captcha */
#okeanos_recaptcha { width:329px; border:1px solid #808080; margin:0 0 20px; position:relative; }
#okeanos_recaptcha { width:329px; border:1px solid #9e9e9e; margin:0 0 20px; position:relative; }
#okeanos_recaptcha #recaptcha_image { padding:15px 0; }
#okeanos_recaptcha label.recaptcha_only_if_image,
#okeanos_recaptcha label.recaptcha_only_if_audio{ position:absolute; top:auto; bottom:11px; }
......@@ -120,7 +120,7 @@ form .with-hidden { display:none; }
#okeanos_recaptcha .img-refresh a:hover { background:url(../images/refresh_g.png); }
#okeanos_recaptcha .img-audio a { background:url(../images/sound_lg.png); }
#okeanos_recaptcha .img-audio a:hover { background:url(../images/sound_g.png); }
#okeanos_recaptcha .actions-wrap { border-top:1px solid #808080 }
#okeanos_recaptcha .actions-wrap { border-top:1px solid #9e9e9e; }
input.submit:focus,
input[type="submit"]:focus,
......@@ -204,16 +204,16 @@ form.signup .back { float:right; margin:15px 70px 0 0 ; height:43px; line
/* styles for complex profile form */
form .form-following p span.extra-img { background:url(../images/symbols3.png) 0 -161px; z-index:8; }
form .form-following p:hover span.extra-img { background-position:0 0px; }
form .form-following input:hover + span.extra-img { background-position:0 0px; }
form .form-following p:hover span.extra-img:hover { background-position:0 -54px; cursor:pointer; }
form .form-following.open p span.extra-img { background-position: -33px -161px; }
form .form-following.open p:hover span.extra-img { background-position: -33px 0px; }
form .form-following.open input:hover + span.extra-img { background-position: -33px 0px; }
form .form-following.open p:hover span.extra-img:hover { background-position: -33px -54px; cursor:pointer; }
form .refresh p span.extra-img { background:url(../images/symbols3.png) 54px -161px; z-index:8; }
form .refresh p:hover span.extra-img { background-position:54px 0px; }
form .refresh input:hover + span.extra-img { background-position:54px 0px; }
form .refresh p:hover span.extra-img:hover { background-position:54px -54px; cursor:pointer; }
form .refresh.open p span.extra-img { background-position: -33px -161px; }
form .refresh.open p:hover span.extra-img { background-position: -33px 0px; }
form .refresh.open input:hover + span.extra-img { background-position: -33px 0px; }
form .refresh.open p:hover span.extra-img:hover { background-position: -33px -54px; cursor:pointer; }
. hidden-form-rows { display:none; }
......@@ -55,7 +55,7 @@ img.right { margin:0 0 1em 1em; float:right;}
.two-cols .lt { float:left; width:400px;}
.two-cols-blog .rt { float:right; width:220px; margin-left:80px; padding-right:65px;}
.two-cols-blog .lt { overflow:hidden;}
.container h2 { font-weight:normal; font-size:1.308em; margin-bottom:1em; }
.container h2 { font-weight:normal; font-size:1.308em; margin-bottom:1.5em; }
.container h3 { font-weight:normal; margin-bottom:1em; }
.container h2 em { color: #3582AC; font-style:normal; }
/*.content a { border-bottom: 1px solid #F89A1C; text-decoration:none; color:#000; }
......@@ -409,6 +409,7 @@ form.quotas-form span.info span { width:285px; }
*/
.quotas-form input[type="submit"].lt { position:absolute; left:0; top:0; }
.quotas-form .form-row.submit .rt { position:absolute; right:0; top:25px; }
.quotas-form fieldset ul { padding:0; margin:0 0 1em; position:relative; }
.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 { margin-left:0; }
......@@ -601,5 +602,5 @@ h2 span.subtitle { font-size: 0.9em; color: #55B577;}
.landing-page .rt { text-align:center;vertical-align:middle; }
#signup-classic { clear:both; }
#signup-classic + .form-stacked { display:none; }
.extralogin a.standalone { display:block; width:140px; margin-bottom:20px; white-space:nowrap;}
.extralogin a.standalone { display:block; width:150px; margin-bottom:20px; white-space:nowrap;}
.hidden-form-rows { display:none; }
......@@ -89,6 +89,7 @@ def login(
try:
eppn = tokens.get(Tokens.SHIB_EPPN)
eppn = 'skata'
if not eppn:
raise KeyError(_(astakos_messages.SHIBBOLETH_MISSING_EPPN) % {
'domain': settings.BASEURL,
......
......@@ -25,4 +25,4 @@
</div>
</form>
<br>
LOGIN using
LOGIN using &nbsp;&nbsp;
......@@ -26,12 +26,5 @@
{% include "im/profile_auth_methods.html" %}
</div>
<div class="full-dotted right-align">
<ul class="options">
{% for s in services %}
<li><a href="{{s.url}}" class="blue">Take me to {{s.name}}></a></li>
{% endfor %}
</ul>
</div>
{% endblock body %}
......@@ -10,13 +10,6 @@
{% block page.body %}
<h2>
{% if update_form %}REQUEST PROJECT MODIFICATION{% else %}REQUEST PROJECT{% endif %}
/ <span class="subtitle">
{% if show_form %}
FORM
{% else %}
{% if update_form %}CONFIRM{% else %}CONFIRM{% endif %}
{% endif %}
</span>
</h2>
......
......@@ -79,9 +79,10 @@
<div class="form-row submit">
<input type="submit" value="BACK" class="submit lt" onclick='this.form.action="?edit=1&verify=0";'>
<input type="submit" value="SUBMIT" class="submit" >
<a href="{% url project_add %}" class="rt">CANCEL</a>
</div>
</form>
<a href="{% url project_add %}" class="blue">CANCEL</a>
</div>
......
......@@ -5,20 +5,23 @@
{% endblock %}
{% block body.left %}
<div class="centered">
{% if third_party_token %}
<img class="pic" src="{{ IM_STATIC_URL }}images/mailbox.png" />
{% else %}
<img class="pic" src="{{ IM_STATIC_URL }}images/pictures/accounts_3.png" />
<img class="pic" src="{{ IM_STATIC_URL }}images/ringer1.png" />
{% endif %}
</div>
{% comment %}{% include "im/services_description.html" %}{% endcomment %}
{% endblock body.left %}
{% block body.right %}
<h2>{% trans "SIGN UP" %}</h2>
{% if not third_party_token and not signup_form.errors %}
<p>{% trans "Choose one of the following sign up methods." %}</p>
<div class="extralogin">
{% for provider in auth_providers %}
{% if provider.is_available_for_create %}
......@@ -47,6 +50,11 @@ $(document).ready(function(){
$("#signup-classic").click(function(e){
e.preventDefault();
$(this).siblings('.form-stacked').slideToggle();
pic = $(this).parents('.rt').siblings('.lt').find('img.pic');
var src = (pic.attr('src') === '{{ IM_STATIC_URL }}images/ringer1.png')
? '{{ IM_STATIC_URL }}images/ringer2.png'
: '{{ IM_STATIC_URL }}images/ringer1.png';
pic.attr('src', src);
})
});
</script>
......
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