Revision cb4714e7
b/snf-astakos-app/astakos/im/auth_providers.py | ||
---|---|---|
73 | 73 |
module_active = False |
74 | 74 |
module_enabled = False |
75 | 75 |
one_per_user = False |
76 |
login_prompt = _('Login using') |
|
76 | 77 |
|
77 | 78 |
def get_message(self, msg, **kwargs): |
78 | 79 |
params = kwargs |
... | ... | |
94 | 95 |
settings_attr = self.get_setting(attr.upper()) |
95 | 96 |
if not settings_attr: |
96 | 97 |
return getattr(self, attr) |
97 |
return settings_attr
|
|
98 |
return _(settings_attr)
|
|
98 | 99 |
else: |
99 | 100 |
return super(AuthProvider, self).__getattr__(key) |
100 | 101 |
|
... | ... | |
130 | 131 |
description = _('Create a local password for your account') |
131 | 132 |
create_prompt = _('Create an account') |
132 | 133 |
add_prompt = _('Create a local password for your account') |
134 |
login_prompt = _('if you already have a username and password') |
|
135 |
signup_prompt = _('New to ~Okeanos ?') |
|
133 | 136 |
|
134 | 137 |
|
135 | 138 |
@property |
... | ... | |
171 | 174 |
'%(affiliation)s affiliation) is connected with your ' |
172 | 175 |
' account.') |
173 | 176 |
user_title = _('Academic credentials (%(identifier)s)') |
177 |
primary_login_prompt = _('If you are a student/researcher/faculty you can' |
|
178 |
' login using your university-credentials in' |
|
179 |
' the following page') |
|
174 | 180 |
|
175 | 181 |
@property |
176 | 182 |
def add_url(self): |
b/snf-astakos-app/astakos/im/templates/im/auth/local_login_form.html | ||
---|---|---|
1 | 1 |
<form action="{% url astakos.im.target.local.login %}" method="post"class="login innerlabels">{% csrf_token %} |
2 |
<p> |
|
3 |
{{ provider.get_primary_login_prompt_display }} |
|
4 |
</p> |
|
2 | 5 |
{% with login_form as form %} |
3 | 6 |
{% include "im/form_render.html" %} |
4 | 7 |
{% endwith %} |
b/snf-astakos-app/astakos/im/templates/im/auth/local_login_prompt.html | ||
---|---|---|
1 | 1 |
<form action="{% url astakos.im.target.local.login %}#other-login-methods" method="post" |
2 | 2 |
class="login-form login innerlabels">{% csrf_token %} |
3 |
<p>if you already have a username and password</p> |
|
3 |
<p> |
|
4 |
{{ provider.get_login_prompt_display }} |
|
5 |
</p> |
|
4 | 6 |
<Br /> |
5 | 7 |
<div class="login-form" style="display:block"> |
6 | 8 |
{% with login_form as form %} |
b/snf-astakos-app/astakos/im/templates/im/auth/local_signup_prompt.html | ||
---|---|---|
1 | 1 |
<br /> |
2 |
New to okeanos ?
|
|
2 |
{{ provider.get_signup_prompt_display }}
|
|
3 | 3 |
<a href="{% url astakos.im.views.signup %}{% ifnotequal code "" %}?code={{ code|urlencode }}{% endifnotequal %}"> |
4 | 4 |
{{ provider.get_create_prompt_display }} |
5 | 5 |
</a> |
b/snf-astakos-app/astakos/im/templates/im/auth/shibboleth_login.html | ||
---|---|---|
1 | 1 |
<p> |
2 |
If you are a student/researcher/faculty you can login using your university |
|
3 |
credentials in the following page |
|
2 |
{{ master_auth_provider.get_primary_login_prompt_display }} |
|
4 | 3 |
</p> |
5 | 4 |
<br /> |
6 | 5 |
<a class="button" href="/im/login/shibboleth">ACADEMIC LOGIN</a> |
b/snf-astakos-app/astakos/im/templates/im/auth/shibboleth_login_prompt.html | ||
---|---|---|
1 |
LOGIN or SIGNUP using |
|
1 |
<br /> |
|
2 |
{{ provider.get_login_prompt }} |
|
2 | 3 |
<a href="/im/login/shibboleth?{% ifnotequal next "" %}&next={{ next|urlencode }}{% endifnotequal %}{% ifnotequal code ""%}{% if next != "" %}&{% else %}?{% endif %}code={{ code }}{% endifnotequal %}" |
3 | 4 |
alt="{{ provider.get_title_display }}">{{ provider.get_title_display }}</a> |
b/snf-astakos-app/astakos/im/templates/im/auth/twitter_login_prompt.html | ||
---|---|---|
1 |
<br />LOGIN or SIGNUP using
|
|
1 |
<br />{{ provider.get_login_prompt_display }}
|
|
2 | 2 |
<a href="/im/login/twitter?{% ifnotequal next "" %}&next={{ next|urlencode }}{% endifnotequal %}{% ifnotequal code ""%}{% if next != "" %}&{% else %}?{% endif %}code={{ code }}{% endifnotequal %}" |
3 | 3 |
alt="{{ provider.get_title_display }}">{{ provider.get_title_display }}</a> |
b/snf-astakos-app/astakos/im/templates/im/login_base.html | ||
---|---|---|
22 | 22 |
{% for provider in auth_providers %} |
23 | 23 |
{% if not provider == master_auth_provider %} |
24 | 24 |
{% include provider.login_prompt_template %} |
25 |
<br /> |
|
26 | 25 |
{% endif %} |
27 | 26 |
{% endfor %} |
28 | 27 |
<div class="bottom"> |
Also available in: Unified diff