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.
This commit is contained in:
nac26
parent
1126d6f75d
commit
9892846244
7 changed files with 212 additions and 144 deletions
|
|
@ -1,7 +1,11 @@
|
|||
<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
|
||||
|
||||
<head>
|
||||
<meta charset="utf-8" />
|
||||
<!-- Google Chrome Frame open source plug-in brings Google Chrome's open web technologies and speedy JavaScript engine to Internet Explorer-->
|
||||
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
|
||||
|
||||
<#include "title.ftl">
|
||||
|
||||
<#include "stylesheets.ftl">
|
||||
<#include "headScripts.ftl">
|
||||
</head>
|
||||
|
||||
<#include "headScripts.ftl">
|
||||
|
|
@ -1,29 +1,52 @@
|
|||
<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
|
||||
|
||||
<#import "lib-list.ftl" as l>
|
||||
|
||||
<div id="identity">
|
||||
|
||||
<h1><a title="Home" href="${urls.home}">${siteName}</a></h1>
|
||||
|
||||
<header id="branding" role="banner">
|
||||
<h1 class="vivo-logo"><a href="${urls.home}"><span class="displace">${siteName}</span></a></h1>
|
||||
<#if siteTagline?has_content>
|
||||
<em>${siteTagline}</em>
|
||||
</#if>
|
||||
|
||||
<ul id="otherMenu">
|
||||
<@l.firstLastList>
|
||||
|
||||
<nav role="navigation">
|
||||
<ul id="header-nav" role="list">
|
||||
<#if user.loggedIn>
|
||||
<li>
|
||||
Logged in as <strong>${user.loginName}</strong> (<a href="${urls.logout}">Log out</a>)
|
||||
</li>
|
||||
<li role="listitem">${user.loginName}</li>
|
||||
<li role="listitem"><a href="${urls.logout}" title="End your session">Log out</a></li>
|
||||
<#if user.hasSiteAdminAccess>
|
||||
<li><a href="${urls.siteAdmin}">Site Admin</a></li>
|
||||
<li role="listitem"><a href="${urls.siteAdmin}" title="Manage this site">Site Admin</a></li>
|
||||
</#if>
|
||||
<#else>
|
||||
<li><a title="log in to manage this site" href="${urls.login}">Log in</a></li>
|
||||
</#if>
|
||||
<li role="listitem"><a href="${urls.login}" title="Log in to manage this site" >Log in</a></li>
|
||||
</#if>
|
||||
<#-- List of links that appear in submenus, like the header and footer. -->
|
||||
<li role="listitem"><a href="${urls.about}" title="More details about this site">About</a></li>
|
||||
<#if urls.contact??>
|
||||
<li role="listitem"><a href="${urls.contact}" title="Send us your feedback or ask a question">Contact Us</a></li>
|
||||
</#if>
|
||||
<li role="listitem"><a href="http://www.vivoweb.org/support" title="Visit the national project web site" target="blank">Support</a></li>
|
||||
<li role="listitem"><a href="${urls.index}" title="View an outline of the content in this site">Index</a></li>
|
||||
</ul>
|
||||
</nav>
|
||||
|
||||
<section id="search" role="region">
|
||||
<fieldset>
|
||||
<legend>Search form</legend>
|
||||
|
||||
<#include "subMenuLinks.ftl">
|
||||
</@l.firstLastList>
|
||||
</ul>
|
||||
</div>
|
||||
<form id="search-form" action="${urls.search}" name="search" role="search">
|
||||
<#if user.showFlag1SearchField>
|
||||
<select id="search-form-modifier" name="flag1" class="form-item" >
|
||||
<option value="nofiltering" selected="selected">entire database (${user.loginName})</option>
|
||||
<option value="${portalId}">${siteTagline!}</option>
|
||||
</select>
|
||||
|
||||
<#else>
|
||||
<input type="hidden" name="flag1" value="${portalId}" />
|
||||
</#if>
|
||||
|
||||
<div id="search-field">
|
||||
<input type="text" name="querytext" class="search-vivo" value="${querytext!}" />
|
||||
<input type="submit" value="Search" class="submit">
|
||||
</div>
|
||||
</form>
|
||||
</fieldset>
|
||||
</section>
|
||||
</header>
|
||||
|
|
@ -1,13 +1,16 @@
|
|||
<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
|
||||
|
||||
<div id="primaryAndOther">
|
||||
<ul id="primary">
|
||||
<#list tabMenu.items as item>
|
||||
<li>
|
||||
<a href="${item.url}" <#if item.active> class="activeTab" </#if>>
|
||||
${item.linkText}
|
||||
</a>
|
||||
</li>
|
||||
<nav role="navigation">
|
||||
<ul id="main-nav" role="list">
|
||||
<#list menu.items as item>
|
||||
<li role="listitem"><a href="${item.url}" <#if item.active> class="selected" </#if>>${item.linkText}</a></li>
|
||||
</#list>
|
||||
</ul>
|
||||
</div>
|
||||
</nav>
|
||||
|
||||
<div id="wrapper-content" role="main">
|
||||
<#if flash?has_content>
|
||||
<section id="flash-message" role="alert">
|
||||
${flash}
|
||||
</section>
|
||||
</#if>
|
||||
|
|
@ -7,6 +7,8 @@
|
|||
<%@ 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.
|
||||
|
|
@ -51,25 +53,22 @@
|
|||
%>
|
||||
|
||||
|
||||
<c:set var="portal" value="${requestScope.portalBean}"/>
|
||||
<c:set var="themeDir"><c:out value="${portal.themeDir}" /></c:set>
|
||||
<c:set var="bodyJsp"><c:out value="${requestScope.bodyJsp}" default="/debug.jsp"/></c:set>
|
||||
|
||||
<jsp:include page="doctype.jsp"/>
|
||||
<head>
|
||||
<jsp:include page="headContent.jsp"/>
|
||||
</head>
|
||||
<% /* Prepare Freemarker components to allow .ftl templates to be included from jsp */
|
||||
FreemarkerHttpServlet.getFreemarkerComponentsForJsp(request);
|
||||
%>
|
||||
|
||||
<!DOCTYPE html>
|
||||
<html lang="en">
|
||||
${ftl_head}
|
||||
|
||||
<body ${requestScope.bodyAttr}>
|
||||
<div id="wrap" class="container">
|
||||
<div id="header">
|
||||
<jsp:include page="/templates/page/freemarkerTransition/identity.jsp" flush="true"/>
|
||||
<jsp:include page="/templates/page/freemarkerTransition/menu.jsp" flush="true"/>
|
||||
</div><!-- #header -->
|
||||
<hr class="hidden" />
|
||||
<div id="contentwrap">
|
||||
${ftl_identity}
|
||||
|
||||
${ftl_menu}
|
||||
|
||||
<c:import url="${bodyJsp}"/>
|
||||
</div> <!-- #contentwrap -->
|
||||
<jsp:include page="/templates/page/freemarkerTransition/footer.jsp" flush="true"/>
|
||||
</div> <!-- #wrap -->
|
||||
|
||||
${ftl_footer}
|
||||
|
||||
</body>
|
||||
</html>
|
||||
Loading…
Add table
Add a link
Reference in a new issue