BP: Added two 2column layout, both with additional sidebars below.

diff --git a/templates/bulletproof/UTF-8/lang_bg.inc.php b/templates/bulletproof/UTF-8/lang_bg.inc.php
index 7e9915e0b714230a8e08ae13a59cf74f1283c41e..deaab4a6dc2e7f9e52f207dd631406523d41b570 100644 (file)
--- a/templates/bulletproof/UTF-8/lang_bg.inc.php
+++ b/templates/bulletproof/UTF-8/lang_bg.inc.php
@@ -15,6 +15,8 @@ Translator: Ivan Cenov (jwalker@hotmail.bg)
 @define('LAYOUT_SB','Две колони, S-B');
 @define('LAYOUT_BS','Две колони, B-S, CF');
 @define('LAYOUT_SC','Една колона, приставките отдолу, CF');
+@define('LAYOUT_SBF','');
+@define('LAYOUT_BSF','');
 @define('JAVASCRIPT_COLUMNS','Генериране на колони с еднаква височина (използва се Javascript, а това може да забави малко появата на страницата');
 // Custom header
 @define('BP_CUSTOM_HEADER','Изображение по избор на базата данни за хедъра на блога');

diff --git a/templates/bulletproof/UTF-8/lang_de.inc.php b/templates/bulletproof/UTF-8/lang_de.inc.php
index 6b66aa34e22f533671221688cc7b746a76f676fe..a3378ab7e66d323a9c8f10a71ab98cb0688aa8b7 100644 (file)
--- a/templates/bulletproof/UTF-8/lang_de.inc.php
+++ b/templates/bulletproof/UTF-8/lang_de.inc.php
@@ -10,6 +10,8 @@
 @define('LAYOUT_SB','Zweispaltig, Seitenleiste links');
 @define('LAYOUT_BS','Zweispaltig, Seitenleiste rechts, CF');
 @define('LAYOUT_SC','Einspaltig, Seitenleiste(n) unten, CF');
+@define('LAYOUT_SBF','Zweispaltig, Seitenleisten links + unten');
+@define('LAYOUT_BSF','Zweispaltig, Seitenleisten rechts + unten, CF');
 @define('JAVASCRIPT_COLUMNS','Gleich lange Spalten über Javascript erzeugen (Kann den Seitenaufbau verzögern.)');
 // Custom header
 @define('BP_CUSTOM_HEADER','Eigene Header-Grafik aus der Mediendatenbank verwenden');

diff --git a/templates/bulletproof/UTF-8/lang_en.inc.php b/templates/bulletproof/UTF-8/lang_en.inc.php
index c6b01a1c43ee4a48be510cefed117b5d3cacadcf..6aa2157c8fb6c69e9f54130a7bf20f35db29d780 100644 (file)
--- a/templates/bulletproof/UTF-8/lang_en.inc.php
+++ b/templates/bulletproof/UTF-8/lang_en.inc.php
@@ -10,6 +10,8 @@
 @define('LAYOUT_SB','Two columns, S-B');
 @define('LAYOUT_BS','Two columns, B-S, CF');
 @define('LAYOUT_SC','One column, sidebars below, CF');
+@define('LAYOUT_SBF','Two columns, sidebars left + below');
+@define('LAYOUT_BSF','Two columns, sidebars right + below, CF');
 @define('JAVASCRIPT_COLUMNS','Generate equal heights columns using javascript (May slow down page rendering a little.)');
 // Custom header
 @define('BP_CUSTOM_HEADER','Custom header image from media database');

