Summit

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

  1. 1152170-fix
  2. Merge into trunk
Proposed by José Antonio Rey
Status: Merged
Approved by: Chris Johnston
Approved revision: 510
Merged at revision: 514
Proposed branch: lp:~jose/summit/1152170-fix
Merge into: lp:summit
Diff against target: 126 lines (+47/-7)
6 files modified
summit/schedule/templates/schedule/by_participant.html (+7/-1)
summit/schedule/templates/schedule/by_room.html (+7/-1)
summit/schedule/templates/schedule/by_track.html (+7/-1)
summit/schedule/templates/schedule/daily.html (+7/-1)
summit/schedule/templates/schedule/meeting.html (+7/-1)
summit/schedule/templates/schedule/virtual_meeting.html (+12/-2)
To merge this branch: bzr merge lp:~jose/summit/1152170-fix
Reviewer Review Type Date Requested Status
Chris Johnston Approve
Review via email: mp+153496@code.launchpad.net

Commit message

Changed IRC links to logs when summit state is set to public.

Description of the change

Same as etherpad fix. Added if, and set to point to the logs instead of webchat in by_*.html, daily.html, meeting.html and virtual_meeting.html.

To post a comment you must log in.
Revision history for this message
José Antonio Rey (jose) wrote :

Just wanted to mention, while bugs #1155416, #1155417 and #1155420 are fixed I have linked and embedded the whole room log. As cjohnston said, it's better than nothing.

