Merge lp:~cjohnston/loco-team-portal/706657 into lp:loco-team-portal

[Chris Johnston]

[Nigel Babu (nigelbabu)]

We've been doing inline style to position the webchat div from last release. Since we're doing that almost everywhere (and its my mistake), we should probably move all of that into the css file and give it a class. Looks fine otherwise.

review: Needs Fixing

[lp:~cjohnston/loco-team-portal/706657]

385. By Chris Johnston on 2011-02-03

Changes style from inline to stylesheet.

[Nigel Babu (nigelbabu)]

Looks good :)

review: Approve

=== modified file 'loco_directory/media/css/newstyle.css'
--- loco_directory/media/css/newstyle.css	2011-01-23 14:48:17 +0000
+++ loco_directory/media/css/newstyle.css	2011-02-03 01:46:26 +0000
@@ -460,3 +460,15 @@
     margin-left: 30px;
     font-size: 0.9em;
 }
+
+#webchat {
+    display: none;
+    width: 900px;
+    margin: 0 auto;
+}
+
+#ircchat {
+    display: block;
+    width: 900px;
+    margin: 0 auto;
+}

=== modified file 'loco_directory/templates/irc_chat.html'
--- loco_directory/templates/irc_chat.html	2011-01-25 02:14:26 +0000
+++ loco_directory/templates/irc_chat.html	2011-02-03 01:46:26 +0000
@@ -15,7 +15,7 @@
 <article class="main-content alone">
     <h2>Webchat</h2>
     <br />
-    <div style="display: block; width: 900px; margin: 0 auto;">
+    <div id="ircchat">
         {% 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 %}

=== modified file 'loco_directory/templates/meetings/team_meeting_detail.inc.html'
--- loco_directory/templates/meetings/team_meeting_detail.inc.html	2010-12-09 15:17:27 +0000
+++ loco_directory/templates/meetings/team_meeting_detail.inc.html	2011-02-03 01:46:26 +0000
@@ -11,3 +11,14 @@
     {% include "meetings/team_meeting_detail_agenda.inc.html" %}
 </article>
 
+<article class="main-content">
+    {% block general %}
+        <div id="webchat">
+            {% 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 %}
+</article>

=== 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 01:46:26 +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>

=== modified file 'loco_directory/templates/teams/team_detail.html'
--- loco_directory/templates/teams/team_detail.html	2011-01-26 00:57:42 +0000
+++ loco_directory/templates/teams/team_detail.html	2011-02-03 01:46:26 +0000
@@ -245,13 +245,13 @@
 
 {% endblock %}
 {% block general %}
-{% if team.irc_chan %}
-    <div id="webchat" style="display: none; width: 900px; margin: 0 auto;">
-        {% 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=locodir-user" width="900" height="400"></iframe>
-        {% endif %}
-</div>
-{% endif %}
+    {% if team.irc_chan %}
+        <div id="webchat">
+            {% 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=locodir-user" width="900" height="400"></iframe>
+            {% endif %}
+        </div>
+    {% endif %}
 {% endblock %}