Merge lp:~mhall119/summit/guidebook-rebrand into lp:summit

[Michael Hall]

Conventionist is rebranding themselves as Guidebook, this updates Summit to match.

[Chris Johnston (cjohnston)]

I suggest waiting until the rebranding is official. I also suggest removing the current references to conventionist.

[Chris Johnston (cjohnston)]

IMO this should be a main-content not a minor-content page... Also, the link for visiting from your phones browser should point to http://guidebookapp.com/getit

review: Needs Fixing

[lp:~mhall119/summit/guidebook-rebrand]

82. By Michael Hall on 2011-04-29

append /getit to the end of the conventionist url

[Nigel Babu (nigelbabu)]

Ack

review: Approve

=== removed file 'summit/media/img/conventionist-qr-50.png'
Binary files summit/media/img/conventionist-qr-50.png	2011-04-08 14:59:22 +0000 and summit/media/img/conventionist-qr-50.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'summit/media/img/conventionist-qr.png'
Binary files summit/media/img/conventionist-qr.png	2011-04-08 14:59:22 +0000 and summit/media/img/conventionist-qr.png	1970-01-01 00:00:00 +0000 differ
=== added file 'summit/media/img/guidebook_125.png'
Binary files summit/media/img/guidebook_125.png	1970-01-01 00:00:00 +0000 and summit/media/img/guidebook_125.png	2011-04-29 15:13:29 +0000 differ
=== added file 'summit/media/img/guidebook_50.png'
Binary files summit/media/img/guidebook_50.png	1970-01-01 00:00:00 +0000 and summit/media/img/guidebook_50.png	2011-04-29 15:13:29 +0000 differ
=== modified file 'summit/schedule/templates/schedule/mobile.html'
--- summit/schedule/templates/schedule/mobile.html	2011-04-08 20:17:23 +0000
+++ summit/schedule/templates/schedule/mobile.html	2011-04-29 15:13:29 +0000
@@ -6,14 +6,14 @@
 <article class="minor-content">
 <h1>Mobile Schedule</h1>
 
-<p>For those that have an Android or iPhone we have a new way to access the UDS schedule. We have arranged to have the UDS schedule available on the Conventionist software. </p>
+<p>For those that have an Android or iPhone we have a new way to access the UDS schedule. We have arranged to have the UDS schedule available on the <a href="http://guidebookapp.com/getit?ref=email">Guidebook</a> software. </p>
 
 <p>You can download<sup>*</sup> the software from:
 <ol>
 <li>The Apple App Store or the Android Marketplace.</li>
-<li>Visit http://conventionist.com/getit/intl from your phone's browser</li>
+<li>Visit <a href="http://guidebookapp.com/getit?ref=email">http://guidebookapp.com/getit?ref=email</a> from your phone's browser</li>
 <li>Scan the QR code printed here: <br>
-<center><img src="/media/img/conventionist-qr.png" /></center></li>
+<center><img src="/media/img/guidebook_125.png" /></center></li>
 </ol>
 </p>
 

=== modified file 'summit/schedule/templates/schedule/schedule.html'
--- summit/schedule/templates/schedule/schedule.html	2011-04-08 14:59:22 +0000
+++ summit/schedule/templates/schedule/schedule.html	2011-04-29 15:13:29 +0000
@@ -111,7 +111,7 @@
 
 {% if schedule.date %}
     <div class="schedule-head">
-    <a href="{% url mobile %}"><img class="schedule-qrcode" src="/media/img/conventionist-qr-50.png" /></a>
+    <a href="{% url mobile %}"><img class="schedule-qrcode" src="/media/img/guidebook_50.png" /></a>
     <span class="schedule-date">{{ schedule.date|strftime:"%A" }}</span>
     {% if schedule.crew %}
     <span class="schedule-crew">Crew: {% for crew in schedule.crew %}<a href="https://launchpad.net/~{{crew.attendee}}">{{crew.attendee}}</a>{% if forloop.last %}{% else %}, {% endif %}{% endfor %}