Dons update

diff --git a/templates/bulletproof/commentpopup.tpl b/templates/bulletproof/commentpopup.tpl
index 5aa288c872ee109e15145d58b819ac133d2ff465..97c69c7fba82a4434dbcfd7a6b66e9f9c22955ce 100644 (file)
--- a/templates/bulletproof/commentpopup.tpl
+++ b/templates/bulletproof/commentpopup.tpl
@@ -21,10 +21,8 @@
    <!--[if IE 7]>\r
    <link rel="stylesheet" type="text/css" href="{serendipity_getFile file="ie7.css"}" />\r
    <![endif]-->\r
-   {if $template_option.colorset != 'default'}\r
    <!-- additional colorset stylesheet -->\r
    <link rel="stylesheet" type="text/css" href="{$serendipityHTTPPath}templates/{$template}/{$template_option.colorset}_style.css" />\r
-   {/if}\r
    <link rel="alternate"  type="application/rss+xml" title="{$blogTitle} RSS feed" href="{$serendipityBaseURL}{$serendipityRewritePrefix}feeds/index.rss2" />\r
    <link rel="alternate"  type="application/x.atom+xml"  title="{$blogTitle} Atom feed"  href="{$serendipityBaseURL}{$serendipityRewritePrefix}feeds/atom.xml" />\r
 </head>\r

diff --git a/templates/bulletproof/entries_archives.tpl b/templates/bulletproof/entries_archives.tpl
index cd6bd5577d5118f337c7fdc594fd06d48c456fe8..3be2e7315a97b62847034d0644c4493f6e49098a 100644 (file)
--- a/templates/bulletproof/entries_archives.tpl
+++ b/templates/bulletproof/entries_archives.tpl
@@ -5,7 +5,7 @@
       <h4 class="archives_header">{$archive.year}</h4>\r
       {foreach from=$archive.months item="month"}\r
       <ul class="archives_row">\r
-         {if $template_option.colorset == 'default'}\r
+         {if $template_option.colorset == 'blank'}\r
          <li class="archives_graph"><img src="{serendipity_getFile file="img/graph_bar_horisontal.png"}" alt="bar graph" height="10" width="{math width=100 equation="count * width / max" count=$month.entry_count max=$max_entries format="%d"}" style="border: 1px solid #000000" /></li>\r
          {else}\r
          <li class="archives_graph"><img src="{$serendipityHTTPPath}templates/{$template}/img/{$template_option.colorset}_graph_bar.png" alt="bar graph" height="10" width="{math width=100 equation="count * width / max" count=$month.entry_count max=$max_entries format="%d"}" style="border: 1px solid #000000" /></li>\r

diff --git a/templates/bulletproof/img/blank_back.png b/templates/bulletproof/img/blank_back.png
deleted file mode 100644 (file)
index 79ac172..0000000
Binary files a/templates/bulletproof/img/blank_back.png and /dev/null differ

diff --git a/templates/bulletproof/img/blank_forward.png b/templates/bulletproof/img/blank_forward.png
deleted file mode 100644 (file)
index 6408fd4..0000000
Binary files a/templates/bulletproof/img/blank_forward.png and /dev/null differ

diff --git a/templates/bulletproof/img/blank_graph_bar.png b/templates/bulletproof/img/blank_graph_bar.png
deleted file mode 100644 (file)
index 82102f7..0000000
Binary files a/templates/bulletproof/img/blank_graph_bar.png and /dev/null differ

diff --git a/templates/bulletproof/index.tpl b/templates/bulletproof/index.tpl
index ed0480ddab4d22846f18f5df73bb8dc0efc2ae79..42d3acd77b0ecddf116cfcfda787c564b4891540 100644 (file)
--- a/templates/bulletproof/index.tpl
+++ b/templates/bulletproof/index.tpl
@@ -86,7 +86,7 @@
 <!-- quicksearch option in the navigational link menu bar only when navbar is    -->
 <!-- above or below the banner                                                   -->
    {if $template_option.sitenav_quicksearch == 'true'}
-       <form id="navbarsearchform" action="{$serendipityBaseURL}" method="get"><input type="hidden" name="serendipity[action]" value="search" /><input alt="Quicksearch" type="text" name="serendipity[searchTerm]" value="{$CONST.QUICKSEARCH}..." onfocus="if(this.value=='{$CONST.QUICKSEARCH}...')value=''" onblur="if(this.value=='')value='{$CONST.QUICKSEARCH}...';" /></form>
+       <form id="navbarsearchform" action="{$serendipityBaseURL}" method="get"><input type="hidden" name="serendipity[action]" value="search" /><input alt="{$CONST.QUICKSEARCH}" type="text" name="serendipity[searchTerm]" value="{$CONST.QUICKSEARCH}..." onfocus="if(this.value=='{$CONST.QUICKSEARCH}...')value=''" onblur="if(this.value=='')value='{$CONST.QUICKSEARCH}...';" /></form>
    {/if}
 </div>
 {/if}
@@ -112,7 +112,7 @@
 <!-- quicksearch option in the navigational link menu bar only when navbar is    -->
 <!-- above or below the banner                                                   -->
    {if $template_option.sitenav_quicksearch == 'true'}
