NIHVIVO-556: Changed H2 containing VIVO logo and tagline for H1.Added proper indentation.
This commit is contained in:
mb863
parent
2b48aab2a3
commit
0876f2c28a
6 changed files with 167 additions and 147 deletions
|
|
@ -37,7 +37,7 @@ body{
|
|||
margin: 0 auto;
|
||||
}
|
||||
/* BRANDING ------> */
|
||||
h2.vivo-logo {
|
||||
h1.vivo-logo {
|
||||
position: absolute;
|
||||
width: 386px;
|
||||
height: 59px;
|
||||
|
|
@ -45,7 +45,7 @@ h2.vivo-logo {
|
|||
left: 0;
|
||||
background: url(../images/VIVO-logo.png) 0 0 no-repeat;
|
||||
}
|
||||
h2.vivo-logo a {
|
||||
h1.vivo-logo a {
|
||||
display: block;
|
||||
width: 386px;
|
||||
height: 59px;
|
||||
|
|
|
|||
|
|
@ -1,29 +1,27 @@
|
|||
<#-- $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 -->
|
||||
|
||||
<footer>
|
||||
<#if copyright??>
|
||||
<p class="copyright"><small>©${copyright.year?c}
|
||||
<#if copyright.url??>
|
||||
<a href="${copyright.url}">${copyright.text}</a>
|
||||
<#else>
|
||||
${copyright.text}
|
||||
</#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></p>
|
||||
</#if>
|
||||
|
||||
<nav>
|
||||
<ul id="footer-nav">
|
||||
<li><a href="${urls.about}">About</a></li>
|
||||
<#if urls.contact??>
|
||||
<li><a href="${urls.contact}">Contact Us</a></li>
|
||||
</#if>
|
||||
<li><a href="http://www.vivoweb.org/support" target="blank">Support</a></li>
|
||||
</ul>
|
||||
</nav>
|
||||
</footer>
|
||||
|
||||
|
||||
<footer>
|
||||
<#if copyright??>
|
||||
<p class="copyright"><small>©${copyright.year?c}
|
||||
<#if copyright.url??>
|
||||
<a href="${copyright.url}">${copyright.text}</a>
|
||||
<#else>
|
||||
${copyright.text}
|
||||
</#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></p>
|
||||
</#if>
|
||||
|
||||
<nav>
|
||||
<ul id="footer-nav">
|
||||
<li><a href="${urls.about}">About</a></li>
|
||||
<#if urls.contact??>
|
||||
<li><a href="${urls.contact}">Contact Us</a></li>
|
||||
</#if>
|
||||
<li><a href="http://www.vivoweb.org/support" target="blank">Support</a></li>
|
||||
</ul>
|
||||
</nav>
|
||||
</footer>
|
||||
|
||||
${scripts.add("/js/jquery.js")}
|
||||
${scripts.tags}
|
||||
|
|
|
|||
|
|
@ -4,19 +4,23 @@
|
|||
Please see documentation at https://confluence.cornell.edu/display/ennsrd/Google+Analytics+for+UI. -->
|
||||
|
||||
<#--
|
||||
<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);
|
||||
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>
|
||||
-->
|
||||
|
|
@ -2,58 +2,66 @@
|
|||
<#-- This is a temporary file and will be removed once we have completed the transition to freemarker -->
|
||||
|
||||
<header id="branding">
|
||||
<h2 class="vivo-logo"><a href="${urls.home}"><span class="displace">${siteName}</span></a></h2>
|
||||
<!-- Since we are using a graphic text for the tagline, we won't render ${siteTagline}
|
||||
<#if siteTagline?has_content>
|
||||
<em>${siteTagline}</em>
|
||||
</#if>-->
|
||||
<#import "lib-list.ftl" as l>
|
||||
<nav>
|
||||
<ul id="header-nav">
|
||||
<#if loginName??>
|
||||
<li><span class="pictos-arrow-10">U</span> ${loginName}</li>
|
||||
<li><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>
|
||||
<#-- List of links that appear in submenus, like the header and footer. -->
|
||||
<h1 class="vivo-logo"><a href="${urls.home}"><span class="displace">${siteName}</span></a></h2>
|
||||
<!-- Since we are using a graphic text for the tagline, we won't render ${siteTagline}
|
||||
|
||||
<li><a href="${urls.about}">About</a></li>
|
||||
<#if urls.contact??>
|
||||
<li><a href="${urls.contact}">Contact Us</a></li>
|
||||
</#if>
|
||||
<li><a href="http://www.vivoweb.org/support" target="blank">Support</a></li>
|
||||
</ul>
|
||||
<#if siteTagline?has_content>
|
||||
<em>${siteTagline}</em>
|
||||
</#if>-->
|
||||
|
||||
<#import "lib-list.ftl" as l>
|
||||
|
||||
<nav>
|
||||
<ul id="header-nav">
|
||||
<#if loginName??>
|
||||
<li><span class="pictos-arrow-10">U</span> ${loginName}</li>
|
||||
<li><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>
|
||||
|
||||
<#-- List of links that appear in submenus, like the header and footer. -->
|
||||
<li><a href="${urls.about}">About</a></li>
|
||||
|
||||
<#if urls.contact??>
|
||||
<li><a href="${urls.contact}">Contact Us</a></li>
|
||||
</#if>
|
||||
|
||||
<li><a href="http://www.vivoweb.org/support" target="blank">Support</a></li>
|
||||
</ul>
|
||||
</nav>
|
||||
|
||||
<section id="search">
|
||||
<fieldset>
|
||||
<legend>Search form</legend>
|
||||
<form id="searchForm" action="${urls.search}" name="searchForm">
|
||||
<#if showFlag1SearchField??>
|
||||
<select id="search-form-modifier" name="flag1" class="form-item" >
|
||||
<option value="nofiltering" selected="selected">entire database (${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!}" />
|
||||
<a class ="submit" href="javascript:document.searchForm.submit();">Search</a> </div>
|
||||
<legend>Search form</legend>
|
||||
|
||||
<form id="searchForm" action="${urls.search}" name="searchForm">
|
||||
<#if showFlag1SearchField??>
|
||||
<select id="search-form-modifier" name="flag1" class="form-item" >
|
||||
<option value="nofiltering" selected="selected">entire database (${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!}" />
|
||||
|
||||
<a class ="submit" href="javascript:document.searchForm.submit();">Search</a>
|
||||
</div>
|
||||
|
||||
<!-- <input class ="submit" name="submit" type="submit" value="Search" /> -->
|
||||
</form>
|
||||
</fieldset>
|
||||
</form>
|
||||
</fieldset>
|
||||
</section>
|
||||
</header>
|
||||
<nav>
|
||||
<ul id="main-nav">
|
||||
<#list tabMenu.items as item>
|
||||
<li>
|
||||
<a href="${item.url}" <#if item.active> class="selected" </#if>>
|
||||
${item.linkText}
|
||||
</a>
|
||||
</li>
|
||||
</#list>
|
||||
</ul>
|
||||
</nav>
|
||||
</header>
|
||||
|
||||
<nav>
|
||||
<ul id="main-nav">
|
||||
<#list tabMenu.items as item>
|
||||
<li><a href="${item.url}" <#if item.active> class="selected" </#if>>${item.linkText}</a></li>
|
||||
</#list>
|
||||
</ul>
|
||||
</nav>
|
||||
|
|
@ -33,7 +33,7 @@
|
|||
|
||||
<body>
|
||||
<header id="branding">
|
||||
<h2 class="vivo-logo"><a href="${urls.home}"><span class="displace">${siteName}</span></a></h2>
|
||||
<h1 class="vivo-logo"><a href="${urls.home}"><span class="displace">${siteName}</span></a></h2>
|
||||
<!-- Since we are using a graphic text for the tagline, we won't render ${siteTagline}
|
||||
<#if siteTagline?has_content>
|
||||
<em>${siteTagline}</em>
|
||||
|
|
|
|||
|
|
@ -4,11 +4,13 @@
|
|||
<head>
|
||||
<meta charset="utf-8" />
|
||||
<title>${title}</title>
|
||||
|
||||
<link rel="stylesheet" href="${themeDir}/css/screen.css" />
|
||||
${stylesheets.tags}
|
||||
<!-- script for enabling new HTML5 semantic markup in IE browsers-->
|
||||
<script type="text/javascript" src="${urls.home}/js/html5.js"></script>
|
||||
${headScripts.tags}
|
||||
|
||||
<!--[if lt IE 7]>
|
||||
<script type="text/javascript" src="${urls.home}/js/jquery_plugins/supersleight.js"></script>
|
||||
<script type="text/javascript" src="${themeDir}/js/utils.js"></script>
|
||||
|
|
@ -23,88 +25,96 @@
|
|||
<script type="text/javascript" src="${urls.home}/js/selectivizr.js"></script>
|
||||
<![endif]-->
|
||||
</head>
|
||||
<body>
|
||||
<header id="branding">
|
||||
<h2 class="vivo-logo"><a href="${urls.home}"><span class="displace">${siteName}</span></a></h2>
|
||||
<!-- Since we are using a graphic text for the tagline, we won't render ${siteTagline}
|
||||
<#if siteTagline?has_content>
|
||||
<em>${siteTagline}</em>
|
||||
</#if>-->
|
||||
<#import "lib-list.ftl" as l>
|
||||
<nav>
|
||||
<ul id="header-nav">
|
||||
|
||||
<body>
|
||||
<header id="branding">
|
||||
<h1 class="vivo-logo"><a href="${urls.home}"><span class="displace">${siteName}</span></a></h2>
|
||||
<!-- Since we are using a graphic text for the tagline, we won't render ${siteTagline}
|
||||
<#if siteTagline?has_content>
|
||||
<em>${siteTagline}</em>
|
||||
</#if>-->
|
||||
<#import "lib-list.ftl" as l>
|
||||
|
||||
<nav>
|
||||
<ul id="header-nav">
|
||||
<#if loginName??>
|
||||
<li><span class="pictos-arrow-10">U</span> ${loginName}</li>
|
||||
<li><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>
|
||||
<li><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><a href="${urls.about}">About</a></li>
|
||||
<#if urls.contact??>
|
||||
<li><a href="${urls.contact}">Contact Us</a></li>
|
||||
</#if>
|
||||
<li><a href="http://www.vivoweb.org/support" target="blank">Support</a></li>
|
||||
</ul>
|
||||
</nav>
|
||||
<section id="search">
|
||||
<fieldset>
|
||||
<legend>Search form</legend>
|
||||
|
||||
<form id="searchForm" action="${urls.search}" name="searchForm">
|
||||
<#if showFlag1SearchField??>
|
||||
<select id="search-form-modifier" name="flag1" class="form-item" >
|
||||
<option value="nofiltering" selected="selected">entire database (${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!}" />
|
||||
<a class ="submit" href="javascript:document.searchForm.submit();">Search</a>
|
||||
</div>
|
||||
<!-- <input class ="submit" name="submit" type="submit" value="Search" /> -->
|
||||
</form>
|
||||
</fieldset>
|
||||
</section>
|
||||
</header>
|
||||
<nav>
|
||||
<ul id="main-nav">
|
||||
<#list tabMenu.items as item>
|
||||
<li><a href="${item.url}" <#if item.active> class="selected" </#if>>${item.linkText}</a></li>
|
||||
</#list>
|
||||
</ul>
|
||||
</nav>
|
||||
<div id="wrapper-content">
|
||||
${body}
|
||||
</div> <!-- #wrapper-content -->
|
||||
<footer>
|
||||
<#if copyright??>
|
||||
<p class="copyright"><small>©${copyright.year?c}
|
||||
|
||||
<section id="search">
|
||||
<fieldset>
|
||||
<legend>Search form</legend>
|
||||
|
||||
<form id="searchForm" action="${urls.search}" name="searchForm">
|
||||
<#if showFlag1SearchField??>
|
||||
<select id="search-form-modifier" name="flag1" class="form-item" >
|
||||
<option value="nofiltering" selected="selected">entire database (${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!}" />
|
||||
<a class ="submit" href="javascript:document.searchForm.submit();">Search</a>
|
||||
</div>
|
||||
<!-- <input class ="submit" name="submit" type="submit" value="Search" /> -->
|
||||
</form>
|
||||
</fieldset>
|
||||
</section>
|
||||
</header>
|
||||
|
||||
<nav>
|
||||
<ul id="main-nav">
|
||||
<#list tabMenu.items as item>
|
||||
<li><a href="${item.url}" <#if item.active> class="selected" </#if>>${item.linkText}</a></li>
|
||||
</#list>
|
||||
</ul>
|
||||
</nav>
|
||||
|
||||
<div id="wrapper-content">
|
||||
${body}
|
||||
</div> <!-- #wrapper-content -->
|
||||
|
||||
<footer>
|
||||
<#if copyright??>
|
||||
<p class="copyright"><small>©${copyright.year?c}
|
||||
<#if copyright.url??>
|
||||
<a href="${copyright.url}">${copyright.text}</a>
|
||||
<#else>
|
||||
${copyright.text}
|
||||
</#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>
|
||||
</p>
|
||||
</#if>
|
||||
|
||||
<nav>
|
||||
<ul id="footer-nav">
|
||||
<li><a href="${urls.about}">About</a></li>
|
||||
<#if urls.contact??>
|
||||
<li><a href="${urls.contact}">Contact Us</a></li>
|
||||
</#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></p>
|
||||
</#if>
|
||||
<nav>
|
||||
<ul id="footer-nav">
|
||||
<li><a href="${urls.about}">About</a></li>
|
||||
<#if urls.contact??>
|
||||
<li><a href="${urls.contact}">Contact Us</a></li>
|
||||
</#if>
|
||||
<li><a href="http://www.vivoweb.org/support" target="blank">Support</a></li>
|
||||
</ul>
|
||||
</nav>
|
||||
</footer>
|
||||
<li><a href="http://www.vivoweb.org/support" target="blank">Support</a></li>
|
||||
</ul>
|
||||
</nav>
|
||||
</footer>
|
||||
|
||||
${scripts.add("/js/jquery.js")}
|
||||
${scripts.tags}
|
||||
|
||||
<#include "googleAnalytics.ftl">
|
||||
</body>
|
||||
</html>
|
||||
</html>
|
||||
Loading…
Add table
Reference in a new issue