Merge lp:~cjohnston/loco-team-portal/theme-update into lp:loco-team-portal

[Chris Johnston]

Updates LTP to use the new branding guidelines

[Adnane Belmadiaf (daker)]

1- index.html : remove <hr class="divide" />
2- Replace .current css class with .active in the nav-primary & nav-secondary divs
3- /events/venues/add/ has a big blank at the bottom
4- /events/history/ :
  * Remove <hr class="divide" />
  * The second table is getting outside the page
5- The nav-secondary links should be #333
6- The form title is getting outside the div
7- /teams/<lp_id>/ seems to be a bit broken

review: Needs Fixing

[Chris Johnston (cjohnston)]

1- Done
2- Done.. Still doesn't work.. Secondary div's don't need active because the
3- This is because of: <section class="minor-content alone venue-map" id="venue-map-selector" title="Select venue position">&nbsp;</section>

I don't really know what to do

4- a. done b. hmm... not quite sure what to do.. There is a bunch of data that is causing it to run over
5- it is... core.css
6- done
7- this will need some help.. not sure what to do as I'm not a CSS person.

[Adnane Belmadiaf (daker)]

Move the the active class <li id="main-nav" class="active">
Replace :
  <script src="/ubuntu-website/media/js/modernizr.min.js"></script>
  <script src="//code.jquery.com/jquery-1.7.2.min.js"></script>
with:
  <script type="text/javascript" src="/ubuntu-website/media/js/modernizr.min.js"></script>
  <script type="text/javascript" src="//code.jquery.com/jquery-1.7.2.min.js"></script>
Two jQuery versions are called on the same page (hosted one/local one).

review: Needs Fixing

[lp:~cjohnston/loco-team-portal/theme-update]

532. By Adnane Belmadiaf on 2012-06-13

* Merged Robert's fix for filtering events

[Chris Johnston (cjohnston)]

The li is done, the jquery is in lp:ubuntu-community-webthemes/light-django-theme and needs to be updated there

[lp:~cjohnston/loco-team-portal/theme-update]

533. By Chris Johnston on 2012-06-15

Updates menu li

534. By Chris Johnston on 2012-06-15

further corrections

535. By Chris Johnston on 2012-06-15

update url for styles

[Adnane Belmadiaf (daker)]

Looks good to me but we still need to fix some issues.

review: Approve

=== removed file 'loco_directory/media/css/newstyle.css'
--- loco_directory/media/css/newstyle.css	2012-06-10 19:08:39 +0000
+++ loco_directory/media/css/newstyle.css	1970-01-01 00:00:00 +0000
@@ -1,696 +0,0 @@
-/*
- * newstyle.css
- *
- * Base style for the LoCo Team Portal. This is an implementation
- * of the ( at the time of this writing ) new Ubuntu branding.
- *
- *  Author: Michael Hall      ( mhall119 )
- *  Author: Paul Tagliamonte ( paultag  )
- */
-
-h1.centered {
-    text-align: center;
-}
-
-a {
-    color:      #DD4814;
-}
-
-a:visited {
-    color:      #b12a10;
-}
-
-th.form-item-label {
-    vertical-align: top;
-}
-
-td.no-wrap {
-    white-space: nowrap;
-}
-
-/*
-label {
-    font-weight:    bold;
-    white-space:    nowrap;
-}
-*/
-
-.minor-content.venue-map {
-    min-height: 350px;
-    margin-top: 60px;
-}
-
-.side-content.venue-map {
-    min-height: 250px;
-    margin-top: 60px;
-}
-
-#main-content {
-    margin-right:   20px;
-}
-
-li.col_left {
-    float:          left;
-    width:          45%;
-    clear:          left;
-}
-
-li.col_right {
-    float:          right;
-    width:          45%;
-    clear:          right;
-}
-
-li.float_list { 
-    float:   left;
-    margin: 0px 0px 0px 25px;
-    clear: left;
-}
-
-li.approved {
-    list-style-image: url(../img/approved.png);   /* Colorful Ubuntu Logo */
-}
-
-li.unapproved {
-    list-style-image: url(../img/unapproved.png); /* Grey Ubuntu Logo */
-}
-
-ol.agenda-list, .agenda-list ol, .agenda-list li {
-    padding: 2px 10px !important;
-}
-
-.relative {
-    position: relative;
-}
-
-br.clear {
-    clear:          left;
-}
-
-#main-content .object-detail {
-    -moz-border-radius:    15px;
-    -webkit-border-radius: 15px;
-
-    border:         2px solid #ccc;
-    border-bottom:  4px solid #bbb;
-    border-right:   4px solid #bbb;
-    border-top:     2px solid #ddd;
-    min-height:     500px;
-    text-align:     left;
-}
-
-#main-content .object-detail #options-left ul {
-    position:       relative;
-    left:           -60px;
-}
-
-#main-content .object-detail #options-right ul {
-    position:       relative;
-}
-
-#main-content .object-detail #options-left li {
-    float:          left;
-    margin-left:    5px;
-    display:        inline;
-}
-
-#main-content .object-detail #options-right li {
-    float:          right;
-    margin-right:   5px;
-    text-align:     right;
-    display:        inline;
-}
-    
-#main-content .object-detail .option {
-    width:           32px;
-    height:          32px;
-    display:         block;
-    text-decoration: none;
-}
-
-#main-content .object-detail a.goback {
-    background: transparent url('../img/goback.png')    no-repeat scroll top right;
-}
-
-#main-content .object-detail a.edit {
-    background: transparent url('../img/edit.png')      no-repeat scroll top right;
-}
-
-#main-content .object-detail a.delete {
-    background: transparent url('../img/delete.png')    no-repeat scroll top right;
-}
-
-#main-content .object-detail a.add-team-event {
-    background: transparent url('../img/new_event.png') no-repeat scroll top right;
-}
-
-#main-content .object-detail a.add-comment {
-    background: transparent url('../img/comment.png')   no-repeat scroll top right;
-}
-
-.resource {
-    width:           32px;
-    height:          32px;
-    padding:         2px;
-    margin-top:      4px;
-    margin-bottom:   3px;
-    float:           left;
-    border:          1px white solid;
-}
-
-#main-content .resource:hover {
-    border:          1px #eee solid;
-}
-
-#page-footer .container div.copyright {
-    font-size:       0.75em;  
-    line-height:     1.5em;
-}
-
-#page-footer .container div.loggedin {
-    font-size:       0.75em;  
-    line-height:     1.5em;
-    float:           left;
-    width:           400px;
-    margin-bottom:   10px;
-    margin-top:      5px;
-}
-
-#page-footer .container div.lang_switcher {
-    font-size:       0.75em;  
-    line-height:     1.5em;
-    float:           right; 
-    margin-bottom:   10px;
-    margin-top:      5px;
-    margin-right:    14px;
-}
-
-.team-event-nav {
-    border-bottom:   1px gray solid;
-    list-style:      none;
-    padding:         1px 0px 1px 5px;
-    margin:          5px 0px 5px 0px;
-}
-
-.team-event-nav li {
-    list-style:      none;
-    margin:          -1px 2px 0px 3px;
-    padding:         0px;
-    display:         inline; 
-}
-
-.message .content-shim {
-    margin:                      0px; /* buffer the bulb in */
-    padding:                     5px; /* un-suck the text */
-    background-repeat:           no-repeat;
-    background-image:            url(../img/infobox-icon.png);
-    padding-left:                30px; /* infobox icon is 22x22 */
-}
-
-.message {
-    width:                       70%;
-    margin-left:                 auto;
-    margin-right:                auto;
-    background-color:            #FFFFB6;
-    border-radius:               0px;
-    box-shadow:                  0px 1px 1px #FFE4B6;
-}
-
-.message { /* noncss 3. XXX: remove me in 20 years. */
-    -webkit-border-radius:       8px;
-    -moz-border-radius:          8px;
-    -moz-box-shadow:             0px 0px 1px #FFE4B6;
-    -webkit-box-shadow:          0px 0px 1px #FFE4B6;
-}
-
-/* UI Errors ( To yell at the user when they don't fill out a form ) */
-
-/*
-ul.errorlist {
-    margin:           0px;
-    padding:          0px;
-}
-
-.errorlist li {
-    color:            red;
-    font-weight:      bold;
-    display:          block;
-    font-size:        1.1em;
-    margin:           0px 0px 3px;
-    padding:          4px 5px;
-}
-*/
-
-
-/* Flickr Feed for Global Event */
-
-.thumbs {
-    margin:          0px;
-    padding:         0px;
-    overflow:        hidden;
-}
-
-.thumbs li {
-    list-style:         none;
-    float:              left;
-    margin:             5px;
-    padding:            3px;
-    background:         #eee;
-    -moz-box-shadow:    0px 0px 4px #444;
-    -webkit-box-shadow: 0px 0px 2px #000;
-}
-
-.thumbs li a     { }
-.thumbs li img   { display: block; }
-.thumbs li a img { border: none;}
-
-aside#top-nav {
-    width:           980px;
-}
-
-header#page-header {
-    width:           960px;
-    margin:          0px auto;
-    padding:         0px 10px;
-    position:        relative;
-}
-
-footer#page-footer {
-    width:           960px;
-    margin:          0px auto;
-    padding:         0px 10px;
-    position:        relative;
-}
-
-#page-footer div.container { width: 940px; }
-
-
-
-/*#venue-list ul,*/
-.venue-list{
-    overflow:auto;
-}
-
-
-.venue-list h3 {
-    color: #333;
-    padding: 10px 0px 10px 10px;
-    background: white url(/ubuntu-website/media/images/dotted.png) repeat scroll 0px 0px;
-    margin-bottom: 0;
-}
-
-.venue-list ul {
-    display: block;
-    float: left;
-    list-style-image: none;
-    list-style-type: none;
-    padding: 4px 0px 5px 5px;
-    text-indent: 0px;
-    width: 915px;
-    background-color:#F7F7F7;
-}
-
-.venue-list ul li {
-    list-style-image: none;
-    list-style-type: none;
-    text-indent: 0px;
-    width: 200px;
-    margin-right: 22px;
-    margin-bottom: 5px;
-    padding-left: 5px;
-    float: left;
-    font-size:12px;
-}
-
-.venue-list ul li h3{
-    padding: 0px;
-    background:#f7f6f5;
-    margin: 0px;
-    color: #333;
-    padding: 4px 0px;
-}
-
-
-.venue-list ul li p{
-    font-size: 12px;
-    line-height: 16px;
-    margin: 0px;
-    padding: 0px;
-}
-
-.venue-list ul li p a{
-   border-bottom: 1px dotted #333;
-   clear: both;
-   display: block;
-   float: none;
-   padding: 5px 0px 3px;
-}
-
-#site_search_form {
-    width: auto;
-}
-#site_search_form input#id_q {
-    background-color: #F0F0F0;
-    border: 1px solid #CCCCCC;
-    height: 16px;
-    margin: 7px 0 7px 9px;
-    padding: 3px;
-    width: 180px;
-}
-
-form[name="lang-switcher"] {
-    width: auto;
-}
-
-select[name="lang"] {
-    background: auto;
-    border: auto;
-    width: auto;
-    height: auto;
-    font-size: 1em;
-    margin: 0;
-}
-
-/* TODO: date_begin and date_end should have class .small */
-#id_date_begin_0, #id_date_begin_1, #id_date_end_0, #id_date_end_1 {
-    width: 134px;
-}
-#id_date_begin_0:focus, #id_date_begin_1:focus, #id_date_end_0:focus, #id_date_end_1:focus {
-    width: 132px;
-}
-/*
-.form {
-	width: 500px;
-        float:left;
-}
-
-.form div{
-        padding-top:2px;
-        padding-bottom:2px;
-}
-
-.form div span.help{
-        font-size:20px;
-        color: #DD4814;
-	cursor:pointer;
-	vertical-align: top;
-	display:inline;
-
-}
-
-.form input[type="text"], .form textarea, .form select {
-	padding: 5px;
-	width: 200px;
-	margin: 0px 0px 5px 0px;
-	border: 1px solid #ccc;
-}
-
-.form input[type="text"] {
-	margin-right: 10px;
-}
-
-.form input[type="checkbox"] {
-	width: 200px;
-	height:35px;
-	margin: 0px 0px 5px 0px;
-}
-
-.form div div.field {
-        float: left;
-	padding-top: 5px;
-}
-
-.form div.approved, .form div.approved_date, .form div.expires_date {
-        height:30px;
-}
-
-.form span.extra {
-        float: left;
-	padding-top: 5px;
-	font-size:0.8em;
-}
-
-.form div div.field label{
-	float: left;
-	padding-right: 10px;
-	width: 170px;
-	font-size: 0.8em;
-	text-align: right;
-        font-weight:normal;
-}
-
-.form div span.required { 	
-        font-size:20px;
-	color: red;
-	margin-left:5px;
-	vertical-align: top;
-	display:inline;
-}
-
-.form textarea {
-	height: 90px;
-	width: 270px;
-}
-
-
-.form select:focus, .form textarea:focus, .form input:focus {
-	border: 1px solid #900;
-}
-
-.form input.submit-button {
-	padding-left: 20px;
-	padding-right: 20px;
-	float: right;
-	margin-right: 50px;
-}
-
-.form ul.errorlist {
-	margin: 0px;
-	padding: 0px;
-}
-
-.form .errorlist li {
-	color: red;
-	font-weight: bold;
-	display: block;
-	font-size: 0.8em;
-	margin: 0px 130px 3px;
-	padding: 4px 5px;
-}
-*/
-
-.attendee-cell {
-	padding-top:10px;
-}
-
-.attendee-mugshot {
-	vertical-align: middle;
-}
-
-.agenda-list {
-    list-style-type: decimal;
-}
-
-.agenda-list .agenda-list {
-    margin-left: 20px;
-    list-style-type: lower-alpha;
-}
-
-.agenda-list .agenda-list .agenda-list {
-    list-style-type: lower-roman;
-}
-
-.agenda-list .agenda-list .agenda-list .agenda-list {
-    list-style-type: circle;
-}
-
-.agenda-title {
-    font-weight: bold;
-}
-
-.agenda-description {
-    margin-left: 30px;
-    font-size: 0.9em;
-}
-
-#webchat {
-    display: none;
-    width: 900px;
-    margin: 0 auto;
-}
-
-#ircchat {
-    display: block;
-    width: 900px;
-    margin: 0 auto;
-}
-
-#locobranding {
-    width: 96px; 
-    height: 96px; 
-    position: absolute; 
-    right: 10px;
-}
-
-/* My Teams style */
-h2.dynamic-width { 
-    display: inline-block; 
-    margin-bottom: 0; 
-}
-
-.resources { 
-    font-size: 0.75em; 
-    float: right; 
-    margin-top: 21px;
-}
-
-.resources a {
-    margin-left: 8px;
-}
-
-.photo a {
-    display: inline-block; 
-    padding: 7px;
-}
-
-.photo img {
-    width: 75px;
-}
-
-.main-content-split {
-    width:450px; 
-    margin-top: 15px;
-}
-
-.main-content-split.left {
-    float: left;
-}
-
-.main-content-split.right {
-    float: right;
-}
-
-.main-content-split.left .title {
-    font-size: 0.875em;
-}
-
-.main-content-split.left .new {
-    float: right;
-    font-size: 0.75em;
-}
-
-.event-summary {
-    margin-top:15px;
-}
-
-hr.no-top {
-    margin: 0 0;
-}
-
-img.bottom {
-    vertical-align: bottom;
-}
-
-ul.indent {
-    list-style: none;
-    background-color: #F7F7F7;
-    padding: 2px 2px 2px 15px;
-}
-
-ul.indent li {
-    line-height:1.2em;
-    margin: 0.5em 0;
-}
-
-.teams-legend {
-    width:200px;
-    padding:5px 0;
-    margin:5px 40% 0;
-    float:right;
-    text-align:right;
-    background-color:#F7F7F7;
-    box-shadow:0 1px 1px  #DFDFDF;
-    border-radius:8px;
-}
-
-/* Team photos feed */
-div#flickr, div#picasa, div#pixie {
-    width:100%;
-}
-
-div#flickr a.lightbox img {
-    border: 5px solid #b3aaa4;
-    margin-left: 5px;
-    margin-right: 5px;
-}
-
-div#picasa a.lightbox img {
-    border: 5px solid #b3aaa4;
-    margin-left: 5px;
-    margin-right: 5px;
-}
-
-div#pixie a.lightbox img {
-    border: 5px solid #b3aaa4;
-    margin-left: 5px;
-    margin-right: 5px;
-
-}
-
-.double-side-content {
-    float: left;
-    margin: 5px 10px;
-    padding: 10px;
-    width: 600px;
-}
-
-.double-side-column {
-    float: left;
-    width: 600px;
-}
-
-.single-side-column {
-    float: left;
-    width: 300px;
-}
-
-.map {
-    min-height: 170px;
-    width: 250px;
-}
-
-/* Blog Styling */
-.blog-entry-image {
-    float: left;
-    height: 40px;
-    padding: 0 8px 8px 0;
-}
-
-.blog-entry-title {
-    margin-bottom: 0px;
-}
-
-.blog-entry-author {
-    font-size: 0.75em;
-}
-
-.blog-entry-text p {
-    text-align:justify;
-    font-size: 13px;
-    line-height: 1.4;
-}
-
-.rsvp-link {
-    font-size: 0.8em;
-    font-weight: bold;
-}
-
-table.side-table {
-    width: 280px;
-}
-
-table.left {
-  position:relative;
-  top: 10px;
-  left:-180px;
-}
 
