[Librefm-commits] [1353] okay, added sensible way to do sidebar when we need it

[Matt Lee]

Revision: 1353
          http://svn.sv.gnu.org/viewvc/?view=rev&root=librefm&revision=1353
Author:   mattl
Date:     2009-05-08 03:28:05 +0000 (Fri, 08 May 2009)
Log Message:
-----------
okay, added sensible way to do sidebar when we need it

Modified Paths:
--------------
    trunk/nixtape/themes/librefm/templates/footer.tpl
    trunk/nixtape/themes/librefm/templates/header.tpl

Modified: trunk/nixtape/themes/librefm/templates/footer.tpl
===================================================================
--- trunk/nixtape/themes/librefm/templates/footer.tpl   2009-05-08 03:27:13 UTC 
(rev 1352)
+++ trunk/nixtape/themes/librefm/templates/footer.tpl   2009-05-08 03:28:05 UTC 
(rev 1353)
@@ -1,24 +1,15 @@
-    </div>
+{if ($sidebar)}        </div>
 </div>
-    </div>
-<div class="yui-g" id="artists">
+       </div>
+       <div class="yui-b">
 
-  <strong><a href="http://libre.fm/contact/";>Talk to us</a></strong> if you're 
in a band, represent a
-  label or music service, we'd like to talk ideas and
-  possibilities. While our intention is eventually provide download
-  and streaming services for freely-licensed music, we are also
-  interested in linking all bands to respectable DRM-free music
-  services.
-  
+<!-- sidebar -->
+
 </div>
-<div class="yui-g">
-    <div class="yui-u first" id="links">
-    <p>Get started with Libre.fm -- <a 
href="http://ideas.libre.fm/index.php/Using_turtle";>We have help</a></p>
-    </div>
-    <div class="yui-u" id="moarlinks">
-<p></p>
-    </div>
+
+{else}
 </div>
+{/if}
 
    <div id="ft" role="navigation">
 
@@ -35,11 +26,9 @@
      <ul>
      <li>A <a href="http://foocorp.org/";>FooCorp</a> thing.</li>
      <li><a href="http://autonomo.us/";>autonomo.us</a></li>
-     <li><a 
href="http://svn.savannah.gnu.org/viewvc/branches/stable/nixtape/?root=librefm";>Powered
 by Nixtape</a></li>
+     <li><a href="http://nixtape.org/";>Powered by Nixtape</a></li>
      </ul>
 
-     <p><a href='http://creativecommons.org/licenses/by-sa/3.0/' 
rel='license'><img src="{$base_url}/i/cc-by-sa.png" alt="Attribution-ShareAlike 
3.0" /></a></p>
-
    </div>
 </div>
 </body>

Modified: trunk/nixtape/themes/librefm/templates/header.tpl
===================================================================
--- trunk/nixtape/themes/librefm/templates/header.tpl   2009-05-08 03:27:13 UTC 
(rev 1352)
+++ trunk/nixtape/themes/librefm/templates/header.tpl   2009-05-08 03:28:05 UTC 
(rev 1353)
@@ -38,12 +38,14 @@
 
 <div id="try-the-alpha"><a href="http://alpha.libre.fm/";>This is the current, 
live, in-development beta version of the site</a></div>
 
-<div id="doc2" class="yui-t7">
+{if ($sidebar)}<div id="doc2" class="yui-t5">{else}<div id="doc2" 
class="yui-t7"> {/if}
        <div id="hd" role="navigation">
                <h1 rel="dc:publisher" class="vcard"><a property="foaf:name" 
rel="foaf:homepage" href="{$base_url}" class="fn org url">Libre.fm</a></h1>
                {include file='menu.tpl'}
        </div>
 
    <div id="bd" role="main">
-<div class="yui-gc">
-    <div class="yui-u first" id="content">
+  {if ($sidebar)} <div id="yui-main"> 
+  <div class="yui-b"><div class="yui-g">{else}
+   <div id="bd" role="main"> 
+    <div class="yui-g">{/if}