BP: Add livesearch support for navbar quicksearch. Note: all stylesheets changed...

diff --git a/templates/bulletproof/base.css b/templates/bulletproof/base.css
index c5294cee7d8fe7f98ce613ba8ea588683b513866..694b3d3383b6d76736fc86e32fcac6840f07f854 100644 (file)
--- a/templates/bulletproof/base.css
+++ b/templates/bulletproof/base.css
@@ -46,7 +46,7 @@ body {
     display: inline;
 }
 
-#navbarsearchform {
+#sitenav #searchform {
     float: right;
     display: inline;
 }

diff --git a/templates/bulletproof/blue_style.css b/templates/bulletproof/blue_style.css
index 9cb10a8028c106c9dcb262ad15f892f4ab7e5c44..afd82e17675c8189f4f21d276069b907859b35c4 100644 (file)
--- a/templates/bulletproof/blue_style.css
+++ b/templates/bulletproof/blue_style.css
@@ -241,7 +241,7 @@ input#serendipityQuickSearchTermField {
     border: 1px solid #1F5F7F!important;
 }
 
-#navbarsearchform input {
+#sitenav #searchform input {
     border: 1px solid #1f5f7f;
 }
 

diff --git a/templates/bulletproof/green_style.css b/templates/bulletproof/green_style.css
index 6d3900e6f02ee9beef54c96d551c9a4ee4b005c9..654a350285eaad4549770cba3514e8750ccf597f 100644 (file)
--- a/templates/bulletproof/green_style.css
+++ b/templates/bulletproof/green_style.css
@@ -242,7 +242,7 @@ input#serendipityQuickSearchTermField {
     border: 1px solid #224c03!important;
 }
 
-#navbarsearchform input {
+#sitenav #searchform input {
     border: 1px solid #224c03;
 }
 

diff --git a/templates/bulletproof/index.tpl b/templates/bulletproof/index.tpl
index df0903cb512e30de3df2d9c84de4812bbcda62ea..43489ec4dd514b590bc44b3bc7abb048c6097216 100644 (file)
--- a/templates/bulletproof/index.tpl
+++ b/templates/bulletproof/index.tpl
@@ -93,7 +93,12 @@
                 <!-- 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="{$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>
+                    <form id="searchform" action="{$serendipityHTTPPath}{$serendipityIndexFile}" method="get">
+                        <input type="hidden" name="serendipity[action]" value="search" />
+                        <input alt="{$CONST.QUICKSEARCH}" type="text" id="serendipityQuickSearchTermField" name="serendipity[searchTerm]" value="{$CONST.QUICKSEARCH}..." onfocus="if(this.value=='{$CONST.QUICKSEARCH}...')value=''" onblur="if(this.value=='')value='{$CONST.QUICKSEARCH}...';" />
+                        <div id="LSResult" style="display: none;"><div id="LSShadow"></div></div>
+                    </form>
+                    {serendipity_hookPlugin hook="quicksearch_plugin" hookAll="true"}
                 {/if}
             </div>
         {/if}
@@ -119,7 +124,12 @@
                 <!-- 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="{$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>
+                    <form id="searchform" action="{$serendipityHTTPPath}{$serendipityIndexFile}" method="get">
+                        <input type="hidden" name="serendipity[action]" value="search" />
+                        <input alt="{$CONST.QUICKSEARCH}" type="text" id="serendipityQuickSearchTermField" name="serendipity[searchTerm]" value="{$CONST.QUICKSEARCH}..." onfocus="if(this.value=='{$CONST.QUICKSEARCH}...')value=''" onblur="if(this.value=='')value='{$CONST.QUICKSEARCH}...';" />
+                        <div id="LSResult" style="display: none;"><div id="LSShadow"></div></div>
+                    </form>
+                    {serendipity_hookPlugin hook="quicksearch_plugin" hookAll="true"}
                 {/if}
             </div>
         {/if}

diff --git a/templates/bulletproof/info.txt b/templates/bulletproof/info.txt
index e88160866a35b3336a7cabc491ad47ff16f7c544..2d6044bb30fa260c5af9e9f09aa3b8d1072ce0ca 100644 (file)
--- 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-10-30
+Date: 2007-11-15
 Require Serendipity: 1.2

diff --git a/templates/bulletproof/purple_style.css b/templates/bulletproof/purple_style.css
index 2ba2b9a13197a82f4d8bc6f57ab3469b99ac8e74..375b19bc3d377b37b231fd9154b764843bedb78b 100644 (file)
--- a/templates/bulletproof/purple_style.css
+++ b/templates/bulletproof/purple_style.css
@@ -250,7 +250,7 @@ input#serendipityQuickSearchTermField {
     border: 1px solid #823995!important;
 }
 
-#navbarsearchform input {
+#sitenav #searchform input {
     border: 1px solid #823995;
 }
 

diff --git a/templates/bulletproof/style.css b/templates/bulletproof/style.css
index 32f08ca8253f96077acd1082724a46bb6874e30a..edbf4a26e30a2cca70a43648d50f4019c225b314 100644 (file)
--- a/templates/bulletproof/style.css
+++ b/templates/bulletproof/style.css
@@ -409,11 +409,11 @@ input#serendipityQuickSearchTermField {
     background: #ffffff url('{TEMPLATE_PATH}img/quicksearch.png') no-repeat 97% 50%;
 }
 
-#navbarsearchform {
+#sitenav #searchform {
     margin: 0 10px 0 0;
 }
 
-#navbarsearchform input {
+#sitenav #searchform input {
     width: 165px; 
     margin-top: 3px;
     padding-left: 3px;