Merge lp:~ronnie.vd.c/loco-team-portal/team-page-style into lp:loco-team-portal

[Ronnie]

Restyle of the Team Detail page

=== modified file 'loco_directory/media/css/newstyle.css'
--- loco_directory/media/css/newstyle.css	2011-02-18 02:37:49 +0000
+++ loco_directory/media/css/newstyle.css	2011-02-19 14:23:54 +0000
@@ -62,6 +62,10 @@
     padding: 2px 10px !important;
 }
 
+.relative {
+    position: relative;
+}
+
 br.clear {
     clear:          left;
 }
@@ -464,3 +468,10 @@
     width: 900px;
     margin: 0 auto;
 }
+
+#locobranding {
+    width: 96px; 
+    height: 96px; 
+    position: absolute; 
+    right: 10px;
+}

=== modified file 'loco_directory/templates/teams/team_detail.html'
--- loco_directory/templates/teams/team_detail.html	2011-02-17 21:16:56 +0000
+++ loco_directory/templates/teams/team_detail.html	2011-02-19 14:23:54 +0000
@@ -93,9 +93,9 @@
 {% endblock %}
 
 {% block content %}
-<article class="minor-content alone">
+<article class="minor-content relative">
     <h2><a href="https://launchpad.net/~{{ team.lp_name }}">{{ team.name }}</a></h2>
-
+    <img id="locobranding" src="{{ team.mugshot_url }}" alt="" title="{{ team.name }}" />
     <table>
         <tr>
             <th class="form-item-label" scope="row"><label>{% trans "Location:" %}</label></th>
@@ -199,15 +199,33 @@
           </tr>
     </table>
 </article>
-
+{% comment %}
 <article class="minor-content">
     <img id="locobranding" src="{{ team.mugshot_url }}" alt="" title="{{ team.name }}" />
 </article>
+{% endcomment %}
+
+{% if team.microbloghashtag %}
+<article class="minor-content alone">
+    <h2>{% trans "Microblogging" %} #{{team.microbloghashtag}}</h2>
+    <p><script src="{{MEDIA_URL}}js/twidenash.js?{{team.microbloghashtag}}"></script></p>
+</article>
+{% endif %}
 
 <hr class="divide" />
 
+{% 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 %}
+
 {% if team.flickr_id or team.picasa_id or team.pixie_id %} 
-<article class="minor-content alone">
+<article class="main-content">
     <h2>{% trans "Photos from" %} {{ team.name }}</h2>
     <div style="width:100%;" id="flickr"> </div>
     <div style="width:100%;" id="picasa"> </div> 
@@ -215,22 +233,5 @@
 </article>
 {% endif %}
 
-{% if team.microbloghashtag %}
-<article class="minor-content">
-    <h2>{% trans "Microblogging" %} #{{team.microbloghashtag}}</h2>
-    <p><script src="{{MEDIA_URL}}js/twidenash.js?{{team.microbloghashtag}}"></script></p>
-</article>
-{% endif %}
 
 {% endblock %}
-{% block general %}
-    {% 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 %}