Merge pull request #467 from alphagov/tour-footer-link

Put a link to the tour in the footer

app/main/views/add_service.py

@@ -42,8 +42,8 @@ def add_service():
                                                        restricted=True,
                                                        user_id=session['user_id'],
                                                        email_from=email_from)
-
-        return redirect(url_for('main.tour', service_id=service_id, page=1))
+        session['service_id'] = service_id
+        return redirect(url_for('main.tour', page=1))
     else:
         return render_template(
             'views/add-service.html',

app/main/views/dashboard.py

@@ -34,7 +34,8 @@ def service_dashboard(service_id):
 
     if session.get('invited_user'):
         session.pop('invited_user', None)
-        return redirect(url_for("main.tour", service_id=service_id, page=1))
+        session['service_id'] = service_id
+        return redirect(url_for("main.tour", page=1))
 
     statistics = statistics_api_client.get_statistics_for_service(service_id)['data']
     template_statistics = aggregate_usage(template_statistics_client.get_template_statistics_for_service(service_id))

app/main/views/tour.py

@@ -12,9 +12,8 @@ headings = [
 ]
 
 
-@main.route("/services/<service_id>/tour/<int:page>")
-@login_required
-def tour(service_id, page):
+@main.route("/tour/<int:page>")
+def tour(page):
     return render_template(
         'views/tour/{}.html'.format(page),
         current_page=page,

app/templates/admin_template.html

@@ -91,8 +91,11 @@
           </ul>
         </div>
         <div class="column-one-third">
-          <h2>Developers</h2>
-          <a href="{{ url_for('main.documentation') }}">API documentation</a>
+          <h2>Documentation</h2>
+          <ul>
+            <li><a href="{{ url_for('main.tour', page=1) }}">Take the tour</a></li>
+            <li><a href="{{ url_for('main.documentation') }}">API documentation</a></li>
+          </ul>
         </div>
       </div>
     </div>

app/templates/views/tour/1.html

@@ -17,7 +17,7 @@
 	<p>
 		We can remove these restrictions when you’re ready.
 	</p>
-    <a href='{{ url_for('.tour', service_id=current_service.id, page=next_page) }}'>
+    <a href='{{ url_for('.tour', page=next_page) }}'>
       Next
     </a>
   {% endcall %}

app/templates/views/tour/2.html

@@ -29,7 +29,7 @@
 		  >
 		</picture>
 	</p>
-    <a href='{{ url_for('.tour', service_id=current_service.id, page=next_page) }}'>
+    <a href='{{ url_for('.tour', page=next_page) }}'>
       Next
     </a>
   {% endcall %}

app/templates/views/tour/3.html

@@ -32,7 +32,7 @@
 	<p>
 		Developers, you can add data automatically using an API
 	</p>
-    <a href='{{ url_for('.tour', service_id=current_service.id, page=next_page) }}'>
+    <a href='{{ url_for('.tour', page=next_page) }}'>
       Next
     </a>
   {% endcall %}

app/templates/views/tour/4.html

@@ -14,7 +14,7 @@
 	<p>
 		Notify merges your data with the template and sends the messages
 	</p>
-	<a href="{{ url_for('.service_dashboard', service_id=current_service.id) }}">
+	<a href="{{ url_for('.show_all_services_or_dashboard') }}">
       Next
     </a>
     <picture class="banner-tour-image-flush-bottom">