From: garvinhicking <garvinhicking>
Date: Sun, 26 Aug 2007 16:23:03 +0000 (+0000)
Subject: Dons update
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=be9a8f609407431d06ec242bdce9960ddcb9bb43;p=s9y.git
Dons update
---
diff --git a/templates/bulletproof/commentpopup.tpl b/templates/bulletproof/commentpopup.tpl
index 5aa288c..97c69c7 100644
--- a/templates/bulletproof/commentpopup.tpl
+++ b/templates/bulletproof/commentpopup.tpl
@@ -21,10 +21,8 @@
<!--[if IE 7]>
<link rel="stylesheet" type="text/css" href="{serendipity_getFile file="ie7.css"}" />
<![endif]-->
- {if $template_option.colorset != 'default'}
<!-- additional colorset stylesheet -->
<link rel="stylesheet" type="text/css" href="{$serendipityHTTPPath}templates/{$template}/{$template_option.colorset}_style.css" />
- {/if}
<link rel="alternate" type="application/rss+xml" title="{$blogTitle} RSS feed" href="{$serendipityBaseURL}{$serendipityRewritePrefix}feeds/index.rss2" />
<link rel="alternate" type="application/x.atom+xml" title="{$blogTitle} Atom feed" href="{$serendipityBaseURL}{$serendipityRewritePrefix}feeds/atom.xml" />
</head>
diff --git a/templates/bulletproof/entries_archives.tpl b/templates/bulletproof/entries_archives.tpl
index cd6bd55..3be2e73 100644
--- a/templates/bulletproof/entries_archives.tpl
+++ b/templates/bulletproof/entries_archives.tpl
@@ -5,7 +5,7 @@
<h4 class="archives_header">{$archive.year}</h4>
{foreach from=$archive.months item="month"}
<ul class="archives_row">
- {if $template_option.colorset == 'default'}
+ {if $template_option.colorset == 'blank'}
<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>
{else}
<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>
diff --git a/templates/bulletproof/img/blank_back.png b/templates/bulletproof/img/blank_back.png
deleted file mode 100644
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
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
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 ed0480d..42d3acd 100644
--- 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 c3378c3..38125c5 100644
--- a/templates/bulletproof/plugin_calendar.tpl
+++ b/templates/bulletproof/plugin_calendar.tpl
@@ -3,7 +3,7 @@
<tr>
<th id="back" scope="col" colspan="1" class="serendipity_calendarHeader" style="text-align: right">
{if $plugin_calendar_head.minScroll le $plugin_calendar_head.month_date}
- {if $template_option.colorset == 'default'}
+ {if $template_option.colorset == 'blank'}
<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>
{else}
<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>
@@ -19,7 +19,7 @@
<th id="forward" scope="col" colspan="1" class="serendipity_calendarHeader" style="text-align: left">
{if $plugin_calendar_head.maxScroll ge $plugin_calendar_head.month_date}
- {if $template_option.colorset == 'default'}
+ {if $template_option.colorset == 'blank'}
<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>
{else}
<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>
diff --git a/templates/bulletproof/preview_iframe.tpl b/templates/bulletproof/preview_iframe.tpl
index 83d41dd..c3fc47c 100644
--- 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}" />
<link rel="stylesheet" type="text/css" href="{serendipity_getFile file="base.css"}" />
<link rel="stylesheet" type="text/css" href="{$head_link_stylesheet}" />
-{if $template_option.colorset != 'default'}
-<!-- additional colorset stylesheet -->
+ <!--[if IE 6]>
+ <link rel="stylesheet" type="text/css" href="{serendipity_getFile file="ie6.css"}" />
+ <![endif]-->
+ <!--[if IE 7]>
+ <link rel="stylesheet" type="text/css" href="{serendipity_getFile file="ie7.css"}" />
+ <![endif]-->
+ <!-- additional colorset stylesheet -->
<link rel="stylesheet" type="text/css" href="{$serendipityHTTPPath}templates/{$template}/{$template_option.colorset}_style.css" />
-{/if}
+
<script type="text/javascript">
window.onload = function() {ldelim}
parent.document.getElementById('serendipity_iframe').style.height = document.getElementById('content').offsetHeight
diff --git a/templates/bulletproof/style.css b/templates/bulletproof/style.css
index ec5f33d..2c00e6e 100644
--- 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