Chris Johnston has proposed merging lp:~chrisjohnston/loco-directory/706657
into lp:loco-directory.
Requested reviews:
loco-directory-dev (loco-directory-dev)
Related bugs:
#706657 Add link to join meeting channel on meeting detail page
https://bugs.launchpad.net/bugs/706657
For more details, see:
https://code.launchpad.net/~chrisjohnston/loco-directory/706657/+merge/48413
--
https://code.launchpad.net/~chrisjohnston/loco-directory/706657/+merge/48413
Your team loco-directory-dev is requested to review the proposed merge of
lp:~chrisjohnston/loco-directory/706657 into lp:loco-directory.
=== modified file 'loco_directory/templates/meetings/team_meeting_detail_basic.inc.html'
--- loco_directory/templates/meetings/team_meeting_detail_basic.inc.html 2011-01-24 02:44:41 +0000
+++ loco_directory/templates/meetings/team_meeting_detail_basic.inc.html 2011-02-03 00:56:12 +0000
@@ -21,7 +21,7 @@
</tr>
<tr>
<th class="form-item-label" scope="row"><label>{% trans "Meeting Channel:" %}</label></th>
- <td class="form-item-value">{{ team_meeting_object.channel }}</td>
+ <td class="form-item-value"><a title="{% trans "Join Channel" %} {{ team_meeting_object.channel }}" href="#" onclick="$('#webchat').show('fast', function() {$(window).scrollTop($('#webchat').position().top);} );">{{ team_meeting_object.channel }}</a></td>
</tr>
<tr>
<th class="form-item-label" scope="row"><label>{% trans "Meeting Chair:" %}</label></th>
@@ -48,3 +48,12 @@
{% endif %}
</table>
{% endif %}
+{% block general %}
+ <div id="webchat" style="display: none; width: 900px; margin: 0 auto;">
+ {% if user.is_authenticated %}
+ <iframe src="http://webchat.freenode.net/?channels={{ team_meeting_object.channel }}&prompt=1&uio=OT10cnVlJjEwPXRydWUmMTE9MjM218&nick={{ user.username }}" width="900" height="400"></iframe>
+ {% else %}
+ <iframe src="http://webchat.freenode.net/?channels={{ team_meeting_object.channel }}&prompt=1&uio=OT10cnVlJjEwPXRydWUmMTE9MjM218&nick=locodir-user" width="900" height="400"></iframe>
+ {% endif %}
+</div>
+{% endblock %}
_______________________________________________
Mailing list: https://launchpad.net/~loco-directory-dev
Post to : [email protected]
Unsubscribe : https://launchpad.net/~loco-directory-dev
More help : https://help.launchpad.net/ListHelp