=== added file 'loco_directory/media/css/styles.css'
--- loco_directory/media/css/styles.css	1970-01-01 00:00:00 +0000
+++ loco_directory/media/css/styles.css	2012-06-15 22:38:18 +0000
@@ -0,0 +1,683 @@
+/*
+ * newstyle.css
+ *
+ * Base style for the LoCo Team Portal. This is an implementation
+ * of the ( at the time of this writing ) new Ubuntu branding.
+ *
+ *  Author: Michael Hall      ( mhall119 )
+ *  Author: Paul Tagliamonte ( paultag  )
+ */
+
+h1.centered {
+    text-align: center;
+}
+
+
+th.form-item-label {
+    vertical-align: top;
+}
+
+td.no-wrap {
+    white-space: nowrap;
+}
+
+/*
+label {
+    font-weight:    bold;
+    white-space:    nowrap;
+}
+*/
+
+.minor-content.venue-map {
+    min-height: 350px;
+    margin-top: 60px;
+}
+
+.side-content.venue-map {
+    min-height: 250px;
+    margin-top: 60px;
+}
+
+#main-content {
+    margin-right:   20px;
+}
+
+li.col_left {
+    float:          left;
+    width:          45%;
+    clear:          left;
+}
+
+li.col_right {
+    float:          right;
+    width:          45%;
+    clear:          right;
+}
+
+li.float_list { 
+    float:   left;
+    margin: 0px 0px 0px 25px;
+    clear: left;
+}
+
+li.approved {
+    list-style-image: url(../img/approved.png);   /* Colorful Ubuntu Logo */
+}
+
+li.unapproved {
+    list-style-image: url(../img/unapproved.png); /* Grey Ubuntu Logo */
+}
+
+ol.agenda-list, .agenda-list ol, .agenda-list li {
+    padding: 2px 10px !important;
+}
+
+.relative {
+    position: relative;
+}
+
+br.clear {
+    clear:          left;
+}
+
+#main-content .object-detail {
+    -moz-border-radius:    15px;
+    -webkit-border-radius: 15px;
+
+    border:         2px solid #ccc;
+    border-bottom:  4px solid #bbb;
+    border-right:   4px solid #bbb;
+    border-top:     2px solid #ddd;
+    min-height:     500px;
+    text-align:     left;
+}
+
+#main-content .object-detail #options-left ul {
+    position:       relative;
+    left:           -60px;
+}
+
+#main-content .object-detail #options-right ul {
+    position:       relative;
+}
+
+#main-content .object-detail #options-left li {
+    float:          left;
+    margin-left:    5px;
+    display:        inline;
+}
+
+#main-content .object-detail #options-right li {
+    float:          right;
+    margin-right:   5px;
+    text-align:     right;
+    display:        inline;
+}
+    
+#main-content .object-detail .option {
+    width:           32px;
+    height:          32px;
+    display:         block;
+    text-decoration: none;
+}
+
+#main-content .object-detail a.goback {
+    background: transparent url('../img/goback.png')    no-repeat scroll top right;
+}
+
+#main-content .object-detail a.edit {
+    background: transparent url('../img/edit.png')      no-repeat scroll top right;
+}
+
+#main-content .object-detail a.delete {
+    background: transparent url('../img/delete.png')    no-repeat scroll top right;
+}
+
+#main-content .object-detail a.add-team-event {
+    background: transparent url('../img/new_event.png') no-repeat scroll top right;
+}
+
+#main-content .object-detail a.add-comment {
+    background: transparent url('../img/comment.png')   no-repeat scroll top right;
+}
+
+.resource {
+    width:           32px;
+    height:          32px;
+    padding:         2px;
+    margin-top:      4px;
+    margin-bottom:   3px;
+    float:           left;
+    border:          1px white solid;
+}
+
+#main-content .resource:hover {
+    border:          1px #eee solid;
+}
+
+#page-footer .container div.copyright {
+    font-size:       0.75em;  
+    line-height:     1.5em;
+}
+
+#page-footer .container div.loggedin {
+    font-size:       0.75em;  
+    line-height:     1.5em;
+    float:           left;
+    width:           400px;
+    margin-bottom:   10px;
+    margin-top:      5px;
+}
+
+#page-footer .container div.lang_switcher {
+    font-size:       0.75em;  
+    line-height:     1.5em;
+    float:           right; 
+    margin-bottom:   10px;
+    margin-top:      5px;
+    margin-right:    14px;
+}
+
+.team-event-nav {
+    border-bottom:   1px gray solid;
+    list-style:      none;
+    padding:         1px 0px 1px 5px;
+    margin:          5px 0px 5px 0px;
+}
+
+.team-event-nav li {
+    list-style:      none;
+    margin:          -1px 2px 0px 3px;
+    padding:         0px;
+    display:         inline; 
+}
+
+.message .content-shim {
+    margin:                      0px; /* buffer the bulb in */
+    padding:                     5px; /* un-suck the text */
+    background-repeat:           no-repeat;
+    background-image:            url(../img/infobox-icon.png);
+    padding-left:                30px; /* infobox icon is 22x22 */
+}
+
+.message {
+    width:                       70%;
+    margin-left:                 auto;
+    margin-right:                auto;
+    background-color:            #FFFFB6;
+    border-radius:               0px;
+    box-shadow:                  0px 1px 1px #FFE4B6;
+}
+
+.message { /* noncss 3. XXX: remove me in 20 years. */
+    -webkit-border-radius:       8px;
+    -moz-border-radius:          8px;
+    -moz-box-shadow:             0px 0px 1px #FFE4B6;
+    -webkit-box-shadow:          0px 0px 1px #FFE4B6;
+}
+
+/* UI Errors ( To yell at the user when they don't fill out a form ) */
+
+/*
+ul.errorlist {
+    margin:           0px;
+    padding:          0px;
+}
+
+.errorlist li {
+    color:            red;
+    font-weight:      bold;
+    display:          block;
+    font-size:        1.1em;
+    margin:           0px 0px 3px;
+    padding:          4px 5px;
+}
+*/
+
+
+/* Flickr Feed for Global Event */
+
+.thumbs {
+    margin:          0px;
+    padding:         0px;
+    overflow:        hidden;
+}
+
+.thumbs li {
+    list-style:         none;
+    float:              left;
+    margin:             5px;
+    padding:            3px;
+    background:         #eee;
+    -moz-box-shadow:    0px 0px 4px #444;
+    -webkit-box-shadow: 0px 0px 2px #000;
+}
+
+.thumbs li a     { }
+.thumbs li img   { display: block; }
+.thumbs li a img { border: none;}
+
+aside#top-nav {
+    width:           980px;
+}
+
+header#page-header {
+    width:           960px;
+    margin:          0px auto;
+    padding:         0px 10px;
+    position:        relative;
+}
+
+footer#page-footer {
+    width:           960px;
+    margin:          0px auto;
+    padding:         0px 10px;
+    position:        relative;
+}
+
+#page-footer div.container { width: 940px; }
+
+
+
+/*#venue-list ul,*/
+.venue-list{
+    overflow:auto;
+}
+
+
+.venue-list h3 {
+    color: #333;
+    padding: 10px 0px 10px 10px;
+    background: white url(/ubuntu-website/media/images/dotted.png) repeat scroll 0px 0px;
+    margin-bottom: 0;
+}
+
+.venue-list ul {
+    display: block;
+    float: left;
+    list-style-image: none;
+    list-style-type: none;
+    padding: 4px 0px 5px 5px;
+    text-indent: 0px;
+    width: 915px;
+    background-color:#F7F7F7;
+}
+
+.venue-list ul li {
+    list-style-image: none;
+    list-style-type: none;
+    text-indent: 0px;
+    width: 200px;
+    margin-right: 22px;
+    margin-bottom: 5px;
+    padding-left: 5px;
+    float: left;
+    font-size:12px;
+}
+
+.venue-list ul li h3{
+    padding: 0px;
+    background:#f7f6f5;
+    margin: 0px;
+    color: #333;
+    padding: 4px 0px;
+}
+
+
+.venue-list ul li p{
+    font-size: 12px;
+    line-height: 16px;
+    margin: 0px;
+    padding: 0px;
+}
+
+.venue-list ul li p a{
+   border-bottom: 1px dotted #333;
+   clear: both;
+   display: block;
+   float: none;
+   padding: 5px 0px 3px;
+}
+
+#site_search_form {
+    width: auto;
+}
+#site_search_form input#id_q {
+    background-color: #F0F0F0;
+    border: 1px solid #CCCCCC;
+    height: 16px;
+    margin: 7px 0 7px 9px;
+    padding: 3px;
+    width: 180px;
+}
+
+form[name="lang-switcher"] {
+    width: auto;
+}
+
+select[name="lang"] {
+    background: auto;
+    border: auto;
+    width: auto;
+    height: auto;
+    font-size: 1em;
+    margin: 0;
+}
+
+/* TODO: date_begin and date_end should have class .small */
+#id_date_begin_0, #id_date_begin_1, #id_date_end_0, #id_date_end_1 {
+    width: 134px;
+}
+#id_date_begin_0:focus, #id_date_begin_1:focus, #id_date_end_0:focus, #id_date_end_1:focus {
+    width: 132px;
+}
+/*
+.form {
+	width: 500px;
+        float:left;
+}
+
+.form div{
+        padding-top:2px;
+        padding-bottom:2px;
+}
+
+.form div span.help{
+        font-size:20px;
+        color: #DD4814;
+	cursor:pointer;
+	vertical-align: top;
+	display:inline;
+
+}
+
+.form input[type="text"], .form textarea, .form select {
+	padding: 5px;
+	width: 200px;
+	margin: 0px 0px 5px 0px;
+	border: 1px solid #ccc;
+}
+
+.form input[type="text"] {
+	margin-right: 10px;
+}
+
+.form input[type="checkbox"] {
+	width: 200px;
+	height:35px;
+	margin: 0px 0px 5px 0px;
+}
+
+.form div div.field {
+        float: left;
+	padding-top: 5px;
+}
+
+.form div.approved, .form div.approved_date, .form div.expires_date {
+        height:30px;
+}
+
+.form span.extra {
+        float: left;
+	padding-top: 5px;
+	font-size:0.8em;
+}
+
+.form div div.field label{
+	float: left;
+	padding-right: 10px;
+	width: 170px;
+	font-size: 0.8em;
+	text-align: right;
+        font-weight:normal;
+}
+
+.form div span.required { 	
+        font-size:20px;
+	color: red;
+	margin-left:5px;
+	vertical-align: top;
+	display:inline;
+}
+
+.form textarea {
+	height: 90px;
+	width: 270px;
+}
+
+
+.form select:focus, .form textarea:focus, .form input:focus {
+	border: 1px solid #900;
+}
+
+.form input.submit-button {
+	padding-left: 20px;
+	padding-right: 20px;
+	float: right;
+	margin-right: 50px;
+}
+
+.form ul.errorlist {
+	margin: 0px;
+	padding: 0px;
+}
+
+.form .errorlist li {
+	color: red;
+	font-weight: bold;
+	display: block;
+	font-size: 0.8em;
+	margin: 0px 130px 3px;
+	padding: 4px 5px;
+}
+*/
+
+.attendee-cell {
+	padding-top:10px;
+}
+
+.attendee-mugshot {
+	vertical-align: middle;
+}
+
+.agenda-list {
+    list-style-type: decimal;
+}
+
+.agenda-list .agenda-list {
+    margin-left: 20px;
+    list-style-type: lower-alpha;
+}
+
+.agenda-list .agenda-list .agenda-list {
+    list-style-type: lower-roman;
+}
+
+.agenda-list .agenda-list .agenda-list .agenda-list {
+    list-style-type: circle;
+}
+
+.agenda-title {
+    font-weight: bold;
+}
+
+.agenda-description {
+    margin-left: 30px;
+    font-size: 0.9em;
+}
+
+#webchat {
+    display: none;
+    width: 900px;
+    margin: 0 auto;
+}
+
+#ircchat {
+    display: block;
+    width: 900px;
+    margin: 0 auto;
+}
+
+#locobranding {
+    width: 96px; 
+    height: 96px; 
+    position: absolute; 
+    right: 10px;
+}
+
+/* My Teams style */
+h2.dynamic-width { 
+    display: inline-block; 
+    margin-bottom: 0; 
+}
+
+.resources { 
+    font-size: 0.75em; 
+    float: right; 
+    margin-top: 21px;
+}
+
+.resources a {
+    margin-left: 8px;
+}
+
+.photo a {
+    display: inline-block; 
+    padding: 7px;
+}
+
+.photo img {
+    width: 75px;
+}
+
+.main-content-split {
+    width:450px; 
+    margin-top: 15px;
+}
+
+.main-content-split.left {
+    float: left;
+}
+
+.main-content-split.right {
+    float: right;
+}
+
+.main-content-split.left .title {
+    font-size: 0.875em;
+}
+
+.main-content-split.left .new {
+    float: right;
+    font-size: 0.75em;
+}
+
+.event-summary {
+    margin-top:15px;
+}
+
+hr.no-top {
+    margin: 0 0;
+}
+
+img.bottom {
+    vertical-align: bottom;
+}
+
+ul.indent {
+    list-style: none;
+    background-color: #F7F7F7;
+    padding: 2px 2px 2px 15px;
+}
+
+ul.indent li {
+    line-height:1.2em;
+    margin: 0.5em 0;
+}
+
+.teams-legend {
+    width:200px;
+    padding:5px 0;
+    margin:5px 40% 0;
+    float:right;
+    text-align:right;
+    background-color:#F7F7F7;
+    box-shadow:0 1px 1px  #DFDFDF;
+    border-radius:8px;
+}
+
+/* Team photos feed */
+div#flickr, div#picasa, div#pixie {
+    width:100%;
+}
+
+div#flickr a.lightbox img {
+    border: 5px solid #b3aaa4;
+    margin-left: 5px;
+    margin-right: 5px;
+}
+
+div#picasa a.lightbox img {
+    border: 5px solid #b3aaa4;
+    margin-left: 5px;
+    margin-right: 5px;
+}
+
+div#pixie a.lightbox img {
+    border: 5px solid #b3aaa4;
+    margin-left: 5px;
+    margin-right: 5px;
+
+}
+
+.double-side-content {
+    float: left;
+    margin: 5px 10px;
+    padding: 10px;
+    width: 600px;
+}
+
+.double-side-column {
+    float: left;
+    width: 600px;
+}
+
+.single-side-column {
+    float: left;
+    width: 300px;
+}
+
+.map {
+    min-height: 170px;
+    width: 250px;
+}
+
+/* Blog Styling */
+.blog-entry-image {
+    float: left;
+    height: 40px;
+    padding: 0 8px 8px 0;
+}
+
+.blog-entry-title {
+    margin-bottom: 0px;
+}
+
+.blog-entry-author {
+    font-size: 0.75em;
+}
+
+.blog-entry-text p {
+    text-align:justify;
+    font-size: 13px;
+    line-height: 1.4;
+}
+
+.rsvp-link {
+    font-size: 0.8em;
+    font-weight: bold;
+}
+
+table.side-table {
+    width: 280px;
+}
 
=== modified file 'loco_directory/settings.py'
--- loco_directory/settings.py	2012-02-09 02:06:11 +0000
+++ loco_directory/settings.py	2012-06-15 22:38:18 +0000
@@ -190,8 +190,8 @@
     'bzr_apps': ('bzr+ssh://bazaar.launchpad.net/%2Bbranch/ubuntu-django-foundations/bzr-apps/', '7'),
 
     ## ubuntu-website supplied templates and styles
-    'ubuntu_website': ('bzr+ssh://bazaar.launchpad.net/~ubuntu-community-webthemes/ubuntu-community-webthemes/light-django-theme', '36'),
-    
+    'ubuntu_website': ('bzr+ssh://bazaar.launchpad.net/~ubuntu-community-webthemes/ubuntu-community-webthemes/light-django-theme', '45'),
+
     ## twidenash supplied microblog embedding javascript
     'media/js/twidenash': ('bzr+ssh://bazaar.launchpad.net/~django-foundations-dev/twidenash/2.0/', '4'),
 }
 
