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
|
|
@ -2,25 +2,29 @@
|
|||
|
||||
<#import "lib-list.ftl" as l>
|
||||
|
||||
<div id="footer">
|
||||
</div> <!-- content -->
|
||||
</div> <!-- contentwrap -->
|
||||
|
||||
<#if urls.bannerImage??>
|
||||
<img class="footerLogo" src="${urls.bannerImage}" alt="${siteTagline!}" />
|
||||
</#if>
|
||||
<div id="footer">
|
||||
<#if urls.bannerImage??>
|
||||
<img class="footerLogo" src="${urls.bannerImage}" alt="${siteTagline!}" />
|
||||
</#if>
|
||||
|
||||
<div class="footerLinks">
|
||||
<ul class="otherNav">
|
||||
<@l.firstLastList>
|
||||
<#include "subMenuLinks.ftl">
|
||||
</@l.firstLastList>
|
||||
</ul>
|
||||
</div>
|
||||
<div class="footerLinks">
|
||||
<ul class="otherNav">
|
||||
<@l.firstLastList>
|
||||
<#include "subMenuLinks.ftl">
|
||||
</@l.firstLastList>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
<#include "copyright.ftl">
|
||||
<#include "copyright.ftl">
|
||||
|
||||
All Rights Reserved. <a href="${urls.termsOfUse}">Terms of Use</a>
|
||||
All Rights Reserved. <a href="${urls.termsOfUse}">Terms of Use</a>
|
||||
|
||||
<#include "version.ftl">
|
||||
|
||||
</div>
|
||||
<#include "version.ftl">
|
||||
</div>
|
||||
|
||||
</div> <!-- wrap -->
|
||||
|
||||
<#include "scripts.ftl">
|
||||
11
themes/vivo-basic/templates/head.ftl
Normal file
11
themes/vivo-basic/templates/head.ftl
Normal file
|
|
@ -0,0 +1,11 @@
|
|||
<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
|
||||
|
||||
<meta charset="utf-8" />
|
||||
|
||||
<title>${title}</title>
|
||||
|
||||
<#include "stylesheets.ftl">
|
||||
<link rel="stylesheet" href="${urls.theme}/css/screen.css" media="screen" />
|
||||
<link rel="stylesheet" href="${urls.theme}/css/print.css" media="print" />
|
||||
|
||||
<#include "headScripts.ftl">
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
|
||||
|
||||
<#-- Template for home page body contents -->
|
||||
|
||||
<p>This is the home page of the VIVO vivo-basic theme.</p>
|
||||
|
|
@ -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
|
||||
<div id="institution">
|
||||
</div>
|
||||
-->
|
||||
|
||||
<div id="identity">
|
||||
|
||||
<h1><a title="Home" href="${urls.home}">${siteName}</a></h1>
|
||||
|
||||
<#-- RY We will need this in non-NIHVIVO versions
|
||||
<#if siteTagline?has_content>
|
||||
<em>${siteTagline}</em>
|
||||
</#if>
|
||||
-->
|
||||
|
||||
<ul id="otherMenu">
|
||||
<@l.firstLastList>
|
||||
<#if user.loggedIn>
|
||||
<li>
|
||||
Logged in as <strong>${user.loginName}</strong> (<a href="${urls.logout}">Log out</a>)
|
||||
</li>
|
||||
<#if user.hasSiteAdminAccess>
|
||||
<li><a href="${urls.siteAdmin}">Site Admin</a></li>
|
||||
</#if>
|
||||
<#else>
|
||||
<li><a title="log in to manage this site" href="${urls.login}">Log in</a></li>
|
||||
</#if>
|
||||
|
||||
<#include "subMenuLinks.ftl">
|
||||
</@l.firstLastList>
|
||||
</ul>
|
||||
</div>
|
||||
|
|
@ -1,13 +1,46 @@
|
|||
<#-- $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>
|
||||
</#list>
|
||||
</ul>
|
||||
</div>
|
||||
<#-- Note to UI team: do not change this div without also making the corresponding change in menu.jsp -->
|
||||
<div id="navAndSearch" class="block">
|
||||
<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>
|
||||
</#list>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
<div id="searchBlock">
|
||||
<form id="searchForm" action="${urls.search}" >
|
||||
<label for="search">Search </label>
|
||||
|
||||
<#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>
|
||||
|
||||
<input type="text" name="querytext" id="search" class="search-form-item" value="${querytext!}" size="20" />
|
||||
<input class="search-form-submit" name="submit" type="submit" value="Search" />
|
||||
</form>
|
||||
</div>
|
||||
</div> <!-- navAndSearch -->
|
||||
</div> <!-- header -->
|
||||
|
||||
<hr class="hidden" />
|
||||
|
||||
<div id="contentwrap">
|
||||
<#if flash?has_content>
|
||||
<section id="flash-message" role="alert">
|
||||
${flash}
|
||||
</section>
|
||||
</#if>
|
||||
|
||||
<div id="content">
|
||||
|
|
@ -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">
|
||||
|
||||
<body>
|
||||
<div id="wrap" class="container">
|
||||
<div id="header">
|
||||
<!DOCTYPE html>
|
||||
<html lang="en">
|
||||
<head>
|
||||
<#include "head.ftl">
|
||||
</head>
|
||||
|
||||
<body>
|
||||
<#include "identity.ftl">
|
||||
|
||||
<#include "menu.ftl">
|
||||
|
||||
${body}
|
||||
|
||||
<#include "identity.ftl">
|
||||
|
||||
<#-- Note to UI team: do not change this div without also making the corresponding change in menu.jsp -->
|
||||
<div id="navAndSearch" class="block">
|
||||
<#include "menu.ftl">
|
||||
<#include "search.ftl">
|
||||
</div> <!-- navAndSearch -->
|
||||
|
||||
<#include "breadcrumbs.ftl">
|
||||
</div> <!-- header -->
|
||||
|
||||
<hr class="hidden" />
|
||||
|
||||
<div id="contentwrap">
|
||||
<#if flash?has_content>
|
||||
<section id="flash-message" role="alert">
|
||||
${flash}
|
||||
</section>
|
||||
</#if>
|
||||
|
||||
<div id="content">
|
||||
${body}
|
||||
</div> <!-- content -->
|
||||
</div> <!-- contentwrap -->
|
||||
|
||||
<#include "footer.ftl">
|
||||
|
||||
</div> <!-- wrap -->
|
||||
|
||||
<#include "scripts.ftl">
|
||||
</body>
|
||||
</body>
|
||||
</html>
|
||||
|
|
@ -1,19 +0,0 @@
|
|||
<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
|
||||
|
||||
<div id="searchBlock">
|
||||
<form id="searchForm" action="${urls.search}" >
|
||||
<label for="search">Search </label>
|
||||
|
||||
<#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>
|
||||
|
||||
<input type="text" name="querytext" id="search" class="search-form-item" value="${querytext!}" size="20" />
|
||||
<input class="search-form-submit" name="submit" type="submit" value="Search" />
|
||||
</form>
|
||||
</div>
|
||||
Loading…
Add table
Add a link
Reference in a new issue