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
=== modified file 'summit/schedule/templates/schedule/by_participant.html'
--- summit/schedule/templates/schedule/by_participant.html 2012-10-28 07:05:50 +0000
+++ summit/schedule/templates/schedule/by_participant.html 2013-01-18 22:26:20 +0000
@@ -70,6 +70,7 @@
70 <a href="{{agenda.room.icecast_url}}"><img class="icon" src="/media/img/audio.png" title="Audio Feed" alt="(Audio Feed)"></a>70 <a href="{{agenda.room.icecast_url}}"><img class="icon" src="/media/img/audio.png" title="Audio Feed" alt="(Audio Feed)"></a>
71 {% endif %}71 {% endif %}
72 {% 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 %}72 {% 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 %}
73 {% 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 %}
73</td>74</td>
74</tr>75</tr>
75{% endfor %}76{% endfor %}
7677
=== modified file 'summit/schedule/templates/schedule/by_room.html'
--- summit/schedule/templates/schedule/by_room.html 2012-10-28 07:05:50 +0000
+++ summit/schedule/templates/schedule/by_room.html 2013-01-18 22:26:20 +0000
@@ -76,6 +76,7 @@
76 <a href="{{agenda.room.icecast_url}}"><img class="icon" src="/media/img/audio.png" title="Audio Feed" alt="(Audio Feed)"></a>76 <a href="{{agenda.room.icecast_url}}"><img class="icon" src="/media/img/audio.png" title="Audio Feed" alt="(Audio Feed)"></a>
77 {% endif %}77 {% endif %}
78 {% 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 %}78 {% 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 %}
79 {% 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 %}
79</td>80</td>
80</tr>81</tr>
81{% endfor %}82{% endfor %}
8283
=== modified file 'summit/schedule/templates/schedule/by_track.html'
--- summit/schedule/templates/schedule/by_track.html 2012-10-28 07:05:50 +0000
+++ summit/schedule/templates/schedule/by_track.html 2013-01-18 22:26:20 +0000
@@ -71,6 +71,7 @@
71 <a href="{{agenda.room.icecast_url}}"><img class="icon" src="/media/img/audio.png" title="Audio Feed" alt="(Audio Feed)"></a>71 <a href="{{agenda.room.icecast_url}}"><img class="icon" src="/media/img/audio.png" title="Audio Feed" alt="(Audio Feed)"></a>
72 {% endif %}72 {% endif %}
73 {% 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 %}73 {% 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 %}
74 {% 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 %}
74</td>75</td>
75</tr>76</tr>
76{% endfor %}77{% endfor %}
7778
=== modified file 'summit/schedule/templates/schedule/daily.html'
--- summit/schedule/templates/schedule/daily.html 2012-10-31 10:05:55 +0000
+++ summit/schedule/templates/schedule/daily.html 2013-01-18 22:26:20 +0000
@@ -98,6 +98,7 @@
98 <a href="{{agenda.room.icecast_url}}"><img class="icon" src="/media/img/audio.png" title="Audio Feed" alt="(Audio Feed)"></a>98 <a href="{{agenda.room.icecast_url}}"><img class="icon" src="/media/img/audio.png" title="Audio Feed" alt="(Audio Feed)"></a>
99 {% endif %}99 {% endif %}
100 {% 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 %}100 {% 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 %}
101 {% 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 %}
101</td>102</td>
102</tr>103</tr>
103{% endfor %} 104{% endfor %}

Subscribers

People subscribed via source and target branches

to all changes: