From: yellowled <yellowled>
Date: Tue, 4 Dec 2007 10:34:57 +0000 (+0000)
Subject: BP: Edited 1column layout to look like it was supposed to in the first place.
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=af9646c803ed98ba0d6188ecb846b25165b73974;p=s9y.git

BP: Edited 1column layout to look like it was supposed to in the first place.
---

diff --git a/templates/bulletproof/base.css b/templates/bulletproof/base.css
index 0133cb6..1105814 100644
--- a/templates/bulletproof/base.css
+++ b/templates/bulletproof/base.css
@@ -96,19 +96,22 @@ body {
 .onemain {
     width: 100%;
 }
-.oneside {
-    width: 50%;
-    max-width: 300px;
-}
+
 .onefull {
     width: 100%;
-    max-width: 300px;
 }
 
 .layout2sb_content {
     clear: right !important;
 }
 
+.onefull .serendipitySideBarItem {
+    float: left;
+    margin: 0px 1px 10px 11px!important;
+    padding: 0!important;
+    width: 18.5%;
+}
+
 #footer {
     float: left;
     position: relative;
diff --git a/templates/bulletproof/ie5.css b/templates/bulletproof/ie5.css
index bc376b4..3700d51 100644
--- a/templates/bulletproof/ie5.css
+++ b/templates/bulletproof/ie5.css
@@ -9,7 +9,11 @@
 
 
 .layout1col_content {
-    float: none !important;
+    float: none!important;
+}
+
+.layout1col_right_full {
+    float: none!important;
 }
 
 /* stop the footer from extending the page's height */
diff --git a/templates/bulletproof/ie6.css b/templates/bulletproof/ie6.css
index 9483b0a..3f20f2e 100644
--- a/templates/bulletproof/ie6.css
+++ b/templates/bulletproof/ie6.css
@@ -9,7 +9,11 @@
 
 
 .layout1col_content {
-    float: none !important;
+    float: none!important;
+}
+
+.layout1col_right_full {
+    float: none!important;
 }
 
 #footer {
diff --git a/templates/bulletproof/ie7.css b/templates/bulletproof/ie7.css
index 657c330..923f8e9 100644
--- a/templates/bulletproof/ie7.css
+++ b/templates/bulletproof/ie7.css
@@ -9,7 +9,11 @@
 
 
 .layout1col_content {
-    float: none !important;
+    float: none!important;
+}
+
+.layout1col_right_full {
+    float: none!important;
 }
 
 #footer {
diff --git a/templates/bulletproof/index.tpl b/templates/bulletproof/index.tpl
index dc4f704..3074d95 100644
--- a/templates/bulletproof/index.tpl
+++ b/templates/bulletproof/index.tpl
@@ -290,39 +290,21 @@
                 {$CONTENT}
             </div>
 
-            {if $leftSidebarElements > 0}
-                <div id="serendipityLeftSideBar" class="{if $rightSidebarElements > 0}oneside layout1col_left_side{else}onefull layout_1col_left_full{/if}">
-                    {if $template_option.sitenavpos == 'left'}
-                        <!-- #sbsitenav: like #sitenav, but placed within the sidebar                    -->
-                        <div id="sbsitenav" class="serendipitySideBarItem">
-                            <h3 class="serendipitySideBarTitle">{$template_option.sitenav_sidebar_title}</h3>
-                            <div class="serendipitySideBarContent">
-                                <!-- the line below must remain as a single uninterrupted line to display correctly in ie6 -->
-                                <ul>{foreach from=$navlinks item="navlink" name="sbnav"}<li class="{if $currpage==$navlink.href}currentpage{/if}{if $smarty.foreach.sbnav.first} sbnavlink_first{/if}{if $smarty.foreach.sbnav.last} sbnavlink_last{/if}"><a href="{$navlink.href}" title="{$navlink.title}">{$navlink.title}</a></li>{/foreach}</ul>
-                            </div>    
-                            <div class="serendipitySideBarFooter"></div>
-                        </div>
-                    {/if}
-                    {serendipity_printSidebar side="left"}
-                </div>
-            {/if}
-
-            {if $rightSidebarElements > 0}
-                <div id="serendipityRightSideBar" class="{if $leftSidebarElements > 0}oneside layout1col_right_side{else}onefull layout1col_right_full{/if}">
-                    {if $template_option.sitenavpos == 'right'}
-                        <!-- #sbsitenav: like #sitenav, but placed within the sidebar                    -->
-                        <div id="sbsitenav" class="serendipitySideBarItem">
-                            <h3 class="serendipitySideBarTitle">{$template_option.sitenav_sidebar_title}</h3>
-                            <div class="serendipitySideBarContent">
-                                <!-- the line below must remain as a single uninterrupted line to display correctly in ie6 -->
-                                <ul>{foreach from=$navlinks item="navlink" name="sbnav"}<li class="{if $currpage==$navlink.href}currentpage{/if}{if $smarty.foreach.sbnav.first} sbnavlink_first{/if}{if $smarty.foreach.sbnav.last} sbnavlink_last{/if}"><a href="{$navlink.href}" title="{$navlink.title}">{$navlink.title}</a></li>{/foreach}</ul>
-                            </div>
-                            <div class="serendipitySideBarFooter"></div>
-                        </div>
-                    {/if}
-                    {serendipity_printSidebar side="right"}
+            <div id="serendipityRightSideBar" class="onefull layout1col_right_full">
+            {if $template_option.sitenavpos == 'left' || $template_option.sitenavpos == 'right'}
+            <!-- #sbsitenav: like #sitenav, but placed within the sidebar -->
+                <div id="sbsitenav" class="serendipitySideBarItem">
+                    <h3 class="serendipitySideBarTitle">{$template_option.sitenav_sidebar_title}</h3>
+                    <div class="serendipitySideBarContent">
+            <!-- the line below must remain as a single uninterrupted line to display correctly in ie6 -->
+                        <ul>{foreach from=$navlinks item="navlink" name="sbnav"}<li class="{if $currpage==$navlink.href}currentpage{/if}{if $smarty.foreach.sbnav.first} sbnavlink_first{/if}{if $smarty.foreach.sbnav.last} sbnavlink_last{/if}"><a href="{$navlink.href}" title="{$navlink.title}">{$navlink.title}</a></li>{/foreach}</ul>
+                    </div>
+                    <div class="serendipitySideBarFooter"></div>
                 </div>
             {/if}
+            {serendipity_printSidebar side="left"}
+            {serendipity_printSidebar side="right"}
+            </div>
         {/if}
 
         <!-- #footer: the page footer can be used for additional information             -->
@@ -363,6 +345,7 @@
 {/if}
 
 {$raw_data}
+
 {serendipity_hookPlugin hook="frontend_footer"}
 {if $is_embedded != true}
     </body>
diff --git a/templates/bulletproof/info.txt b/templates/bulletproof/info.txt
index 8d47705..407ccc2 100644
--- a/templates/bulletproof/info.txt
+++ b/templates/bulletproof/info.txt
@@ -1,4 +1,4 @@
 Name: Bulletproof v1.2 beta (s9y-bulletproof.com)
 Author: Bulletproof development team
-Date: 2007-11-18
+Date: 2007-12-04
 Require Serendipity: 1.2