=== modified file 'loco_directory/templates/404.html'
--- loco_directory/templates/404.html	2011-11-12 01:43:27 +0000
+++ loco_directory/templates/404.html	2012-06-15 22:38:18 +0000
@@ -4,9 +4,8 @@
 {% block page_name %}{% trans "This Page Does Not Exist" %}{% endblock %}
 
 {% block content %}
-
-<article class="main-content">
-
+<div class="row">
+    <section class="span-12">
 <h2>{% trans "This Page Does Not Exist!" %}</h2>
 
 <p>
@@ -17,6 +16,7 @@
 </ul>
 </p>
 <p>{% trans "If you believe the reason you are here is a bug in the LoCo Team Portal please " %} <a href='https://bugs.launchpad.net/loco-team-portal/+filebug'>{% trans "Report it!" %}</a></p>
-</article>
+</section>
+</div>
 
 {% endblock %}
 
=== modified file 'loco_directory/templates/500.html'
--- loco_directory/templates/500.html	2011-11-12 01:43:27 +0000
+++ loco_directory/templates/500.html	2012-06-15 22:38:18 +0000
@@ -20,14 +20,15 @@
 
 {% block content %}
 
-<article class="main-content">
+<div class="row">
+    <section class="span-12">
     <h2>{% trans "The LoCo Portal has encountered an Error!" %}</h2>
     <p>{% trans "Please try your request again." %}
     </p>
     <p>{% trans "If you continue to experience problems with the LoCo Team Portal, please " %} <a href='https://bugs.launchpad.net/loco-team-portal/+filebug'>{% trans "Report it!" %}</a>
     </p>
-</article>
-
+</section>
+</div>
 {% endblock %}
 
 {% block footer %}{% endblock %}
 
=== modified file 'loco_directory/templates/about.html'
--- loco_directory/templates/about.html	2011-11-22 03:14:58 +0000
+++ loco_directory/templates/about.html	2012-06-15 22:38:18 +0000
@@ -5,8 +5,8 @@
 
 {% block content %}
 
-
-<article class="main-content leading">
+<div class="row">
+<section class="span-12">
     <h2>{% trans "What is the LoCo Team Portal?" %}</h2>
     {% with '</a>' as link_end %}
     {% with '<a href="https://launchpad.net/~nixternal">' as link_developer %}
@@ -19,11 +19,12 @@
     {% endwith %}
     {% endwith %}
     {% endwith %}
-</article>
-
+</section>
+</div>
 <hr class="divide" />
 
-<article class="minor-content">
+<div class="row">
+<section class="span-6">
     <h2>{% trans "The Portal Data" %}</h2>
     {% with '</a>' as link_end %}
     {% with '<a href="https://launchpad.net/">' as link_launchpad %}
@@ -41,9 +42,8 @@
     {% endwith %}
     {% endwith %}
     {% endwith %}
-</article>
-
-<article class="minor-content">
+</section>
+<section class="span-6 last">
     <h2>{% trans "Contribute to the LoCo Team Portal!" %}</h2>
     {% with '</a>' as link_end %}
         <p>{% trans "You can make it better:" %}
@@ -69,11 +69,11 @@
             <p>{% blocktrans %}Need to know more, {{ link_ld }}just ask!{{ link_end }}{% endblocktrans %}</p>
         {% endwith %}
     {% endwith %}
-
-    <hr class="divide" />
-</article>
-
-<article class="minor-content">
+</section>
+</div>
+	<hr class="divide" />
+<div class="row">
+<section class="span-12">
     <h2>{% trans "Coming Soon!" %}</h2>
     <p>
       {% trans "Future additions to this site will include:" %}
@@ -82,5 +82,6 @@
         <li>{% trans "Various mashups" %}</li>
       </ul>
     </p>
-</article>
+</section>
+</div>
 {% endblock %}
 
=== modified file 'loco_directory/templates/about_loco.html'
--- loco_directory/templates/about_loco.html	2011-10-10 15:05:02 +0000
+++ loco_directory/templates/about_loco.html	2012-06-15 22:38:18 +0000
@@ -4,17 +4,19 @@
 {% block page_name %}{% trans "About Local Community (LoCo) Teams" %}{% endblock %}
 
 {% block sub_nav_links %}
-<a class="sub-nav-item" href="{% url loco_setup %}">{% trans "Setting up a new Local Community (LoCo) Team" %}</a>
+<li><a class="sub-nav-item" href="{% url loco_setup %}">{% trans "Setting up a new Local Community (LoCo) Team" %}</a></li>
 {% endblock %}
 
 {% block content %}
 
-<article class="main-content">
+<div class="row">
+    <section class="span-12">
     <h2>{% trans "About Local Community (LoCo) Teams" %}</h2>
     <p>{% trans "With the incredible success of Ubuntu around the world, the LoCo project is here to help groups of Ubuntu fans and enthusiasts work together in regional teams to help advocate, promote, translate, develop and otherwise improve Ubuntu. Our worldwide network of LoCo teams is providing a strong backbone to our already vast and extensive Ubuntu community. Why not go and see the" %} <a title="{% trans "See All LoCo Teams" %}" href="{% url team-list %}">{% trans "full list of teams!" %}</a></p>
-</article>
+</section></div>
 
-<article class="main-content">
+<div class="row">
+    <section class="span-12">
     <h3>{% trans "Joining a LoCo Team" %}</h3>
     <ul>
         {% with '</a>' as link_end %}
@@ -31,12 +33,13 @@
         {% endwith %}
         {% endwith %}
     </ul>
-</article>
+</section></div>
 
-<article class="main-content">
+<div class="row">
+    <section class="span-12">
     <h3>{% trans "Why Local Teams?" %}</h3>
     <p>{% trans "Ever since the birth of computers, enthusiasts and fans around the world have collected together in garages, universities and pubs to talk about their interest, learn from each other and help promote their interest. Combine this with the huge popularity of Ubuntu, and you have the Ubuntu LoCo project." %}</p>
-</article>
+</section></div>
 
 
 {% endblock %}
 
=== modified file 'loco_directory/templates/base.html'
--- loco_directory/templates/base.html	2011-11-28 19:41:52 +0000
+++ loco_directory/templates/base.html	2012-06-15 22:38:18 +0000
@@ -1,13 +1,15 @@
-{% extends "ubuntu_website_base.html" %}
+{% extends "website_base.html" %}
 {% load i18n %}
 
 {% block title %}{% block page_name %}{% trans "Home" %}{%endblock %} | {% trans "Ubuntu LoCo Team Portal" %}{% endblock %}
 
 {% block logo_text %}{% trans "LoCo Team Portal" %}{% endblock %}
 
+{% block extrastyles %}
+    <link rel="stylesheet" type="text/css" href="{{ MEDIA_URL }}/css/styles.css" />
+{% endblock %}
+
 {% block extrahead %}
-    <link rel="stylesheet" type="text/css" href="{{MEDIA_URL}}css/newstyle.css" />
-    <script type="text/javascript" src="{{MEDIA_URL}}jquery/jquery.js"></script>
     <script type="text/javascript">
       var _gaq = _gaq || [];
       _gaq.push(['_setAccount', 'UA-26763972-1']);
@@ -39,12 +41,14 @@
 {% endblock %}
 
 {% block main_nav_links %}
-    <a class="main-nav-item {% ifequal url_base 'teams' %}current{% endifequal %}" title="{% trans "Show All Teams" %}" href="{% url team-list %}">{% trans "Teams" %}</a>
-    <a class="main-nav-item {% ifequal url_base 'events' %}current{% endifequal %}" title="{% trans "Show All Events" %}" href="{% url event-list %}">{% trans "Events" %}</a>
-    <a class="main-nav-item {% ifequal url_base 'meetings' %}current{% endifequal %}" title="{% trans "Show All Meetings" %}" href="{% url meeting-list %}">{% trans "Meetings" %}</a>
-    <a class="main-nav-item {% ifequal url_base 'loco-council' %}current{% endifequal %}" title="{% trans "LoCo Council" %}" href="{% url loco_council %}">{% trans "LoCo Council" %}</a>
-    <a class="main-nav-item {% ifequal url_base 'about-loco' %}current{% endifequal %}" title="{% trans "About LoCo Teams" %}" href="{% url about_loco %}">{% trans "About LoCos" %}</a>
-    <a class="main-nav-item {% ifequal url_base 'irc' %}current{% endifequal %}" title="{% trans "IRC Chat" %}" href="{% url irc_chat %}">{% trans "IRC Chat" %}</a>
+<ul class="clearfix">
+    <li{% if item.current %} class='active'{% endif %} id="main-nav"><a class="main-nav-item {% ifequal url_base 'teams' %}active{% endifequal %}" title="{% trans "Show All Teams" %}" href="{% url team-list %}">{% trans "Teams" %}</a></li>
+    <li{% if item.current %} class='active'{% endif %} id="main-nav"><a class="main-nav-item {% ifequal url_base 'events' %}active{% endifequal %}" title="{% trans "Show All Events" %}" href="{% url event-list %}">{% trans "Events" %}</a></li>
+    <li{% if item.current %} class='active'{% endif %} id="main-nav"><a class="main-nav-item {% ifequal url_base 'meetings' %}active{% endifequal %}" title="{% trans "Show All Meetings" %}" href="{% url meeting-list %}">{% trans "Meetings" %}</a></li>
+    <li{% if item.current %} class='active'{% endif %} id="main-nav"><a class="main-nav-item {% ifequal url_base 'loco-council' %}active{% endifequal %}" title="{% trans "LoCo Council" %}" href="{% url loco_council %}">{% trans "LoCo Council" %}</a></li>
+    <li{% if item.current %} class='active'{% endif %} id="main-nav"><a class="main-nav-item {% ifequal url_base 'about-loco' %}active{% endifequal %}" title="{% trans "About LoCo Teams" %}" href="{% url about_loco %}">{% trans "About LoCos" %}</a></li>
+    <li{% if item.current %} class='active'{% endif %} id="main-nav"><a class="main-nav-item {% ifequal url_base 'irc' %}active{% endifequal %}" title="{% trans "IRC Chat" %}" href="{% url irc_chat %}">{% trans "IRC Chat" %}</a></li>
+</ul>
 {% endblock %}
 
 {% block sub_nav_links %}
@@ -52,17 +56,17 @@
 
 {% block search_box %}
 <form id="site_search_form" action="{% url common.views.site_search %}" method="get">
-		{{ search_form.q }}
-		<input type="image" src="/media/img/search.png" title="{% trans "Search" %}" alt="{% trans "Search" %}"  />
+        {{ search_form.q }}
+        <input type="image" src="/media/img/search.png" title="{% trans "Search" %}" alt="{% trans "Search" %}" />
 </form>
 {% endblock %}
 
 {% block messages %}
-	{% if messages %}
-	  {% for message in messages %}
-	    <div class = 'message' ><div class = 'content-shim' >{{ message }}</div></div>
-	  {% endfor %}
-	{% endif %}
+    {% if messages %}
+      {% for message in messages %}
+        <div class = 'message' ><div class = 'content-shim' >{{ message }}</div></div>
+      {% endfor %}
+    {% endif %}
 {% endblock %}
 
 {% block content %}
@@ -73,22 +77,22 @@
 
 {% block footer %}
 <div style="height: 40px;">
-	<div class="lang_switcher">
-		<form name="lang-switcher" style="text-align:right;" action="/language/" method="get">
-		<input name="next" type="hidden" value="{{ request.path }}" />
-		    <select name="lang" onchange="document.forms['lang-switcher'].submit()">
-			{% for lang in LANGUAGES %}
-			    <option value="{{ lang.0 }}"{% ifequal LANGUAGE_CODE lang.0 %} selected="selected"{% endifequal %}>{{ lang.1 }}</option>
-			{% endfor %}
-		    </select>
-		</form>
-	</div>
+    <div class="lang_switcher">
+        <form name="lang-switcher" style="text-align:right;" action="/language/" method="get">
+        <input name="next" type="hidden" value="{{ request.path }}" />
+            <select name="lang" onchange="document.forms['lang-switcher'].submit()">
+            {% for lang in LANGUAGES %}
+                <option value="{{ lang.0 }}"{% ifequal LANGUAGE_CODE lang.0 %} selected="selected"{% endifequal %}>{{ lang.1 }}</option>
+            {% endfor %}
+            </select>
+        </form>
+    </div>
 </div>
 <div class="copyright">
-    &copy; 2008-{% now "Y" %} Canonical Ltd., Ubuntu Community. Ubuntu is a registered trademark of Canonical Ltd.<br />
-    <a href="/about">{% trans "About the LoCo Team Portal Project" %}</a><br />
-    {% trans 'Problems with LoCo Team Portal?' %} <a href="https://bugs.launchpad.net/loco-team-portal/+filebug">{% trans 'File a Bug' %}</a><br />
-    {% trans "LoCo Team Portal" %} {{ loco_version }}
+    <p>&copy; 2008-{% now "Y" %} Canonical Ltd., Ubuntu Community. Ubuntu is a registered trademark of Canonical Ltd.</p>
+    <p><a href="/about">{% trans "About the LoCo Team Portal Project" %}</a></p>
+    <p>{% trans 'Problems with LoCo Team Portal?' %} <a href="https://bugs.launchpad.net/loco-team-portal/+filebug">{% trans 'File a Bug' %}</a></p>
+    <p>{% trans "LoCo Team Portal" %} {{ loco_version }}</p>
 </div>
 {% endblock %}
 
 
=== modified file 'loco_directory/templates/events/event_history_list.html'
--- loco_directory/templates/events/event_history_list.html	2012-06-10 19:08:39 +0000
+++ loco_directory/templates/events/event_history_list.html	2012-06-15 22:38:18 +0000
@@ -9,11 +9,12 @@
 {% block page_name %}{% trans "Ubuntu LoCo Events History" %}{% endblock %}
 
 {% block sub_nav_links %}
-<a class="sub-nav-item" href="{% url event-list %}">{% trans "Back to Events List" %}</a>
+<li><a class="sub-nav-item" href="{% url event-list %}">{% trans "Back to Events List" %}</a></li>
 {% endblock %}
 
 {% block content %}
-<article class="main-content">
+<div class="row">
+<section class="span-12">
 <h2>{% trans "Ubuntu LoCo Global Events History" %}</h2>
 
 {% if global_event_list %}
@@ -24,11 +25,11 @@
 {% else %}
 <p>{% trans "There have been no LoCo Global Events in the past :(" %}</p>
 {% endif %}
-</article>
-
-<hr class="divide" />
-
-<article class="main-content">
+</section>
+</div>
+
+<div class="row">
+<section class="span-12">
 <h2>{% trans "Ubuntu LoCo Team Events History" %}</h2>
 
 <form action="." method="post">{% csrf_token %}
@@ -56,5 +57,6 @@
 <p>{% trans "There have been no LoCo Team Events in the past :(" %}</p>
 {% endif %}
 
-</article>
+</section>
+</div>
 {% endblock %}
 
=== modified file 'loco_directory/templates/events/event_list.html'
--- loco_directory/templates/events/event_list.html	2011-10-05 00:50:53 +0000
+++ loco_directory/templates/events/event_list.html	2012-06-15 22:38:18 +0000
@@ -19,16 +19,17 @@
 {% endblock %}
 
 {% block sub_nav_links %}
-<a class="sub-nav-item" title="{% trans "Show All Venues" %}" href="{% url venue-list %}">{% trans "Venues" %}</a>
+<li><a class="sub-nav-item" title="{% trans "Show All Venues" %}" href="{% url venue-list %}">{% trans "Venues" %}</a>
 {% if user_is_on_lc %}
-<a class="sub-nav-item" href="{% url global-event-new %}">{% trans "Add Global Event" %}</a>
+<li><a class="sub-nav-item" href="{% url global-event-new %}">{% trans "Add Global Event" %}</a></li>
 {% endif %}
-<a class="sub-nav-item" href="{% url team-event-select %}">{% trans "Add Team Event" %}</a>
-<a class="sub-nav-item" href="{% url event-history-list %}">{% trans "Past Events" %}</a>
+<li><a class="sub-nav-item" href="{% url team-event-select %}">{% trans "Add Team Event" %}</a></li>
+<li><a class="sub-nav-item" href="{% url event-history-list %}">{% trans "Past Events" %}</a></li>
 {% endblock %}
 
 {% block content %}
-<article class="minor-content">
+<div class="row">
+<section class="span-6">
 <h2>{% trans "Ubuntu LoCo Global Events" %}
 {% if global_event_list %}
 <a class="global_event_ical" href="{% url global-event-list-ical %}">
@@ -41,13 +42,14 @@
 {% else %}
 </h2><p>{% trans "There are currently no LoCo Global Events" %}</p>
 {% endif %}
-</article>
-
-<section id="venue-map" class="minor-content alone venue-map"></section>
-
-<hr class="divide" />
-
-<article class="main-content">
+</section>
+
+<section id="venue-map" class="span-6 last alone venue-map"></section>
+</div>
+
+
+<div class="row">
+<section class="span-12">
 <h2>{% trans "Ubuntu LoCo Team Events" %}
 {% if team_event_list %}
 <a class="teams_event_ical" href="{% url teams-event-list-ical %}">
