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

Converted tab to spaces.

Browse source
This commit is contained in:
mb863 2010-11-04 13:50:34 +00:00
parent 856b38dc63
commit 3ca081aa86
6 changed files with 247 additions and 244 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -5,20 +5,20 @@ Please see documentation at https://confluence.cornell.edu/display/ennsrd/Google
<#--
<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"));
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();
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 rollupTracker = _gat._getTracker("UA-12531954-1");
rollupTracker._setDomainName("none");
rollupTracker._setAllowLinker(true);
rollupTracker._trackPageview(location.host+location.pathname);
}
catch(err) {}

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

@ -12,11 +12,11 @@
<#import "lib-list.ftl" as l>
<nav>
<ul id="header-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>
<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>

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

@ -41,7 +41,7 @@
<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>
@ -132,7 +132,7 @@
<li><a href="#">Faculty Member<span class="count-individuals"> (18,080)</span></a></li>
<li><a class="selected" href="#">Graduate Student<span class="count-individuals"> (2,550)</span></a></li>
<li><a href="#">Librarian <span class="count-individuals"> (1,280)</span></a></li>
<li><a href="#">Non-Academic <span class="count-individuals"> (280)</span></a></li>
<li><a href="#">Non-Academic <span class="count-individuals"> (280)</span></a></li>
<li><a href="#">Non-Faculty Academic <span class="count-individuals"> (2,380)</span></a></li>
<li><a href="#">Person<span class="count-individuals"> (2,480)</span></a></li>
<li><a href="#">Postdoc <span class="count-individuals"> (1,380)</span></a></li>

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

@ -26,8 +26,8 @@
<![endif]-->
</head>
<body>
<header id="branding">
<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>
@ -86,8 +86,11 @@
</ul>
</nav>
<div id="wrapper-content">
${body}
<div id="wrapper-content">
<#-- mb863: using for now until we have controllers page.ftl to render the two templates commented below-->
<#--<#include "menupage/menupage.ftl">-->
<#--<#include "menupage/menupage--classgroup-people.ftl">-->
${body}
</div> <!-- #wrapper-content -->
<footer>
@ -114,7 +117,7 @@
${scripts.add("/js/jquery.js")}
${scripts.tags}
<#include "googleAnalytics.ftl">
</body>
</html>