Revision history for this message
Chris Johnston (cjohnston) :
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 2013-03-06 15:46:02 +0000
3+++ summit/schedule/templates/schedule/by_participant.html 2013-03-15 03:54:19 +0000
4@@ -69,7 +69,13 @@
5 {% if agenda.room.icecast_url %}
6 <a href="{{agenda.room.icecast_url}}"><img class="icon" src="/media/img/audio.png" title="Audio Feed" alt="(Audio Feed)"></a>
7 {% endif %}
8- {% 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 %}
9+ {% if agenda.room.irc_channel %}
10+ {% if summit.state == 'public' %}
11+ <a href="http://ubottu.com/uds-logs/archives/{{summit.name}}/%23{{agenda.room.irc_channel}}.log"><img class="icon" src="/media/img/chat.png" title="IRC Logs: #{{agenda.room.irc_channel}}" alt="(IRC Logs)" /></a>
12+ {% else %}
13+ <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>
14+ {% endif %}
15+ {% endif %}
16 {% 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 %}
17 </td>
18 </tr>
19
20=== modified file 'summit/schedule/templates/schedule/by_room.html'
21--- summit/schedule/templates/schedule/by_room.html 2013-03-06 15:46:02 +0000
22+++ summit/schedule/templates/schedule/by_room.html 2013-03-15 03:54:19 +0000
23@@ -75,7 +75,13 @@
24 {% if agenda.room.icecast_url %}
25 <a href="{{agenda.room.icecast_url}}"><img class="icon" src="/media/img/audio.png" title="Audio Feed" alt="(Audio Feed)"></a>
26 {% endif %}
27- {% 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 %}
28+ {% if agenda.room.irc_channel %}
29+ {% if summit.state == 'public' %}
30+ <a href="http://ubottu.com/uds-logs/archives/{{summit.name}}/%23{{agenda.room.irc_channel}}.log"><img class="icon" src="/media/img/chat.png" title="IRC Logs: #{{agenda.room.irc_channel}}" alt="(IRC Logs)" /></a>
31+ {% else %}
32+ <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>
33+ {% endif %}
34+ {% endif %}
35 {% 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 %}
36 </td>
37 </tr>
38
39=== modified file 'summit/schedule/templates/schedule/by_track.html'
40--- summit/schedule/templates/schedule/by_track.html 2013-03-06 15:46:02 +0000
41+++ summit/schedule/templates/schedule/by_track.html 2013-03-15 03:54:19 +0000
42@@ -70,7 +70,13 @@
43 {% if agenda.room.icecast_url %}
44 <a href="{{agenda.room.icecast_url}}"><img class="icon" src="/media/img/audio.png" title="Audio Feed" alt="(Audio Feed)"></a>
45 {% endif %}
46- {% 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 %}
47+ {% if agenda.room.irc_channel %}
48+ {% if summit.state == 'public' %}
49+ <a href="http://ubottu.com/uds-logs/archives/{{summit.name}}/%23{{agenda.room.irc_channel}}.log"><img class="icon" src="/media/img/chat.png" title="IRC Logs: #{{agenda.room.irc_channel}}" alt="(IRC Logs)" /></a>
50+ {% else %}
51+ <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>
52+ {% endif %}
53+ {% endif %}
54 {% 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 %}
55 </td>
56 </tr>
57
58=== modified file 'summit/schedule/templates/schedule/daily.html'
59--- summit/schedule/templates/schedule/daily.html 2013-03-06 15:46:02 +0000
60+++ summit/schedule/templates/schedule/daily.html 2013-03-15 03:54:19 +0000
61@@ -97,7 +97,13 @@
62 {% if agenda.room.icecast_url %}
63 <a href="{{agenda.room.icecast_url}}"><img class="icon" src="/media/img/audio.png" title="Audio Feed" alt="(Audio Feed)"></a>
64 {% endif %}
65- {% 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 %}
66+ {% if agenda.room.irc_channel %}
67+ {% if summit.state == 'public' %}
68+ <a href="http://ubottu.com/uds-logs/archives/{{summit.name}}/%23{{agenda.room.irc_channel}}.log"><img class="icon" src="/media/img/chat.png" title="IRC Logs: #{{agenda.room.irc_channel}}" alt="(IRC Logs)" /></a>
69+ {% else %}
70+ <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>
71+ {% endif %}
72+ {% 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 %}
74 </td>
75 </tr>
76
77=== modified file 'summit/schedule/templates/schedule/meeting.html'
78--- summit/schedule/templates/schedule/meeting.html 2013-03-04 17:47:31 +0000
79+++ summit/schedule/templates/schedule/meeting.html 2013-03-15 03:54:19 +0000
80@@ -138,7 +138,13 @@
81 {% if meeting.spec_url %}<li><a href="{{ meeting.spec_url }}">Blueprint</a></li>{% endif %}
82 {% if meeting.wiki_url %}<li><a href="{{ meeting.wiki_url }}">Wiki page</a></li>{% endif %}
83 {% for ai in agenda_items %}
84- {% if ai.room.irc_channel %}<li><a href="https://webchat.freenode.net/?channels={{ai.room.irc_channel}}">IRC Channel: #{{ai.room.irc_channel}}</a></li>{% endif %}
85+ {% if ai.room.irc_channel %}
86+ {% if summit.state == 'public' %}
87+ <li><a href="http://ubottu.com/uds-logs/archives/{{summit.name}}/%23{{ai.room.irc_channel}}.log">IRC Logs for #{{ai.room.irc_channel}}</a></li>
88+ {% else %}
89+ <li><a href="https://webchat.freenode.net/?channels={{ai.room.irc_channel}}">IRC Channel: #{{ai.room.irc_channel}}</a></li>
90+ {% endif %}
91+ {% endif %}
92 {% endfor %}
93
94 </ul>
95
96=== modified file 'summit/schedule/templates/schedule/virtual_meeting.html'
97--- summit/schedule/templates/schedule/virtual_meeting.html 2013-03-09 22:37:04 +0000
98+++ summit/schedule/templates/schedule/virtual_meeting.html 2013-03-15 03:54:19 +0000
99@@ -123,7 +123,11 @@
100 {% endif %}
101 </div>
102 <div id="chat">
103- <iframe style="width:100%; border:2px solid #000000" src="http://webchat.freenode.net?channels={% for ai in agenda_items %}{{ ai.room.irc_channel }}{% endfor %}&uio=Mj10cnVlJjQ9dHJ1ZSY5PXRydWUmMTA9dHJ1ZSYxMz1mYWxzZSYxND1mYWxzZQbf" height="395"></iframe>
104+ {% if summit.state == 'public' %}
105+ <iframe style="width:100%; border:2px solid #000000" src="http://ubottu.com/uds-logs/archives/{{ summit.name }}/%23{% for ai in agenda_items %}{{ ai.room.irc_channel }}{% endfor %}.log" height="395"></iframe>
106+ {% else %}
107+ <iframe style="width:100%; border:2px solid #000000" src="http://webchat.freenode.net?channels={% for ai in agenda_items %}{{ ai.room.irc_channel }}{% endfor %}&uio=Mj10cnVlJjQ9dHJ1ZSY5PXRydWUmMTA9dHJ1ZSYxMz1mYWxzZSYxND1mYWxzZQbf" height="395"></iframe>
108+ {% endif %}
109 </div>
110 </section>
111 </div>
112@@ -157,7 +161,13 @@
113 {% if meeting.spec_url %}<li><a href="{{ meeting.spec_url }}">Blueprint</a></li>{% endif %}
114 {% if meeting.wiki_url %}<li><a href="{{ meeting.wiki_url }}">Wiki page</a></li>{% endif %}
115 {% for ai in agenda_items %}
116- {% if ai.room.irc_channel %}<li><a href="https://webchat.freenode.net/?channels={{ai.room.irc_channel}}">IRC Channel: #{{ai.room.irc_channel}}</a></li>{% endif %}
117+ {% if ai.room.irc_channel %}
118+ {% if summit.state == 'public' %}
119+ <li><a href="http://ubottu.com/uds-logs/archives/{{summit.name}}/%23{{ai.room.irc_channel}}.log">IRC Logs for #{{ai.room.irc_channel}}</a></li>
120+ {% else %}
121+ <li><a href="https://webchat.freenode.net/?channels={{ai.room.irc_channel}}">IRC Channel: #{{ai.room.irc_channel}}</a></li>
122+ {% endif %}
123+ {% endif %}
124 {% endfor %}
125
126 </ul>

Subscribers

People subscribed via source and target branches

to all changes: