Summit

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

  1. 1197855-fix
  2. Merge into trunk
Proposed by José Antonio Rey
Status: Needs review
Proposed branch: lp:~jose/summit/1197855-fix
Merge into: lp:summit
Diff against target: 170 lines (+26/-7)
12 files modified
summit/schedule/templates/schedule/all_meetings.html (+2/-1)
summit/schedule/templates/schedule/attend.html (+3/-1)
summit/schedule/templates/schedule/by_participant.html (+1/-0)
summit/schedule/templates/schedule/by_room.html (+1/-0)
summit/schedule/templates/schedule/by_track.html (+1/-0)
summit/schedule/templates/schedule/create_meeting.html (+6/-1)
summit/schedule/templates/schedule/daily.html (+1/-0)
summit/schedule/templates/schedule/meeting.html (+1/-0)
summit/schedule/templates/schedule/mine.html (+2/-1)
summit/schedule/templates/schedule/mobile.html (+3/-1)
summit/schedule/templates/schedule/propose_meeting.html (+4/-2)
summit/schedule/templates/schedule/virtual_meeting.html (+1/-0)
To merge this branch: bzr merge lp:~jose/summit/1197855-fix
Reviewer Review Type Date Requested Status
Adnane Belmadiaf Approve
Chris Johnston Needs Fixing
Summit Hackers Pending
Review via email: mp+178679@code.launchpad.net

Commit message

Added 'Back to schedule' link in most pages.

Description of the change

Fixed bug 1197855

Added 'Back to schedule' link in most pages.

To post a comment you must log in.
Revision history for this message
Chris Johnston (cjohnston) wrote :

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

review: Needs Fixing
Reply
Revision history for this message
Adnane Belmadiaf (daker) wrote :

+1

review: Approve
Reply
Revision history for this message
José Antonio Rey (jose) wrote :

> 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.

Reply
lp:~jose/summit/1197855-fix updated
560. By José Antonio Rey

Added more buttons and fixed a popup

Unmerged revisions

560. By José Antonio Rey

Added more buttons and fixed a popup

559. By José Antonio Rey

