Merge lp:~jose/summit/1197855-fix into lp:summit

[José Antonio Rey]

Added 'Back to schedule' link in most pages.

Fixed bug 1197855

Added 'Back to schedule' link in most pages.

[Chris Johnston (cjohnston)]

This should be done as a 'message' after the proposes a meeting, not as a subnav link

review: Needs Fixing

[Adnane Belmadiaf (daker)]

+1

review: Approve

[José Antonio Rey (jose)]

> This should be done as a 'message' after the proposes a meeting, not as a
> subnav link

Just seen this. I will be fixing it after the current UDS.

[lp:~jose/summit/1197855-fix]

560. By José Antonio Rey on 2015-05-23

Added more buttons and fixed a popup

Unmerged revisions

560. By José Antonio Rey on 2015-05-23

Added more buttons and fixed a popup

559. By José Antonio Rey on 2013-08-06

Added 'Back to Schedule' link in most pages

=== modified file 'summit/schedule/templates/schedule/all_meetings.html'
--- summit/schedule/templates/schedule/all_meetings.html	2013-05-08 19:37:12 +0000
+++ summit/schedule/templates/schedule/all_meetings.html	2015-05-23 19:45:07 +0000
@@ -66,7 +66,8 @@
 </style>
 {% endblock %}
 
-{% block sub_nav %}
+{% block sub_nav_links %}
+<li><a class="sub-nav-item" href="{% url summit.schedule.views.summit summit.name %}">Back to schedule</a></li>
 {% endblock %}
 
 {% block content %}

=== modified file 'summit/schedule/templates/schedule/attend.html'
--- summit/schedule/templates/schedule/attend.html	2013-04-08 01:47:03 +0000
+++ summit/schedule/templates/schedule/attend.html	2015-05-23 19:45:07 +0000
@@ -1,7 +1,9 @@
 {% extends "base.html" %}
 
 {% block page_name %}Attend {{ meeting }} - {{ summit.title }}{%endblock %}
-{% block sub_nav %}{% endblock %}
+{% block sub_nav_links %}
+<li><a class="sub-nav-item" href="{% url summit.schedule.views.summit summit.name %}">Back to schedule</a></li>
+{% endblock %}
 
 {% block closure %}
 <script type="text/javascript"><!--

=== modified file 'summit/schedule/templates/schedule/by_participant.html'
--- summit/schedule/templates/schedule/by_participant.html	2013-05-14 02:30:50 +0000
+++ summit/schedule/templates/schedule/by_participant.html	2015-05-23 19:45:07 +0000
@@ -14,6 +14,7 @@
 {% block sub_nav_links %}
     <li><a class="sub-nav-item mobile" href="{% url summit.schedule.views.mobile summit.name %}">Mobile</a></li>
     <li><a class="sub-nav-item" href="/{{ summit.name }}/participant/my_schedule_{{ attendee.secret_key }}.ical">My sessions (iCal)</a></li>
+    <li><a class="sub-nav-item" href="{% url summit.schedule.views.summit summit.name %}">Back to schedule</a></li>
 {% endblock %}
 
 {% block content %}

=== modified file 'summit/schedule/templates/schedule/by_room.html'
--- summit/schedule/templates/schedule/by_room.html	2013-05-14 02:30:50 +0000
+++ summit/schedule/templates/schedule/by_room.html	2015-05-23 19:45:07 +0000
@@ -13,6 +13,7 @@
 
 {% block sub_nav_links %}
 <li><a class="sub-nav-item mobile" href="{% url summit.schedule.views.mobile summit.name %}">Mobile</a></li>
+<li><a class="sub-nav-item" href="{% url summit.schedule.views.summit summit.name %}">Back to schedule</a></li>
 {% endblock %}
 
 {% block content %}

=== modified file 'summit/schedule/templates/schedule/by_track.html'
--- summit/schedule/templates/schedule/by_track.html	2013-05-14 02:30:50 +0000
+++ summit/schedule/templates/schedule/by_track.html	2015-05-23 19:45:07 +0000
@@ -13,6 +13,7 @@
 
 {% block sub_nav_links %}
 <li><a class="sub-nav-item mobile" href="{% url summit.schedule.views.mobile summit.name %}">Mobile</a></li>
+<li><a class="sub-nav-item" href="{% url summit.schedule.views.summit summit.name %}">Back to schedule</a></li>
 {% endblock %}
 
 {% block content %}

=== modified file 'summit/schedule/templates/schedule/create_meeting.html'
--- summit/schedule/templates/schedule/create_meeting.html	2013-04-08 01:47:03 +0000
+++ summit/schedule/templates/schedule/create_meeting.html	2015-05-23 19:45:07 +0000
@@ -1,7 +1,9 @@
 {% extends "base.html" %}
 
 {% block page_name %}Create a Meeting - {{ summit.title }}{%endblock %}
