From 211a2c20a7c90dc53fff9a4107ba2e2e209127a0 Mon Sep 17 00:00:00 2001
From: mb863 <mb863@43c2fc9b-1942-4403-87b2-35b4218f7473>
Date: Wed, 24 Nov 2010 20:05:03 +0000
Subject: [PATCH] NIHVIVO-1433: Fixed search for interior pages.

---
 themes/wilma/templates/menu.ftl      |  4 ++--
 themes/wilma/templates/page-home.ftl | 16 ++++++++++++----
 themes/wilma/templates/page.ftl      |  4 ++--
 3 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/themes/wilma/templates/menu.ftl b/themes/wilma/templates/menu.ftl
index 0324ce93..3c4a9f20 100644
--- a/themes/wilma/templates/menu.ftl
+++ b/themes/wilma/templates/menu.ftl
@@ -38,7 +38,7 @@
         <fieldset>
             <legend>Search form</legend>
 
-            <form id="searchForm" action="${urls.search}" name="searchForm" role="search"> 
+            <form id="search-form" action="${urls.search}" name="search" role="search"> 
             
                 <#if user.showFlag1SearchField>
                     <select id="search-form-modifier" name="flag1" class="form-item" >
@@ -52,7 +52,7 @@
                 <div id="search-field">
                     <input type="text" name="querytext" class="search-vivo" value="${querytext!}"  />
                
-                    <a class ="submit" href="javascript:document.searchForm.submit();">Search</a>
+                    <a class ="submit" href="javascript:document.search.submit();">Search</a>
                 </div>
             
                 <!-- <input class ="submit" name="submit" type="submit"  value="Search" /> -->
diff --git a/themes/wilma/templates/page-home.ftl b/themes/wilma/templates/page-home.ftl
index d60d3267..33577c67 100644
--- a/themes/wilma/templates/page-home.ftl
+++ b/themes/wilma/templates/page-home.ftl
@@ -60,7 +60,7 @@
                 <fieldset>
                     <legend>Search form</legend>
 
-                    <form id="search-form" action="${urls.search}" name="search-form" role="search"> 
+                    <form id="search-form" action="${urls.search}" name="search" role="search"> 
                        <#if user.showFlag1SearchField>
                            <select id="search-form-modifier" name="flag1" class="form-item" >
                                <option value="nofiltering" selected="selected">entire database (${user.loginName})</option>
@@ -71,7 +71,7 @@
                        </#if> 
                        <div id="search-field">
                            <input type="text" name="querytext" class="search-vivo" value="${querytext!}" />
-                           <a class ="submit" href="javascript:document.search-form.submit();" role="button">Search</a>
+                           <a class ="submit" href="javascript:document.search.submit();">Search</a>
                        </div>
                     </form>
                  </fieldset>
@@ -102,10 +102,18 @@
                     
                     <fieldset>
                         <legend>Search form</legend>
-                        <form id="search-home-vivo" action="${urls.search}" method="post" name="search" role="search">
+                        <form id="search-home-vivo" action="${urls.search}" method="post" name="searchHome" role="search">
+                            <#if user.showFlag1SearchField>
+                                <select id="search-form-modifier2" name="flag1" class="form-item" >
+                                    <option value="nofiltering" selected="selected">entire database (${user.loginName})</option>
+                                    <option value="${portalId}">${siteTagline!}</option>
+                                </select>
+                            <#else>
+                                <input type="hidden" name="flag1" value="${portalId}" />
+                           </#if> 
                             <div id="search-home-field">
                                 <input name="search-home-vivo" class="search-home-vivo" id="search-home-vivo"  type="text" />
-                                <a class ="submit" href="#">Search</a>
+                                <a class ="submit" href="javascript:document.searchHome.submit();">Search</a>
                             </div>
                         </form>
                     </fieldset>
diff --git a/themes/wilma/templates/page.ftl b/themes/wilma/templates/page.ftl
index c502ab78..37354e59 100644
--- a/themes/wilma/templates/page.ftl
+++ b/themes/wilma/templates/page.ftl
@@ -60,7 +60,7 @@
                 <fieldset>
                     <legend>Search form</legend>
                     
-                    <form id="search-form" action="${urls.search}" name="search-form" role="search"> 
+                    <form id="search-form" action="${urls.search}" name="search" role="search"> 
                         <#if user.showFlag1SearchField>
                             <select id="search-form-modifier" name="flag1" class="form-item" >
                                 <option value="nofiltering" selected="selected">entire database (${user.loginName})</option>
@@ -73,7 +73,7 @@
                         
                         <div id="search-field">
                             <input type="text" name="querytext" class="search-vivo" value="${querytext!}" />
-                            <a class ="submit" href="javascript:document.search-form.submit();">Search</a>
+                            <a class ="submit" href="javascript:document.search.submit();">Search</a>
                         </div>
                     </form>
                 </fieldset>