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

NIHVIVO-1234 Handle routing of a request for the home page to the HomePageController by forwarding from TabController

Browse source
This commit is contained in:
rjy7 2010-10-28 15:09:20 +00:00
parent d431495481
commit 96ff5c99b5
2 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
productMods/WEB-INF/web.xml
View file

@ -883,6 +883,7 @@
<servlet-name>SearchController</servlet-name> <servlet-name>SearchController</servlet-name>
<url-pattern>/search</url-pattern> <url-pattern>/search</url-pattern>
</servlet-mapping> </servlet-mapping>
<!-- for now, need to make sure the links on CALS' site doesn't break --> <!-- for now, need to make sure the links on CALS' site doesn't break -->
<servlet-mapping> <servlet-mapping>
<servlet-name>SearchController</servlet-name> <servlet-name>SearchController</servlet-name>
@ -976,7 +977,6 @@
<url-pattern>/index.jsp</url-pattern> <url-pattern>/index.jsp</url-pattern>
</servlet-mapping> </servlet-mapping>
<!--
<servlet> <servlet>
<servlet-name>HomePageController</servlet-name> <servlet-name>HomePageController</servlet-name>
<servlet-class>edu.cornell.mannlib.vitro.webapp.controller.freemarker.HomePageController</servlet-class> <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.freemarker.HomePageController</servlet-class>
@ -985,7 +985,7 @@
<servlet-name>HomePageController</servlet-name> <servlet-name>HomePageController</servlet-name>
<url-pattern>/home</url-pattern> <url-pattern>/home</url-pattern>
</servlet-mapping> </servlet-mapping>
-->
<!-- <servlet> <!-- <servlet>
<servlet-name>EntityPropertyListController</servlet-name> <servlet-name>EntityPropertyListController</servlet-name>
<servlet-class>edu.cornell.mannlib.vitro.webapp.controller.EntityPropertyListController</servlet-class> <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.EntityPropertyListController</servlet-class>

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

@ -2,9 +2,7 @@
<#-- This is a temporary file and will be removed once we have completed the transition to freemarker --> <#-- This is a temporary file and will be removed once we have completed the transition to freemarker -->
<#if loginName??> <#if ! loginName??>
<#-- nothing to see here -->
<#else>
<section id="log-in"> <section id="log-in">
<h3>Log in</h3> <h3>Log in</h3>