From c9fa835a9e6dc0b7f83ac2c828ecf8e24bce5bda Mon Sep 17 00:00:00 2001 From: nac26 Date: Wed, 8 Dec 2010 14:04:45 +0000 Subject: [PATCH] NIHVIVO-1389 NIHVIVO-1407 NIHVIVO-1437 Significant refactoring of templates both in vitro core and vivo themes to ensure consistent markup with 3 different base templates at play (page.ftl, basicPage.jsp and formPrefix/formSuffix.jsp) Resulted in creating smaller component freemarker templates that could be included by all of the base templates, whether ftl or jsp. This is a temporary compromise while we continue our conversion to Freemarker. The goal was to keep jsp files outside of the theme and working behind the scenes. --- productMods/edit/formPrefix.jsp | 118 ---------------- productMods/edit/formSuffix.jsp | 65 --------- .../forms/addAuthorsToInformationResource.jsp | 2 +- .../edit/forms/addGrantRoleToPerson.jsp | 2 +- .../edit/forms/addPublicationToPerson.jsp | 2 +- .../edit/forms/addRoleToPersonTwoStage.jsp | 2 +- .../forms/js/customFormWithAutocomplete.js | 2 +- productMods/edit/forms/newIndividualForm.jsp | 2 +- .../forms/organizationHasPositionHistory.jsp | 2 +- .../forms/personHasEducationalTraining.jsp | 2 +- .../edit/forms/personHasPositionHistory.jsp | 2 +- productMods/templates/page/basicPage.jsp | 60 -------- themes/vivo-basic/templates/footer.ftl | 36 ++--- themes/vivo-basic/templates/head.ftl | 11 ++ themes/vivo-basic/templates/home.ftl | 5 - themes/vivo-basic/templates/identity.ftl | 36 ----- themes/vivo-basic/templates/menu.ftl | 55 ++++++-- themes/vivo-basic/templates/page.ftl | 54 ++----- themes/vivo-basic/templates/search.ftl | 19 --- themes/wilma/templates/edit/formPrefix.jsp | 113 --------------- themes/wilma/templates/edit/formSuffix.jsp | 54 ------- themes/wilma/templates/footer.ftl | 28 ++-- themes/wilma/templates/head.ftl | 22 +++ themes/wilma/templates/identity.ftl | 53 +++++++ themes/wilma/templates/menu.ftl | 70 ++-------- themes/wilma/templates/page-home.ftl | 125 +---------------- themes/wilma/templates/page.ftl | 132 +----------------- themes/wilma/templates/page/basicPage.jsp | 114 --------------- 28 files changed, 210 insertions(+), 978 deletions(-) delete mode 100644 productMods/edit/formPrefix.jsp delete mode 100644 productMods/edit/formSuffix.jsp delete mode 100644 productMods/templates/page/basicPage.jsp create mode 100644 themes/vivo-basic/templates/head.ftl delete mode 100644 themes/vivo-basic/templates/home.ftl delete mode 100644 themes/vivo-basic/templates/identity.ftl delete mode 100644 themes/vivo-basic/templates/search.ftl delete mode 100644 themes/wilma/templates/edit/formPrefix.jsp delete mode 100644 themes/wilma/templates/edit/formSuffix.jsp create mode 100644 themes/wilma/templates/head.ftl create mode 100644 themes/wilma/templates/identity.ftl delete mode 100644 themes/wilma/templates/page/basicPage.jsp diff --git a/productMods/edit/formPrefix.jsp b/productMods/edit/formPrefix.jsp deleted file mode 100644 index 2d2811ab..00000000 --- a/productMods/edit/formPrefix.jsp +++ /dev/null @@ -1,118 +0,0 @@ -<%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%> -<%-- This is a temporary file and will be removed once we have completed the transition to freemarker --%> - -<%@ page import="java.util.List" %> -<%@ page import="edu.cornell.mannlib.vitro.webapp.filters.VitroRequestPrep"%> -<%@ page import="edu.cornell.mannlib.vitro.webapp.controller.VitroRequest" %> -<%@ page import="edu.cornell.mannlib.vitro.webapp.beans.Portal"%> -<%@ page import="edu.cornell.mannlib.vitro.webapp.controller.freemarker.FreemarkerHttpServlet" %> - -<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c"%> -<%@ taglib uri="http://java.sun.com/jstl/functions" prefix="fn" %> - -<% -FreemarkerHttpServlet.getFreemarkerComponentsForJsp(request); -%> - -<% - VitroRequest vreq = new VitroRequest(request); - Portal portal = vreq.getPortal(); - - String contextRoot = vreq.getContextPath(); - - String themeDir = portal != null ? portal.getThemeDir() : Portal.DEFAULT_THEME_DIR_FROM_CONTEXT; - themeDir = contextRoot + '/' + themeDir; -%> - - - -<%=themeDir%> - - - -<%-- test for Wilma theme to help for smooth transition --%> - - - - - - - - - - <% - String useTinyMCE = (useTinyMCE=request.getParameter("useTinyMCE")) != null && !(useTinyMCE.equals("")) ? useTinyMCE : "false"; - if (useTinyMCE.equalsIgnoreCase("true")) { - String height = (height=request.getParameter("height")) != null && !(height.equals("")) ? height : "200"; - String width = (width=request.getParameter("width")) != null && !(width.equals("")) ? width : "75%"; - String defaultButtons="bold,italic,underline,separator,link,bullist,numlist,separator,sub,sup,charmap,separator,undo,redo,separator,code"; - String buttons = (buttons=request.getParameter("buttons")) != null && !(buttons.equals("")) ? buttons : defaultButtons; - String tbLocation = (tbLocation=request.getParameter("toolbarLocation")) != null && !(tbLocation.equals("")) ? tbLocation : "top"; - %> - - - <% } %> - - - <% String useAutoComplete = (useAutoComplete=request.getParameter("useAutoComplete")) != null && !(useAutoComplete.equals("")) ? useAutoComplete : "false"; - if (useAutoComplete.equalsIgnoreCase("true")) { %> - " /> - <% } %> - - - - " media="screen"/> - - - " /> - - - - Edit - - -
- - -
-
- - - \ No newline at end of file diff --git a/productMods/edit/formSuffix.jsp b/productMods/edit/formSuffix.jsp deleted file mode 100644 index c2ca72b1..00000000 --- a/productMods/edit/formSuffix.jsp +++ /dev/null @@ -1,65 +0,0 @@ -<%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%> -<%-- This is a temporary file and will be removed once we have completed the transition to freemarker --%> - -<%@ page import="java.util.List" %> -<%@ page import="edu.cornell.mannlib.vitro.webapp.filters.VitroRequestPrep"%> -<%@ page import="edu.cornell.mannlib.vitro.webapp.controller.VitroRequest" %> -<%@ page import="edu.cornell.mannlib.vitro.webapp.beans.Portal"%> -<%@ page import="edu.cornell.mannlib.vitro.webapp.controller.freemarker.FreemarkerHttpServlet" %> - -<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c"%> -<%@ taglib uri="http://java.sun.com/jstl/functions" prefix="fn" %> - -<% -FreemarkerHttpServlet.getFreemarkerComponentsForJsp(request); -%> - -<% - VitroRequest vreq = new VitroRequest(request); - Portal portal = vreq.getPortal(); - - String contextRoot = vreq.getContextPath(); - - String themeDir = portal != null ? portal.getThemeDir() : Portal.DEFAULT_THEME_DIR_FROM_CONTEXT; - themeDir = contextRoot + '/' + themeDir; -%> - - - -<%=themeDir%> - - - -<%-- test for Wilma theme to help for smooth transition --%> - - - - - -
- -
-
- - - -
- - - - - - - <% String useAutoComplete = (useAutoComplete=request.getParameter("useAutoComplete")) != null && !(useAutoComplete.equals("")) ? useAutoComplete : "false"; - if (useAutoComplete.equalsIgnoreCase("true")) { %> - - <% } %> - - - - - - - - - \ No newline at end of file diff --git a/productMods/edit/forms/addAuthorsToInformationResource.jsp b/productMods/edit/forms/addAuthorsToInformationResource.jsp index 266db9f1..bc86959a 100644 --- a/productMods/edit/forms/addAuthorsToInformationResource.jsp +++ b/productMods/edit/forms/addAuthorsToInformationResource.jsp @@ -393,7 +393,7 @@ SPARQL queries for existing values. --%> <%-- DO NOT CHANGE IDS, CLASSES, OR HTML STRUCTURE IN THIS FORM WITHOUT UNDERSTANDING THE IMPACT ON THE JAVASCRIPT! --%> -
" > +" >