diff --git a/templates/bulletproof/config.inc.php b/templates/bulletproof/config.inc.php
index 288d4226d96e1d868364c06dc46540aa9a68d1fe..07a97329f351edb6e2529ad0abd36245b6c819e0 100644 (file)
--- a/templates/bulletproof/config.inc.php
+++ b/templates/bulletproof/config.inc.php
@@ -49,7 +49,9 @@ $template_config = array(
                                  '3ssb' => LAYOUT_SSB,\r
                                  '2sb'  => LAYOUT_SB,\r
                                  '2bs'  => LAYOUT_BS,\r
-                                 '1col' => LAYOUT_SC)\r
+                                 '1col' => LAYOUT_SC,\r
+                                 '2sbf' => LAYOUT_SBF,\r
+                                 '2bsf' => LAYOUT_BSF)\r
     ),\r
     array(\r
         'var'           => 'jscolumns',\r

diff --git a/templates/bulletproof/index.tpl b/templates/bulletproof/index.tpl
index 109aeb9adb4dcab28678b798b2ac3fe4e71adefc..fc49b59611ee6d5758cd4d5c1259ef7410152794 100644 (file)
--- a/templates/bulletproof/index.tpl
+++ b/templates/bulletproof/index.tpl
@@ -58,6 +58,7 @@
 {else}
     {serendipity_hookPlugin hook="frontend_header"}
 {/if}
+
 {if $is_raw_mode != true}
 
     <!-- #skiplinks: these are links used to navigate quickly in text-based browsers -->
@@ -307,6 +308,76 @@
             </div>
         {/if}
 
+        {if $template_option.layouttype == '2sbf'}
+            <!-- case 7: 2 columns, left sidebar plus sidebar below -->
+            <div id="serendipityLeftSideBar" class="twoside layout2sb_left">
+                {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}
+                {if $leftSidebarElements > 0}{serendipity_printSidebar side="left"}{/if}
+            </div>
+            <div id="content" class="twomain layout2sb_content hfeed">
+                {$CONTENT}
+            </div>
+            <div id="serendipityRightSideBar" class="onefull layout1col_right_full">
+            {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}
+            {if $rightSidebarElements > 0}{serendipity_printSidebar side="right"}{/if}
+            </div>
+        {/if}
+
+        {if $template_option.layouttype == '2bsf'}
+            <!-- case 8: 2 columns, right sidebar plus sidebar below -->
+            <div id="content" class="twomain layout2bs_content hfeed">
+                {$CONTENT}
+            </div>
+            <div id="serendipityRightSideBar" class="twoside layout2bs_right">
+                {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}
+                {if $rightSidebarElements > 0}{serendipity_printSidebar side="right"}{/if}
+            </div>
+            <div id="serendipityLeftSideBar" class="onefull layout1col_right_full">
+            {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}
+            {if $leftSidebarElements > 0}{serendipity_printSidebar side="left"}{/if}
+            </div>
+        {/if}
+
         <!-- #footer: the page footer can be used for additional information             -->
         <div id="footer">
             {if $template_option.footer_text_toggle == 'true'}

diff --git a/templates/bulletproof/info.txt b/templates/bulletproof/info.txt
index 110ee6d691d4e5339ccf99ae6d83d2dab9c018cc..c488471934b460fe8197af41c06f434ec1680dcf 100644 (file)
--- a/templates/bulletproof/info.txt
+++ b/templates/bulletproof/info.txt
@@ -1,4 +1,4 @@
 Name: Bulletproof v1.2 (s9y-bulletproof.com)
 Author: Bulletproof development team
-Date: 2007-12-07
+Date: 2008-01-24
 Require Serendipity: 1.2

diff --git a/templates/bulletproof/lang_bg.inc.php b/templates/bulletproof/lang_bg.inc.php
index c9d86deac13f7a3567fde210c0e2be6315e3dc3c..3a24d46433ce4ec7906943f97e196829f59dca03 100644 (file)
--- a/templates/bulletproof/lang_bg.inc.php
+++ b/templates/bulletproof/lang_bg.inc.php
@@ -15,6 +15,8 @@ Translator: Ivan Cenov (jwalker@hotmail.bg)
 @define('LAYOUT_SB','Äâå êîëîíè, S-B');\r
 @define('LAYOUT_BS','Äâå êîëîíè, B-S, CF');\r
 @define('LAYOUT_SC','Åäíà êîëîíà, ïðèñòàâêèòå îòäîëó, CF');\r
+@define('LAYOUT_SBF','');\r
+@define('LAYOUT_BSF','');\r
 @define('JAVASCRIPT_COLUMNS','Ãåíåðèðàíå íà êîëîíè ñ åäíàêâà âèñî÷èíà (èçïîëçâà ñå Javascript, à òîâà ìîæå äà çàáàâè ìàëêî ïîÿâàòà íà ñòðàíèöàòà');\r
 // Custom header\r
 @define('BP_CUSTOM_HEADER','Èçîáðàæåíèå ïî èçáîð íà áàçàòà äàííè çà õåäúðà íà áëîãà');\r

diff --git a/templates/bulletproof/lang_de.inc.php b/templates/bulletproof/lang_de.inc.php
index e5da2cb4d09d940ff6186099166ce05011ac4f1f..d77be3a1e15c44d725d42bbf4740524cd5820487 100644 (file)
--- a/templates/bulletproof/lang_de.inc.php
+++ b/templates/bulletproof/lang_de.inc.php
@@ -10,6 +10,8 @@
 @define('LAYOUT_SB','Zweispaltig, Seitenleiste links');\r
 @define('LAYOUT_BS','Zweispaltig, Seitenleiste rechts, CF');\r
 @define('LAYOUT_SC','Einspaltig, Seitenleiste(n) unten, CF');\r
+@define('LAYOUT_SBF','Zweispaltig, Seitenleisten links + unten');\r
+@define('LAYOUT_BSF','Zweispaltig, Seitenleisten rechts + unten, CF');\r
 @define('JAVASCRIPT_COLUMNS','Gleich lange Spalten über Javascript erzeugen (Kann den Seitenaufbau verzögern.)');\r
 // Custom header\r
 @define('BP_CUSTOM_HEADER','Eigene Header-Grafik aus der Mediendatenbank verwenden');\r

diff --git a/templates/bulletproof/lang_en.inc.php b/templates/bulletproof/lang_en.inc.php
index 5849eccc8a1164bd4817b4ff7c53cf7ffd0ec94a..b692c84013b7d352404cb95c19b461e805f839b6 100644 (file)
--- a/templates/bulletproof/lang_en.inc.php
+++ b/templates/bulletproof/lang_en.inc.php
@@ -10,6 +10,8 @@
 @define('LAYOUT_SB','Two columns, S-B');\r
 @define('LAYOUT_BS','Two columns, B-S, CF');\r
 @define('LAYOUT_SC','One column, sidebars below, CF');\r
+@define('LAYOUT_SBF','Two columns, sidebars left + below');\r
+@define('LAYOUT_BSF','Two columns, sidebars right + below, CF');\r
 @define('JAVASCRIPT_COLUMNS','Generate equal heights columns using javascript (May slow down page rendering a little.)');\r
 // Custom header\r
 @define('BP_CUSTOM_HEADER','Custom header image from media database');\r