Summit

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

  1. 1073635-fix
  2. Merge into trunk
Proposed by José Antonio Rey
Status: Merged
Approved by: Michael Hall
Approved revision: 479
Merged at revision: 476
Proposed branch: lp:~jose/summit/1073635-fix
Merge into: lp:summit
Diff against target: 47 lines (+4/-0)
4 files modified
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/daily.html (+1/-0)
To merge this branch: bzr merge lp:~jose/summit/1073635-fix
Reviewer Review Type Date Requested Status
Adnane Belmadiaf Approve
Review via email: mp+132998@code.launchpad.net

Commit message

Adding blueprint link to daily, participant, room, and track views.

Description of the change

Adding blueprint link to daily, participant, room, and track views.

To post a comment you must log in.
Revision history for this message
Adnane Belmadiaf (daker) wrote :

Please fix those issues :
- {{agenda.meeting.spec_url}} should be {{ agenda.meeting.spec_url }}
- /media/img/gem-sm.png should be {{ MEDIA_URL }}img/gem-sm.png

review: Needs Fixing
Revision history for this message
José Antonio Rey (jose) wrote :

Fixed as requested.

lp:~jose/summit/1073635-fix updated
478. By José Antonio Rey

Added spaces in agenda.meeting.spec_url and changed /media/ for {{ MEDIA_URL }}.

479. By José Antonio Rey

Fixed typo on daily.html

Revision history for this message
Adnane Belmadiaf (daker) wrote :

+1 from me :)

review: Approve

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_participant.html'
2--- summit/schedule/templates/schedule/by_participant.html 2012-10-28 07:05:50 +0000
3+++ summit/schedule/templates/schedule/by_participant.html 2013-01-18 22:26:20 +0000
4@@ -70,6 +70,7 @@
5 <a href="{{agenda.room.icecast_url}}"><img class="icon" src="/media/img/audio.png" title="Audio Feed" alt="(Audio Feed)"></a>
6 {% endif %}
7 {% if agenda.room.irc_channel %}<a href="https://webchat.freenode.net/?channels={{agenda.room.irc_channel}}"><img class="icon" src="/media/img/chat.png" title="IRC Channel: #{{agenda.room.irc_channel}}" alt="(IRC Channel)" /></a>{% endif %}
8+ {% if agenda.meeting.spec_url %}<a href="{{ agenda.meeting.spec_url }}"><img class="icon" src="{{ MEDIA_URL }}img/gem-sm.png" title="Go to Blueprint" alt="Go to Blueprint" /></a>{% endif %}
9 </td>
10 </tr>
11 {% endfor %}
12
13=== modified file 'summit/schedule/templates/schedule/by_room.html'
14--- summit/schedule/templates/schedule/by_room.html 2012-10-28 07:05:50 +0000
15+++ summit/schedule/templates/schedule/by_room.html 2013-01-18 22:26:20 +0000
16@@ -76,6 +76,7 @@
17 <a href="{{agenda.room.icecast_url}}"><img class="icon" src="/media/img/audio.png" title="Audio Feed" alt="(Audio Feed)"></a>
18 {% endif %}
19 {% if agenda.room.irc_channel %}<a href="https://webchat.freenode.net/?channels={{agenda.room.irc_channel}}"><img class="icon" src="/media/img/chat.png" title="IRC Channel: #{{agenda.room.irc_channel}}" alt="(IRC Channel)" /></a>{% endif %}
20+ {% if agenda.meeting.spec_url %}<a href="{{ agenda.meeting.spec_url }}"><img class="icon" src="{{ MEDIA_URL}}img/gem-sm.png" title="Go to Blueprint" alt="Go to Blueprint" /></a>{% endif %}
21 </td>
22 </tr>
23 {% endfor %}
24
25=== modified file 'summit/schedule/templates/schedule/by_track.html'
26--- summit/schedule/templates/schedule/by_track.html 2012-10-28 07:05:50 +0000
27+++ summit/schedule/templates/schedule/by_track.html 2013-01-18 22:26:20 +0000
28@@ -71,6 +71,7 @@
29 <a href="{{agenda.room.icecast_url}}"><img class="icon" src="/media/img/audio.png" title="Audio Feed" alt="(Audio Feed)"></a>
30 {% endif %}
31 {% if agenda.room.irc_channel %}<a href="https://webchat.freenode.net/?channels={{agenda.room.irc_channel}}"><img class="icon" src="/media/img/chat.png" title="IRC Channel: #{{agenda.room.irc_channel}}" alt="(IRC Channel)" /></a>{% endif %}
32+ {% if agenda.meeting.spec_url %}<a href="{{ agenda.meeting.spec_url }}"><img class="icon" src="{{ MEDIA_URL }}img/gem-sm.png" title="Go to Blueprint" alt="Go to Blueprint" /></a>{% endif %}
33 </td>
34 </tr>
35 {% endfor %}
36
37=== modified file 'summit/schedule/templates/schedule/daily.html'
38--- summit/schedule/templates/schedule/daily.html 2012-10-31 10:05:55 +0000
39+++ summit/schedule/templates/schedule/daily.html 2013-01-18 22:26:20 +0000
40@@ -98,6 +98,7 @@
41 <a href="{{agenda.room.icecast_url}}"><img class="icon" src="/media/img/audio.png" title="Audio Feed" alt="(Audio Feed)"></a>
42 {% endif %}
43 {% if agenda.room.irc_channel %}<a href="https://webchat.freenode.net/?channels={{agenda.room.irc_channel}}"><img class="icon" src="/media/img/chat.png" title="IRC Channel: #{{agenda.room.irc_channel}}" alt="(IRC Channel)" /></a>{% endif %}
44+ {% if agenda.meeting.spec_url %}<a href="{{ agenda.meeting.spec_url }}"><img class="icon" src="{{ MEDIA_URL }}img/gem-sm.png" title="Go to Blueprint" alt="Go to Blueprint" /></a>{% endif %}
45 </td>
46 </tr>
47 {% endfor %}

Subscribers

People subscribed via source and target branches

to all changes: