Merge lp:~cjohnston/summit/add-summit-registration-links into lp:summit

[Chris Johnston]

Add links to register your attendance in Summit

[lp:~cjohnston/summit/add-summit-registration-links]

520. By Chris Johnston on 2013-04-07

Puts css in theme

[Adnane Belmadiaf (daker)]

+1

review: Approve

[lp:~cjohnston/summit/add-summit-registration-links]

521. By Chris Johnston on 2013-04-08

Update from trunk

[Adnane Belmadiaf (daker)]

+1

review: Approve

=== modified file 'summit/schedule/templates/schedule/summit.html'
--- summit/schedule/templates/schedule/summit.html	2013-04-07 23:42:24 +0000
+++ summit/schedule/templates/schedule/summit.html	2013-04-08 21:08:20 +0000
@@ -38,19 +38,15 @@
 <div class="row">
     <section class="span-8">
         {% if attendee %}
-            <p>You are attending, you can update the days and times of your attendance <ins></ins>
-                <a class="launchpad" href="http://launchpad.net/sprints/{{ summit.name }}/+attend"><img src="/media/img/gem-sm.png" /> Launchpad</a>.
+        <p>You are registered as attending {{ summit.title }}. <a href="{% url registration summit %}">Update registration</a>.
             </p>
             <p>Download your 
                 <a href="/{{ summit.name }}/participant/my_schedule_{{ attendee.secret_key }}.ical">Participation Schedule</a> to import into your Calendar.
             </p>
         {% else %}
             {% if request.user.is_authenticated %}
-                <p><strong>You are not registered as attending.</strong></p>
-                <p>You can register your attendance in
-                    <a class="launchpad" href="http://launchpad.net/sprints/{{ summit.name }}/+attend"><img src="/media/img/gem-sm.png" /> Launchpad</a>.
-                    If you have recently done so, wait a few minutes and reload this page.
-                </p>
+                <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>You are not logged in.</strong></p>
                 <p><a href="/openid/login?next={{login_next}}">Log in now</a></p>

=== modified file 'summit/schedule/tests/registration.py'
--- summit/schedule/tests/registration.py	2013-04-08 21:08:20 +0000
+++ summit/schedule/tests/registration.py	2013-04-08 21:08:20 +0000
@@ -85,6 +85,19 @@
         attendee = Attendee.objects.get(user=self.user1)
         return attendee
 
+    def view_summit_page(self):
+        rev_args = [self.summit.name, ]
+        response = self.c.get(
+            reverse(
+                'summit.schedule.views.summit',
+                args=rev_args
+            )
+        )
+        self.assertEqual(response.status_code, 200)
+        self.assertTemplateUsed(response, 'schedule/summit.html')
+
+        return response
+
     def with_summit_registration_times(self):
         """
         Using the start and end of the summit as the registration times
@@ -220,3 +233,40 @@
             response.content
         )
         self.with_custom_registration_times()
+
+    def test_registered_view(self):
+        """
+        Test that when a user is already registered for the summit
+        that they will see a link to update their registration
+        """
+        self.create_attendee()
+        self.attendee1.from_launchpad = True
+        self.attendee1.save()
+        self.login()
+        rev_args = [self.summit.name, ]
+        response = self.view_summit_page()
+        self.assertIn(
+            reverse(
+                'registration',
+                args=rev_args
+            ),
+            response.content
+        )
+        self.assertIn('Update registration', response.content)
+
+    def test_unregistered_view(self):
+        """
+        Test that when a user is not registered for the summit
+        that they will see a button to register
+        """
+        self.login()
+        rev_args = [self.summit.name, ]
+        response = self.view_summit_page()
+        self.assertIn(
+            reverse(
+                'registration',
+                args=rev_args
+            ),
+            response.content
+        )
+        self.assertIn('Register in Summit', response.content)