From f33f8bf935273d9258b3ad471675fe114b803688 Mon Sep 17 00:00:00 2001 From: Don Chambers Date: Thu, 20 Sep 2007 02:22:57 +0000 Subject: [PATCH] BP: contain sidebar navigation within .serendipitySideBarContent. Templates created on bulletproof prior to now may require revisions to accomodate this change. --- templates/bulletproof/blue_style.css | 6 + templates/bulletproof/green_style.css | 6 + templates/bulletproof/index.tpl | 693 +++++++++++++------------ templates/bulletproof/info.txt | 2 +- templates/bulletproof/purple_style.css | 6 + 5 files changed, 375 insertions(+), 338 deletions(-) diff --git a/templates/bulletproof/blue_style.css b/templates/bulletproof/blue_style.css index 4e4bc3e0..9cb10a80 100644 --- a/templates/bulletproof/blue_style.css +++ b/templates/bulletproof/blue_style.css @@ -182,6 +182,12 @@ body { /* not used in this template */ } +#sbsitenav .serendipitySideBarContent { + padding: 0; + border: 0; + margin: 0; +} + #sbsitenav { padding: 10px; margin: 0; diff --git a/templates/bulletproof/green_style.css b/templates/bulletproof/green_style.css index cff0936f..6d3900e6 100644 --- a/templates/bulletproof/green_style.css +++ b/templates/bulletproof/green_style.css @@ -177,6 +177,12 @@ body { /* not used in this template */ } +#sbsitenav .serendipitySideBarContent { + padding: 0; + border: 0; + margin: 0; +} + #sbsitenav { padding: 10px; margin: 0; diff --git a/templates/bulletproof/index.tpl b/templates/bulletproof/index.tpl index 490f8819..ffcc1e73 100644 --- a/templates/bulletproof/index.tpl +++ b/templates/bulletproof/index.tpl @@ -1,365 +1,384 @@ {if $is_embedded != true} -{if $is_xhtml} - + {if $is_xhtml} + + {else} + + {/if} + + + + {$head_title|@default:$blogTitle}{if $head_subtitle} - {$head_subtitle}{/if} + + + + + {if $entry_id}{/if} + + + + + + + + + + + + {if $template_option.custheader == 'true'} + + {/if} + {if $template_option.jscolumns == 'true'}{/if} + {serendipity_hookPlugin hook="frontend_header"} + + + {else} - + {serendipity_hookPlugin hook="frontend_header"} {/if} - - - - {$head_title|@default:$blogTitle}{if $head_subtitle} - {$head_subtitle}{/if} - - - - - {if $entry_id}{/if} - - - - - - - - - - - - {if $template_option.custheader == 'true'} - - {/if} - {if $template_option.jscolumns == 'true'}{/if} - {serendipity_hookPlugin hook="frontend_header"} - - - -{else}{serendipity_hookPlugin hook="frontend_header"}{/if} {if $is_raw_mode != true} - - - - + + + + - - - - -
-
+ + + + +
+
-{if $template_option.sitenavpos == 'above'} - - - -{/if} + {if $template_option.sitenavpos == 'above'} + + + + {/if} - - - -
+ + + +
-{if $template_option.sitenavpos == 'below'} - - - -{/if} + {if $template_option.sitenavpos == 'below'} + + + + {/if} - - + + -{if $template_option.layouttype == '3sbs'} - -
- -{if $template_option.sitenavpos == 'left'} - -
- -

{$template_option.sitenav_sidebar_title}

- - -
-
-{/if} - {serendipity_printSidebar side="left"} -
-
- - {$CONTENT} -
-
- -{if $template_option.sitenavpos == 'right'} - -
- -

{$template_option.sitenav_sidebar_title}

- - -
-
-{/if} - {serendipity_printSidebar side="right"} -
-{/if} + {if $template_option.layouttype == '3sbs'} + +
+ + {if $template_option.sitenavpos == 'left'} + +
+ +

{$template_option.sitenav_sidebar_title}

+
+ + +
+
+
+ {/if} + {serendipity_printSidebar side="left"} +
+
+ + {$CONTENT} +
+
+ + {if $template_option.sitenavpos == 'right'} + +
+ +

{$template_option.sitenav_sidebar_title}

+
+ + +
+
+
+ {/if} + {serendipity_printSidebar side="right"} +
+ {/if} -{if $template_option.layouttype == '3bss'} - -
- - {$CONTENT} -
-
- -{if $template_option.sitenavpos == 'left'} - -
- -

{$template_option.sitenav_sidebar_title}

- - -
-
-{/if} - {serendipity_printSidebar side="left"} -
-
- -{if $template_option.sitenavpos == 'right'} - -
- -

{$template_option.sitenav_sidebar_title}

- - -
-
-{/if} - {serendipity_printSidebar side="right"} -
-{/if} + {if $template_option.layouttype == '3bss'} + +
+ + {$CONTENT} +
+
+ + {if $template_option.sitenavpos == 'left'} + +
+ +

{$template_option.sitenav_sidebar_title}

+
+ + +
+
+
+ {/if} + {serendipity_printSidebar side="left"} +
+
+ + {if $template_option.sitenavpos == 'right'} + +
+ +

{$template_option.sitenav_sidebar_title}