@@ -59,6 +61,6 @@
 {% else %}
 </h2><p>{% trans "There are currently no LoCo Team Events" %}</p>
 {% endif %}
-
-</article>
+</section>
+</div>
 {% endblock %}
 
=== modified file 'loco_directory/templates/events/global_event_delete_confirm.html'
--- loco_directory/templates/events/global_event_delete_confirm.html	2011-10-05 00:50:53 +0000
+++ loco_directory/templates/events/global_event_delete_confirm.html	2012-06-15 22:38:18 +0000
@@ -8,14 +8,16 @@
 {% endblock %}
 
 {% block content %}
-<article class="main-content">
+<div class="row">
+<section class="span-9">
     <form action="." method="post">
         <fieldset>
-            <legend>{% trans "Delete global Event" %}</legend>
+            <h3>{% trans "Delete global Event" %}</h3>
             <label>{% blocktrans with global_event_object.name as eventname %}Do you really want to delete the Global Event: {{eventname}}?{% endblocktrans %}</label>
         </fieldset>
 	    <input type="submit" value="Submit" />
 	    <a href="{{global_event_object.get_absolute_url}}">{% trans "Cancel" %}</a>
     </form>
-</article>
+</section>
+</div>
 {% endblock %}
 
=== modified file 'loco_directory/templates/events/global_event_detail.html'
--- loco_directory/templates/events/global_event_detail.html	2011-10-05 00:50:53 +0000
+++ loco_directory/templates/events/global_event_detail.html	2012-06-15 22:38:18 +0000
@@ -21,11 +21,11 @@
 {% block title %}{% trans global_event_object.name %} | {% trans "Ubuntu LoCo Team Portal" %} {% endblock %}
 
 {% block sub_nav_links %}
-<a class="sub-nav-item" href="{% url event-list %}">{% trans "Back to Events List" %}</a>
-<a class="sub-nav-item" href="{% url team-event-select %}?global_event_id={{global_event_object.id}}">{% trans "Add Team Event" %}</a>
+<li><a class="sub-nav-item" href="{% url event-list %}">{% trans "Back to Events List" %}</a></li>
+<li><a class="sub-nav-item" href="{% url team-event-select %}?global_event_id={{global_event_object.id}}">{% trans "Add Team Event" %}</a></li>
 {% if user_is_on_lc %}
-<a class="sub-nav-item" href="{% url global-event-update global_event_object.id %}">{% trans "Edit Details" %}</a>
-<a class="sub-nav-item" href="{% url global-event-delete global_event_object.id %}">{% trans "Delete Event" %}</a>
+<li><a class="sub-nav-item" href="{% url global-event-update global_event_object.id %}">{% trans "Edit Details" %}</a></li>
+<li><a class="sub-nav-item" href="{% url global-event-delete global_event_object.id %}">{% trans "Delete Event" %}</a></li>
 {% endif %}
 {% endblock %}
 
 
=== modified file 'loco_directory/templates/events/global_event_detail.inc.html'
--- loco_directory/templates/events/global_event_detail.inc.html	2012-02-07 20:10:49 +0000
+++ loco_directory/templates/events/global_event_detail.inc.html	2012-06-15 22:38:18 +0000
@@ -69,7 +69,8 @@
 {% endif %}
 {% endblock %}
 
-<article class="double-side-content">
+<div class="row">
+<section class="span-6">
     <h2>{{global_event_object.name}}</h2>
     {% if global_event_object.description %}
         <table id="global-event-basic">
@@ -86,9 +87,9 @@
     <div id="photo-feed"></div>
 {% endif %}
 
-</article>
+</section>
 
-<div class="single-side-column">
+<section class="span-6 last">
     <section id="venue-map" class="side-content alone venue-map"></section>
 
     <div class="share">
@@ -114,21 +115,24 @@
 {% endif %}
 
 {% if global_event_object.microbloghashtag %}
-    <article class="side-content alone">
+    <article class="alone">
     <h2>{% trans "Microblogging" %} #{{global_event_object.microbloghashtag}}</h2>
     <div class="twidenash" id="{{ global_event_object.microbloghashtag }}"></div>
     </article>
 {% endif %}
 
+
+</section>
 </div>
 
-
 {% if global_event_object.channel %}
-<div id="webchat">
+<div class="row " id="webchat">
+<section class="span-12">
     {% if user.is_authenticated %}
 	<iframe src="http://webchat.freenode.net/?channels={{ global_event_object.channel }}&prompt=1&uio=OT10cnVlJjEwPXRydWUmMTE9MjM218&nick={{ user.username|irc }}" width="900" height="400"></iframe>
     {% else %}
 	<iframe src="http://webchat.freenode.net/?channels={{ global_event_object.channel }}&prompt=1&uio=OT10cnVlJjEwPXRydWUmMTE9MjM218&nick=locodir-user" width="900" height="400"></iframe>
     {% endif %}
+    </section>
 </div>
 {% endif %}
 
=== modified file 'loco_directory/templates/events/global_event_new.html'
--- loco_directory/templates/events/global_event_new.html	2011-10-05 00:50:53 +0000
+++ loco_directory/templates/events/global_event_new.html	2012-06-15 22:38:18 +0000
@@ -18,15 +18,17 @@
 {% endblock %}
 
 {% block content %}
-<article class="main-content">
+<div class="row">
+<section class="span-9">
     <form action="." method="post">
         <fieldset>
-            <legend>{% trans "Add new Global Event" %}</legend>
+            <h3>{% trans "Add new Global Event" %}</h3>
             {{ form.as_template }}
         </fieldset>
 	    {% if is_popup %}<input type="hidden" name="_popup" value="1">{% endif %}		
 	    <input type="submit" name="submit" value="{% trans "Submit" %}" class="submit-button" /> 
     </form>
-</article>
+</section>
+</div>
 
 {% endblock %}
 
=== modified file 'loco_directory/templates/events/global_event_update.html'
--- loco_directory/templates/events/global_event_update.html	2011-10-05 00:50:53 +0000
+++ loco_directory/templates/events/global_event_update.html	2012-06-15 22:38:18 +0000
@@ -16,15 +16,17 @@
 {% endblock %}
 
 {% block content %}
-<article class="main-content">
+<div class="row">
+<section class="span-9">
     <form action="." method="post">
         <fieldset>
-            <legend>{% trans "Update Global Event" %}</legend>
+            <h3>{% trans "Update Global Event" %}</h3>
             {{ form.as_template }}
         </fieldset>
 	    {% if is_popup %}<input type="hidden" name="_popup" value="1">{% endif %}		
 	    <input type="submit" name="submit" value="{% trans "Submit" %}" class="submit-button" /> 
     </form>
-</article>
+</section>
+</div>
 
 {% endblock %}
 
=== modified file 'loco_directory/templates/events/global_jam_dashboard.html'
--- loco_directory/templates/events/global_jam_dashboard.html	2012-02-09 16:42:49 +0000
+++ loco_directory/templates/events/global_jam_dashboard.html	2012-06-15 22:38:18 +0000
@@ -84,104 +84,102 @@
 {% block title %}{% trans global_event_object.name %} | {% trans "Ubuntu LoCo Team Portal" %} {% endblock %}
 
 {% block sub_nav_links %}
-<a class="sub-nav-item" href="{% url global-event-detail global_event_object.id %}">{% trans "Show Event Details" %}</a>
-<a class="sub-nav-item" href="{% url team-event-select %}?global_event_id={{global_event_object.id}}">{% trans "Add Team Event" %}</a>
-{% if user_is_on_lc %}
-<a class="sub-nav-item" href="{% url global-event-update global_event_object.id %}">{% trans "Edit Details" %}</a>
-<a class="sub-nav-item" href="{% url global-event-delete global_event_object.id %}">{% trans "Delete Event" %}</a>
-{% endif %}
+    <li><a class="sub-nav-item" href="{% url global-event-detail global_event_object.id %}">{% trans "Show Event Details" %}</a></li>
+    <li><a class="sub-nav-item" href="{% url team-event-select %}?global_event_id={{global_event_object.id}}">{% trans "Add Team Event" %}</a></li>
+    {% if user_is_on_lc %}
+        <li><a class="sub-nav-item" href="{% url global-event-update global_event_object.id %}">{% trans "Edit Details" %}</a></li>
+        <li><a class="sub-nav-item" href="{% url global-event-delete global_event_object.id %}">{% trans "Delete Event" %}</a></li>
+    {% endif %}
 {% endblock %}
 
 {% block content %}
 
-<article class="double-side-content">
-    {% if global_event_object.activities %}
-        {{ global_event_object.activities|markdown }}
-    {% endif %}
-
-{% if global_event_object.channel %}
-<div>
-    {% if user.is_authenticated %}
-	<iframe src="http://webchat.freenode.net/?channels={{ global_event_object.channel }}&prompt=1&uio=OT10cnVlJjEwPXRydWUmMTE9MzEc5&nick={{ user.username|irc }}" width="600" height="400"></iframe>
-    {% else %}
-	<iframe src="http://webchat.freenode.net/?channels={{ global_event_object.channel }}&prompt=1&uio=OT10cnVlJjEwPXRydWUmMTE9MzEc5&nick=locodir-user" width="600" height="400"></iframe>
-    {% endif %}
-</div>
-{% endif %}
-
-{% if global_event_object.pictag %}
-    <article class="alone">
-        <h2>{% trans "Photos" %} #{{global_event_object.pictag}}
-        <a href="http://www.flickr.com/search/?w=all&q={{ global_event_object.pictag }}&m=tags">
-            <img src="{{MEDIA_URL}}img/flickr.ico" alt="{{ global_event_object.pictag }} on Flickr" />
-        </a>
-        <a href="http://picasaweb.google.com/lh/view?tags=%22{{ global_event_object.pictag }}%22&psc=G#">
-            <img src="{{MEDIA_URL}}img/picasa.ico" alt="{{ global_event_object.pictag }} on Picasa" />
-        </a>
-        <a href="http://pix.ie/explore/tag/{{ global_event_object.pictag }}">
-            <img src="{{MEDIA_URL}}img/pixie.ico" alt="{{ global_event_object.pictag }} on Pix.ie" />
-        </a>
-    </h2>
-    <div id="photo-feed"></div>
-    </article>
-{% endif %}
-
-</article>
-
-<div class="single-side-column">
-    <article>
-    <h2>{{ global_event_object.name }}</h2>
-
-    {% if global_event_object.date_begin %}
-    <p>
-        {% ifequal global_event_object.date_begin|date global_event_object.date_end|date %}
-            {{ global_event_object.date_begin|date:"D, d N Y H:i" }} - {{ global_event_object.date_end|date:"H:i T"}}
-        {% else %}
-            {{ global_event_object.date_begin|date:"D, d N Y H:i" }} - {{ global_event_object.date_end|date:"D, d N Y H:i T"}}
-        {% endifequal %}
-    </p>
-    {% endif %}
-
-    {% if global_event_object.announce %}
-    <p>
-        <a href="{{ global_event_object.announce }}">{{global_event_object.announce }}</a>
-    </p>
-    {% endif %}
-    </article>
+<div class="row">
+    <section class="span-6">
+        {% if global_event_object.activities %}
+            {{ global_event_object.activities|markdown }}
+        {% endif %}
+
+        {% if global_event_object.channel %}
+        <div>
+            {% if user.is_authenticated %}
+                <iframe src="http://webchat.freenode.net/?channels={{ global_event_object.channel }}&prompt=1&uio=OT10cnVlJjEwPXRydWUmMTE9MzEc5&nick={{ user.username|irc }}" width="600" height="400"></iframe>
+            {% else %}
+                <iframe src="http://webchat.freenode.net/?channels={{ global_event_object.channel }}&prompt=1&uio=OT10cnVlJjEwPXRydWUmMTE9MzEc5&nick=locodir-user" width="600" height="400"></iframe>
+            {% endif %}
+        </div>
+        {% endif %}
+
+        {% if global_event_object.pictag %}
+        <article class="alone">
+            <h2>{% trans "Photos" %} #{{global_event_object.pictag}}
+                <a href="http://www.flickr.com/search/?w=all&q={{ global_event_object.pictag }}&m=tags">
+                    <img src="{{MEDIA_URL}}img/flickr.ico" alt="{{ global_event_object.pictag }} on Flickr" />
+                </a>
+                <a href="http://picasaweb.google.com/lh/view?tags=%22{{ global_event_object.pictag }}%22&psc=G#">
+                    <img src="{{MEDIA_URL}}img/picasa.ico" alt="{{ global_event_object.pictag }} on Picasa" />
+                </a>
+                <a href="http://pix.ie/explore/tag/{{ global_event_object.pictag }}">
+                    <img src="{{MEDIA_URL}}img/pixie.ico" alt="{{ global_event_object.pictag }} on Pix.ie" />
+                </a>
+            </h2>
+            <div id="photo-feed"></div>
+        </article>
+        {% endif %}
+    </section>
+ 
+    <section class="span-6 last">
+        <article>
+            <h2>{{ global_event_object.name }}</h2>
+            {% if global_event_object.date_begin %}
+                <p>
+                   {% ifequal global_event_object.date_begin|date global_event_object.date_end|date %}
+                       {{ global_event_object.date_begin|date:"D, d N Y H:i" }} - {{ global_event_object.date_end|date:"H:i T"}}
+                   {% else %}
+                        {{ global_event_object.date_begin|date:"D, d N Y H:i" }} - {{ global_event_object.date_end|date:"D, d N Y H:i T"}}
+                   {% endifequal %}
+                </p>
+            {% endif %}
+            {% if global_event_object.announce %}
+                <p>
+                    <a href="{{ global_event_object.announce }}">{{global_event_object.announce }}</a>
+                </p>
+            {% endif %}
+        </article>
     
-    <article class="side-content share">
-        <a href="http://www.reddit.com/submit" onclick="window.location = 'http://www.reddit.com/submit?url=' + encodeURIComponent(window.location); return false"> <img style="padding-bottom: 4px;"src="http://www.reddit.com/static/spreddit7.gif" alt="submit to reddit" border="0" /></a><br />
-        <div id="fb-root"></div>
-        <script>(function(d, s, id) {
-          var js, fjs = d.getElementsByTagName(s)[0];
-          if (d.getElementById(id)) {return;}
-          js = d.createElement(s); js.id = id;
-          js.src = "//connect.facebook.net/en_US/all.js#xfbml=1&appId=127188230723188";
-          fjs.parentNode.insertBefore(js, fjs);
-        }(document, 'script', 'facebook-jssdk'));</script>
-        <div class="fb-like" data-href="http://loco.ubuntu.com{% url global-event-detail global_event_object.id %}" data-send="false" data-layout="box_count" data-width="40" data-show-faces="false" data-font="arial"></div>
-        <script type="text/javascript" src="https://apis.google.com/js/plusone.js"></script>
-        <g:plusone size="tall"></g:plusone>
-        <a href="http://twitter.com/share" class="twitter-share-button" data-count="vertical" data-lang="en">Tweet</a>
-        <script type="text/javascript" src="http://platform.twitter.com/widgets.js"></script>
-        <script src="http://www.stumbleupon.com/hostedbadge.php?s=5"></script>
-    </article>
-
-{% if global_event_object.microbloghashtag %}
-    <article class="side-content alone">
-    <h2>#{{global_event_object.microbloghashtag}}
-        <a href="http://identi.ca/tag/{{ global_event_object.microbloghashtag }}">
-            <img src="{{MEDIA_URL}}img/identica.ico" alt="{{ global_event_object.microbloghashtag }} on Identi.ca" />
-        </a>
-        <a href="http://twitter.com/#search?q=%23{{ global_event_object.microbloghashtag }}">
-            <img src="{{MEDIA_URL}}img/twitter.ico" alt="{{ global_event_object.microbloghashtag }} on Twitter" />
-        </a>
-    </h2>
-    <div class="twidenash" id="{{global_event_object.microbloghashtag}}"></div>
-    </article>
-{% endif %}
-
+        <article class="share">
+            <a href="http://www.reddit.com/submit" onclick="window.location = 'http://www.reddit.com/submit?url=' + encodeURIComponent(window.location); return false"> <img style="padding-bottom: 4px;"src="http://www.reddit.com/static/spreddit7.gif" alt="submit to reddit" border="0" /></a><br />
+            <div id="fb-root"></div>
+            <script>(function(d, s, id) {
+            var js, fjs = d.getElementsByTagName(s)[0];
+            if (d.getElementById(id)) {return;}
+            js = d.createElement(s); js.id = id;
+            js.src = "//connect.facebook.net/en_US/all.js#xfbml=1&appId=127188230723188";
+            fjs.parentNode.insertBefore(js, fjs);
+            }(document, 'script', 'facebook-jssdk'));</script>
+            <div class="fb-like" data-href="http://loco.ubuntu.com{% url global-event-detail global_event_object.id %}" data-send="false" data-layout="box_count" data-width="40" data-show-faces="false" data-font="arial"></div>
+            <script type="text/javascript" src="https://apis.google.com/js/plusone.js"></script>
+            <g:plusone size="tall"></g:plusone>
+            <a href="http://twitter.com/share" class="twitter-share-button" data-count="vertical" data-lang="en">Tweet</a>
+            <script type="text/javascript" src="http://platform.twitter.com/widgets.js"></script>
+            <script src="http://www.stumbleupon.com/hostedbadge.php?s=5"></script>
+        </article>
+
+    {% if global_event_object.microbloghashtag %}
+        <article class=" alone">
+            <h2>#{{global_event_object.microbloghashtag}}
+                <a href="http://identi.ca/tag/{{ global_event_object.microbloghashtag }}">
+                    <img src="{{MEDIA_URL}}img/identica.ico" alt="{{ global_event_object.microbloghashtag }} on Identi.ca" />
+                </a>
+                <a href="http://twitter.com/#search?q=%23{{ global_event_object.microbloghashtag }}">
+                    <img src="{{MEDIA_URL}}img/twitter.ico" alt="{{ global_event_object.microbloghashtag }} on Twitter" />
+                </a>
+            </h2>
+            <div class="twidenash" id="{{global_event_object.microbloghashtag}}"></div>
+        </article>
+    {% endif %}
+
+    </section>
 </div>
 
