Summit

Merge lp:~cjohnston/summit/the-star-is-rising into lp:summit

  1. the-star-is-rising
  2. Merge into trunk
Proposed by Chris Johnston
Status: Merged
Approved by: Michael Hall
Approved revision: 449
Merged at revision: 448
Proposed branch: lp:~cjohnston/summit/the-star-is-rising
Merge into: lp:summit
Diff against target: 62 lines (+10/-3)
3 files modified
summit/schedule/templates/schedule/by_room.html (+3/-1)
summit/schedule/templates/schedule/by_track.html (+3/-1)
summit/schedule/templates/schedule/daily.html (+4/-1)
To merge this branch: bzr merge lp:~cjohnston/summit/the-star-is-rising
Reviewer Review Type Date Requested Status
Michael Hall (community) Approve
Review via email: mp+126814@code.launchpad.net

Commit message

Changes the star on the agenda pages to link to the attending form instead of the meeting page.

To post a comment you must log in.
lp:~cjohnston/summit/the-star-is-rising updated
449. By Chris Johnston

Minor fix

Revision history for this message
Michael Hall (mhall119) wrote :

LGTM

review: Approve
Revision history for this message
Nigel Babu (nigelbabu) wrote :

Nice branch name ;-)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'summit/schedule/templates/schedule/by_room.html'
2--- summit/schedule/templates/schedule/by_room.html 2012-05-28 03:36:43 +0000
3+++ summit/schedule/templates/schedule/by_room.html 2012-09-27 22:02:20 +0000
4@@ -34,12 +34,14 @@
5 <tr style="background-color: {% ifequal agenda.meeting.type 'plenary' %}#ffffe0{% else %}{{ agenda.meeting.track_color }}{% endifequal %}; {% if agenda.meeting.private %}border: 1px; border-style: solid; border-color: #FF0000;{% endif %}">
6 <td width="75%">
7 <span onMouseOver="show_agenda_details({{agenda.id}}, {{slot.id}});" onMouseOut="hide_agenda_details({{agenda.id}}, {{slot.id}});">
8- <a href="{{agenda.meeting.meeting_page_url}}" style="color: #000000;" class="main-agenda-item-name">
9+ <a href="{% url summit.schedule.views.attend_meeting agenda.meeting.summit.name, agenda.meeting.id %}">
10 {% if attendee in agenda.meeting.attendees %}
11 <img class="icon" src="/media/img/attending.png" alt="Attending">
12 {% else %}
13 <img class="icon" src="/media/img/not_attending.png" alt="Not Attending">
14 {% endif %}
15+ </a>
16+ <a href="{{agenda.meeting.meeting_page_url}}" style="color: #000000;" class="main-agenda-item-name">
17 {{agenda.meeting.title}}
18 </a>
19 {% if agenda.meeting.tracks.count > 0 %}
20
21=== modified file 'summit/schedule/templates/schedule/by_track.html'
22--- summit/schedule/templates/schedule/by_track.html 2012-05-28 03:36:43 +0000
23+++ summit/schedule/templates/schedule/by_track.html 2012-09-27 22:02:20 +0000
24@@ -35,12 +35,14 @@
25 <tr style="background-color: {% ifequal agenda.meeting.type 'plenary' %}#ffffe0{% else %}{{ agenda.meeting.track_color }}{% endifequal %}; {% if agenda.meeting.private %}border: 1px; border-style: solid; border-color: #FF0000;{% endif %}">
26 <td width="75%">
27 <span onMouseOver="show_agenda_details({{agenda.id}}, {{slot.id}});" onMouseOut="hide_agenda_details({{agenda.id}}, {{slot.id}});">
28- <a href="{{agenda.meeting.meeting_page_url}}" style="color: #000000;" class="main-agenda-item-name">
29+ <a href="{% url summit.schedule.views.attend_meeting agenda.meeting.summit.name, agenda.meeting.id %}">
30 {% if attendee in agenda.meeting.attendees %}
31 <img class="icon" src="/media/img/attending.png" alt="Attending">
32 {% else %}
33 <img class="icon" src="/media/img/not_attending.png" alt="Not Attending">
34 {% endif %}
35+ </a>
36+ <a href="{{agenda.meeting.meeting_page_url}}" style="color: #000000;" class="main-agenda-item-name">
37 {{agenda.meeting.title}}
38 </a>
39 <div id="agenda-{{agenda.id}}-{{slot.id}}-details" class="agenda-details">
40
41=== modified file 'summit/schedule/templates/schedule/daily.html'
42--- summit/schedule/templates/schedule/daily.html 2012-05-28 03:36:43 +0000
43+++ summit/schedule/templates/schedule/daily.html 2012-09-27 22:02:20 +0000
44@@ -51,14 +51,17 @@
45 <tr style="background-color: {% ifequal agenda.meeting.type 'plenary' %}#ffffe0{% else %}{{ agenda.meeting.track_color }}{% endifequal %}; {% if agenda.meeting.private %}border: 1px; border-style: solid; border-color: #FF0000;{% endif %}">
46 <td width="75%">
47 <span onMouseOver="show_agenda_details({{agenda.id}}, {{slot.id}});" onMouseOut="hide_agenda_details({{agenda.id}}, {{slot.id}});">
48- <a href="{{agenda.meeting.meeting_page_url}}" style="color: #000000;" class="main-agenda-item-name">
49+ <a href="{% url summit.schedule.views.attend_meeting agenda.meeting.summit.name, agenda.meeting.id %}">
50 {% if attendee in agenda.meeting.attendees %}
51 <img class="icon" src="/media/img/attending.png" alt="Attending">
52 {% else %}
53 <img class="icon" src="/media/img/not_attending.png" alt="Not Attending">
54 {% endif %}
55+ </a>
56+ <a href="{{agenda.meeting.meeting_page_url}}" style="color: #000000;" class="main-agenda-item-name">
57 {{agenda.meeting.title}}
58 </a>
59+
60 {% if agenda.meeting.tracks.count > 0 %}
61 <span class="main-agenda-item-tracks">({% for track in agenda.meeting.tracks.all %}
62 {% ifnotequal forloop.counter 1 %}, {% endifnotequal %}{{ track.title }}

Subscribers

People subscribed via source and target branches