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

NIHVIVO-1439: Fixed search in home page. Cleaned the javascript calls to trigger the search forms in home and interior pages.

Browse source
This commit is contained in:
mb863 2010-11-29 16:35:01 +00:00
parent 589a743746
commit 12877a6302
4 changed files with 25 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

39
themes/wilma/css/wilma.css
View file

@ -125,6 +125,15 @@ ul#header-nav a:active {
height:38px; height:38px;
background:url(../images/search-interior-pages.png) 0 0 no-repeat; background:url(../images/search-interior-pages.png) 0 0 no-repeat;
} }
#search-field .submit {
text-decoration:none;
background-color:transparent;
color:#fff;
font-size:14px;
border:none;
padding-left:25px;
padding-top:8px;
}
input.search-vivo { input.search-vivo {
float:left; float:left;
width:290px; width:290px;
@ -135,17 +144,6 @@ input.search-vivo {
margin-left:10px; margin-left:10px;
margin-top:5px; margin-top:5px;
} }
#search a.submit {
float:right;
display:block;
width:70px;
height:25px;
font-size:14px;
color:#fff;
padding-top:8px;
padding-left:15px;
text-decoration: none;
}
#search-form-modifier{ #search-form-modifier{
display:none; display:none;
} }
@ -359,6 +357,15 @@ p.passwordNote{
height: 44px; height: 44px;
background: url(../images/search-field-and-button.png) 0 0 no-repeat; background: url(../images/search-field-and-button.png) 0 0 no-repeat;
} }
#search-home-field .submit {
text-decoration:none;
background-color:transparent;
color:#fff;
font-size:18px;
border:none;
padding-left:40px;
padding-top:8px;
}
input.search-home-vivo { input.search-home-vivo {
float: left; float: left;
margin: 10px 0 0 8px; margin: 10px 0 0 8px;
@ -368,16 +375,6 @@ input.search-home-vivo {
font-size: 18px; font-size: 18px;
color: #5e6363; color: #5e6363;
} }
#search-home a.submit {
float: right;
display: block;
width: 80px;
height: 20px;
font-size: 14;
color: #fff;
padding-top: 10px;
padding-left: 30px;
}
/* BROWSE ------> */ /* BROWSE ------> */
#browse { #browse {
clear: both; clear: both;

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

@ -51,8 +51,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!}" />
<input type="submit" value="Search" class="submit">
<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" /> -->

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

@ -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.submit();">Search</a> <input type="submit" value="Search" class="submit">
</div> </div>
</form> </form>
</fieldset> </fieldset>
@ -104,16 +104,16 @@
<legend>Search form</legend> <legend>Search form</legend>
<form id="search-home-vivo" action="${urls.search}" method="post" name="searchHome" role="search"> <form id="search-home-vivo" action="${urls.search}" method="post" name="searchHome" role="search">
<#if user.showFlag1SearchField> <#if user.showFlag1SearchField>
<select id="search-form-modifier2" 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>
<option value="${portalId}">${siteTagline!}</option> <option value="${portalId}">${siteTagline!}</option>
</select> </select>
<#else> <#else>
<input type="hidden" name="flag1" value="${portalId}" /> <input type="hidden" name="flag1" value="${portalId}" />
</#if> </#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 type="text" name="querytext" class="search-home-vivo" value="${querytext!}" />
<a class ="submit" href="javascript:document.searchHome.submit();">Search</a> <input type="submit" value="Search" class="submit">
</div> </div>
</form> </form>
</fieldset> </fieldset>

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

@ -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.submit();">Search</a> <input type="submit" value="Search" class="submit">
</div> </div>
</form> </form>
</fieldset> </fieldset>