-
 {% endblock %}
 
=== modified file 'loco_directory/templates/events/team_event_comment_new.html'
--- loco_directory/templates/events/team_event_comment_new.html	2011-10-05 00:50:53 +0000
+++ loco_directory/templates/events/team_event_comment_new.html	2012-06-15 22:38:18 +0000
@@ -16,18 +16,18 @@
 {% endblock %}
 
 {% block content %}
-<article class="main-content">
+<div class="row">
+<section class="span-9">
     <form action="." method="post">
         <fieldset>
-            <legend>{% trans "Team Event Comment" %}</legend>
+            <h3>{% trans "Team Event Comment" %}</h3>
     	    {{ form.as_template }}
 	    </fieldset>
 		{% if is_popup %}<input type="hidden" name="_popup" value="1">{% endif %}		
 		<input type="submit" name="submit" value="{% trans "Submit" %}" class="submit-button" /> 
     </form>
-</article>
+</section></div>
 
 {% include "events/team_event_detail.inc.html" %}
 
-
 {% endblock %}
 
=== modified file 'loco_directory/templates/events/team_event_delete_confirm.html'
--- loco_directory/templates/events/team_event_delete_confirm.html	2011-10-05 00:50:53 +0000
+++ loco_directory/templates/events/team_event_delete_confirm.html	2012-06-15 22:38:18 +0000
@@ -8,14 +8,16 @@
 {% endblock %}
 
 {% block content %}
-<article class="main-content">
+<div class="row">
+<section class="span-9">
     <form action="." method="post">
         <fieldset>
-            <legend>{% trans "Delete Team Event" %}</legend>
+            <h3>{% trans "Delete Team Event" %}</h3>
             <label>{% blocktrans with team_event_object.name as eventname %}Do you really want to delete the Team Event: {{eventname}}?{% endblocktrans %}</label>
         </fieldset>
 	    <input type="submit" value="{% trans 'Delete' %}" />
 	    <a href="{{team_event_object.get_absolute_url}}">{% trans "Cancel" %}</a>
     </form>
-</article>
+</section>
+</div>
 {% endblock %}
 
=== modified file 'loco_directory/templates/events/team_event_detail.html'
--- loco_directory/templates/events/team_event_detail.html	2011-11-14 21:59:40 +0000
+++ loco_directory/templates/events/team_event_detail.html	2012-06-15 22:38:18 +0000
@@ -22,17 +22,17 @@
 {% endblock %}
 
 {% block sub_nav_links %}
-{% for team in team_event_object.teams.all %}<a class="sub-nav-item" href="{{ team.get_absolute_url }}">{{ team.name }}</a>{% endfor %}
+{% for team in team_event_object.teams.all %}<li><a class="sub-nav-item" href="{{ team.get_absolute_url }}">{{ team.name }}</a></li>{% endfor %}
 
-<a class="sub-nav-item" href="{% url team-event-comment-new team_event_object.first_team.lp_name team_event_object.id %}#comment">{% trans "Add Comment" %}</a>
+<li><a class="sub-nav-item" href="{% url team-event-comment-new team_event_object.first_team.lp_name team_event_object.id %}#comment">{% trans "Add Comment" %}</a></li>
 {% if user.is_authenticated %}
   {% if user_is_team_member %}
-    <a class="sub-nav-item" href="{% url team-event-update team_event_object.first_team.lp_name team_event_object.id %}">{% trans "Edit Details" %}</a>
-    <a class="sub-nav-item" href="{% url team-event-delete team_event_object.first_team.lp_name team_event_object.id %}">{% trans "Delete Event" %}</a>
-    <a class="sub-nav-item" href="{% url team-event-copy team_event_object.first_team.lp_name team_event_object.id %}">{% trans "Copy Event" %}</a>
+    <li><a class="sub-nav-item" href="{% url team-event-update team_event_object.first_team.lp_name team_event_object.id %}">{% trans "Edit Details" %}</a></li>
+    <li><a class="sub-nav-item" href="{% url team-event-delete team_event_object.first_team.lp_name team_event_object.id %}">{% trans "Delete Event" %}</a></li>
+    <li><a class="sub-nav-item" href="{% url team-event-copy team_event_object.first_team.lp_name team_event_object.id %}">{% trans "Copy Event" %}</a></li>
   {% endif %}
 {% endif %}
-<a class="sub-nav-item" href="{% url event-ical team_event_object.first_team.lp_name team_event_object.id %}">{% trans "iCal Feed" %}</a>
+<li><a class="sub-nav-item" href="{% url event-ical team_event_object.first_team.lp_name team_event_object.id %}">{% trans "iCal Feed" %}</a></li>
 {% endblock %}
 
 {% block content %}
 
=== modified file 'loco_directory/templates/events/team_event_detail.inc.html'
--- loco_directory/templates/events/team_event_detail.inc.html	2012-02-07 14:36:29 +0000
+++ loco_directory/templates/events/team_event_detail.inc.html	2012-06-15 22:38:18 +0000
@@ -1,5 +1,6 @@
 {% load i18n markup %}
-<article class="double-side-content">
+<div class="row">
+<section class="span-6">
     <h2>{{team_event_object.name}}</h2>
     {% if team_event_object.description %}
         <table id="team-event-basic">
@@ -10,9 +11,8 @@
     {% endif %}
     <h3>{% trans "Details" %}</h3>
     {% include "events/team_event_detail_basic.inc.html" %}
-</article>
-
-<article class="side-content attendee">
+</section>
+<section class="span-6 last">
     <h3>
             {% if team_event_object.registration %}
                 <a class="rsvp-link" href="{{team_event_object.registration}}" target="external_registration">{% trans 'Register' %}</a>
@@ -25,11 +25,14 @@
             {% endif %}
     </h3>
     {% include "events/team_event_detail_attendees.inc.html" %}
-</article>
+</section>
+</div>
 
 {% if team_event_object.teameventcomment_set.all %}
-<article class="main-content">
+<div class="row">
+<section class="span-12">
     <h3>{% blocktrans with team_event_object.teameventcomment_set.all.count as comment_count %}Event Comments ({{ comment_count }}){% endblocktrans %}</h3>
     {% include "events/team_event_detail_comments.inc.html" %}
-</article>
+</section>
+</div>
 {% endif %}
 
=== modified file 'loco_directory/templates/events/team_event_list.inc.html'
--- loco_directory/templates/events/team_event_list.inc.html	2011-11-13 11:43:59 +0000
+++ loco_directory/templates/events/team_event_list.inc.html	2012-06-15 22:38:18 +0000
@@ -1,5 +1,5 @@
 {% load i18n %}
-<table id="team_event_list" class="basic wide">
+<table id="team_event_list" class="basic">
     <thead>
         <tr id="team_event_list_header">
             <th class="event_name">{% trans "Event Name" %}</th>
 
=== modified file 'loco_directory/templates/events/team_event_new.html'
--- loco_directory/templates/events/team_event_new.html	2011-10-05 00:50:53 +0000
+++ loco_directory/templates/events/team_event_new.html	2012-06-15 22:38:18 +0000
@@ -24,15 +24,17 @@
 {% endblock %}
 
 {% block content %}
-<article class="main-content">
+<div class="row">
+<section class="span-9">
     <form action="." method="post">
         <fieldset>
-            <legend>{% trans "Add new Team Event for " %}{{ team_object.name}}<span class="supporting">{% trans 'is required' %}</span></legend>
+            <h3>{% trans "Add new Team Event for " %}{{ team_object.name}}<span class="supporting">{% trans 'is required' %}</span></h3>
 	        {{ form.as_template }}
         </fieldset>
 	    {% if is_popup %}<input type="hidden" name="_popup" value="1">{% endif %}	
         <input type="submit" name="submit" value="{% trans "Submit" %}" class="submit-button" /> 
     </form>
-</article>
+</section>
+</div>
 
 {% endblock %}
 
=== modified file 'loco_directory/templates/events/team_event_new_select.html'
--- loco_directory/templates/events/team_event_new_select.html	2011-10-05 00:50:53 +0000
+++ loco_directory/templates/events/team_event_new_select.html	2012-06-15 22:38:18 +0000
@@ -4,7 +4,8 @@
 {% block page_name %}{% trans "New Team Event" %}{% endblock %}
 
 {% block content %}
-<article class="main-content alone">
+<div class="row">
+<section class="span-9">
 <h2>{% trans "Select a Team to add an Event for" %}:</h2>
 <p>
 <ul>
@@ -13,6 +14,7 @@
 {% endfor %}
 </ul>
 </p>
-</article>
+</section>
+</div>
 
 {% endblock %}
 
=== modified file 'loco_directory/templates/events/team_event_register.html'
--- loco_directory/templates/events/team_event_register.html	2011-10-05 00:50:53 +0000
+++ loco_directory/templates/events/team_event_register.html	2012-06-15 22:38:18 +0000
@@ -8,10 +8,11 @@
 {% endblock %}
 
 {% block content %}
-<article class="main-content">
+<div class="row">
+<section class="span-9">
     <form action="." method="post">
         <fieldset>
-            <legend>{% trans "Register for event " %}</legend>
+            <h3>{% trans "Register for event " %}</h3>
             {% if is_past_event %}
                 <p><strong>{% trans "This event has finished!" %}</strong> {% trans "Feel free to change your registration status to reflect whether you actually attended; we're just making sure you know you're not signing up for an upcoming event :)" %}</p>
             {% endif %}
@@ -20,6 +21,7 @@
 	    {% if is_popup %}<input type="hidden" name="_popup" value="1">{% endif %}		
 	    <input type="submit" name="submit" value="{% trans "Submit" %}" class="submit-button" /> 
     </form>
-</article>
+</section>
+</div>
 
 {% endblock %}
 
=== modified file 'loco_directory/templates/events/team_event_update.html'
--- loco_directory/templates/events/team_event_update.html	2011-10-05 00:50:53 +0000
+++ loco_directory/templates/events/team_event_update.html	2012-06-15 22:38:18 +0000
@@ -16,15 +16,17 @@
 {% endblock %}
 
 {% block content %}
-<article class="main-content">
+<div class="row">
+<section class="span-9">
     <form action="." method="post">
         <fieldset>
-            <legend>{% trans "Update Team Event" %}</legend>
+            <h3>{% trans "Update Team Event" %}</h3>
 	        {{ form.as_template }}
         </fieldset>
 	    {% if is_popup %}<input type="hidden" name="_popup" value="1">{% endif %}		
 	    <input type="submit" name="submit" value="{% trans "Submit" %}" class="submit-button" /> 
     </form>
-</article>
+</section>
+</div>
 
 {% endblock %}
 
=== modified file 'loco_directory/templates/index.html'
--- loco_directory/templates/index.html	2011-10-10 14:16:42 +0000
+++ loco_directory/templates/index.html	2012-06-15 22:38:18 +0000
@@ -2,8 +2,8 @@
 {% load i18n %}
 
 {% block sub_nav_links %}
-<a class="sub-nav-item" href="{% url about_loco %}">{% trans "About Local Community (LoCo) Teams" %}</a>
-<a class="sub-nav-item" href="{% url using_locodir %}">{% trans "Using the LoCo Team Portal" %}</a>
+<li><a class="sub-nav-item" href="{% url about_loco %}">{% trans "About Local Community (LoCo) Teams" %}</a></li>
+<li><a class="sub-nav-item" href="{% url using_locodir %}">{% trans "Using the LoCo Team Portal" %}</a></li>
 {% endblock %}
 
 {% block extrahead %}{{block.super}}
@@ -20,9 +20,9 @@
 {% endblock %}
 
 {% block content %}
-
+<div class="row">
+<section class="span-12">
 <h1 class="centered">{% trans "Ubuntu Local Community (LoCo) Team Portal" %}</h1>
-    <article class="main-content">
     <ul id="continents">
         <li id="northamerica">
         <a href="{% url team-list %}#North%20America">
@@ -51,12 +51,10 @@
     </ul>
     <br />
     <p style="text-align: center; font-weight: bold;">{% trans "Click on your continent to find teams near you." %}</p>
-</article>
-
-<hr class="divide" />
-<br />
-
-<section class="double-side-content">
+</section></div>
+
+<div class="row">
+<section class="span-8">
     <h2>{% trans "Latest blog articles" %}</h2>
     {% for article in articles %}
         <article class="blog-entry">
@@ -81,15 +79,13 @@
         </article>
     {% endfor %}
 </section>
-
-<article class="side-content">
+<section class="span-4 last">
     <h2>{% if team_event_count %}{{ team_event_count }} {% endif %}{% trans "Upcoming Events" %}</h2>
     <a href="{% url event-list %}"><img src="{{ MEDIA_URL }}img/home-map.png" /></a>
-</article>
 
-<article class="side-content">
     <h2>{% trans "Latest social messages" %}</h2>
     <div class="twidenash" id="locoteams"></div>
-</article>
+</section>
+</div>
 
 {% endblock %}
 
=== modified file 'loco_directory/templates/irc_chat.html'
--- loco_directory/templates/irc_chat.html	2011-10-05 00:50:53 +0000
+++ loco_directory/templates/irc_chat.html	2012-06-15 22:38:18 +0000
@@ -4,15 +4,16 @@
 {% block page_name %}{% trans "Ubuntu LoCo Teams IRC Chat" %}{% endblock %}
 
 {% block content %}
-
+<div class="row">
+    <section class="span-12">
 <h1>{% trans "Ubuntu LoCo Teams IRC Chat" %}</h1>
 
-<article class="main-content">
     <p>{% trans "Why not join other team members from different LoCos around the world on IRC in the #ubuntu-locoteams IRC channel. This is where LoCo enthusiasts like to hang out. It is open to everyone, you don't have to be a leader. This is the perfect channel to ask questions about LoCo team issues or planning events. It is also a great place to talk and socialize with members of other LoCo teams." %}</p>
     <p>{% trans "It's a great place to chat to with members from different teams, get ideas from them and learn how other teams interact. Why not join, idle and learn. Encourage other members of your LoCo to join this channel by mentioning it on your wiki page or in your IRC channel's topic." %}</p>
-</article>
+</section></div>
 
-<article class="main-content alone">
+<div class="row">
+    <section class="span-12 alone">
     <h2>Webchat</h2>
     <br />
     <div id="ircchat">
@@ -22,6 +23,6 @@
             <iframe src="http://webchat.freenode.net/?channels=#ubuntu-locoteams&prompt=1&uio=MTE9MzE28&nick=locodir-user" width="900" height="400"></iframe>
         {% endif %}
     </div>
-</article>
+</section></div>
 
 {% endblock %}
 
=== modified file 'loco_directory/templates/loco_council.html'
--- loco_directory/templates/loco_council.html	2011-10-05 00:50:53 +0000
+++ loco_directory/templates/loco_council.html	2012-06-15 22:38:18 +0000
@@ -4,13 +4,13 @@
 {% block page_name %}{% trans "Ubuntu LoCo Council" %}{% endblock %}
 
 {% block sub_nav_links %}
-    <a class="sub-nav-item" href="approved">{% trans "Approved Teams" %}</a>
+    <li><a class="sub-nav-item" href="approved">{% trans "Approved Teams" %}</a></li>
 {% endblock %}
 
 {% block content %}
-
+<div class="row">
+    <section class="span-12">
     <h1>{% trans "Ubuntu LoCo Council" %}</h1>
