Revision ab7e3a9e

b/snf-astakos-app/astakos/im/messages.py
146 146
AUTH_PROVIDER_NOT_ACTIVE_FOR_ADD             =   "'%(provider)s is disabled"
147 147
AUTH_PROVIDER_ADDED                          =   "Your new login method has been added"
148 148
AUTH_PROVIDER_ADD_FAILED                     =   "Failed to add new login method"
149
AUTH_PROVIDER_LOGIN_TO_ADD                   =   "Please login now to your existing account."
149 150

  
b/snf-astakos-app/astakos/im/models.py
1152 1152
        return
1153 1153
    set_default_group(instance)
1154 1154
    # TODO handle socket.error & IOError
1155
    register_users((instance,))
1155
    #register_users((instance,))
1156 1156

  
1157 1157

  
1158 1158
def resource_post_save(sender, instance, created, **kwargs):
b/snf-astakos-app/astakos/im/static/im/css/formating.css
103 103
/* misc ---------------------------------------*/
104 104
img[align="left"]								{ margin:0 1em 0.5em 0; }
105 105
img[align="right"]								{ margin:0 0 0.5em 1em; }
106

  
107
/* button */
108
.button { display: inline-block; color: #fff; line-height: 22px; padding: 10px 22px; background-color: #F89A1C; margin-bottom: 10px;}
109
.button:hover { background-color: #3582AC;}
110
.button.wide { display: block;}
111
span.action-desc { display: block; color: #fff;}
b/snf-astakos-app/astakos/im/target/local.py
75 75
    third_party_token = get_query(request).get('key', False)
76 76

  
77 77
    if not form.is_valid():
78
        if third_party_token:
79
            messages.info(request, astakos_messages.AUTH_PROVIDER_LOGIN_TO_ADD)
80

  
78 81
        return render_to_response(
79 82
            on_failure,
80 83
            {'login_form':form,
b/snf-astakos-app/astakos/im/target/shibboleth.py
164 164
        user.save()
165 165

  
166 166
        extra_context['provider'] = 'shibboleth'
167
        extra_context['provider_title'] = 'Academic credentials'
167 168
        extra_context['token'] = user.token
168 169
        extra_context['signup_url'] = reverse('signup') + \
169 170
                                        "?third_party_token=%s" % user.token
b/snf-astakos-app/astakos/im/target/twitter.py
173 173
        user.save()
174 174

  
175 175
        extra_context['provider'] = 'twitter'
176
        extra_context['provider_title'] = 'Twitter'
176 177
        extra_context['token'] = user.token
177 178
        extra_context['signup_url'] = reverse('signup') + \
178 179
                                    "?third_party_token=%s" % user.token
b/snf-astakos-app/astakos/im/templates/im/base.html
6 6
  <meta http-equiv="X-UA-Compatible" content="{{ resource.meta.compatibility }}">
7 7
  
8 8
  <title>
9
     {% block page.title %}{% endblock %} / GRNET Cloud Accounts 
9
     {% block page.title %}Accounts{% endblock %} / GRNET Cloud Accounts 
10 10
  </title>
11 11
  
12 12
  <meta name="description" content="">
b/snf-astakos-app/astakos/im/templates/im/login_base.html
1 1
{% extends 'im/base_two_cols.html'%}
2 2

  
3 3
{% block signup_class %}hidden{% endblock %}
4
{% block page.title %}{% endblock %}
5 4

  
6 5
{% block body.left %}
7 6
	<img class="pic" src="{{ IM_STATIC_URL }}images/porta.png" />
b/snf-astakos-app/astakos/im/templates/im/third_party_check_local.html
13 13
    {% if "local" in im_modules %}
14 14
      <div class="form-stacked">
15 15
        <h2><span>Already have an account?</span></h2>
16
        <a href="{% url astakos.im.views.index %}?key={{ token }}">YES</a>
17
        <a href="{{ signup_url }}">NO</a>
16
        <a href="{% url astakos.im.views.index %}?key={{ token }}"
17
          class="button wide">
18
          <span class="left">YES</span>
19
          <span class="action-desc right">I want to add '{{ provider_title }}' as a new login method for my existing account</span>
20
        </a>
21
        <a href="{{ signup_url }}?key={{ token }}" class="button wide">
22
          <span class="left">NO</span>
23
          <span class="right action-desc">I want to create a new account</span>
24
        </a>
18 25
      </div>
19 26
    {% endif %}
20 27
{% endblock %}
b/snf-astakos-app/astakos/im/views.py
195 195
    if request.user.is_authenticated():
196 196
        return HttpResponseRedirect(reverse('astakos.im.views.edit_profile'))
197 197

  
198
    third_party_token = request.GET.get('key', False)
199
    if third_party_token:
200
        messages.info(request, astakos_messages.AUTH_PROVIDER_LOGIN_TO_ADD)
201

  
198 202
    return render_response(
199 203
        template_name,
200 204
        login_form = LoginForm(request=request),

Also available in: Unified diff