# HG changeset patch
# User Brian Neal <bgneal@gmail.com>
# Date 1382147466 18000
# Node ID d20dd565f0014ec5abd4370995f0b34f21f13b60
# Parent  846cda22d77c3dccd5b57be3603c39539a454c6e
Bootstrap: update the bio page.

diff -r 846cda22d77c -r d20dd565f001 madeira/templates/band/bio.html
--- a/madeira/templates/band/bio.html	Fri Oct 18 20:31:36 2013 -0500
+++ b/madeira/templates/band/bio.html	Fri Oct 18 20:51:06 2013 -0500
@@ -1,44 +1,46 @@
 {% extends 'base.html' %}
+{% load core_tags %}
 {% block title %}The Madeira | Biography{% endblock %}
+{% block navblock %}{% navbar 'bio' %}{% endblock %}
 {% block content %}
 <h1>Band Biography</h1>
 <p>
 The Madeira began in 2004 in Indianapolis, IN. The band features Ivan Pongracic
 on lead guitar, the founder of the 1990s surf music icons the Space Cossacks;
 Patrick O'Connor on rhythm guitar, the founder of the Indy space-surf mavens
-Destination: Earth!; Dane Carter on drums; and Todd Fortier on bass.  The
-Madeira have released four CDs:  &ldquo;Sandstorm&rdquo; (2005),
-&ldquo;Ruins&rdquo; EP (2006), &ldquo;Carpe Noctem&rdquo; (2008) and
-&ldquo;Tribal Fires&rdquo; (2012).  They've played all around the US, including
-three California tours as well as shows on the East Coast and in the South,
-though they primarily play in the Indiana/Illinois/Ohio/Michigan area.  They
-headlined the third night of the 2009 Surfer Joe Festival in Livorno, Italy,
-followed by a 10-day Italian tour.  UK's Pipeline magazine, the leading
-surf/instrumental-rock fanzine in the world, selected &ldquo;Carpe
-Noctem&rdquo; Album of the Year in 2008 and &ldquo;Sandstorm&rdquo; and
-&ldquo;Tribal Fires&rdquo; as runners-up for the Album of the Year in 2006 and
-2012 respectively.
+Destination: Earth!; Dane Carter on drums; and Todd Fortier on bass. The
+Madeira have released four CDs: “Sandstorm” (2005), “Ruins” EP (2006), “Carpe
+Noctem” (2008) and “Tribal Fires” (2012). They've played all around the US,
+including three California tours as well as shows on the East Coast and in the
+South, though they primarily play in the Indiana/Illinois/Ohio/Michigan area.
+They headlined the third night of the 2009 Surfer Joe Festival in Livorno,
+Italy, followed by a 10-day Italian tour. UK's Pipeline magazine, the leading
+surf/instrumental-rock fanzine in the world, selected “Carpe Noctem” Album of
+the Year in 2008 and “Sandstorm” and “Tribal Fires” as runners-up for the Album
+of the Year in 2006 and 2012 respectively.
 </p>
 
 {% if members %}
    {% for member in members %}
-      <h2>{{ member.name }} - {{ member.instrument }}</h2>
-      <p>
+      <h2>{{ member.name }} <small>{{ member.instrument }}</small></h2>
+      <div class="media">
       {% if member.photo %}
-         <img class="left" src="{{ member.photo.url }}" border="0" alt="{{ member.name }}" title="{{ member.name }}" />
-         {{ member.bio|linebreaks }}
-      </p>
-         {% if member.gear_set.all %}
-            <p>Gear:</p>
-            <ul>
-               {% for item in member.gear_set.all %}
-                  <li>{{ item.item }}</li>
-               {% endfor %}
-            </ul>
-         {% endif %}
+         <img class="pull-left media-object img-rounded" src="{{ member.photo.url }}" alt="{{ member.name }}"
+            title="{{ member.name }}" />
       {% endif %}
+      {{ member.bio|linebreaks }}
+      {% if member.gear_set.all %}
+         <p>Gear:</p>
+         <ul>
+            {% for item in member.gear_set.all %}
+               <li>{{ item.item }}</li>
+            {% endfor %}
+         </ul>
+      {% endif %}
+      <br class="clearfix">
+      </div>
    {% endfor %}
 {% else %}
-The band has no members.
+<p>The band has no members.</p>
 {% endif %}
 {% endblock %}
diff -r 846cda22d77c -r d20dd565f001 madeira/templates/core/navbar_tag.html
--- a/madeira/templates/core/navbar_tag.html	Fri Oct 18 20:31:36 2013 -0500
+++ b/madeira/templates/core/navbar_tag.html	Fri Oct 18 20:51:06 2013 -0500
@@ -25,7 +25,7 @@
                   <li{% if active_tab == "flyers" %} class="active"{% endif %}><a href="{% url 'gigs-flyers' %}">Flyers</a></li>
                </ul>
             </li>
-            <li><a href="{% url 'band-bio' %}">Bio</a></li>
+            <li{% if active_tab == "bio" %} class="active"{% endif %}><a href="{% url 'band-bio' %}">Bio</a></li>
             <li class="dropdown{% if active_tab == "photos" or active_tab == "songs" or active_tab == "videos" %} active{% endif %}">
                <a href="#" class="dropdown-toggle" data-toggle="dropdown">Media <b class="caret"></b></a>
                <ul class="dropdown-menu">