-    <article class="main-content">
         <p>
             {% trans "The Ubuntu LoCo Council is comprised of elected, dedicated members of the Ubuntu Community. They have diverse backgrounds, but have a firm understanding of what makes up successful LoCos. The LoCo Council was set up to govern Ubuntu LoCo teams, and utilizing their past experiences, provide guidance and help when needed to these teams and lead them by example." %}
         </p>
@@ -41,5 +41,5 @@
             {% endwith %}
             {% endwith %}
         </p>
-    </article>
+    </section></div>
 {% endblock %}
 
=== modified file 'loco_directory/templates/loco_setup.html'
--- loco_directory/templates/loco_setup.html	2012-05-27 23:17:17 +0000
+++ loco_directory/templates/loco_setup.html	2012-06-15 22:38:18 +0000
@@ -4,12 +4,13 @@
 {% block page_name %}{% trans "Setting up a LoCo Team" %}{% endblock %}
 
 {% block sub_nav_links %}
-<a class="sub-nav-item" href="{% url about_loco %}">{% trans "About Local Community (LoCo) Teams" %}</a>
+<li><a class="sub-nav-item" href="{% url about_loco %}">{% trans "About Local Community (LoCo) Teams" %}</a></li>
 {% endblock %}
 
 {% block content %}
 
-<article class="main-content">
+<div class="row">
+    <section class="span-12">
     <h2>{% trans "Setting up a Local Community (LoCo) Team" %}</h2>
     <p>{% blocktrans %}
 This page serves to help people who want to set up a LoCo Team in their
@@ -32,9 +33,10 @@
 Community which is one of the things that makes Ubuntu great. The LoCos are
 a very important part of the Ubuntu Community.
     {% endblocktrans %}</p>
-</article>
+</section></div>
 
-<article class="main-content">
+<div class="row">
+    <section class="span-12">
     <h2>{% trans "Team naming standards and Setting up your team resources" %}</h2>
 
     <h3>{% trans "Team Naming Standard" %}</h3>
@@ -116,9 +118,9 @@
    {% endblocktrans %}</p></dd>
 </dl>
 
-</article>
-
-<article class="main-content">
+</section></div>
+<div class="row">
+    <section class="span-12">
     <h2>{% trans "So step by step:" %}</h2>
 
 <dl>
@@ -160,6 +162,6 @@
 to help you as best we can.
 {% endblocktrans %}</p>
 
-</article>
+</section></div>
 
 {% endblock %}
 
=== modified file 'loco_directory/templates/login_failure.html'
--- loco_directory/templates/login_failure.html	2011-11-12 01:43:27 +0000
+++ loco_directory/templates/login_failure.html	2012-06-15 22:38:18 +0000
@@ -20,7 +20,8 @@
 
 {% block content %}
 
-<article class="main-content">
+<div class="row">
+    <section class="span-12">
     <h2>{{message|safe}}</h2>
 
     {% if exception %}
@@ -33,7 +34,7 @@
 
     <p>{% trans "If you continue to experience problems with LoCo Team Portal, please " %} <a href='https://bugs.launchpad.net/loco-team-portal/+filebug'>{% trans "Report it!" %}</a>
     </p>
-</article>
+</section></div>
 
 {% endblock %}
 
 
=== modified file 'loco_directory/templates/meetings/agenda_item_delete_confirm.html'
--- loco_directory/templates/meetings/agenda_item_delete_confirm.html	2011-10-05 00:50:53 +0000
+++ loco_directory/templates/meetings/agenda_item_delete_confirm.html	2012-06-15 22:38:18 +0000
@@ -5,7 +5,7 @@
 {% block page_name %}{% trans "Delete Agenda Item" %}{% endblock %}
 
 {% block sub_nav_links %}
-<a class="sub-nav-item" href="{% url team-meeting-detail team_meeting_object.first_team.lp_name team_meeting_object.id %}">{% trans "Back to Meeting Details" %}</a>
+<li><a class="sub-nav-item" href="{% url team-meeting-detail team_meeting_object.first_team.lp_name team_meeting_object.id %}">{% trans "Back to Meeting Details" %}</a></li>
 {% endblock %}
 
 {% block extrahead %}{{ block.super }}
@@ -13,10 +13,11 @@
 {% endblock %}
 
 {% block content %}
-<article class="main-content">
+<div class="row">
+<section class="span-9">
     <form action="." method="post">
         <fieldset>
-            <legend>{% trans "Delete Agenda Item" %}</legend>
+            <h3>{% trans "Delete Agenda Item" %}</h3>
             {% if agenda_item_object.children.all %}
                 <p>{% trans 'Deleting this Agenda Item will also delete the following Agenda Items:' %}</p>
                 {% recurse item.children.all with agenda_item_object.children.all as item %}
@@ -37,5 +38,6 @@
         <input type="submit" value="{% trans 'Delete' %}" />
         <a href="{{team_meeting_object.get_absolute_url}}">{% trans "Cancel" %}</a>
     </form>
-</article>
+</section>
+</div>
 {% endblock %}
 
=== modified file 'loco_directory/templates/meetings/agenda_item_new.html'
--- loco_directory/templates/meetings/agenda_item_new.html	2011-10-05 00:50:53 +0000
+++ loco_directory/templates/meetings/agenda_item_new.html	2012-06-15 22:38:18 +0000
@@ -4,7 +4,7 @@
 {% block page_name %}{% trans "New Agenda Item" %}{% endblock %}
 
 {% block sub_nav_links %}
-<a class="sub-nav-item" href="{% url team-meeting-detail team_meeting_object.first_team.lp_name team_meeting_object.id %}">{% trans "Back to Meeting Details" %}</a>
+<li><a class="sub-nav-item" href="{% url team-meeting-detail team_meeting_object.first_team.lp_name team_meeting_object.id %}">{% trans "Back to Meeting Details" %}</a></li>
 {% endblock %}
 
 {% block extrahead %}{{ block.super }}
@@ -20,15 +20,17 @@
 {% endblock %}
 
 {% block content %}
-<article class="main-content">
+<div class="row">
+<section class="span-9">
     <form action="." method="post">
         <fieldset>
-            <legend>{% trans "Add new Agenda Item for " %}{{ team_meeting_object.name}}</legend>
+            <h3>{% trans "Add new Agenda Item for " %}{{ team_meeting_object.name}}</h3>
 	        {{ form.as_template }}
         </fieldset>
 		{% if is_popup %}<input type="hidden" name="_popup" value="1">{% endif %}		
 		<input type="submit" name="submit" value="{% trans "Submit" %}" class="submit-button" /> 
     </form>
-</article>
+</section>
+</div>
 
 {% endblock %}
 
=== modified file 'loco_directory/templates/meetings/agenda_item_update.html'
--- loco_directory/templates/meetings/agenda_item_update.html	2011-10-05 00:50:53 +0000
+++ loco_directory/templates/meetings/agenda_item_update.html	2012-06-15 22:38:18 +0000
@@ -4,8 +4,8 @@
 {% block page_name %}{% trans "Update Agenda Item" %}{% endblock %}
 
 {% block sub_nav_links %}
-<a class="sub-nav-item" href="{% url team-meeting-detail team_meeting_object.first_team.lp_name team_meeting_object.id %}">{% trans "Back to Meeting Details" %}</a>
-<a class="sub-nav-item" href="{% url agenda-item-delete team_meeting_object.id agenda_item_object.id %}">{% trans "Delete Agenda Item" %}</a>
+<li><a class="sub-nav-item" href="{% url team-meeting-detail team_meeting_object.first_team.lp_name team_meeting_object.id %}">{% trans "Back to Meeting Details" %}</a></li>
+<li><a class="sub-nav-item" href="{% url agenda-item-delete team_meeting_object.id agenda_item_object.id %}">{% trans "Delete Agenda Item" %}</a></li>
 {% endblock %}
 
 {% block extrahead %}{{ block.super }}
@@ -21,15 +21,17 @@
 {% endblock %}
 
 {% block content %}
-<article class="main-content">
+<div class="row">
+<section class="span-9">
     <form action="." method="post">
         <fieldset>
-            <legend>{% trans "Update Agenda Item" %}</legend>
+            <h3>{% trans "Update Agenda Item" %}</h3>
 	        {{ form.as_template }}
         </fieldset>
 	    {% if is_popup %}<input type="hidden" name="_popup" value="1">{% endif %}		
 	    <input type="submit" name="submit" value="{% trans "Submit" %}" class="submit-button" /> 
     </form>
-</article>
+    </section>
+</div>
 
 {% endblock %}
 
=== modified file 'loco_directory/templates/meetings/meeting_history_list.html'
--- loco_directory/templates/meetings/meeting_history_list.html	2011-10-05 00:50:53 +0000
+++ loco_directory/templates/meetings/meeting_history_list.html	2012-06-15 22:38:18 +0000
@@ -4,11 +4,12 @@
 {% block page_name %}{% trans "Ubuntu Teams Meeting History" %}{% endblock %}
 
 {% block sub_nav_links %}
-<a class="sub-nav-item" href="{% url meeting-list %}">{% trans "Back to Meetings List" %}</a>
+<li><a class="sub-nav-item" href="{% url meeting-list %}">{% trans "Back to Meetings List" %}</a></li>
 {% endblock %}
 
 {% block content %}
-<article class="main-content">
+<div class="row">
+<section class="span-12">
 <h2>{% trans "Ubuntu Teams Meeting History" %}</h2>
 {% if team_meeting_list %}
 <p>{% trans "Select a past team meeting below to see more information about it:" %}</p>
@@ -18,6 +19,6 @@
 {% else %}
 <p>{% trans "There have been no Team Meetings in the past :(" %}</p>
 {% endif %}
-
-</article>
+</section>
+</div>
 {% endblock %}
 
=== modified file 'loco_directory/templates/meetings/meeting_list.html'
--- loco_directory/templates/meetings/meeting_list.html	2011-10-05 00:50:53 +0000
+++ loco_directory/templates/meetings/meeting_list.html	2012-06-15 22:38:18 +0000
@@ -4,12 +4,13 @@
 {% block page_name %}{% trans "Ubuntu Teams Meeting List" %}{% endblock %}
 
 {% block sub_nav_links %}
-<a class="sub-nav-item" href="{% url team-meeting-select %}">{% trans "Add Team Meeting" %}</a>
-<a class="sub-nav-item" href="{% url meeting-history-list %}">{% trans "Past Meetings" %}</a>
+<li><a class="sub-nav-item" href="{% url team-meeting-select %}">{% trans "Add Team Meeting" %}</a></li>
+<li><a class="sub-nav-item" href="{% url meeting-history-list %}">{% trans "Past Meetings" %}</a></li>
 {% endblock %}
 
 {% block content %}
-<article class="main-content">
+<div class="row">
+<section class="span-12">
 <h2>{% trans "Ubuntu Teams Meetings" %}
 {% if team_meeting_list %}
 <a class="teams_meeting_ical" href="{% url teams-meeting-list-ical %}">
@@ -22,5 +23,6 @@
 </h2><p>{% trans "There are currently no Team Meetings" %}</p>
 {% endif %}
 
-</article>
+</section>
+</div>
 {% endblock %}
 
=== modified file 'loco_directory/templates/meetings/team_meeting_delete_confirm.html'
--- loco_directory/templates/meetings/team_meeting_delete_confirm.html	2011-10-05 00:50:53 +0000
+++ loco_directory/templates/meetings/team_meeting_delete_confirm.html	2012-06-15 22:38:18 +0000
@@ -8,14 +8,16 @@
 {% endblock %}
 
 {% block content %}
-<article class="main-content">
+<div class="row">
+<section class="span-9">
     <form action="." method="post">
         <fieldset>
-            <legend>{% trans "Delete Team Meeting" %}</legend>
+            <h3>{% trans "Delete Team Meeting" %}</h3>
             <label>{% blocktrans with team_meeting_object.name as meetingname %}Do you really want to delete the Team Meeting: {{meetingname}}?{% endblocktrans %}</label>
         </fieldset>
 	    <input type="submit" value="Submit" />
 	    <a href="{{team_meeting_object.get_absolute_url}}">{% trans "Cancel" %}</a>
     </form>
-</article>
+</section>
+</div>
 {% endblock %}
 
=== modified file 'loco_directory/templates/meetings/team_meeting_detail.html'
--- loco_directory/templates/meetings/team_meeting_detail.html	2011-11-12 18:35:35 +0000
+++ loco_directory/templates/meetings/team_meeting_detail.html	2012-06-15 22:38:18 +0000
@@ -12,15 +12,15 @@
 {% endblock %}
 
 {% block sub_nav_links %}
-{% for team in team_meeting_object.teams.all %}<a class="sub-nav-item" href="{{ team.get_absolute_url }}">{{ team.name }}</a>{% endfor %}
+{% for team in team_meeting_object.teams.all %}<li><a class="sub-nav-item" href="{{ team.get_absolute_url }}">{{ team.name }}</a>{% endfor %}</li>
 {% if user.is_authenticated %}
   {% if user_is_team_member %}
-    <a class="sub-nav-item" href="{% url team-meeting-update team_meeting_object.first_team.lp_name team_meeting_object.id %}">{% trans "Edit Details" %}</a>
-    <a class="sub-nav-item" href="{% url team-meeting-delete team_meeting_object.first_team.lp_name team_meeting_object.id %}">{% trans "Delete Meeting" %}</a>
-    <a class="sub-nav-item" href="{% url team-meeting-copy team_meeting_object.first_team.lp_name team_meeting_object.id %}">{% trans "Copy Meeting" %}</a>
+    <li><a class="sub-nav-item" href="{% url team-meeting-update team_meeting_object.first_team.lp_name team_meeting_object.id %}">{% trans "Edit Details" %}</a></li>
+    <li><a class="sub-nav-item" href="{% url team-meeting-delete team_meeting_object.first_team.lp_name team_meeting_object.id %}">{% trans "Delete Meeting" %}</a></li>
+    <li><a class="sub-nav-item" href="{% url team-meeting-copy team_meeting_object.first_team.lp_name team_meeting_object.id %}">{% trans "Copy Meeting" %}</a></li>
   {% endif %}
 {% endif %}
-<a class="sub-nav-item" href="{% url meeting-ical team_meeting_object.first_team.lp_name team_meeting_object.id %}">{% trans "iCal Feed" %}</a>
+<li><a class="sub-nav-item" href="{% url meeting-ical team_meeting_object.first_team.lp_name team_meeting_object.id %}">{% trans "iCal Feed" %}</a></li>
 {% endblock %}
 
 {% block content %}
 
=== modified file 'loco_directory/templates/meetings/team_meeting_detail.inc.html'
--- loco_directory/templates/meetings/team_meeting_detail.inc.html	2011-02-03 01:43:39 +0000
+++ loco_directory/templates/meetings/team_meeting_detail.inc.html	2012-06-15 22:38:18 +0000
@@ -1,17 +1,22 @@
 {% load i18n %}
-<article class="main-content">
+<div class="row">
+    <section class="span-12">
     <h2>{{team_meeting_object.name}}</h2>
 
     <h3>{% trans "Details" %}</h3>
     {% include "meetings/team_meeting_detail_basic.inc.html" %}
-</article>
+    </section>
+</div>
 
-<article class="main-content">
+<div class="row">
+    <section class="span-12">
     <h3>{% trans "Agenda" %}</h3>
     {% include "meetings/team_meeting_detail_agenda.inc.html" %}
-</article>
+    </section>
+</div>
 
-<article class="main-content">
+<div class="row">
+    <section class="span-12">
     {% block general %}
         <div id="webchat">
             {% if user.is_authenticated %}
@@ -21,4 +26,5 @@
             {% endif %}
         </div>
     {% endblock %}
-</article>
+    </section>
+</div>
 
=== modified file 'loco_directory/templates/meetings/team_meeting_new.html'
--- loco_directory/templates/meetings/team_meeting_new.html	2011-10-05 00:50:53 +0000
+++ loco_directory/templates/meetings/team_meeting_new.html	2012-06-15 22:38:18 +0000
@@ -16,15 +16,17 @@
 {% endblock %}
 
 {% block content %}
-<article class="main-content">
+<div class="row">
+    <section class="span-9">
     <form action="." method="post">
         <fieldset>
-            <legend>{% trans "Add new Team Meeting for " %}{{ team_object.name}}</legend>
+            <h3>{% trans "Add new Team Meeting for " %}{{ team_object.name}}</h3>
 	        {{ form.as_template }}
         </fieldset>
 	    {% if is_popup %}<input type="hidden" name="_popup" value="1">{% endif %}		
 	    <input type="submit" name="submit" value="{% trans "Submit" %}" class="submit-button" />
     </form>
-</article>
+    </section>
+</div>
 
 {% endblock %}
 
=== modified file 'loco_directory/templates/meetings/team_meeting_new_select.html'
--- loco_directory/templates/meetings/team_meeting_new_select.html	2011-10-05 00:50:53 +0000
+++ loco_directory/templates/meetings/team_meeting_new_select.html	2012-06-15 22:38:18 +0000
@@ -4,7 +4,8 @@
 {% block page_name %}{% trans "New Team Meeting" %}{% endblock %}
 
 {% block content %}
