Some reorganization of templates. Restored entitylist as destination of links on index page, since new individuallist controller/templates not finished yet.

This commit is contained in:
rjy7 2010-05-26 14:04:00 +00:00
parent 042dbae1ce
commit 366d93314d
6 changed files with 9 additions and 9 deletions

View file

@ -1,22 +1,22 @@
<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
<#include "/components/doctype.html">
<#include "partials/doctype.html">
<#include "/components/head.ftl">
<#include "partials/head.ftl">
<body>
<div id="wrap" class="container">
<div id="header">
<#include "/components/identity.ftl">
<#include "partials/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 "/components/menu.ftl">
<#include "/components/search.ftl">
<#include "partials/menu.ftl">
<#include "partials/search.ftl">
</div> <!-- navAndSearch -->
<#-- <#include "/components/breadcrumbs.ftl"> -->
<#-- <#include "/partials/breadcrumbs.ftl"> -->
</div> <!-- header -->
<hr class="hidden" />
@ -29,11 +29,11 @@
</div> <!-- content -->
</div> <!-- contentwrap -->
<#include "/components/footer.ftl">
<#include "partials/footer.ftl">
</div> <!-- wrap -->
<#include "/components/scripts.ftl">
<#include "partials/scripts.ftl">
</body>
</html>

View file

@ -0,0 +1,27 @@
<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
<#import "/macros/list.ftl" as l>
<div id="footer">
<#if bannerImageUrl??>
<img class="footerLogo" src="${urls.bannerImage}" alt="${tagline!}" />
</#if>
<div class="footerLinks">
<ul class="otherNav">
<@l.makeList>
<li><a href="${urls.about}" title="more about this web site">About</a></li>,
<#if urls.contact??>
<li><a href="${urls.contact}" title="feedback form">Contact Us</a></li>
</#if>
</@l.makeList>
</ul>
</div>
<#include "copyright.ftl">
All Rights Reserved. <a href="${urls.termsOfUse}">Terms of Use</a>
</div>

View file

@ -0,0 +1,21 @@
<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
<#-- NOTICE: This is SAMPLE Google Analytics code. You must replace it with your institution's code. -->
<#--
<script type="text/javascript"> var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www."); document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
</script>
<script type="text/javascript">
try {
var pageTracker = _gat._getTracker("UA-5164622-5");
pageTracker._setDomainName("vivo.cornell.edu");
pageTracker._setAllowLinker(true);
pageTracker._trackPageview();
var rollupTracker = _gat._getTracker("UA-12531954-1");
rollupTracker._setDomainName("none");
rollupTracker._setAllowLinker(true);
rollupTracker._trackPageview(location.host+location.pathname);
}
catch(err) {}
</script>
-->

View file

@ -0,0 +1,32 @@
<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
<#import "/macros/list.ftl" as l>
<div id="identity">
<h1><a title="Home" href="${urls.home}">${siteName}</a></h1>
<#-- RY We will need this in non-NIHVIVO versions
<#if tagline.has_content>
<em>${tagline}</em>
</#if>
-->
<ul id="otherMenu">
<@l.makeList>
<#if loginName??>
<li>
Logged in as <strong>${loginName}</strong> (<a href="${urls.logout}">Log out</a>)
</li>,
<li><a href="${urls.siteAdmin}">Site Admin</a></li>,
<#else>
<li><a title="log in to manage this site" href="${urls.login}">Log in</a></li>,
</#if>
<li><a href="${urls.about}">About</a></li>,
<#if urls.contact??>
<li><a href="${urls.contact}">Contact Us</a></li>
</#if>
</@l.makeList>
</ul>
</div>

View file

@ -0,0 +1,13 @@
<#-- $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>

View file

@ -0,0 +1,19 @@
<#-- $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 showFlag1SearchField??>
<select id="search-form-modifier" name="flag1" class="form-item" >
<option value="nofiltering" selected="selected">entire database (${loginName})</option>
<option value="${portalId}">${tagline!}</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>