Add an Author

diff --git a/productMods/edit/forms/addGrantRoleToPerson.jsp b/productMods/edit/forms/addGrantRoleToPerson.jsp index b55a2b99..fad62503 100644 --- a/productMods/edit/forms/addGrantRoleToPerson.jsp +++ b/productMods/edit/forms/addGrantRoleToPerson.jsp @@ -284,7 +284,7 @@ PREFIX core: <${vivoCore}> <%@ include file="unsupportedBrowserMessage.jsp" %> <%-- DO NOT CHANGE IDS, CLASSES, OR HTML STRUCTURE IN THIS FORM WITHOUT UNDERSTANDING THE IMPACT ON THE JAVASCRIPT! --%> -" > +" >

diff --git a/productMods/edit/forms/addPublicationToPerson.jsp b/productMods/edit/forms/addPublicationToPerson.jsp index 0f9345cd..d165e746 100644 --- a/productMods/edit/forms/addPublicationToPerson.jsp +++ b/productMods/edit/forms/addPublicationToPerson.jsp @@ -232,7 +232,7 @@ SPARQL queries for existing values. --%> <%@ include file="unsupportedBrowserMessage.jsp" %> <%-- DO NOT CHANGE IDS, CLASSES, OR HTML STRUCTURE IN THIS FORM WITHOUT UNDERSTANDING THE IMPACT ON THE JAVASCRIPT! --%> -" > +" >

