Merge lp:~vorlon/summit/better-registration-link into lp:summit

[Steve Langasek]

Make registration more obvious for non-logged-in users.

If the user is not logged in, they are shown no information about how to register, only a small login link in the upper corner of the page. Give the user a more obvious link, so that if they want to register they will be guided through the login (or account creation) process.

[Michael Hall (mhall119)]

Looks good

review: Approve

=== modified file 'summit/schedule/templates/schedule/summit.html'
--- summit/schedule/templates/schedule/summit.html	2013-05-09 20:30:41 +0000
+++ summit/schedule/templates/schedule/summit.html	2014-04-13 21:52:18 +0000
@@ -46,8 +46,10 @@
         {% else %}
             {% if request.user.is_authenticated %}
                 <p><strong>You have not registered in Summit.</strong></p>
-                <p><a class="link-cta" href="{% url registration summit %}">Register in Summit</a></p>
+            {% else %}
+                <p><strong>Log in now to register:</strong></p>
             {% endif %}
+            <p><a class="link-cta" href="{% url registration summit %}">Register in Summit</a></p>
         {% endif %}
     </section>
     <article class="span-4 last">

=== modified file 'summit/version.py'
--- summit/version.py	2013-08-28 11:38:34 +0000
+++ summit/version.py	2014-04-13 21:52:18 +0000
@@ -1,2 +1,2 @@
-version = '1.2.14'
-revno = '560'
+version = '1.2.16'
+revno = '221'