-{% block sub_nav %}{% endblock %}
+{% block sub_nav_links %}
+<li><a class="sub-nav-item" href="{% url summit.schedule.views.summit summit.name %}">Back to schedule</a></li>
+{% endblock %}
 
 {% block closure %}
 <script type="text/javascript"><!--
@@ -36,6 +38,9 @@
                 <input type="submit" name="submit" value="Create" class="submit-button" />
             </fieldset>
         </form>
+        {% if form.is_valid %}
+        Thanks, your meeting has been submitted for review. <a href="{% url summit.schedule.views.summit summit.name %}">Go back to the schedule.</a>
+        {% endif%}
     </article>
 </div>
 {% endblock %}

=== modified file 'summit/schedule/templates/schedule/daily.html'
--- summit/schedule/templates/schedule/daily.html	2013-05-14 02:30:50 +0000
+++ summit/schedule/templates/schedule/daily.html	2015-05-23 19:45:07 +0000
@@ -17,6 +17,7 @@
 {% endif %}
 <li><a class="sub-nav-item mobile" href="{% url summit.schedule.views.mobile summit.name %}">Mobile</a></li>
 <li><a class="sub-nav-item" href="display">Wide display</a></li>
+<li><a class="sub-nav-item" href="{% url summit.schedule.views.summit summit.name %}">Back to schedule</a></li>
 {% endblock %}
 
 {% block content %}

=== modified file 'summit/schedule/templates/schedule/meeting.html'
--- summit/schedule/templates/schedule/meeting.html	2014-04-29 19:28:06 +0000
+++ summit/schedule/templates/schedule/meeting.html	2015-05-23 19:45:07 +0000
@@ -66,6 +66,7 @@
     {% if scheduler %}
         <li><a class="sub-nav-item" href="{% url summit.schedule.views.meeting_copy meeting.summit.name, meeting.id, meeting.name|default:'-' %}">Copy meeting</a></li>
     {% endif %}
+    <li><a class="sub-nav-item" href="{% url summit.schedule.views.summit summit.name %}">Back to schedule</a></li>
 {% endblock %}
 
 {% block content %}

=== modified file 'summit/schedule/templates/schedule/mine.html'
--- summit/schedule/templates/schedule/mine.html	2013-03-14 01:19:19 +0000
+++ summit/schedule/templates/schedule/mine.html	2015-05-23 19:45:07 +0000
@@ -66,7 +66,8 @@
 </style>
 {% endblock %}
 
-{% block sub_nav %}
+{% block sub_nav_links %}
+<li><a class="sub-nav-item" href="{% url summit.schedule.views.summit summit.name %}">Back to schedule</a></li>
 {% endblock %}
 
 {% block content %}

=== modified file 'summit/schedule/templates/schedule/mobile.html'
--- summit/schedule/templates/schedule/mobile.html	2012-04-30 16:48:43 +0000
+++ summit/schedule/templates/schedule/mobile.html	2015-05-23 19:45:07 +0000
@@ -3,7 +3,9 @@
 
 {% block page_name %}Mobile Schedule using Guidebook{%endblock %}
 
-{% block sub_nav %}{% endblock %}
+{% block sub_nav_links %}
+<li><a class="sub-nav-item" href="{% url summit.schedule.views.summit summit.name %}">Back to schedule</a></li>
+{% endblock %}
 
 {% block content %}
 

=== modified file 'summit/schedule/templates/schedule/propose_meeting.html'
--- summit/schedule/templates/schedule/propose_meeting.html	2013-06-26 05:02:35 +0000
+++ summit/schedule/templates/schedule/propose_meeting.html	2015-05-23 19:45:07 +0000
@@ -1,7 +1,9 @@
 {% extends "base.html" %}
 
-{% block page_name %}Propose a Meeting - {{ summit.title }}{%endblock %}
-{% block sub_nav %}{% endblock %}
+{% block page_name %}Propose a Meeting - {{ summit.title }}{% endblock %}
+{% block sub_nav_links %}
+<li><a class="sub-nav-item" href="{% url summit.schedule.views.summit summit.name %}">Back to schedule</a></li>
+{% endblock %}
 
 {% block closure %}
 <script type="text/javascript"><!--

=== modified file 'summit/schedule/templates/schedule/virtual_meeting.html'
--- summit/schedule/templates/schedule/virtual_meeting.html	2014-04-29 19:28:06 +0000
+++ summit/schedule/templates/schedule/virtual_meeting.html	2015-05-23 19:45:07 +0000
@@ -63,6 +63,7 @@
     {% if scheduler %}
         <li><a class="sub-nav-item" href="{% url summit.schedule.views.meeting_copy meeting.summit.name, meeting.id, meeting.name|default:'-' %}">Copy meeting</a></li>
     {% endif %}
+    <li><a class="sub-nav-item" href="{% url summit.schedule.views.summit summit.name %}">Back to schedule</a></li>
 {% endblock %}
 
 {% block content %}