diff --git a/productMods/edit/forms/addRoleToPersonTwoStage.jsp b/productMods/edit/forms/addRoleToPersonTwoStage.jsp index 06e13db8..91b0a01b 100644 --- a/productMods/edit/forms/addRoleToPersonTwoStage.jsp +++ b/productMods/edit/forms/addRoleToPersonTwoStage.jsp @@ -398,7 +398,7 @@ public static Log log = LogFactory.getLog("edu.cornell.mannlib.vitro.webapp.jsp.

${titleVerb} ${roleActivityTypeLabel} entry for <%= subjectName %>

<%-- DO NOT CHANGE IDS, CLASSES, OR HTML STRUCTURE IN THIS FORM WITHOUT UNDERSTANDING THE IMPACT ON THE JAVASCRIPT! --%> - " > + " >

diff --git a/productMods/edit/forms/js/customFormWithAutocomplete.js b/productMods/edit/forms/js/customFormWithAutocomplete.js index 1db7cbcc..fb41550c 100644 --- a/productMods/edit/forms/js/customFormWithAutocomplete.js +++ b/productMods/edit/forms/js/customFormWithAutocomplete.js @@ -40,7 +40,7 @@ var customForm = { // NB These must be assigned after the elements have been loaded onto the page. initObjects: function(){ - this.form = $('#content form'); + this.form = $('form.customForm'); this.fullViewOnly = $('.fullViewOnly'); this.button = $('#submit'); this.requiredLegend = $('#requiredLegend'); diff --git a/productMods/edit/forms/newIndividualForm.jsp b/productMods/edit/forms/newIndividualForm.jsp index 9e9c914e..f534778f 100644 --- a/productMods/edit/forms/newIndividualForm.jsp +++ b/productMods/edit/forms/newIndividualForm.jsp @@ -175,7 +175,7 @@ parameter set up by editRequestDispatch.

Create a new ${typeName}

-" > +" > diff --git a/productMods/edit/forms/organizationHasPositionHistory.jsp b/productMods/edit/forms/organizationHasPositionHistory.jsp index d5194ab8..5f1ac8a5 100644 --- a/productMods/edit/forms/organizationHasPositionHistory.jsp +++ b/productMods/edit/forms/organizationHasPositionHistory.jsp @@ -184,7 +184,7 @@

${title}

-" > +" > diff --git a/productMods/edit/forms/personHasEducationalTraining.jsp b/productMods/edit/forms/personHasEducationalTraining.jsp index 62e02487..3ae3ad3c 100644 --- a/productMods/edit/forms/personHasEducationalTraining.jsp +++ b/productMods/edit/forms/personHasEducationalTraining.jsp @@ -399,7 +399,7 @@ This goes to an experimental FM based form:

${titleVerb} educational training entry for <%= subjectName %>

-" > +" > diff --git a/productMods/edit/forms/personHasPositionHistory.jsp b/productMods/edit/forms/personHasPositionHistory.jsp index 06b54248..a5331d1b 100644 --- a/productMods/edit/forms/personHasPositionHistory.jsp +++ b/productMods/edit/forms/personHasPositionHistory.jsp @@ -316,7 +316,7 @@

${titleVerb} position entry for <%= subjectName %>

-" > +" >

diff --git a/productMods/templates/page/basicPage.jsp b/productMods/templates/page/basicPage.jsp deleted file mode 100644 index 3ea38437..00000000 --- a/productMods/templates/page/basicPage.jsp +++ /dev/null @@ -1,60 +0,0 @@ -<%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%> -<%-- This is a temporary file and will be removed once we have completed the transition to freemarker --%> - -<%@ page import="edu.cornell.mannlib.vitro.webapp.web.*" %> -<%@ page import="edu.cornell.mannlib.vitro.webapp.controller.VitroRequest" %> -<%@ page import="edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory" %> -<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %> -<%@ taglib uri="http://java.sun.com/jstl/functions" prefix="fn" %> -<%@ page errorPage="/error.jsp"%> -<%@ page contentType="text/html; charset=UTF-8"%> -<%@ page import="edu.cornell.mannlib.vitro.webapp.filters.VitroRequestPrep" %> -<%@ page import="edu.cornell.mannlib.vitro.webapp.beans.Portal"%> -<%@ page import="edu.cornell.mannlib.vitro.webapp.controller.freemarker.FreemarkerHttpServlet" %> - -<% -FreemarkerHttpServlet.getFreemarkerComponentsForJsp(request); -%> - -<% - VitroRequest vreq = new VitroRequest(request); - Portal portal = vreq.getPortal(); - - String contextRoot = vreq.getContextPath(); - - String themeDir = portal != null ? portal.getThemeDir() : Portal.DEFAULT_THEME_DIR_FROM_CONTEXT; - themeDir = contextRoot + '/' + themeDir; -%> - - - -<%=themeDir%> - - - -<%-- test for Wilma theme to help for smooth transition --%> - - - - - - - - - - -
- - -
- -
- -
- - - - \ No newline at end of file diff --git a/themes/vivo-basic/templates/footer.ftl b/themes/vivo-basic/templates/footer.ftl index 39ba9a28..43cf2fca 100644 --- a/themes/vivo-basic/templates/footer.ftl +++ b/themes/vivo-basic/templates/footer.ftl @@ -2,25 +2,29 @@ <#import "lib-list.ftl" as l> - + - <#if urls.bannerImage??> - - + + <#include "version.ftl"> + + + +<#include "scripts.ftl"> \ No newline at end of file diff --git a/themes/vivo-basic/templates/head.ftl b/themes/vivo-basic/templates/head.ftl new file mode 100644 index 00000000..4b7db3b3 --- /dev/null +++ b/themes/vivo-basic/templates/head.ftl @@ -0,0 +1,11 @@ +<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> + + + + ${title} + + <#include "stylesheets.ftl"> + + + + <#include "headScripts.ftl"> \ No newline at end of file diff --git a/themes/vivo-basic/templates/home.ftl b/themes/vivo-basic/templates/home.ftl deleted file mode 100644 index db190fd6..00000000 --- a/themes/vivo-basic/templates/home.ftl +++ /dev/null @@ -1,5 +0,0 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> - -<#-- Template for home page body contents --> - -

This is the home page of the VIVO vivo-basic theme.

\ No newline at end of file diff --git a/themes/vivo-basic/templates/identity.ftl b/themes/vivo-basic/templates/identity.ftl deleted file mode 100644 index be71685a..00000000 --- a/themes/vivo-basic/templates/identity.ftl +++ /dev/null @@ -1,36 +0,0 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> - -<#import "lib-list.ftl" as l> - -<#-- uncomment this div to place your institutional branding/identity at the top of every page -
-
---> - -
- -

${siteName}

- - <#-- RY We will need this in non-NIHVIVO versions - <#if siteTagline?has_content> - ${siteTagline} - - --> - -
    - <@l.firstLastList> - <#if user.loggedIn> -
  • - Logged in as ${user.loginName} (Log out) -
    • - <#if user.hasSiteAdminAccess> -
  • Site Admin
    • - - <#else> -
  • Log in
    • - - - <#include "subMenuLinks.ftl"> - -
-
\ No newline at end of file diff --git a/themes/vivo-basic/templates/menu.ftl b/themes/vivo-basic/templates/menu.ftl index 42cf0593..c98b7816 100644 --- a/themes/vivo-basic/templates/menu.ftl +++ b/themes/vivo-basic/templates/menu.ftl @@ -1,13 +1,46 @@ <#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> -
- -
\ No newline at end of file + <#-- Note to UI team: do not change this div without also making the corresponding change in menu.jsp --> + + + + + +
+ <#if flash?has_content> + + + +
\ No newline at end of file diff --git a/themes/vivo-basic/templates/page.ftl b/themes/vivo-basic/templates/page.ftl index d8f1278e..8f6e9857 100644 --- a/themes/vivo-basic/templates/page.ftl +++ b/themes/vivo-basic/templates/page.ftl @@ -1,46 +1,20 @@ <#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> -<#include "doctype.html"> +<#import "lib-list.ftl" as l> -${stylesheets.addFromTheme("/css/screen.css")} -<#-- print stylesheet commented out for now until we can add a media parameter to stylesheets.add method --> -<#-- ${stylesheets.addFromTheme("/css/print.css")} --> - -<#include "head.ftl"> - - -
- - - - -
- <#if flash?has_content> - - - -
- ${body} -
-
- <#include "footer.ftl"> - -
- - <#include "scripts.ftl"> - + \ No newline at end of file diff --git a/themes/vivo-basic/templates/search.ftl b/themes/vivo-basic/templates/search.ftl deleted file mode 100644 index ee3e410e..00000000 --- a/themes/vivo-basic/templates/search.ftl +++ /dev/null @@ -1,19 +0,0 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> - -
-
- - - <#if user.showFlag1SearchField> - - <#else> - - - - - -
-
\ No newline at end of file diff --git a/themes/wilma/templates/edit/formPrefix.jsp b/themes/wilma/templates/edit/formPrefix.jsp deleted file mode 100644 index e4b6a95e..00000000 --- a/themes/wilma/templates/edit/formPrefix.jsp +++ /dev/null @@ -1,113 +0,0 @@ -<%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%> -<%-- This is a temporary file and will be removed once we have completed the transition to freemarker --%> - -<%@ page import="edu.cornell.mannlib.vitro.webapp.web.*" %> -<%@ page import="edu.cornell.mannlib.vitro.webapp.controller.VitroRequest" %> -<%@ page import="edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory" %> -<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %> -<%@ page errorPage="/error.jsp"%> -<%@ page contentType="text/html; charset=UTF-8"%> -<%@ page import="edu.cornell.mannlib.vitro.webapp.filters.VitroRequestPrep" %> -<%@ page import="edu.cornell.mannlib.vitro.webapp.beans.Portal"%> -<%@ page import="edu.cornell.mannlib.vitro.webapp.controller.freemarker.FreemarkerHttpServlet" %> - -<% -FreemarkerHttpServlet.getFreemarkerComponentsForJsp(request); -%> - -<% - VitroRequest vreq = new VitroRequest(request); - Portal portal = vreq.getPortal(); - - String contextRoot = vreq.getContextPath(); - - String themeDir = portal != null ? portal.getThemeDir() : Portal.DEFAULT_THEME_DIR_FROM_CONTEXT; - themeDir = contextRoot + '/' + themeDir; -%> - - - - - - - - - - - - - Edit - - - - - - - - - - - <% - String useTinyMCE = (useTinyMCE=request.getParameter("useTinyMCE")) != null && !(useTinyMCE.equals("")) ? useTinyMCE : "false"; - if (useTinyMCE.equalsIgnoreCase("true")) { - String height = (height=request.getParameter("height")) != null && !(height.equals("")) ? height : "200"; - String width = (width=request.getParameter("width")) != null && !(width.equals("")) ? width : "75%"; - String defaultButtons="bold,italic,underline,separator,link,bullist,numlist,separator,sub,sup,charmap,separator,undo,redo,separator,code"; - String buttons = (buttons=request.getParameter("buttons")) != null && !(buttons.equals("")) ? buttons : defaultButtons; - String tbLocation = (tbLocation=request.getParameter("toolbarLocation")) != null && !(tbLocation.equals("")) ? tbLocation : "top"; - %> - - - <% } %> - - <% String useAutoComplete = (useAutoComplete=request.getParameter("useAutoComplete")) != null && !(useAutoComplete.equals("")) ? useAutoComplete : "false"; - if (useAutoComplete.equalsIgnoreCase("true")) { %> - " /> - <% } %> - - - " media="screen"/> - - - " /> - - - ${ftl_menu} -
- \ No newline at end of file diff --git a/themes/wilma/templates/edit/formSuffix.jsp b/themes/wilma/templates/edit/formSuffix.jsp deleted file mode 100644 index ac4417a0..00000000 --- a/themes/wilma/templates/edit/formSuffix.jsp +++ /dev/null @@ -1,54 +0,0 @@ -<%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%> -<%-- This is a temporary file and will be removed once we have completed the transition to freemarker --%> - -<%@ page import="edu.cornell.mannlib.vitro.webapp.web.*" %> -<%@ page import="edu.cornell.mannlib.vitro.webapp.controller.VitroRequest" %> -<%@ page import="edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory" %> -<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %> -<%@ page errorPage="/error.jsp"%> -<%@ page contentType="text/html; charset=UTF-8"%> -<%@ page import="edu.cornell.mannlib.vitro.webapp.filters.VitroRequestPrep" %> -<%@ page import="edu.cornell.mannlib.vitro.webapp.beans.Portal"%> -<%@ page import="edu.cornell.mannlib.vitro.webapp.controller.freemarker.FreemarkerHttpServlet" %> - -<% -FreemarkerHttpServlet.getFreemarkerComponentsForJsp(request); -%> - -<% - VitroRequest vreq = new VitroRequest(request); - Portal portal = vreq.getPortal(); - - String contextRoot = vreq.getContextPath(); - - String themeDir = portal != null ? portal.getThemeDir() : Portal.DEFAULT_THEME_DIR_FROM_CONTEXT; - themeDir = contextRoot + '/' + themeDir; -%> - - - - - - - - -
- - ${ftl_footer} - - - - - - -<% String useAutoComplete = (useAutoComplete=request.getParameter("useAutoComplete")) != null && !(useAutoComplete.equals("")) ? useAutoComplete : "false"; - if (useAutoComplete.equalsIgnoreCase("true")) { %> - -<% } %> - - - - - - - \ No newline at end of file diff --git a/themes/wilma/templates/footer.ftl b/themes/wilma/templates/footer.ftl index df5fbd99..ccb6f0b9 100644 --- a/themes/wilma/templates/footer.ftl +++ b/themes/wilma/templates/footer.ftl @@ -1,33 +1,39 @@ <#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> -<#-- This is a temporary file and will be removed once we have completed the transition to freemarker -->
+ -${scripts.tags} + -<#include "googleAnalytics.ftl"> \ No newline at end of file + + +<#include "scripts.ftl"> \ No newline at end of file diff --git a/themes/wilma/templates/head.ftl b/themes/wilma/templates/head.ftl new file mode 100644 index 00000000..eafef476 --- /dev/null +++ b/themes/wilma/templates/head.ftl @@ -0,0 +1,22 @@ +<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> + + + + + + ${title} + + + + <#include "stylesheets.ftl"> + + + <#include "headScripts.ftl"> + + + + \ No newline at end of file diff --git a/themes/wilma/templates/identity.ftl b/themes/wilma/templates/identity.ftl new file mode 100644 index 00000000..4823e408 --- /dev/null +++ b/themes/wilma/templates/identity.ftl @@ -0,0 +1,53 @@ +<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> + + \ No newline at end of file diff --git a/themes/wilma/templates/menu.ftl b/themes/wilma/templates/menu.ftl index 2f846cf9..356acce9 100644 --- a/themes/wilma/templates/menu.ftl +++ b/themes/wilma/templates/menu.ftl @@ -1,66 +1,16 @@ <#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> -<#-- This is a temporary file and will be removed once we have completed the transition to freemarker --> - - -
\ No newline at end of file + +
+ <#if flash?has_content> + + \ No newline at end of file diff --git a/themes/wilma/templates/page-home.ftl b/themes/wilma/templates/page-home.ftl index 30804f3e..df61bd64 100644 --- a/themes/wilma/templates/page-home.ftl +++ b/themes/wilma/templates/page-home.ftl @@ -5,94 +5,13 @@ - - - - - ${title} - - - - <#include "stylesheets.ftl"> - - - <#include "headScripts.ftl"> - - - - - + <#include "head.ftl"> - + <#include "identity.ftl"> - - -
- <#if flash?has_content> - - + <#include "menu.ftl">

What is VIVO?

@@ -224,43 +143,7 @@

View All 4

-
- - - ${scripts.tags} - - - - - <#include "googleAnalytics.ftl"> + <#include "footer.ftl"> diff --git a/themes/wilma/templates/page.ftl b/themes/wilma/templates/page.ftl index 178ff3e6..8f6e9857 100644 --- a/themes/wilma/templates/page.ftl +++ b/themes/wilma/templates/page.ftl @@ -1,140 +1,20 @@ <#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> <#import "lib-list.ftl" as l> - + - - - - - ${title} - - - - <#include "stylesheets.ftl"> - - - <#include "headScripts.ftl"> - - - - - + <#include "head.ftl"> - + <#include "identity.ftl"> - + <#include "menu.ftl"> -
- <#if flash?has_content> - - - - ${body} -
+ ${body} - - - ${scripts.tags} - - - - - - <#include "googleAnalytics.ftl"> + <#include "footer.ftl"> \ No newline at end of file diff --git a/themes/wilma/templates/page/basicPage.jsp b/themes/wilma/templates/page/basicPage.jsp deleted file mode 100644 index a2c11e47..00000000 --- a/themes/wilma/templates/page/basicPage.jsp +++ /dev/null @@ -1,114 +0,0 @@ -<%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%> -<%-- This is a temporary file and will be removed once we have completed the transition to freemarker --%> - -<%@ page import="edu.cornell.mannlib.vitro.webapp.web.*" %> -<%@ page import="edu.cornell.mannlib.vitro.webapp.controller.VitroRequest" %> -<%@ page import="edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory" %> -<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %> -<%@ page errorPage="/error.jsp"%> -<%@ page contentType="text/html; charset=UTF-8"%> -<%@ page import="edu.cornell.mannlib.vitro.webapp.filters.VitroRequestPrep" %> -<%@ page import="edu.cornell.mannlib.vitro.webapp.beans.Portal"%> -<%@ page import="edu.cornell.mannlib.vitro.webapp.controller.freemarker.FreemarkerHttpServlet" %> - -<% /*********************************************** - Display a single Page in the most basic fashion. - The html is generated followed by the banners and menu. - After that the result of the jsp in the attribute bodyJsp is inserted. - Finally comes the footer. - - request.attributes: - "bodyJsp" - jsp of the body of this page. - "title" - title of page - "css" - optional additional css for page - "scripts" - optional name of file containing