-<article class="main-content alone">
+<div class="row">
+<section class="span-12">
 <h2>{% trans "Select a Team to add an meeting for" %}:</h2>
 <p>
 <ul>
@@ -13,6 +14,7 @@
 {% endfor %}
 </ul>
 </p>
-</article>
+</section>
+</div>
 
 {% endblock %}
 
=== modified file 'loco_directory/templates/meetings/team_meeting_update.html'
--- loco_directory/templates/meetings/team_meeting_update.html	2011-10-05 00:50:53 +0000
+++ loco_directory/templates/meetings/team_meeting_update.html	2012-06-15 22:38:18 +0000
@@ -16,15 +16,17 @@
 {% endblock %}
 
 {% block content %}
-<article class="main-content">
+<div class="row">
+    <section class="span-9">
     <form action="." method="post">
         <fieldset>
-            <legend>{% trans "Update Team Meeting" %}</legend>
+            <h3>{% trans "Update Team Meeting" %}</h3>
 	        {{ form.as_template }}
         </fieldset>
         {% if is_popup %}<input type="hidden" name="_popup" value="1">{% endif %}		
         <input type="submit" name="submit" value="{% trans "Submit" %}" class="submit-button" />
     </form>
-</article>
+    </section>
+</div>
 
 {% endblock %}
 
=== modified file 'loco_directory/templates/site_search.html'
--- loco_directory/templates/site_search.html	2011-01-23 15:02:32 +0000
+++ loco_directory/templates/site_search.html	2012-06-15 22:38:18 +0000
@@ -6,7 +6,8 @@
 {% if q %}
 
 {% if teams %}
-<article class="main-content">
+<div class="row">
+    <section class="span-12">
     <h2>{% trans "Teams" %}</h2>
     <ul>
     {{colcycle.reset}}
@@ -14,12 +15,13 @@
         <li title="{% if team.approved %}{% blocktrans with team.name as teamname %}{{ teamname }} approved{% endblocktrans %}{% else %}{% blocktrans with team.name as teamname %}{{ teamname }} not approved{% endblocktrans %}{% endif %}" class="{% if team.approved %}approved{% else %}unapproved{% endif %} {{colcycle.next}}"><a href="{{ team.get_absolute_url }}">{{ team.name }}</a></li>
     {% endfor %}
     </ul>
-</article>
+</section></div>
 <hr class="divide" />
 {% endif %}
 
 {% if global_events %}
-<article class="main-content">
+<div class="row">
+    <section class="span-12">
     <h2>{% trans "Global Events" %}</h2>
     {{colcycle.reset}}
     <ul>
@@ -27,12 +29,13 @@
         <li class="{{colcycle.next}}"><a href="{{ event.get_absolute_url }}">{{ event.name }}</a> {{event.date_begin|date}} - {{event.date_end|date}}</li>
     {% endfor %}
     </ul>
-</article>
+</section></div>
 <hr class="divide" />
 {% endif %}
 
 {% if team_events %}
-<article class="main-content">
+<div class="row">
+    <section class="span-12">
     <h2>{% trans "Team Events" %}</h2>
     {{colcycle.reset}}
     <ul>
@@ -40,12 +43,13 @@
         <li class="{{colcycle.next}}"><a href="{{ event.get_absolute_url }}">{{ event.name }}</a>{% if event.venue.city %}, {{ event.venue.city }}{% endif %} - {% for team in event.teams.all %}<a title="{% trans "more information about this team" %}" href="{{ team.get_absolute_url }}">{{ team.name }}</a>{% endfor %}</li>
     {% endfor %}
     </ul>
-</article>
+</section></div>
 <hr class="divide" />
 {% endif %}
 
 {% if venues %}
-<article class="main-content">
+<div class="row">
+    <section class="span-12">
     <h2>{% trans "Venues" %}</h2>
     {{colcycle.reset}}
     <ul>
@@ -53,12 +57,13 @@
         <li class="{{colcycle.next}}"><a href="{{ venue.get_absolute_url }}">{{ venue.name }}</a>{% if venue.city %}, {{ venue.city }}{% endif %}</li>
     {% endfor %}
     </ul>
-</article>
+</section></div>
 <hr class="divide" />
 {% endif %}
 
 {% if meetings %}
-<article class="main-content">
+<div class="row">
+    <section class="span-12">
     <h2>{% trans "Meetings" %}</h2>
     {{colcycle.reset}}
     <ul>
@@ -69,15 +74,16 @@
         </li>
     {% endfor %}
     </ul>
-</article>
+</section></div>
 <hr class="divide" />
 {% endif %}
 
 {% else %}
-<article class="main-content alone">
+<div class="row">
+    <section class="span-12">
     <center>
     <h3>{% trans "No search terms provided" %}</h3>
     </center>
-</article>
+</section></div>
 {% endif %}
 {% endblock %}
 
=== modified file 'loco_directory/templates/teams/merge_teams.html'
--- loco_directory/templates/teams/merge_teams.html	2011-10-05 00:50:53 +0000
+++ loco_directory/templates/teams/merge_teams.html	2012-06-15 22:38:18 +0000
@@ -3,21 +3,21 @@
 
 {% block page_name %}{% trans "Merge Teams" %}{% endblock %}
 {% block extrahead %}{{ block.super }}
-<link rel="stylesheet" type="text/css" href="/media/css/newstyle.css" />
 {% endblock %}
 
 {% block content %}
-
+<div class="row">
+<section class="span-12">
 <h1>{% trans "Merge Teams" %}</h1>
 
 <hr class="divide" />
 
-<article class="minor-content alone">
     {% if not team_object or not other_team_object %}
         <p>{% trans "You need two valid teams you want to merge with another." %}</p>
     {% else %}
         <p><a href="{% url team-detail other_team_object %}">{% blocktrans with other_team_object.name as teamname %}Go back to the main page of {{teamname}}.{% endblocktrans %}</a></p>
     {% endif %}
-</article>
+</section>
+</div>
 
 {% endblock %}
 
=== modified file 'loco_directory/templates/teams/my_teams.html'
--- loco_directory/templates/teams/my_teams.html	2011-10-05 00:50:53 +0000
+++ loco_directory/templates/teams/my_teams.html	2012-06-15 22:38:18 +0000
@@ -26,20 +26,20 @@
     {% endfor %}
 {% endblock %}
 
-
 {% block sub_nav_links %}
-            <a class="sub-nav-item" href="{% url my-teams %}" title="{% trans 'My Teams' %}">{% trans "My Teams" %}</a>
-			<a class="sub-nav-item" href="{% url team-list %}" title="{% trans 'All Teams' %}">{% trans "All Teams" %}</a>
+            <li><a class="sub-nav-item" href="{% url my-teams %}" title="{% trans 'My Teams' %}">{% trans "My Teams" %}</a></li>
+			<li><a class="sub-nav-item" href="{% url team-list %}" title="{% trans 'All Teams' %}">{% trans "All Teams" %}</a></li>
 			{% comment %}
 			<!-- TODO: Need to create those pages -->
-			<a class="sub-nav-item" href="" title="{% trans 'Join a Team' %}">{% trans "Join a Team" %}</a>
-			<a class="sub-nav-item" href="" title="{% trans 'Create a Team' %}">{% trans "Create a Team" %}</a>
+			<li><a class="sub-nav-item" href="" title="{% trans 'Join a Team' %}">{% trans "Join a Team" %}</a></li>
+			<li><a class="sub-nav-item" href="" title="{% trans 'Create a Team' %}">{% trans "Create a Team" %}</a></li>
 			{% endcomment %}
 {% endblock %}
 
 {% block content %}
     {% for team in teams %}
-    <article class="main-content">
+<div class="row">
+<section class="span-12">
         <h2 class="dynamic-width">
             <a href="{% url team-detail team_slug=team.lp_name %}" class="team-title" title="{{ team.name }}">{{ team.name }}</a>
             {% comment %}
@@ -97,6 +97,7 @@
             {% endif %}
             {% endif %}
         </section>
-    </article>
+    </section>
+    </div>
     {% endfor %}
 {% endblock %}
 
=== modified file 'loco_directory/templates/teams/select_other_team.html'
--- loco_directory/templates/teams/select_other_team.html	2011-10-05 00:50:53 +0000
+++ loco_directory/templates/teams/select_other_team.html	2012-06-15 22:38:18 +0000
@@ -3,16 +3,16 @@
 
 {% block page_name %}{% trans "Merge Teams" %}{% endblock %}
 {% block extrahead %}{{ block.super }}
-<link rel="stylesheet" type="text/css" href="/media/css/newstyle.css" />
 {% endblock %}
 
 {% block content %}
 
+<div class="row">
+<section class="span-12 alone">
 <h1>{% trans "Merge Teams" %}</h1>
 
 <hr class="divide" />
 
-<article class="minor-content alone">
     {% if other_teams %}
         <h2>{% blocktrans with team_object.lp_name as teamname %}Select the team you want to merge "{{teamname}}" with:{% endblocktrans %}</h2>
         <table width="100%">
@@ -31,6 +31,7 @@
     {% if not other_teams %}
         <p>{% trans "There are currently no teams you could merge your team with." %}</p>
     {% endif %}
-</article>
+</section>
+</div>
 
 {% endblock %}
 
=== modified file 'loco_directory/templates/teams/team_detail.html'
--- loco_directory/templates/teams/team_detail.html	2011-12-19 13:14:36 +0000
+++ loco_directory/templates/teams/team_detail.html	2012-06-15 22:38:18 +0000
@@ -8,12 +8,12 @@
 {% endblock %}
 
 {% block sub_nav_links %}
-            <a class="sub-nav-item" href="{% url team-list %}" title="{% trans "Back to Teams List" %}">{% trans "Back to Teams List" %}</a>
-            {% if is_member %}{% else %} <a class="sub-nav-item" href="https://launchpad.net/~{{ team.lp_name }}/+join">{% trans "Join This Team!" %}</a>{% endif %}
-            {% if is_admin %}<a class="sub-nav-item" href="{% url team-edit team.lp_name %}" title="{% trans "Edit Details" %}">{% trans "Edit Details" %}</a>{% endif %}
-            {% if is_admin and not team.active %}<a class="sub-nav-item" href="{% url select-other-team team.lp_name %}" title="{% trans "Merge with another team" %}">{% trans "Merge team" %}</a>{% endif %}
-            {% if is_member %}<a class="sub-nav-item" href="{% url team-event-new team.lp_name %}" title="{% trans "Add New Event" %}">{% trans "Add New Event" %}</a>{% endif %}
-            {% if is_member %}<a class="sub-nav-item" href="{% url team-meeting-new team.lp_name %}" title="{% trans "Add New Meeting" %}">{% trans "Add New Meeting" %}</a>{% endif %}
+            <li><a class="sub-nav-item" href="{% url team-list %}" title="{% trans "Back to Teams List" %}">{% trans "Back to Teams List" %}</a></li>
+            {% if is_member %}{% else %}<li><a class="sub-nav-item" href="https://launchpad.net/~{{ team.lp_name }}/+join">{% trans "Join This Team!" %}</a></li>{% endif %}
+            {% if is_admin %}<li><a class="sub-nav-item" href="{% url team-edit team.lp_name %}" title="{% trans "Edit Details" %}">{% trans "Edit Details" %}</a></li>{% endif %}
+            {% if is_admin and not team.active %}<li><a class="sub-nav-item" href="{% url select-other-team team.lp_name %}" title="{% trans "Merge with another team" %}">{% trans "Merge team" %}</a></li>{% endif %}
+            {% if is_member %}<li><a class="sub-nav-item" href="{% url team-event-new team.lp_name %}" title="{% trans "Add New Event" %}">{% trans "Add New Event" %}</a></li>{% endif %}
+            {% if is_member %}<li><a class="sub-nav-item" href="{% url team-meeting-new team.lp_name %}" title="{% trans "Add New Meeting" %}">{% trans "Add New Meeting" %}</a></li>{% endif %}
 {% endblock %}
 
 
@@ -70,8 +70,8 @@
 {% endblock %}
 
 {% block content %}
-
-<article class="minor-content relative">
+<div class="row">
+    <section class="span8">
     <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>
@@ -176,12 +176,8 @@
                 </td>
           </tr>
     </table>
-</article>
-{% comment %}
-<article class="minor-content">
-    <img id="locobranding" src="{{ team.mugshot_url }}" alt="" title="{{ team.name }}" />
-</article>
-{% endcomment %}
+</section>
+</div>
 
 {% if team.microbloghashtag %}
 <article class="minor-content alone">
@@ -203,14 +199,16 @@
 {% endif %}
 
 {% if team.flickr_id or team.picasa_id or team.pixie_id %} 
-<article class="main-content">
+<div class="row">
+    <section class="span-12">
     {% with team.name as team_name %}
     <h2>{% blocktrans %}Photos from {{ team_name }}{% endblocktrans %}</h2>
     {% endwith %}
     <div id="flickr"> </div>
     <div id="picasa"> </div>
     <div id="pixie"> </div>
-</article>
+    </section>
+</div>
 {% endif %}
 
 {% endblock %}
 
=== modified file 'loco_directory/templates/teams/team_event_history.html'
--- loco_directory/templates/teams/team_event_history.html	2011-10-05 00:50:53 +0000
+++ loco_directory/templates/teams/team_event_history.html	2012-06-15 22:38:18 +0000
@@ -4,12 +4,13 @@
 {% block page_name %}{% blocktrans with team_object.name as teamname %}{{teamname}} Events History{% endblocktrans %}{% endblock %}
 
 {% block sub_nav_links %}
-<a class="sub-nav-item" href="{% url team-detail team_object.lp_name %}">{% trans "Back to Team Details" %}</a>
-<a class="sub-nav-item" href="{% url team-event-list team_object.lp_name %}">{% trans "Upcoming Events" %}</a>
+<li><a class="sub-nav-item" href="{% url team-detail team_object.lp_name %}">{% trans "Back to Team Details" %}</a></li>
+<li><a class="sub-nav-item" href="{% url team-event-list team_object.lp_name %}">{% trans "Upcoming Events" %}</a></li>
 {% endblock %}
 
 {% block content %}
-<article class="main-content">
+<div class="row">
+<section class="span-12">
 <h1>{% blocktrans with team_object.name as teamname %}{{teamname}} Events History{% endblocktrans %}</h1>
 
 {% if team_event_list %}
