litvinovg/vivo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

NIHVIVO-556: Changed H2 containing VIVO logo and tagline for H1.Added proper indentation.

Browse source
This commit is contained in:
mb863 2010-11-03 19:15:51 +00:00
parent 2b48aab2a3
commit 0876f2c28a
6 changed files with 167 additions and 147 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
themes/wilma/css/wilma.css
View file

@ -37,7 +37,7 @@ body{
margin: 0 auto; margin: 0 auto;
} }
/* BRANDING ------> */ /* BRANDING ------> */
h2.vivo-logo { h1.vivo-logo {
position: absolute; position: absolute;
width: 386px; width: 386px;
height: 59px; height: 59px;
@ -45,7 +45,7 @@ h2.vivo-logo {
left: 0; left: 0;
background: url(../images/VIVO-logo.png) 0 0 no-repeat; background: url(../images/VIVO-logo.png) 0 0 no-repeat;
} }
h2.vivo-logo a { h1.vivo-logo a {
display: block; display: block;
width: 386px; width: 386px;
height: 59px; height: 59px;

6
themes/wilma/templates/footer.ftl
View file

@ -1,7 +1,7 @@
<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> <#-- $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 --> <#-- This is a temporary file and will be removed once we have completed the transition to freemarker -->
<footer> <footer>
<#if copyright??> <#if copyright??>
<p class="copyright"><small>&copy;${copyright.year?c} <p class="copyright"><small>&copy;${copyright.year?c}
<#if copyright.url??> <#if copyright.url??>
@ -21,9 +21,7 @@
<li><a href="http://www.vivoweb.org/support" target="blank">Support</a></li> <li><a href="http://www.vivoweb.org/support" target="blank">Support</a></li>
</ul> </ul>
</nav> </nav>
</footer> </footer>
${scripts.add("/js/jquery.js")} ${scripts.add("/js/jquery.js")}
${scripts.tags} ${scripts.tags}

26
themes/wilma/templates/googleAnalytics.ftl
View file

@ -4,19 +4,23 @@
Please see documentation at https://confluence.cornell.edu/display/ennsrd/Google+Analytics+for+UI. --> 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"> <script type="text/javascript">
try { 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"));
var pageTracker = _gat._getTracker("UA-5164622-5"); </script>
pageTracker._setDomainName("vivo.cornell.edu");
pageTracker._setAllowLinker(true); <script type="text/javascript">
pageTracker._trackPageview(); try {
var rollupTracker = _gat._getTracker("UA-12531954-1"); var pageTracker = _gat._getTracker("UA-5164622-5");
rollupTracker._setDomainName("none"); pageTracker._setDomainName("vivo.cornell.edu");
rollupTracker._setAllowLinker(true); pageTracker._setAllowLinker(true);
rollupTracker._trackPageview(location.host+location.pathname); pageTracker._trackPageview();
var rollupTracker = _gat._getTracker("UA-12531954-1");
rollupTracker._setDomainName("none");
rollupTracker._setAllowLinker(true);
rollupTracker._trackPageview(location.host+location.pathname);
} }
catch(err) {} catch(err) {}
</script> </script>
--> -->

30
themes/wilma/templates/menu.ftl
View file

@ -2,12 +2,15 @@
<#-- This is a temporary file and will be removed once we have completed the transition to freemarker --> <#-- This is a temporary file and will be removed once we have completed the transition to freemarker -->
<header id="branding"> <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} <!-- Since we are using a graphic text for the tagline, we won't render ${siteTagline}
<#if siteTagline?has_content> <#if siteTagline?has_content>
<em>${siteTagline}</em> <em>${siteTagline}</em>
</#if>--> </#if>-->
<#import "lib-list.ftl" as l> <#import "lib-list.ftl" as l>
<nav> <nav>
<ul id="header-nav"> <ul id="header-nav">
<#if loginName??> <#if loginName??>
@ -17,18 +20,22 @@
<#else> <#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> </#if>
<#-- List of links that appear in submenus, like the header and footer. -->
<#-- List of links that appear in submenus, like the header and footer. -->
<li><a href="${urls.about}">About</a></li> <li><a href="${urls.about}">About</a></li>
<#if urls.contact??> <#if urls.contact??>
<li><a href="${urls.contact}">Contact Us</a></li> <li><a href="${urls.contact}">Contact Us</a></li>
</#if> </#if>
<li><a href="http://www.vivoweb.org/support" target="blank">Support</a></li> <li><a href="http://www.vivoweb.org/support" target="blank">Support</a></li>
</ul> </ul>
</nav> </nav>
<section id="search"> <section id="search">
<fieldset> <fieldset>
<legend>Search form</legend> <legend>Search form</legend>
<form id="searchForm" action="${urls.search}" name="searchForm"> <form id="searchForm" action="${urls.search}" name="searchForm">
<#if showFlag1SearchField??> <#if showFlag1SearchField??>
<select id="search-form-modifier" name="flag1" class="form-item" > <select id="search-form-modifier" name="flag1" class="form-item" >
@ -38,22 +45,23 @@
<#else> <#else>
<input type="hidden" name="flag1" value="${portalId}" /> <input type="hidden" name="flag1" value="${portalId}" />
</#if> </#if>
<div id="search-field"> <div id="search-field">
<input type="text" name="querytext" class="search-vivo" value="${querytext!}" /> <input type="text" name="querytext" class="search-vivo" value="${querytext!}" />
<a class ="submit" href="javascript:document.searchForm.submit();">Search</a> </div>
<a class ="submit" href="javascript:document.searchForm.submit();">Search</a>
</div>
<!-- <input class ="submit" name="submit" type="submit" value="Search" /> --> <!-- <input class ="submit" name="submit" type="submit" value="Search" /> -->
</form> </form>
</fieldset> </fieldset>
</section> </section>
</header> </header>
<nav>
<nav>
<ul id="main-nav"> <ul id="main-nav">
<#list tabMenu.items as item> <#list tabMenu.items as item>
<li> <li><a href="${item.url}" <#if item.active> class="selected" </#if>>${item.linkText}</a></li>
<a href="${item.url}" <#if item.active> class="selected" </#if>>
${item.linkText}
</a>
</li>
</#list> </#list>
</ul> </ul>
</nav> </nav>

2
themes/wilma/templates/page-home.ftl
View file

@ -33,7 +33,7 @@
<body> <body>
<header id="branding"> <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} <!-- Since we are using a graphic text for the tagline, we won't render ${siteTagline}
<#if siteTagline?has_content> <#if siteTagline?has_content>
<em>${siteTagline}</em> <em>${siteTagline}</em>

18
themes/wilma/templates/page.ftl
View file

@ -4,11 +4,13 @@
<head> <head>
<meta charset="utf-8" /> <meta charset="utf-8" />
<title>${title}</title> <title>${title}</title>
<link rel="stylesheet" href="${themeDir}/css/screen.css" /> <link rel="stylesheet" href="${themeDir}/css/screen.css" />
${stylesheets.tags} ${stylesheets.tags}
<!-- script for enabling new HTML5 semantic markup in IE browsers--> <!-- script for enabling new HTML5 semantic markup in IE browsers-->
<script type="text/javascript" src="${urls.home}/js/html5.js"></script> <script type="text/javascript" src="${urls.home}/js/html5.js"></script>
${headScripts.tags} ${headScripts.tags}
<!--[if lt IE 7]> <!--[if lt IE 7]>
<script type="text/javascript" src="${urls.home}/js/jquery_plugins/supersleight.js"></script> <script type="text/javascript" src="${urls.home}/js/jquery_plugins/supersleight.js"></script>
<script type="text/javascript" src="${themeDir}/js/utils.js"></script> <script type="text/javascript" src="${themeDir}/js/utils.js"></script>
@ -23,14 +25,16 @@
<script type="text/javascript" src="${urls.home}/js/selectivizr.js"></script> <script type="text/javascript" src="${urls.home}/js/selectivizr.js"></script>
<![endif]--> <![endif]-->
</head> </head>
<body> <body>
<header id="branding"> <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} <!-- Since we are using a graphic text for the tagline, we won't render ${siteTagline}
<#if siteTagline?has_content> <#if siteTagline?has_content>
<em>${siteTagline}</em> <em>${siteTagline}</em>
</#if>--> </#if>-->
<#import "lib-list.ftl" as l> <#import "lib-list.ftl" as l>
<nav> <nav>
<ul id="header-nav"> <ul id="header-nav">
<#if loginName??> <#if loginName??>
@ -41,7 +45,6 @@
<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> </#if>
<#-- List of links that appear in submenus, like the header and footer. --> <#-- List of links that appear in submenus, like the header and footer. -->
<li><a href="${urls.about}">About</a></li> <li><a href="${urls.about}">About</a></li>
<#if urls.contact??> <#if urls.contact??>
<li><a href="${urls.contact}">Contact Us</a></li> <li><a href="${urls.contact}">Contact Us</a></li>
@ -49,6 +52,7 @@
<li><a href="http://www.vivoweb.org/support" target="blank">Support</a></li> <li><a href="http://www.vivoweb.org/support" target="blank">Support</a></li>
</ul> </ul>
</nav> </nav>
<section id="search"> <section id="search">
<fieldset> <fieldset>
<legend>Search form</legend> <legend>Search form</legend>
@ -59,9 +63,11 @@
<option value="nofiltering" selected="selected">entire database (${loginName})</option> <option value="nofiltering" selected="selected">entire database (${loginName})</option>
<option value="${portalId}">${siteTagline!}</option> <option value="${portalId}">${siteTagline!}</option>
</select> </select>
<#else> <#else>
<input type="hidden" name="flag1" value="${portalId}" /> <input type="hidden" name="flag1" value="${portalId}" />
</#if> </#if>
<div id="search-field"> <div id="search-field">
<input type="text" name="querytext" class="search-vivo" value="${querytext!}" /> <input type="text" name="querytext" class="search-vivo" value="${querytext!}" />
<a class ="submit" href="javascript:document.searchForm.submit();">Search</a> <a class ="submit" href="javascript:document.searchForm.submit();">Search</a>
@ -71,6 +77,7 @@
</fieldset> </fieldset>
</section> </section>
</header> </header>
<nav> <nav>
<ul id="main-nav"> <ul id="main-nav">
<#list tabMenu.items as item> <#list tabMenu.items as item>
@ -78,19 +85,22 @@
</#list> </#list>
</ul> </ul>
</nav> </nav>
<div id="wrapper-content"> <div id="wrapper-content">
${body} ${body}
</div> <!-- #wrapper-content --> </div> <!-- #wrapper-content -->
<footer> <footer>
<#if copyright??> <#if copyright??>
<p class="copyright"><small>&copy;${copyright.year?c} <p class="copyright"><small>&copy;${copyright.year?c}
<#if copyright.url??> <#if copyright.url??>
<a href="${copyright.url}">${copyright.text}</a> <a href="${copyright.url}">${copyright.text}</a>
<#else> <#else>
${copyright.text}
</#if> </#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> 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> </#if>
<nav> <nav>
<ul id="footer-nav"> <ul id="footer-nav">
<li><a href="${urls.about}">About</a></li> <li><a href="${urls.about}">About</a></li>