Added 'Back to Schedule' link in most pages

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
66</style>66</style>
67{% endblock %}67{% endblock %}
6868
69{% block sub_nav %}69{% block sub_nav_links %}
70<li><a class="sub-nav-item" href="{% url summit.schedule.views.summit summit.name %}">Back to schedule</a></li>
70{% endblock %}71{% endblock %}
7172
72{% block content %}73{% block content %}
7374
=== 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 @@
1{% extends "base.html" %}1{% extends "base.html" %}
22
3{% block page_name %}Attend {{ meeting }} - {{ summit.title }}{%endblock %}3{% block page_name %}Attend {{ meeting }} - {{ summit.title }}{%endblock %}
4{% block sub_nav %}{% endblock %}4{% block sub_nav_links %}
5<li><a class="sub-nav-item" href="{% url summit.schedule.views.summit summit.name %}">Back to schedule</a></li>
6{% endblock %}
57
6{% block closure %}8{% block closure %}
7<script type="text/javascript"><!--9<script type="text/javascript"><!--
810
=== 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 @@
14{% block sub_nav_links %}14{% block sub_nav_links %}
15 <li><a class="sub-nav-item mobile" href="{% url summit.schedule.views.mobile summit.name %}">Mobile</a></li>15 <li><a class="sub-nav-item mobile" href="{% url summit.schedule.views.mobile summit.name %}">Mobile</a></li>
16 <li><a class="sub-nav-item" href="/{{ summit.name }}/participant/my_schedule_{{ attendee.secret_key }}.ical">My sessions (iCal)</a></li>16 <li><a class="sub-nav-item" href="/{{ summit.name }}/participant/my_schedule_{{ attendee.secret_key }}.ical">My sessions (iCal)</a></li>
17 <li><a class="sub-nav-item" href="{% url summit.schedule.views.summit summit.name %}">Back to schedule</a></li>
17{% endblock %}18{% endblock %}
1819
19{% block content %}20{% block content %}
2021
=== 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 @@
1313
14{% block sub_nav_links %}14{% block sub_nav_links %}
15<li><a class="sub-nav-item mobile" href="{% url summit.schedule.views.mobile summit.name %}">Mobile</a></li>15<li><a class="sub-nav-item mobile" href="{% url summit.schedule.views.mobile summit.name %}">Mobile</a></li>
16<li><a class="sub-nav-item" href="{% url summit.schedule.views.summit summit.name %}">Back to schedule</a></li>
16{% endblock %}17{% endblock %}
1718
18{% block content %}19{% block content %}
1920
=== 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 @@
1313
14{% block sub_nav_links %}14{% block sub_nav_links %}
15<li><a class="sub-nav-item mobile" href="{% url summit.schedule.views.mobile summit.name %}">Mobile</a></li>15<li><a class="sub-nav-item mobile" href="{% url summit.schedule.views.mobile summit.name %}">Mobile</a></li>
16<li><a class="sub-nav-item" href="{% url summit.schedule.views.summit summit.name %}">Back to schedule</a></li>
16{% endblock %}17{% endblock %}
1718
18{% block content %}19{% block content %}
1920
=== 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 @@
1{% extends "base.html" %}1{% extends "base.html" %}
22
3{% block page_name %}Create a Meeting - {{ summit.title }}{%endblock %}3{% block page_name %}Create a Meeting - {{ summit.title }}{%endblock %}
4{% block sub_nav %}{% endblock %}4{% block sub_nav_links %}
5<li><a class="sub-nav-item" href="{% url summit.schedule.views.summit summit.name %}">Back to schedule</a></li>
6{% endblock %}
57
6{% block closure %}8{% block closure %}
7<script type="text/javascript"><!--9<script type="text/javascript"><!--
@@ -36,6 +38,9 @@
36 <input type="submit" name="submit" value="Create" class="submit-button" />38 <input type="submit" name="submit" value="Create" class="submit-button" />
37 </fieldset>39 </fieldset>
38 </form>40 </form>
41 {% if form.is_valid %}
42 Thanks, your meeting has been submitted for review. <a href="{% url summit.schedule.views.summit summit.name %}">Go back to the schedule.</a>
43 {% endif%}
39 </article>44 </article>
40</div>45</div>
41{% endblock %}46{% endblock %}
4247
=== 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 @@
17{% endif %}17{% endif %}
18<li><a class="sub-nav-item mobile" href="{% url summit.schedule.views.mobile summit.name %}">Mobile</a></li>18<li><a class="sub-nav-item mobile" href="{% url summit.schedule.views.mobile summit.name %}">Mobile</a></li>
19<li><a class="sub-nav-item" href="display">Wide display</a></li>19<li><a class="sub-nav-item" href="display">Wide display</a></li>
20<li><a class="sub-nav-item" href="{% url summit.schedule.views.summit summit.name %}">Back to schedule</a></li>
20{% endblock %}21{% endblock %}
2122
22{% block content %}23{% block content %}
2324
=== 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 @@
66 {% if scheduler %}66 {% if scheduler %}
67 <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>67 <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>
68 {% endif %}68 {% endif %}
69 <li><a class="sub-nav-item" href="{% url summit.schedule.views.summit summit.name %}">Back to schedule</a></li>
69{% endblock %}70{% endblock %}
7071
71{% block content %}72{% block content %}
7273
=== 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 @@
66</style>66</style>
67{% endblock %}67{% endblock %}
6868
69{% block sub_nav %}69{% block sub_nav_links %}
70<li><a class="sub-nav-item" href="{% url summit.schedule.views.summit summit.name %}">Back to schedule</a></li>
70{% endblock %}71{% endblock %}
7172
72{% block content %}73{% block content %}
7374
=== 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 @@
33
4{% block page_name %}Mobile Schedule using Guidebook{%endblock %}4{% block page_name %}Mobile Schedule using Guidebook{%endblock %}
55
6{% block sub_nav %}{% endblock %}6{% block sub_nav_links %}
7<li><a class="sub-nav-item" href="{% url summit.schedule.views.summit summit.name %}">Back to schedule</a></li>
8{% endblock %}
79
8{% block content %}10{% block content %}
911
1012
=== 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 @@
1{% extends "base.html" %}1{% extends "base.html" %}
22
3{% block page_name %}Propose a Meeting - {{ summit.title }}{%endblock %}3{% block page_name %}Propose a Meeting - {{ summit.title }}{% endblock %}
4{% block sub_nav %}{% endblock %}4{% block sub_nav_links %}
5<li><a class="sub-nav-item" href="{% url summit.schedule.views.summit summit.name %}">Back to schedule</a></li>
6{% endblock %}
57
6{% block closure %}8{% block closure %}
7<script type="text/javascript"><!--9<script type="text/javascript"><!--
810
=== 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 @@
63 {% if scheduler %}63 {% if scheduler %}
64 <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>64 <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>
65 {% endif %}65 {% endif %}
66 <li><a class="sub-nav-item" href="{% url summit.schedule.views.summit summit.name %}">Back to schedule</a></li>
66{% endblock %}67{% endblock %}
6768
68{% block content %}69{% block content %}

Subscribers

People subscribed via source and target branches

to all changes: