Chris Johnston has proposed merging lp:~chrisjohnston/loco-directory/656205
into lp:loco-directory.
Requested reviews:
loco-directory-dev (loco-directory-dev)
Related bugs:
#656205 Nickname not prefilled in webchat
https://bugs.launchpad.net/bugs/656205
--
https://code.launchpad.net/~chrisjohnston/loco-directory/656205/+merge/41996
Your team loco-directory-dev is requested to review the proposed merge of
lp:~chrisjohnston/loco-directory/656205 into lp:loco-directory.
=== modified file 'loco_directory/templates/irc_chat.html'
--- loco_directory/templates/irc_chat.html 2010-11-20 17:25:50 +0000
+++ loco_directory/templates/irc_chat.html 2010-11-27 04:39:04 +0000
@@ -15,7 +15,11 @@
<article class="main-content alone">
<h2>Webchat</h2>
<br />
- <iframe src="http://webchat.freenode.net/?channels=#ubuntu-locoteams&prompt=1&uio=MTE9MzE28"; width="900" height="400"></iframe>
+ {% if user.is_authenticated %}
+ <iframe src="http://webchat.freenode.net/?channels=#ubuntu-locoteams&prompt=1&uio=MTE9MzE28&nick={{ user.username }}" width="900" height="400"></iframe>
+ {% else %}
+ <iframe src="http://webchat.freenode.net/?channels=#ubuntu-locoteams&prompt=1&uio=MTE9MzE28&nick=loco-user"; width="900" height="400"></iframe>
+ {% endif %}
</article>
{% endblock %}
=== modified file 'loco_directory/templates/teams/team_detail.html'
--- loco_directory/templates/teams/team_detail.html 2010-11-20 17:25:50 +0000
+++ loco_directory/templates/teams/team_detail.html 2010-11-27 04:39:04 +0000
@@ -237,8 +237,12 @@
{% endblock %}
{% block general %}
{% if team.irc_chan %}
-<div id="webchat" style="display:none;">
- <iframe src="http://webchat.freenode.net/?channels={{ team.irc_chan }}&prompt=1&uio=OT10cnVlJjEwPXRydWUmMTE9MjM218" width="900" height="400"></iframe>
+ <div id="webchat" style="display:none;">
+ {% if user.is_authenticated %}
+ <iframe src="http://webchat.freenode.net/?channels={{ team.irc_chan }}&prompt=1&uio=OT10cnVlJjEwPXRydWUmMTE9MjM218&nick={{ user.username }}" width="900" height="400"></iframe>
+ {% else %}
+ <iframe src="http://webchat.freenode.net/?channels={{ team.irc_chan }}&prompt=1&uio=OT10cnVlJjEwPXRydWUmMTE9MjM218&nick=loco-user" width="900" height="400"></iframe>
+ {% endif %}
</div>
{% endif %}
{% 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
