NIHVIVO-1149 Reintegrate dev-fmservlet branch after finishing restructuring of FreemarkerHttpServlet and subclasses. Two files had to be copied manually.

2010-09-15 21:32:32 +00:00 · 2010-09-15 21:32:32 +00:00 · 8547665029
commit 8547665029
parent 0abe35eb14
21 changed files with 625 additions and 482 deletions
--- a/webapp/web/templates/freemarker/body/login/login-main.ftl
+++ b/webapp/web/templates/freemarker/body/login/login-main.ftl
@ -2,8 +2,8 @@

 <#-- Main template for the login panel -->

-<#if loginPanel??>
-    ${loginPanel}
+<#if loginTemplate??>
+    <#include loginTemplate>
    
    ${stylesheets.add("/css/login.css")}
    ${stylesheets.addFromTheme("/css/formedit.css")}