Summit

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

  1. 1197855-fix
  2. Merge into trunk
Proposed by José Antonio Rey on 2013-08-06
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 on 2013-12-01
Chris Johnston 2013-08-06 Needs Fixing on 2013-12-01
Summit Hackers 2015-05-23 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.
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
Adnane Belmadiaf (daker) wrote :

+1

review: Approve
Reply
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 on 2015-05-23
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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'summit/schedule/templates/schedule/all_meetings.html'
2--- summit/schedule/templates/schedule/all_meetings.html 2013-05-08 19:37:12 +0000
3+++ summit/schedule/templates/schedule/all_meetings.html 2015-05-23 19:45:07 +0000
4@@ -66,7 +66,8 @@
5 </style>
6 {% endblock %}
7
8-{% block sub_nav %}
9+{% block sub_nav_links %}
10+<li><a class="sub-nav-item" href="{% url summit.schedule.views.summit summit.name %}">Back to schedule</a></li>
11 {% endblock %}
12
13 {% block content %}
14
15=== modified file 'summit/schedule/templates/schedule/attend.html'
16--- summit/schedule/templates/schedule/attend.html 2013-04-08 01:47:03 +0000
17+++ summit/schedule/templates/schedule/attend.html 2015-05-23 19:45:07 +0000
18@@ -1,7 +1,9 @@
19 {% extends "base.html" %}
20
21 {% block page_name %}Attend {{ meeting }} - {{ summit.title }}{%endblock %}
22-{% block sub_nav %}{% endblock %}
23+{% block sub_nav_links %}
24+<li><a class="sub-nav-item" href="{% url summit.schedule.views.summit summit.name %}">Back to schedule</a></li>
25+{% endblock %}
26
27 {% block closure %}
28 <script type="text/javascript"><!--
29
30=== modified file 'summit/schedule/templates/schedule/by_participant.html'
31--- summit/schedule/templates/schedule/by_participant.html 2013-05-14 02:30:50 +0000
32+++ summit/schedule/templates/schedule/by_participant.html 2015-05-23 19:45:07 +0000
33@@ -14,6 +14,7 @@
34 {% block sub_nav_links %}
35 <li><a class="sub-nav-item mobile" href="{% url summit.schedule.views.mobile summit.name %}">Mobile</a></li>
36 <li><a class="sub-nav-item" href="/{{ summit.name }}/participant/my_schedule_{{ attendee.secret_key }}.ical">My sessions (iCal)</a></li>
37+ <li><a class="sub-nav-item" href="{% url summit.schedule.views.summit summit.name %}">Back to schedule</a></li>
38 {% endblock %}
39
40 {% block content %}
41
42=== modified file 'summit/schedule/templates/schedule/by_room.html'
43--- summit/schedule/templates/schedule/by_room.html 2013-05-14 02:30:50 +0000
44+++ summit/schedule/templates/schedule/by_room.html 2015-05-23 19:45:07 +0000
45@@ -13,6 +13,7 @@
46
47 {% block sub_nav_links %}
48 <li><a class="sub-nav-item mobile" href="{% url summit.schedule.views.mobile summit.name %}">Mobile</a></li>
49+<li><a class="sub-nav-item" href="{% url summit.schedule.views.summit summit.name %}">Back to schedule</a></li>
50 {% endblock %}
51
52 {% block content %}
53
54=== modified file 'summit/schedule/templates/schedule/by_track.html'
55--- summit/schedule/templates/schedule/by_track.html 2013-05-14 02:30:50 +0000
56+++ summit/schedule/templates/schedule/by_track.html 2015-05-23 19:45:07 +0000
57@@ -13,6 +13,7 @@
58
59 {% block sub_nav_links %}
60 <li><a class="sub-nav-item mobile" href="{% url summit.schedule.views.mobile summit.name %}">Mobile</a></li>
61+<li><a class="sub-nav-item" href="{% url summit.schedule.views.summit summit.name %}">Back to schedule</a></li>
62 {% endblock %}
63
64 {% block content %}
65
66=== modified file 'summit/schedule/templates/schedule/create_meeting.html'
67--- summit/schedule/templates/schedule/create_meeting.html 2013-04-08 01:47:03 +0000
68+++ summit/schedule/templates/schedule/create_meeting.html 2015-05-23 19:45:07 +0000
69@@ -1,7 +1,9 @@
70 {% extends "base.html" %}
71
72 {% block page_name %}Create a Meeting - {{ summit.title }}{%endblock %}
73-{% block sub_nav %}{% endblock %}
74+{% block sub_nav_links %}
75+<li><a class="sub-nav-item" href="{% url summit.schedule.views.summit summit.name %}">Back to schedule</a></li>
76+{% endblock %}
77
78 {% block closure %}
79 <script type="text/javascript"><!--
80@@ -36,6 +38,9 @@
81 <input type="submit" name="submit" value="Create" class="submit-button" />
82 </fieldset>
83 </form>
84+ {% if form.is_valid %}
85+ Thanks, your meeting has been submitted for review. <a href="{% url summit.schedule.views.summit summit.name %}">Go back to the schedule.</a>
86+ {% endif%}
87 </article>
88 </div>
89 {% endblock %}
90
91=== modified file 'summit/schedule/templates/schedule/daily.html'
92--- summit/schedule/templates/schedule/daily.html 2013-05-14 02:30:50 +0000
93+++ summit/schedule/templates/schedule/daily.html 2015-05-23 19:45:07 +0000
94@@ -17,6 +17,7 @@
95 {% endif %}
96 <li><a class="sub-nav-item mobile" href="{% url summit.schedule.views.mobile summit.name %}">Mobile</a></li>
97 <li><a class="sub-nav-item" href="display">Wide display</a></li>
98+<li><a class="sub-nav-item" href="{% url summit.schedule.views.summit summit.name %}">Back to schedule</a></li>
99 {% endblock %}
100
101 {% block content %}
102
103=== modified file 'summit/schedule/templates/schedule/meeting.html'
104--- summit/schedule/templates/schedule/meeting.html 2014-04-29 19:28:06 +0000
105+++ summit/schedule/templates/schedule/meeting.html 2015-05-23 19:45:07 +0000
106@@ -66,6 +66,7 @@
107 {% if scheduler %}
108 <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>
109 {% endif %}
110+ <li><a class="sub-nav-item" href="{% url summit.schedule.views.summit summit.name %}">Back to schedule</a></li>
111 {% endblock %}
112
113 {% block content %}
114
115=== modified file 'summit/schedule/templates/schedule/mine.html'
116--- summit/schedule/templates/schedule/mine.html 2013-03-14 01:19:19 +0000
117+++ summit/schedule/templates/schedule/mine.html 2015-05-23 19:45:07 +0000
118@@ -66,7 +66,8 @@
119 </style>
120 {% endblock %}
121
122-{% block sub_nav %}
123+{% block sub_nav_links %}
124+<li><a class="sub-nav-item" href="{% url summit.schedule.views.summit summit.name %}">Back to schedule</a></li>
125 {% endblock %}
126
127 {% block content %}
128
129=== modified file 'summit/schedule/templates/schedule/mobile.html'
130--- summit/schedule/templates/schedule/mobile.html 2012-04-30 16:48:43 +0000
131+++ summit/schedule/templates/schedule/mobile.html 2015-05-23 19:45:07 +0000
132@@ -3,7 +3,9 @@
133
134 {% block page_name %}Mobile Schedule using Guidebook{%endblock %}
135
136-{% block sub_nav %}{% endblock %}
137+{% block sub_nav_links %}
138+<li><a class="sub-nav-item" href="{% url summit.schedule.views.summit summit.name %}">Back to schedule</a></li>
139+{% endblock %}
140
141 {% block content %}
142
143
144=== modified file 'summit/schedule/templates/schedule/propose_meeting.html'
145--- summit/schedule/templates/schedule/propose_meeting.html 2013-06-26 05:02:35 +0000
146+++ summit/schedule/templates/schedule/propose_meeting.html 2015-05-23 19:45:07 +0000
147@@ -1,7 +1,9 @@
148 {% extends "base.html" %}
149
150-{% block page_name %}Propose a Meeting - {{ summit.title }}{%endblock %}
151-{% block sub_nav %}{% endblock %}
152+{% block page_name %}Propose a Meeting - {{ summit.title }}{% endblock %}
153+{% block sub_nav_links %}
154+<li><a class="sub-nav-item" href="{% url summit.schedule.views.summit summit.name %}">Back to schedule</a></li>
155+{% endblock %}
156
157 {% block closure %}
158 <script type="text/javascript"><!--
159
160=== modified file 'summit/schedule/templates/schedule/virtual_meeting.html'
161--- summit/schedule/templates/schedule/virtual_meeting.html 2014-04-29 19:28:06 +0000
162+++ summit/schedule/templates/schedule/virtual_meeting.html 2015-05-23 19:45:07 +0000
163@@ -63,6 +63,7 @@
164 {% if scheduler %}
165 <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>
166 {% endif %}
167+ <li><a class="sub-nav-item" href="{% url summit.schedule.views.summit summit.name %}">Back to schedule</a></li>
168 {% endblock %}
169
170 {% block content %}

Subscribers

People subscribed via source and target branches

to all changes: