From 5b1a9ed4b98e312a0d1838f2002eae608f06e1a6 Mon Sep 17 00:00:00 2001
From: mb863 <mb863@43c2fc9b-1942-4403-87b2-35b4218f7473>
Date: Mon, 25 Oct 2010 19:39:50 +0000
Subject: [PATCH] Added back menu.ftl and footer.ftl to
 VIVO/themes/wilma/templates because
 VIVO/themes/wilma/templates/page/basic-Page.jsp needs these templates to
 function properly

---
 themes/wilma/templates/footer.ftl | 47 ++++++++++++++++++++++++++
 themes/wilma/templates/menu.ftl   | 56 +++++++++++++++++++++++++++++++
 2 files changed, 103 insertions(+)
 create mode 100644 themes/wilma/templates/footer.ftl
 create mode 100644 themes/wilma/templates/menu.ftl

diff --git a/themes/wilma/templates/footer.ftl b/themes/wilma/templates/footer.ftl
new file mode 100644
index 00000000..d70bc943
--- /dev/null
+++ b/themes/wilma/templates/footer.ftl
@@ -0,0 +1,47 @@
+<footer>
+    <div id="footer-content">
+      	<#if copyright??>
+			<p class="copyright"><small>&copy;${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>
+    </div>
+  </footer>
+</div>
+
+
+
+<script type="text/javascript" src="http://use.typekit.com/chp2uea.js"></script>
+<script type="text/javascript">try{Typekit.load();}catch(e){}</script>
+${scripts.add("/js/jquery.js")}
+${scripts.tags}
+
+
+<!--[if lt IE 7]>
+<script type="text/javascript" src="${themeDir}/js/jquery_plugins/supersleight.js"></script>
+<script type="text/javascript" src="${themeDir}/js/utils.js"></script>
+<link rel="stylesheet" href="css/ie6.css" />
+<![endif]-->
+
+<!--[if IE 7]>
+<link rel="stylesheet" href="css/ie7.css" />
+<![endif]-->
+
+<!--[if (gte IE 6)&(lte IE 8)]>
+<script type="text/javascript" src="${themeDir}/js/selectivizr.js"></script>
+<![endif]-->
+
+<#include "googleAnalytics.ftl">
\ No newline at end of file
diff --git a/themes/wilma/templates/menu.ftl b/themes/wilma/templates/menu.ftl
new file mode 100644
index 00000000..9811160e
--- /dev/null
+++ b/themes/wilma/templates/menu.ftl
@@ -0,0 +1,56 @@
+<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. -->
+
+        <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>
\ No newline at end of file