-       <form id="navbarsearchform" action="{$serendipityBaseURL}" method="get"><input type="hidden" name="serendipity[action]" value="search" /><input alt="Quicksearch" type="text" name="serendipity[searchTerm]" value="{$CONST.QUICKSEARCH}..." onfocus="if(this.value=='{$CONST.QUICKSEARCH}...')value=''" onblur="if(this.value=='')value='{$CONST.QUICKSEARCH}...';" /></form>
+       <form id="navbarsearchform" action="{$serendipityBaseURL}" method="get"><input type="hidden" name="serendipity[action]" value="search" /><input alt="{$CONST.QUICKSEARCH}" type="text" name="serendipity[searchTerm]" value="{$CONST.QUICKSEARCH}..." onfocus="if(this.value=='{$CONST.QUICKSEARCH}...')value=''" onblur="if(this.value=='')value='{$CONST.QUICKSEARCH}...';" /></form>
    {/if}
 </div>
 {/if}

diff --git a/templates/bulletproof/plugin_calendar.tpl b/templates/bulletproof/plugin_calendar.tpl
index c3378c30bf3613fc39c2aa1d04c9dbd1788c2e4b..38125c5347a51a5431b5444b35051c7f68e74e42 100644 (file)
--- a/templates/bulletproof/plugin_calendar.tpl
+++ b/templates/bulletproof/plugin_calendar.tpl
@@ -3,7 +3,7 @@
       <tr>\r
         <th id="back" scope="col" colspan="1" class="serendipity_calendarHeader" style="text-align: right">\r
         {if $plugin_calendar_head.minScroll le $plugin_calendar_head.month_date}\r
-           {if $template_option.colorset == 'default'}\r
+           {if $template_option.colorset == 'blank'}\r
            <a title="{$CONST.BACK}" href="{$plugin_calendar_head.uri_previous}"><img alt="{$CONST.BACK}" src="{serendipity_getFile file="img/back.png"}" width="12" height="12" /></a>\r
            {else}\r
            <a title="{$CONST.BACK}" href="{$plugin_calendar_head.uri_previous}"><img alt="{$CONST.BACK}" src="{$serendipityHTTPPath}templates/{$template}/img/{$template_option.colorset}_back.png" width="12" height="12" /></a>\r
@@ -19,7 +19,7 @@
 \r
         <th id="forward" scope="col" colspan="1" class="serendipity_calendarHeader" style="text-align: left">\r
         {if $plugin_calendar_head.maxScroll ge $plugin_calendar_head.month_date}\r
-            {if $template_option.colorset == 'default'}\r
+            {if $template_option.colorset == 'blank'}\r
             <a title="{$CONST.FORWARD}" href="{$plugin_calendar_head.uri_next}"><img alt="{$CONST.FORWARD}" src="{serendipity_getFile file="img/forward.png"}" width="12" height="12" /></a>\r
             {else}\r
             <a title="{$CONST.FORWARD}" href="{$plugin_calendar_head.uri_next}"><img alt="{$CONST.FORWARD}" src="{$serendipityHTTPPath}templates/{$template}/img/{$template_option.colorset}_forward.png" width="12" height="12" /></a>\r

diff --git a/templates/bulletproof/preview_iframe.tpl b/templates/bulletproof/preview_iframe.tpl
index 83d41dd72cf222f9da747ebe67f575e96b54318e..c3fc47c64e09935ba70396a2ef504bf95c4c5218 100644 (file)
--- a/templates/bulletproof/preview_iframe.tpl
+++ b/templates/bulletproof/preview_iframe.tpl
@@ -4,10 +4,15 @@
         <meta name="Powered-By" content="Serendipity v.{$head_version}" />\r
         <link rel="stylesheet" type="text/css" href="{serendipity_getFile file="base.css"}" />\r
         <link rel="stylesheet" type="text/css" href="{$head_link_stylesheet}" />\r
-{if $template_option.colorset != 'default'}\r
-<!-- additional colorset stylesheet -->\r
+        <!--[if IE 6]>\r
+        <link rel="stylesheet" type="text/css" href="{serendipity_getFile file="ie6.css"}" />\r
+        <![endif]-->\r
+        <!--[if IE 7]>\r
+        <link rel="stylesheet" type="text/css" href="{serendipity_getFile file="ie7.css"}" />\r
+        <![endif]-->\r
+        <!-- additional colorset stylesheet -->\r
         <link rel="stylesheet" type="text/css" href="{$serendipityHTTPPath}templates/{$template}/{$template_option.colorset}_style.css" />\r
-{/if}\r
+\r
         <script type="text/javascript">\r
            window.onload = function() {ldelim}\r
              parent.document.getElementById('serendipity_iframe').style.height = document.getElementById('content').offsetHeight\r

diff --git a/templates/bulletproof/style.css b/templates/bulletproof/style.css
index ec5f33d99c6e7b7e657a66aa1abf28501940e72b..2c00e6ee3335770d16b39c9103d8d439975cb630 100644 (file)
--- a/templates/bulletproof/style.css
+++ b/templates/bulletproof/style.css
@@ -390,3 +390,8 @@ input#serendipityQuickSearchTermField {
     text-align: left;
     margin-left: 10px;
 }
+
+/* overide serendipitySideBarItem overflow: hidden just for sidebar quicksearch livesearch_result */
+.container_serendipity_quicksearch_plugin{
+    overflow: visible !important;
+}
\ No newline at end of file