Revision 8a084e9f

b/snf-astakos-app/astakos/im/auth_providers.py
183 183
    module = 'local'
184 184
    title = _('Local password')
185 185
    description = _('Create a local password for your account')
186
    add_prompt =  _('Create a local password for your account')
187
    login_prompt = _('if you already have a username and password')
186
    add_prompt =  _('Allows you to login using a local password')
187
    details_tpl = _('Local account')
188
    login_prompt = _('Classic login (username/password)')
188 189
    signup_prompt = _('New to ~okeanos ?')
189 190
    signup_link_prompt = _('create an account now')
190 191
    login_view = 'password_change'
......
196 197
    login_template = 'im/auth/local_login_form.html'
197 198
    login_prompt_template = 'im/auth/local_login_prompt.html'
198 199
    signup_prompt_template = 'im/auth/local_signup_prompt.html'
199
    details_tpl = _('You can login to your account using your'
200
                    ' %(auth_backend)s password.')
201 200

  
202 201
    @property
203 202
    def extra_actions(self):
......
206 205

  
207 206
class ShibbolethAuthProvider(AuthProvider):
208 207
    module = 'shibboleth'
209
    title = _('Academic account (Shibboleth)')
210
    add_prompt = _('Allows you to login to your account using your academic '
211
                    'account')
212
    details_tpl = _('Shibboleth account \'%(identifier)s\' is connected to your '
213
                    ' account.')
208
    title = _('Academic account')
209
    add_prompt = _('Allows you to login using an academic account')
210
    details_tpl = _('Academic account: %(identifier)s')
214 211
    user_title = _('Academic credentials (%(identifier)s)')
215
    primary_login_prompt = _('If you are a student/researcher/faculty you can'
216
                             ' login using your university-credentials in'
217
                             ' the following page')
212
    primary_login_prompt = _('If you are a student, professor or researcher you '
213
                             'can login using your academic account.')
218 214
    login_view = 'astakos.im.target.shibboleth.login'
219 215

  
220 216
    login_template = 'im/auth/shibboleth_login.html'
......
225 221
class TwitterAuthProvider(AuthProvider):
226 222
    module = 'twitter'
227 223
    title = _('Twitter')
228
    add_prompt = _('Allows you to login to your account using Twitter')
229
    details_tpl = _('Twitter screen name: %(info_screen_name)s')
224
    add_prompt = _('Allows you to login using a Twitter account')
225
    details_tpl = _('Twitter account: %(info_screen_name)s')
230 226
    user_title = _('Twitter (%(info_screen_name)s)')
231 227
    login_view = 'astakos.im.target.twitter.login'
232 228

  
......
237 233
class GoogleAuthProvider(AuthProvider):
238 234
    module = 'google'
239 235
    title = _('Google')
240
    add_prompt = _('Allows you to login to your account using Google')
236
    add_prompt = _('Allows you to login using a Google account')
241 237
    details_tpl = _('Google account: %(info_email)s')
242 238
    user_title = _('Google (%(info_email)s)')
243 239
    login_view = 'astakos.im.target.google.login'
......
249 245
class LinkedInAuthProvider(AuthProvider):
250 246
    module = 'linkedin'
251 247
    title = _('LinkedIn')
252
    add_prompt = _('Allows you to login to your account using LinkedIn')
253
    user_title = _('LinkedIn (%(info_emailAddress)s)')
248
    add_prompt = _('Allows you to login using a LinkedIn account')
254 249
    details_tpl = _('LinkedIn account: %(info_emailAddress)s')
250
    user_title = _('LinkedIn (%(info_emailAddress)s)')
255 251
    login_view = 'astakos.im.target.linkedin.login'
256 252

  
257 253
    login_template = 'im/auth/third_party_provider_generic_login.html'
b/snf-astakos-app/astakos/im/templates/im/profile_auth_methods.html
16 16
		                <span class="details">{{ userauthprovider.details_display }}</span>
17 17
                      	<div class="dialog-wrap">
18 18
                        	 
19
                          	<p>Are you sure you want to remove  {{ userauthprovider.settings.get_title_display }} from your Authentication methods? </p>
19
				<p>Are you sure you want to remove {{ userauthprovider.settings.get_title_display }} from your authentication methods? </p>
20 20
 
21 21
							<p>
22 22
								<a href="{% url remove_auth_provider userauthprovider.pk %}" class="submit">Yes</a>
b/snf-astakos-app/astakos/im/templates/im/signup.html
18 18
{% block body.right %}
19 19
<h2>{% trans "SIGN UP" %}</h2>
20 20
{% if not third_party_token and not signup_form.errors %}
21
<p>{% trans "Sign up using one of the following methods" %}</p>
21
<p>{% trans "Choose one of the following sign up methods." %}</p>
22 22
<div class="extralogin">
23 23
{% for provider in auth_providers %}
24 24
	{% if provider.is_available_for_create %}
25 25
		{% if provider.module == 'local' %}
26
			<a href="#" class="submit standalone" id="signup-classic">CLASSIC SIGN UP</a>
26
			<a href="#" class="submit standalone" id="signup-classic">CLASSIC</a>
27 27
            {% if "local" in im_modules %}
28 28
            {% include "im/auth/signup_form.html" %}
29 29
		    {% endif %}
30 30
		{% else %}
31 31
			{% if provider.module == 'shibboleth' %}
32
				<a href="{% provider_login_url provider %}" class="submit standalone">ACADEMIC SIGN UP</a>
32
				<a href="{% provider_login_url provider %}" class="submit standalone">ACADEMIC</a>
33 33
			{% else %}
34 34
			<a href="{% provider_login_url provider %}" title="{{ provider.get_title_display }}" class="icons">
35 35
				<img src=" {{ provider.get_icon_url_display }}" alt="{{ provider.get_title_display }}">

Also available in: Unified diff