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
f0131adbd0
commit
c9fa835a9e
28 changed files with 210 additions and 978 deletions
|
|
@ -1,140 +1,20 @@
|
|||
<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
|
||||
|
||||
<#import "lib-list.ftl" as l>
|
||||
|
||||
|
||||
<!DOCTYPE html>
|
||||
<html lang="en">
|
||||
<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">
|
||||
|
||||
<title>${title}</title>
|
||||
<meta name="description" content="" />
|
||||
<meta name="keywords" content="" />
|
||||
|
||||
<#include "stylesheets.ftl">
|
||||
<link rel="stylesheet" href="${urls.theme}/css/screen.css" />
|
||||
|
||||
<#include "headScripts.ftl">
|
||||
|
||||
<!--[if lt IE 7]>
|
||||
<link rel="stylesheet" href="css/ie6.css" />
|
||||
<![endif]-->
|
||||
|
||||
<!--[if IE 7]>
|
||||
<link rel="stylesheet" href="css/ie7.css" />
|
||||
<![endif]-->
|
||||
|
||||
<#include "head.ftl">
|
||||
</head>
|
||||
|
||||
<body>
|
||||
<header id="branding" role="banner">
|
||||
<h1 class="vivo-logo"><a href="${urls.home}"><span class="displace">${siteName}</span></a></h1>
|
||||
<!-- Since we are using a graphic text for the tagline, we won't render ${siteTagline}
|
||||
<#if siteTagline?has_content>
|
||||
<em>${siteTagline}</em>
|
||||
</#if>-->
|
||||
|
||||
<nav role="navigation">
|
||||
<ul id="header-nav" role="list">
|
||||
<#if user.loggedIn>
|
||||
<li role="listitem"><span class="loginIcon">U</span> ${user.loginName}</li>
|
||||
<li role="listitem"><a href="${urls.logout}">Log out</a></li>
|
||||
<#if user.hasSiteAdminAccess>
|
||||
<li role="listitem"><a href="${urls.siteAdmin}">Site Admin</a></li>
|
||||
</#if>
|
||||
<#else>
|
||||
<li role="listitem"><a title="log in to manage this site" href="${urls.login}">Log in</a></li>
|
||||
</#if>
|
||||
<#-- List of links that appear in submenus, like the header and footer. -->
|
||||
<li role="listitem"><a href="${urls.about}">About</a></li>
|
||||
<#if urls.contact??>
|
||||
<li role="listitem"><a href="${urls.contact}">Contact Us</a></li>
|
||||
</#if>
|
||||
<li role="listitem"><a href="http://www.vivoweb.org/support" target="blank">Support</a></li>
|
||||
<li role="listitem"><a href="${urls.index}">Index</a></li>
|
||||
</ul>
|
||||
</nav>
|
||||
|
||||
<section id="search" role="region">
|
||||
<fieldset>
|
||||
<legend>Search form</legend>
|
||||
|
||||
<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>
|
||||
<#include "identity.ftl">
|
||||
|
||||
<nav role="navigation">
|
||||
<ul id="main-nav" role="list">
|
||||
<#list tabMenu.items as item>
|
||||
<li role="listitem"><a href="${item.url}" <#if item.active> class="selected" </#if>>${item.linkText}</a></li>
|
||||
</#list>
|
||||
</ul>
|
||||
</nav>
|
||||
<#include "menu.ftl">
|
||||
|
||||
<div id="wrapper-content" role="main">
|
||||
<#if flash?has_content>
|
||||
<section id="flash-message" role="alert">
|
||||
${flash}
|
||||
</section>
|
||||
</#if>
|
||||
|
||||
${body}
|
||||
</div> <!-- #wrapper-content -->
|
||||
${body}
|
||||
|
||||
<footer role="contentinfo">
|
||||
<#if copyright??>
|
||||
<p class="copyright"><small>©${copyright.year?c}
|
||||
<#if copyright.url??>
|
||||
<a href="${copyright.url}">${copyright.text}</a>
|
||||
<#else>
|
||||
</#if>
|
||||
All Rights Reserved | <a class="terms" href="${urls.termsOfUse}">Terms of Use</a></small> | Powered by <a class="powered-by-vivo" href="http://vivoweb.org" target="_blank"><strong>VIVO</strong></a>
|
||||
<#if user.hasRevisionInfoAccess>
|
||||
| Version <a href="${version.moreInfoUrl}">${version.label}</a>
|
||||
</#if>
|
||||
</p>
|
||||
</#if>
|
||||
|
||||
<nav role="navigation">
|
||||
<ul id="footer-nav" role="list">
|
||||
<li role="listitem"><a href="${urls.about}">About</a></li>
|
||||
<#if urls.contact??>
|
||||
<li role="listitem"><a href="${urls.contact}">Contact Us</a></li>
|
||||
</#if>
|
||||
<li role="listitem"><a href="http://www.vivoweb.org/support" target="blank">Support</a></li>
|
||||
</ul>
|
||||
</nav>
|
||||
</footer>
|
||||
|
||||
${scripts.tags}
|
||||
|
||||
<!--[if lt IE 7]>
|
||||
<script type="text/javascript" src="${urls.base}/js/jquery_plugins/supersleight.js"></script>
|
||||
<script type="text/javascript" src="${urls.base}/js/utils.js"></script>
|
||||
<![endif]-->
|
||||
|
||||
<!--[if (gte IE 6)&(lte IE 8)]>
|
||||
<script type="text/javascript" src="${urls.base}/js/selectivizr.js"></script>
|
||||
<![endif]-->
|
||||
|
||||
<#include "googleAnalytics.ftl">
|
||||
<#include "footer.ftl">
|
||||
</body>
|
||||
</html>
|
||||
Loading…
Add table
Add a link
Reference in a new issue