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

NIHVIVO-1297 Undid the effects of revision 6246. This was a mistake, since including the body template from the page template rather than pregenerating the body string doesn't allow the addition of stylesheet tags to the page head.

Browse source
This commit is contained in:
rjy7 2010-10-29 16:44:29 +00:00
parent 0bbe23a7fa
commit c178c8d922
8 changed files with 103 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

2
webapp/web/templates/freemarker/body/login/login-form.ftl
View file

@ -27,7 +27,7 @@
<form action="${formAction}" method="post">
<label for="loginName">Email or Username</label>
<input id="loginName" class="focus" name="loginName" type="text" value="${username}" />
<input id="loginName" class="focus" name="loginName" type="text" value="${loginName}" />
<label for="loginPassword">Password</label>
<input id="loginPassword" type="password" name="loginPassword" />
<input name="loginForm" type="submit" class="submit" value="Log in"/>

2
webapp/web/templates/freemarker/body/search/search-pagedResults.ftl
View file

@ -56,4 +56,4 @@
</div> <!-- end contentsBrowseGroup -->
${stylesheets.addFromTheme("/css/search.css")}
${stylesheets.addFromTheme("/css/search.css")}

5
webapp/web/templates/freemarker/page/page-home.ftl
View file

@ -1,5 +0,0 @@
<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
<#-- Page template for home page -->
<#include "page.ftl">

2
webapp/web/templates/freemarker/page/page.ftl
View file

@ -23,7 +23,7 @@
<div id="contentwrap">
<div id="content">
<#include bodyTemplate>
${body}
</div> <!-- content -->
</div> <!-- contentwrap -->