+
+ + +
+
+
+ {/if} + {serendipity_printSidebar side="right"} +
+ {/if} -{if $template_option.layouttype == '3ssb'} - -
- -{if $template_option.sitenavpos == 'left'} - -
- -

{$template_option.sitenav_sidebar_title}

- - -
-
-{/if} - {serendipity_printSidebar side="left"} -
-
- -{if $template_option.sitenavpos == 'right'} - -
- -

{$template_option.sitenav_sidebar_title}

- - -
-
-{/if} - {serendipity_printSidebar side="right"} -
-
- - {$CONTENT} -
-{/if} + {if $template_option.layouttype == '3ssb'} + +
+ + {if $template_option.sitenavpos == 'left'} + +
+ +

{$template_option.sitenav_sidebar_title}

+
+ + +
+
+
+ {/if} + {serendipity_printSidebar side="left"} +
+
+ + {if $template_option.sitenavpos == 'right'} + +
+ +

{$template_option.sitenav_sidebar_title}

+
+ + +
+
+
+ {/if} + {serendipity_printSidebar side="right"} +
+
+ + {$CONTENT} +
+ {/if} -{if $template_option.layouttype == '2sb'} - -
- -{if $template_option.sitenavpos == 'left' or $template_option.sitenavpos == 'right'} - -
- -

{$template_option.sitenav_sidebar_title}

- - -
-
-{/if} - {serendipity_printSidebar side="left"} - {serendipity_printSidebar side="right"} -
-
- - {$CONTENT} -
-{/if} + {if $template_option.layouttype == '2sb'} + +
+ + {if $template_option.sitenavpos == 'left' or $template_option.sitenavpos == 'right'} + +
+ +

{$template_option.sitenav_sidebar_title}

+
+ + +
+
+
+ {/if} + {serendipity_printSidebar side="left"} + {serendipity_printSidebar side="right"} +
+
+ + {$CONTENT} +
+ {/if} -{if $template_option.layouttype == '2bs'} - -
- - {$CONTENT} -
-
- -{if $template_option.sitenavpos == 'left' or $template_option.sitenavpos == 'right'} - -
- -

{$template_option.sitenav_sidebar_title}

- - -
-
-{/if} - {serendipity_printSidebar side="left"} - {serendipity_printSidebar side="right"} -
-{/if} + {if $template_option.layouttype == '2bs'} + +
+ + {$CONTENT} +
+
+ + {if $template_option.sitenavpos == 'left' or $template_option.sitenavpos == 'right'} + +
+ +

{$template_option.sitenav_sidebar_title}

+
+ + +
+
+
+ {/if} + {serendipity_printSidebar side="left"} + {serendipity_printSidebar side="right"} +
+ {/if} -{if $template_option.layouttype == '1col'} - -
- - {$CONTENT} -
+ {if $template_option.layouttype == '1col'} + +
+ + {$CONTENT} +
-{if $leftSidebarElements > 0} -
- -{if $template_option.sitenavpos == 'left'} - -
- -

{$template_option.sitenav_sidebar_title}

- - -
-
-{/if} - {serendipity_printSidebar side="left"} -
-{/if} + {if $leftSidebarElements > 0} +
+ + {if $template_option.sitenavpos == 'left'} + +
+ +

{$template_option.sitenav_sidebar_title}

+
+ + +
+
+
+ {/if} + {serendipity_printSidebar side="left"} +
+ {/if} -{if $rightSidebarElements > 0} -
- -{if $template_option.sitenavpos == 'right'} - -
- -

{$template_option.sitenav_sidebar_title}

- - -
-
-{/if} - {serendipity_printSidebar side="right"} -
-{/if} -{/if} + {if $rightSidebarElements > 0} +
+ + {if $template_option.sitenavpos == 'right'} + +
+ +

{$template_option.sitenav_sidebar_title}

+
+ + +
+
+
+ {/if} + {serendipity_printSidebar side="right"} +
+ {/if} + {/if} - - +
{$CONST.POWERED_BY} s9y – Template by Bulletproof development team.
+ {if $template_option.counter_code_toggle == 'true'} +
{$template_option.counter_code}
+ {/if} + + {if ($template_option.sitenavpos != 'none' and $template_option.sitenav_footer == 'true')} + + {/if} +
+ +
{/if} {$raw_data} {serendipity_hookPlugin hook="frontend_footer"} {if $is_embedded != true} - - -{/if} + + +{/if} \ No newline at end of file diff --git a/templates/bulletproof/info.txt b/templates/bulletproof/info.txt index afdcd096..5099f35e 100644 --- a/templates/bulletproof/info.txt +++ b/templates/bulletproof/info.txt @@ -1,4 +1,4 @@ -Name: Bulletproof v1.0 (s9y-bulletproof.com) +Name: Bulletproof v1.1 (s9y-bulletproof.com) Author: Bulletproof development team Date: 2007-09-20 Require Serendipity: 1.2 diff --git a/templates/bulletproof/purple_style.css b/templates/bulletproof/purple_style.css index f200f9e1..2ba2b9a1 100644 --- a/templates/bulletproof/purple_style.css +++ b/templates/bulletproof/purple_style.css @@ -182,6 +182,12 @@ body { /* not used in this template */ } +#sbsitenav .serendipitySideBarContent { + padding: 0; + border: 0; + margin: 0; +} + #sbsitenav { padding: 10px; margin: 0;