Merge lp:~nataliabidart/locolander/sign-in-with-buttons into lp:locolander

Proposed by Natalia Bidart
Status: Merged
Merged at revision: 26
Proposed branch: lp:~nataliabidart/locolander/sign-in-with-buttons
Merge into: lp:locolander
Diff against target: 48 lines (+28/-0)
2 files modified
locolander/locolanderweb/static/css/style.css (+9/-0)
locolander/locolanderweb/templates/socialaccount/snippets/provider_list.html (+19/-0)
To merge this branch: bzr merge lp:~nataliabidart/locolander/sign-in-with-buttons
Reviewer Review Type Date Requested Status
Matias Bordese Approve
Review via email: mp+176098@code.launchpad.net

Commit message

- Added logos for social sign in.

To post a comment you must log in.
26. By Natalia Bidart

Merged trunk into sign-in-with-buttons.

27. By Natalia Bidart

Fixed use of static prefix.

Revision history for this message
Matias Bordese (matiasb) wrote :

Looks good.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'locolander/locolanderweb/static/css/style.css'
2--- locolander/locolanderweb/static/css/style.css 2013-07-20 19:07:02 +0000
3+++ locolander/locolanderweb/static/css/style.css 2013-07-22 01:35:30 +0000
4@@ -63,3 +63,12 @@
5 margin-top: 10px;
6 border-top: dotted grey 1px;
7 }
8+
9+.socialaccount_providers li {
10+ padding: 5px;
11+}
12+
13+.socialaccount_logo {
14+ vertical-align: middle;
15+ padding-right: 5px;
16+}
17
18=== added file 'locolander/locolanderweb/static/images/github.png'
19Binary files locolander/locolanderweb/static/images/github.png 1970-01-01 00:00:00 +0000 and locolander/locolanderweb/static/images/github.png 2013-07-22 01:35:30 +0000 differ
20=== added file 'locolander/locolanderweb/static/images/google.png'
21Binary files locolander/locolanderweb/static/images/google.png 1970-01-01 00:00:00 +0000 and locolander/locolanderweb/static/images/google.png 2013-07-22 01:35:30 +0000 differ
22=== added file 'locolander/locolanderweb/static/images/twitter.png'
23Binary files locolander/locolanderweb/static/images/twitter.png 1970-01-01 00:00:00 +0000 and locolander/locolanderweb/static/images/twitter.png 2013-07-22 01:35:30 +0000 differ
24=== added directory 'locolander/locolanderweb/templates/socialaccount'
25=== added directory 'locolander/locolanderweb/templates/socialaccount/snippets'
26=== added file 'locolander/locolanderweb/templates/socialaccount/snippets/provider_list.html'
27--- locolander/locolanderweb/templates/socialaccount/snippets/provider_list.html 1970-01-01 00:00:00 +0000
28+++ locolander/locolanderweb/templates/socialaccount/snippets/provider_list.html 2013-07-22 01:35:30 +0000
29@@ -0,0 +1,19 @@
30+{% load i18n %}
31+{% load static %}
32+{% load socialaccount %}
33+
34+{% get_static_prefix as static_prefix %}
35+
36+{% for provider in socialaccount.providers %}
37+<li>
38+ <a title="{{ provider.name }}"
39+ class="socialaccount_provider {{ provider.id }}"
40+ href="{% provider_login_url provider.id process=process %}">
41+ <img class="socialaccount_logo {{ provider.id }}"
42+ src="{{ static_prefix }}/images/{{ provider.id }}.png" width="32"/>
43+ <span class="socialaccount_label {{ provider.id }}">
44+ {% trans "Sign in with" %} {{ provider.name }}
45+ </span>
46+ </a>
47+</li>
48+{% endfor %}

Subscribers

People subscribed via source and target branches

to all changes: