litvinovg/vivo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

NIHVIVO-1433: Fixed search for interior pages.

Browse source
This commit is contained in:
mb863 2010-11-24 20:05:03 +00:00
parent da905d48c2
commit 211a2c20a7
3 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
themes/wilma/templates/menu.ftl
View file

@ -38,7 +38,7 @@
<fieldset> <fieldset>
<legend>Search form</legend> <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> <#if user.showFlag1SearchField>
<select id="search-form-modifier" name="flag1" class="form-item" > <select id="search-form-modifier" name="flag1" class="form-item" >
@ -52,7 +52,7 @@
<div id="search-field"> <div id="search-field">
<input type="text" name="querytext" class="search-vivo" value="${querytext!}" /> <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> </div>
<!-- <input class ="submit" name="submit" type="submit" value="Search" /> --> <!-- <input class ="submit" name="submit" type="submit" value="Search" /> -->

16
themes/wilma/templates/page-home.ftl
View file

@ -60,7 +60,7 @@
<fieldset> <fieldset>
<legend>Search form</legend> <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> <#if user.showFlag1SearchField>
<select id="search-form-modifier" name="flag1" class="form-item" > <select id="search-form-modifier" name="flag1" class="form-item" >
<option value="nofiltering" selected="selected">entire database (${user.loginName})</option> <option value="nofiltering" selected="selected">entire database (${user.loginName})</option>
@ -71,7 +71,7 @@
</#if> </#if>
<div id="search-field"> <div id="search-field">
<input type="text" name="querytext" class="search-vivo" value="${querytext!}" /> <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> </div>
</form> </form>
</fieldset> </fieldset>
@ -102,10 +102,18 @@
<fieldset> <fieldset>
<legend>Search form</legend> <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"> <div id="search-home-field">
<input name="search-home-vivo" class="search-home-vivo" id="search-home-vivo" type="text" /> <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> </div>
</form> </form>
</fieldset> </fieldset>

4
themes/wilma/templates/page.ftl
View file

@ -60,7 +60,7 @@
<fieldset> <fieldset>
<legend>Search form</legend> <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> <#if user.showFlag1SearchField>
<select id="search-form-modifier" name="flag1" class="form-item" > <select id="search-form-modifier" name="flag1" class="form-item" >
<option value="nofiltering" selected="selected">entire database (${user.loginName})</option> <option value="nofiltering" selected="selected">entire database (${user.loginName})</option>
@ -73,7 +73,7 @@
<div id="search-field"> <div id="search-field">
<input type="text" name="querytext" class="search-vivo" value="${querytext!}" /> <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> </div>
</form> </form>
</fieldset> </fieldset>