Merge lp:~cjohnston/summit/move-login-quick-links into lp:summit

Proposed by Chris Johnston
Status: Merged
Approved by: Chris Johnston
Approved revision: 541
Merged at revision: 540
Proposed branch: lp:~cjohnston/summit/move-login-quick-links
Merge into: lp:summit
Diff against target: 28 lines (+4/-3)
2 files modified
summit/schedule/templates/schedule/actions.html (+4/-0)
summit/schedule/templates/schedule/summit.html (+0/-3)
To merge this branch: bzr merge lp:~cjohnston/summit/move-login-quick-links
Reviewer Review Type Date Requested Status
Adnane Belmadiaf Approve
Chris Johnston Needs Resubmitting
Review via email: mp+163043@code.launchpad.net

Commit message

Move the login link from the middle of the page into quick links

To post a comment you must log in.
Revision history for this message
Adnane Belmadiaf (daker) wrote :

why {% if not request.user.is_authenticated %} ? you can do {% if not user.is_authenticated %}

review: Needs Information
541. By Chris Johnston <email address hidden>

Update per review

Revision history for this message
Chris Johnston (cjohnston) :
review: Needs Resubmitting
Revision history for this message
Adnane Belmadiaf (daker) wrote :

+1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'summit/schedule/templates/schedule/actions.html'
2--- summit/schedule/templates/schedule/actions.html 2013-04-07 16:12:44 +0000
3+++ summit/schedule/templates/schedule/actions.html 2013-05-08 20:28:27 +0000
4@@ -23,6 +23,10 @@
5 {% if perms.sponsor.add_sponsorshipscore %}
6 <li><a href="/{{ summit.name }}/suggestsponsorship">Suggest sponsorship</a></li>
7 {% endif %}
8+{% else %}
9+{% if not user.is_authenticated %}
10+ <p><a href="/openid/login?next={{login_next}}">Log in now</a></p>
11+{% endif %}
12 {% endifequal %}
13
14 {% ifequal summit.state "review" %}
15
16=== modified file 'summit/schedule/templates/schedule/summit.html'
17--- summit/schedule/templates/schedule/summit.html 2013-04-09 00:17:49 +0000
18+++ summit/schedule/templates/schedule/summit.html 2013-05-08 20:28:27 +0000
19@@ -47,9 +47,6 @@
20 {% if request.user.is_authenticated %}
21 <p><strong>You have not registered in Summit.</strong></p>
22 <p><a class="link-cta" href="{% url registration summit %}">Register in Summit</a></p>
23- {% else %}
24- <p><strong>You are not logged in.</strong></p>
25- <p><a href="/openid/login?next={{login_next}}">Log in now</a></p>
26 {% endif %}
27 {% endif %}
28 </section>

Subscribers

People subscribed via source and target branches