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

Merge branch 'maint-rel-1.6' of https://github.com/vivo-project/Vitro into maint-rel-1.6

Browse source
This commit is contained in:
brianjlowe 2013-11-04 13:33:03 -05:00
commit c27971a36e
3 changed files with 16 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
webapp/themes/vitro/templates/page.ftl
View file

@ -10,20 +10,7 @@
<body class="${bodyClasses!}">
<#include "identity.ftl">
<section id="search" role="region">
<fieldset>
<legend>${i18n().search_form}</legend>
<form id="search-form" action="${urls.search}" name="search" role="search" accept-charset="UTF-8" method="POST">
<div id="search-field">
<input type="text" name="querytext" class="search-vitro" value="${querytext!}" autocapitalize="off" />
<input type="submit" value="${i18n().search_button}" class="search">
</div>
</form>
</fieldset>
</section>
<#include "search.ftl">
<#include "menu.ftl">
${body}

14
webapp/themes/vitro/templates/search.ftl Normal file
View file

@ -0,0 +1,14 @@
<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
<section id="search" role="region">
<fieldset>
<legend>${i18n().search_form}</legend>
<form id="search-form" action="${urls.search}" name="search" role="search" accept-charset="UTF-8" method="POST">
<div id="search-field">
<input type="text" name="querytext" class="search-vitro" value="${querytext!}" autocapitalize="off" />
<input type="submit" value="${i18n().search_button}" class="search">
</div>
</form>
</fieldset>
</section>

2
webapp/web/templates/page/basicPage.jsp
View file

@ -58,7 +58,7 @@
<body ${requestScope.bodyAttr}>
${ftl_identity}
${ftl_search}
${ftl_menu}
<c:import url="${bodyJsp}"/>