<#if flash?has_content> @@ -24,7 +26,6 @@ - - <@lh.facultyMemberCount vClassGroups! /> - <#include "identity.ftl"> - - <#include "menu.ftl"> - -
-

${i18n().intro_title}

- -

${i18n().intro_para1}

-

${i18n().intro_para2}

- -
-

${i18n().intro_searchvivo} filteredSearch

- -
- ${i18n().search_form} - -
-
- -
- - <@widget name="login" /> - - - <@lh.researchClasses /> - - - <@lh.facultyMbrHtml /> - - - <@lh.academicDeptsHtml /> - - <#if geoFocusMapsEnabled > - - <@lh.geographicFocusHtml /> - - - - <@lh.allClassGroups vClassGroups! /> - - <#include "footer.ftl"> - <#-- builds a json object that is used by js to render the academic departments section --> - <@lh.listAcademicDepartments /> - +
+ <@lh.facultyMemberCount vClassGroups! /> + <#include "identity.ftl"> + + <#include "menu.ftl"> + +
+
+

${i18n().intro_title}

+ +

${i18n().intro_para1}

+

${i18n().intro_para2}

+ +
+

${i18n().intro_searchvivo} filteredSearch

+ +
+ ${i18n().search_form} + +
+
+ +
+ +
+ <@widget name="login" /> +
+
+ +
+ + <@lh.researchClasses /> + + + <@lh.facultyMbrHtml /> + + + <@lh.academicDeptsHtml /> + + <#if geoFocusMapsEnabled > + + <@lh.geographicFocusHtml /> + +
+ +
+ + + <@lh.allClassGroups vClassGroups! /> +
+ + <#include "footer.ftl"> + <#-- builds a json object that is used by js to render the academic departments section --> + <@lh.listAcademicDepartments /> +
+ diff --git a/webapp/src/main/webapp/themes/wilma/templates/page.ftl b/webapp/src/main/webapp/themes/wilma/templates/page.ftl index 9b4785605..f03e13d3d 100644 --- a/webapp/src/main/webapp/themes/wilma/templates/page.ftl +++ b/webapp/src/main/webapp/themes/wilma/templates/page.ftl @@ -9,19 +9,25 @@ - <#include "identity.ftl"> - <#include "search.ftl"> - <#include "menu.ftl"> +
+ <#include "identity.ftl"> + <#include "search.ftl"> + <#include "menu.ftl"> - <#-- VIVO OpenSocial Extension by UCSF --> - <#if openSocial??> - <#if openSocial.visible> -
- - +
+
+ <#-- VIVO OpenSocial Extension by UCSF --> + <#if openSocial??> + <#if openSocial.visible> +
+ + - ${body} + ${body} +
+
- <#include "footer.ftl"> + <#include "footer.ftl"> +