@@ -21,6 +22,6 @@
 <p>{% blocktrans with team_object.lp_name as teamname %}There are no past events for LoCo Team {{teamname}} :({% endblocktrans %}</p>
 {% endif %}
 
-
-</article>
+</section>
+</div>
 {% endblock %}
 
=== modified file 'loco_directory/templates/teams/team_event_list.html'
--- loco_directory/templates/teams/team_event_list.html	2011-10-05 00:50:53 +0000
+++ loco_directory/templates/teams/team_event_list.html	2012-06-15 22:38:18 +0000
@@ -4,10 +4,10 @@
 {% block page_name %}{% blocktrans with team_object.name as teamname %}{{teamname}} Events List{% endblocktrans %}{% endblock %}
 
 {% block sub_nav_links %}
-<a class="sub-nav-item" href="{% url team-detail team_object.lp_name %}">{% trans "Back to Team Details" %}</a>
-<a class="sub-nav-item" href="{% url team-event-history team_object.lp_name %}">{% trans "Past Events" %}</a>
-<a class="sub-nav-item" href="{% url team-events-rss team_object.lp_name %}" title="{% trans "Team Events (RSS)" %}"">{% trans "Team Events (RSS)" %}</a>
-{% if is_member %}<a class="sub-nav-item" href="{% url team-event-new team_object.lp_name %}" title="{% trans "Add New Event" %}">{% trans "Add New Event" %}</a>{% endif %}
+<li><a class="sub-nav-item" href="{% url team-detail team_object.lp_name %}">{% trans "Back to Team Details" %}</a></li>
+<li><a class="sub-nav-item" href="{% url team-event-history team_object.lp_name %}">{% trans "Past Events" %}</a></li>
+<li><a class="sub-nav-item" href="{% url team-events-rss team_object.lp_name %}" title="{% trans "Team Events (RSS)" %}"">{% trans "Team Events (RSS)" %}</a></li>
+{% if is_member %}<li><a class="sub-nav-item" href="{% url team-event-new team_object.lp_name %}" title="{% trans "Add New Event" %}">{% trans "Add New Event" %}</a></li>{% endif %}
 {% endblock %}
 
 
@@ -16,7 +16,8 @@
 {% endblock %}
 
 {% block content %}
-<article class="main-content">
+<div class="row">
+<section class="span-12">
 <h1>{% blocktrans with team_object.name as teamname %}{{teamname}} Events List{% endblocktrans %}
 <a class="teams_event_ical" href="{% url team-event-list-ical team_object.lp_name %}">
 <img src="/media/images/ical32.png" title="ical"/></a></h1>
@@ -30,7 +31,6 @@
 <h2>{% blocktrans %}There are currently no events for this team.{% endblocktrans %}</h2>
 {% endif %}
 
-
-
-</article>
+</section>
+</div>
 {% endblock %}
 
=== modified file 'loco_directory/templates/teams/team_list.html'
--- loco_directory/templates/teams/team_list.html	2011-11-03 18:07:11 +0000
+++ loco_directory/templates/teams/team_list.html	2012-06-15 22:38:18 +0000
@@ -11,16 +11,18 @@
 {% endblock %}
 
 {% block content %}
-
-<article class="teams-legend">
+<div class="row">
+    <section class="span-12 teams-legend">
     <ul>
         <li class="approved float_list">{% trans "Approved Teams" %}</li>
         <li class="unapproved float_list">{% trans "Unapproved Teams" %}</li>
     </ul>
-</article>
+    </section>
+</div>
 
   {% for continent in continents %}{% if continent.related_teams %}
-    <article class="main-content">
+<div class="row">
+    <section class="span-12">
       <h2><a name="{{continent.name}}">{{continent.name}}</a></h2>
           <ul>
           {{colcycle.reset}}
@@ -28,12 +30,14 @@
             <li title="{% if team.approved %}{% blocktrans with team.display_name as teamname %}{{ teamname }} approved{% endblocktrans %}{% else %}{% blocktrans with team.display_name as teamname %}{{ teamname }} not approved{% endblocktrans %}{% endif %}" class="{% if team.approved %}approved{% else %}unapproved{% endif %} {{colcycle.next}}"><a href="{{ team.get_absolute_url }}">{{ team.display_name }}</a></li>
           {% endfor %}
           </ul>
-    </article>
+    </section>
+</div>
           <br class="clear" />
   {% endif %}{% endfor %}
 
   {% if countries_without_continent_have_teams %}
-    <article class="main-content">
+    <div class="row">
+    <section class="span-12">
     <h2>{% trans "Countries without continent" %}</h2>
     {% for country in countries_without_continent %}{% if country.country_without_continent_related_teams %}
         <h3>{{country.name}}</h3>
@@ -45,11 +49,13 @@
         </ul>
         <br class="clear" />
       {% endif %}{% endfor %}
-    </article>
+    </section>
+</div>
   {% endif %}
 
   {% if teams_without_country %}
-    <article class="main-content">
+    <div class="row">
+    <section class="span-12">
     <h2>{% trans "Teams without country" %}</h2>
     <ul>
     {{colcycle.reset}}
@@ -58,7 +64,8 @@
     {% endfor %}
     </ul>
     <br class="clear" />
-    </article>
+    </section>
+</div>
   {% endif %}
 
 {% endblock %}
 
=== modified file 'loco_directory/templates/teams/team_meeting_history.html'
--- loco_directory/templates/teams/team_meeting_history.html	2011-10-05 00:50:53 +0000
+++ loco_directory/templates/teams/team_meeting_history.html	2012-06-15 22:38:18 +0000
@@ -4,12 +4,13 @@
 {% block page_name %}{% blocktrans with team_object.name as teamname %}{{teamname}} Meeting History{% endblocktrans %}{% endblock %}
 
 {% block sub_nav_links %}
-<a class="sub-nav-item" href="{% url team-detail team_object.lp_name %}">{% trans "Back to Team Details" %}</a>
-<a class="sub-nav-item" href="{% url team-meeting-list team_object.lp_name %}">{% trans "Upcoming Meetings" %}</a>
+<li><a class="sub-nav-item" href="{% url team-detail team_object.lp_name %}">{% trans "Back to Team Details" %}</a></li>
+<li><a class="sub-nav-item" href="{% url team-meeting-list team_object.lp_name %}">{% trans "Upcoming Meetings" %}</a></li>
 {% endblock %}
 
 {% block content %}
-<article class="main-content">
+<div class="row">
+<section class="span-12">
 <h1>{% blocktrans with team_object.name as teamname %}{{teamname}} Meeting History{% endblocktrans %}</h1>
 
 {% if team_meeting_list %}
@@ -21,5 +22,6 @@
 <p>{% blocktrans with team_object.lp_name as teamname %}There are no past meetings for {{teamname}} :({% endblocktrans %}</p>
 {% endif %}
 
-</article>
+</section>
+</div>
 {% endblock %}
 
=== modified file 'loco_directory/templates/teams/team_meeting_list.html'
--- loco_directory/templates/teams/team_meeting_list.html	2011-10-05 00:50:53 +0000
+++ loco_directory/templates/teams/team_meeting_list.html	2012-06-15 22:38:18 +0000
@@ -4,9 +4,9 @@
 {% block page_name %}{% blocktrans with team_object.name as teamname %}{{teamname}} Meeting List{% endblocktrans %}{% endblock %}
 
 {% block sub_nav_links %}
-<a class="sub-nav-item" href="{% url team-detail team_object.lp_name %}">{% trans "Back to Team Details" %}</a>
-<a class="sub-nav-item" href="{% url team-meeting-history team_object.lp_name %}">{% trans "Past Meetings" %}</a>
-<a class="sub-nav-item" href="{% url team-meetings-rss team_object.lp_name %}" title="{% trans "Team Meetings (RSS)" %}"">{% trans "Team Meetings (RSS)" %}</a>
+<li><a class="sub-nav-item" href="{% url team-detail team_object.lp_name %}">{% trans "Back to Team Details" %}</a></li>
+<li><a class="sub-nav-item" href="{% url team-meeting-history team_object.lp_name %}">{% trans "Past Meetings" %}</a></li>
+<li><a class="sub-nav-item" href="{% url team-meetings-rss team_object.lp_name %}" title="{% trans "Team Meetings (RSS)" %}"">{% trans "Team Meetings (RSS)" %}</a></li>
 {% endblock %}
 
 
@@ -15,7 +15,8 @@
 {% endblock %}
 
 {% block content %}
-<article class="main-content">
+<div class="row">
+<section class="span-12">
 <h1>{% blocktrans with team_object.name as teamname %}{{teamname}} Meeting List{% endblocktrans %}
 <a class="teams_meeting_ical" href="{% url team-meeting-list-ical team_object.lp_name %}">
 <img src="/media/images/ical32.png" title="ical"/></a></h1>
@@ -29,5 +30,6 @@
 <p>{% blocktrans with team_object.lp_name as teamname %}There are currently no meetings for {{teamname}} :({% endblocktrans %}</p>
 {% endif %}
 
-</article>
+</section>
+</div>
 {% endblock %}
 
=== modified file 'loco_directory/templates/teams/team_reapprovals.html'
--- loco_directory/templates/teams/team_reapprovals.html	2011-10-05 00:50:53 +0000
+++ loco_directory/templates/teams/team_reapprovals.html	2012-06-15 22:38:18 +0000
@@ -3,17 +3,16 @@
 
 {% block page_name %}{% trans "Approved Ubuntu LoCo Teams" %}{% endblock %}
 
-{% block extrahead %}{{ block.super }}
-<link rel="stylesheet" type="text/css" href="/media/css/newstyle.css" />
-{% endblock %}
+{% block extrahead %}{{ block.super }}{% endblock %}
 
 {% block content %}
-
+<div class="row">
+<section class="span-12">
 <h1>{% trans "Approved Ubuntu LoCo Teams" %}</h1>
-
-<hr class="divide" />
-
-<article class="minor-content">
+</section>
+</div>
+<div class="row">
+<section class="span-8">
     {% with '</a>' as end_link %}
     {% with '<a href="https://wiki.ubuntu.com/LoCoGettingApproved">' as approved_link %}
     {% with '<a href="https://wiki.ubuntu.com/LoCoFAQ">' as faq_link %}
@@ -34,10 +33,8 @@
     {% endwith %}
     {% endwith %}
     {% endwith %}
-</article>
-
-
-<article class="minor-content alone">
+</section>
+<section class="span-4 last">
     <h2>{% trans "Approved Teams:" %}</h2>
     <br />
     {% if next_teams %}
@@ -74,6 +71,7 @@
     {% if not next_teams and not later_teams %}
         <p>{% trans "There are currently no approved teams in the Ubuntu LoCo Team Portal. :(" %}</p>
     {% endif %}
-</article>
+</section>
+</div>
 
 {% endblock %}
 
=== modified file 'loco_directory/templates/teams/team_update.html'
--- loco_directory/templates/teams/team_update.html	2011-10-05 00:50:53 +0000
+++ loco_directory/templates/teams/team_update.html	2012-06-15 22:38:18 +0000
@@ -16,13 +16,15 @@
 {% endblock %}
 
 {% block sub_nav_links %}
-    <a class="sub-nav-item" href="/teams">{% trans "Back to Teams List" %}</a>
-    <a class="sub-nav-item" href="/teams/{{ team.lp_name }}">{% trans "Back to Team Details" %}</a>
+    <li><a class="sub-nav-item" href="/teams">{% trans "Back to Teams List" %}</a></li>
+    <li><a class="sub-nav-item" href="/teams/{{ team.lp_name }}">{% trans "Back to Team Details" %}</a></li>
 {% endblock %}
 
 {% block content %}
 
-    <article id="form" class="main-content">
+<div class="row">
+<section class="span-9">
+    <article id="form">
         {% if form.errors %}
             <p style="color: red;">
                 {% trans  "Please correct the error" %}{{ form.errors|pluralize }} below.
@@ -31,11 +33,11 @@
 
         <form action="{{ request.path_info }}" method="POST">
             <fieldset>
-                <legend>{% trans "Update the information below" %}</legend>
+                <h3>{% trans "Update the information below" %}</h3>
                 {{ form.as_template }}
             </fieldset>
             <fieldset>
-                <legend>{% trans "Static information" %}</legend>
+                <h3>{% trans "Static information" %}</h3>
                 <div class="approved">
                     <div class="field"><label for="approved">Approved :</label></div>
                     <span class="extra">{% if team.approved %}{% trans "Yes" %}{% else %}{% trans "No" %}{% endif %}</span>
@@ -54,6 +56,7 @@
                 {% if is_popup %}<input type="hidden" name="_popup" value="1">{% endif %}		
                 <input type="submit" name="submit" value="{% trans "Update Information Now!" %}" class="submit-button" /> 
         </form>
-    </article>
+    </section>
+</div>
 
 {% endblock %}
 
=== modified file 'loco_directory/templates/using_locodir.html'
--- loco_directory/templates/using_locodir.html	2011-10-05 00:50:53 +0000
+++ loco_directory/templates/using_locodir.html	2012-06-15 22:38:18 +0000
@@ -5,24 +5,32 @@
 
 {% block content %}
 
-<article class="main-content">
+<div class="row">
+    <section class="span-12">
     <h2>{% trans "Using the LoCo Team Portal" %}</h2>
     <p>{% trans "The LoCo Team Portal is an excellent resource for LoCo Teams to use when planning events. The LoCo Team Portal allows users to set up events and venues for their LoCo Team, and then allow users to register their attendance to the event. This makes planning and tracking much easier for users." %}</p>
-</article>
+    </seclection>
+</div>
 
-<article class="main-content">
+<div class="row">
+    <section class="span-12">
     <h3>{% trans "Teams" %}</h3>
     <p>{% trans "All LoCo Teams registered in Launchpad are a part of the LoCo Team Portal. Team members can create events and venues for their LoCo Team." %}</p>
-</article>
+    </seclection>
+</div>
 
-<article class="main-content">
+<div class="row">
+    <section class="span-12">
     <h3>{% trans "Events" %}</h3>
     <p>{% trans "A LoCo Team member can create an event, and then other members can register their attendance to the event and make comments to the event." %}</p>
-</article>
+    </seclection>
+</div>
 
-<article class="main-content">
+<div class="row">
+    <section class="span-12">
     <h3>{% trans "Venues" %}</h3>
     <p>{% trans "Creating a venue in the LoCo Team Portal will provide other users with information about where an event is being held, and any other information that the users might need to know about the events location." %}</p>
-</article>
+    </seclection>
+</div>
 
 {% endblock %}
 
=== modified file 'loco_directory/templates/venues/venue_detail.html'
--- loco_directory/templates/venues/venue_detail.html	2011-10-05 00:50:53 +0000
+++ loco_directory/templates/venues/venue_detail.html	2012-06-15 22:38:18 +0000
@@ -8,13 +8,15 @@
 <script type="text/javascript" src="http://google-maps-utility-library-v3.googlecode.com/svn/tags/markerclusterer/1.0/src/markerclusterer_packed.js"></script>
 <script type="text/javascript" src="{{ MEDIA_URL }}js/jquery-ubuntu-maps.js"></script>
 {% endblock %}
+<div class="row">
+<section class="span-6">
 
 {% block sub_nav_links %}
-<a class="sub-nav-item" href="{% url venue-list %}" >{% trans "Back to Venues List" %}</a>
+<li><a class="sub-nav-item" href="{% url venue-list %}" >{% trans "Back to Venues List" %}</a></li>
 {% if venue_object.country %}
-<a class="sub-nav-item" href="{% url venue-update venue_object.country.slug venue_object.id %}">{% trans "Edit Venue Details" %}</a>
+<li><a class="sub-nav-item" href="{% url venue-update venue_object.country.slug venue_object.id %}">{% trans "Edit Venue Details" %}</a></li>
 {% else %}
-<a class="sub-nav-item" href="{% url venue-update 'no_country' venue_object.id %}">{% trans "Edit Venue Details" %}</a>
+<li><a class="sub-nav-item" href="{% url venue-update 'no_country' venue_object.id %}">{% trans "Edit Venue Details" %}</a></li>
 {% endif %}
 {% endblock %}
 
 
=== modified file 'loco_directory/templates/venues/venue_detail.inc.html'
--- loco_directory/templates/venues/venue_detail.inc.html	2011-02-17 16:23:06 +0000
+++ loco_directory/templates/venues/venue_detail.inc.html	2012-06-15 22:38:18 +0000
@@ -1,11 +1,12 @@
 {% load i18n %}
-<article class="minor-content">
+<div class="row">
+<section class="span-6">
 	<h2>{{venue_object.name}}</h2>
 	<p>{% include "venues/venue_detail_basic.inc.html" %}</p>
-</article>
+</section>
 
 {% if venue_object.longitude and venue_object.latitude %}
-<article class="minor-content alone venue-map" id="venue-map" class="">
+<section class="span-6 last alone venue-map" id="venue-map">
 </article>
 <script>
     $(function(){
@@ -15,5 +16,6 @@
         });
     });
 </script>
+</setion>
+</div>
 {% endif %}
-
 
=== modified file 'loco_directory/templates/venues/venue_list.html'
--- loco_directory/templates/venues/venue_list.html	2011-11-12 23:19:28 +0000
+++ loco_directory/templates/venues/venue_list.html	2012-06-15 22:38:18 +0000
@@ -4,12 +4,12 @@
 {% block page_name %}{% trans "Ubuntu LoCo Event Venues" %}{% endblock %}
 
 {% block sub_nav_links %}
-    <a class="sub-nav-item" href="{% url venue-new %}">{% trans "Add New Venue" %}</a>
+    <li><a class="sub-nav-item" href="{% url venue-new %}">{% trans "Add New Venue" %}</a></li>
 {% endblock %}
 
 {% block content %}
-<article id="main-content" class="main-content">
-
+<div class="row">
+<section class="span-12">
     <h2>{% trans "Ubuntu LoCo Event Venues" %}</h2>
 
     {% if continent_list or venues_with_country or venues_without_country %}
@@ -63,5 +63,6 @@
     {% else %}
         <p>{% trans "There are currently no LoCo Venues :(" %}</p>
     {% endif %}
-</article>
+</section>
+</div>
 {% endblock %}
 
=== modified file 'loco_directory/templates/venues/venue_update.html'
--- loco_directory/templates/venues/venue_update.html	2011-10-05 00:50:53 +0000
+++ loco_directory/templates/venues/venue_update.html	2012-06-15 22:38:18 +0000
@@ -23,16 +23,18 @@
 {% endblock %}
 
 {% block content %}
-<article class="minor-content">
+<div class="row">
+<section class="span-9">
     <form action="." method="post" style="width:auto;">
         <fieldset>
-            <legend>{% if venue_object %}{% trans "Update Venue" %}{% else %}{% trans "New Venue" %}{% endif %}</legend>
+            <h3>{% if venue_object %}{% trans "Update Venue" %}{% else %}{% trans "New Venue" %}{% endif %}</h3>
             {{ form.as_template }}
         </fieldset>
 		{% if is_popup %}<input type="hidden" name="_popup" value="1">{% endif %}		
 		<input type="submit" name="submit" value="Submit" class="submit-button" /> 
     </form>
-</article>
+</section>
+</div>
 
 <section class="minor-content alone venue-map" id="venue-map-selector" title="{% trans "Select venue position" %}">&nbsp;</section>