Initial template refactoring (paused due to JSP)

webapp/src/main/webapp/templates/freemarker/page/page.ftl

@@ -8,7 +8,9 @@
     <div id="wrap" class="container">
         <div id="header">
 
+            <header id="branding" role="banner">
                 <#include "identity.ftl">
+            </header>
             
             <#-- Note to UI team: do not change this div without also making the corresponding change in menu.jsp -->
             <div id="navAndSearch" class="block">
@@ -22,11 +24,7 @@
         <hr class="hidden" />
 
         <div id="contentwrap">
-            <#if flash?has_content>
+            <#include "flash.html">
-                <div id="flash-message">
-                    ${flash}
-                </div>
-            </#if>
 
             <div id="content">                      
                 ${body}
@@ -34,7 +32,6 @@
         </div> <!-- contentwrap -->
     
         <#include "footer.ftl">
-                                      
     </div> <!-- wrap -->
     
     <#include "scripts.ftl"> 

webapp/src/main/webapp/templates/freemarker/page/partials/copyright.ftl

@@ -1,12 +1,17 @@
 <#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
 
+<p class="copyright">
     <#if copyright??>
-    <div class="copyright">
+        <small>&copy;${copyright.year?c}
-        &copy;${copyright.year?c}
         <#if copyright.url??>
             <a href="${copyright.url}" title="${i18n().copyright}">${copyright.text}</a>
         <#else>
         ${copyright.text}
         </#if>
-    </div>
+        | <a class="terms" href="${urls.termsOfUse}" title="${i18n().terms_of_use}">${i18n().terms_of_use}</a></small> |
     </#if>
+    ${i18n().powered_by} <a class="powered-by-vitro" href="http://vitro.sourceforge.net"><strong>Vitro</strong></a>
+    <#if user.hasRevisionInfoAccess>
+        | ${i18n().version} <a href="${version.moreInfoUrl}" title="${i18n().version}">${version.label}</a>
+    </#if>
+</p>

webapp/src/main/webapp/templates/freemarker/page/partials/flash.ftl

@@ -0,0 +1,8 @@
+<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
+
+<#if flash?has_content>
+    <div id="flash-message">
+        ${flash}
+    </div>
+</#if>
+

webapp/src/main/webapp/templates/freemarker/page/partials/footer.ftl

@@ -2,23 +2,18 @@
 
 <#import "lib-list.ftl" as l>
 
-<div id="footer">
+<footer role="contentinfo">
-
-    <#if urls.bannerImage??>
-        <img class="footerLogo" src="${urls.bannerImage}" alt="${siteTagline!}" />
-    </#if>
-    
-    <div class="footerLinks">
-        <ul class="otherNav">  
-            <@l.firstLastList> 
-                <#include "subMenuLinks.ftl">
-            </@l.firstLastList>
-        </ul>
-    </div>
-
     <#include "copyright.ftl">
 
-    ${i18n().all_rights_reserved} <a href="${urls.termsOfUse}" title="${i18n().terms_of_use}">${i18n().terms_of_use}</a>
+    <nav role="navigation">
+        <ul id="footer-nav" role="list">
+            <li role="listitem"><a href="${urls.about}" title="${i18n().about}">${i18n().about}</a></li>
+        <#if urls.contact??>
+            <li role="listitem"><a href="${urls.contact}" title="${i18n().contact_us}">${i18n().contact_us}</a></li>
+        </#if>
+            <li role="listitem"><a href="http://www.vivoweb.org/support" target="blank" title="${i18n().support}">${i18n().support}</a></li>
+        </ul>
+    </nav>
+</footer>
 
-    <#include "version.ftl">
+<#include "scripts.ftl">
-</div>

webapp/src/main/webapp/templates/freemarker/page/partials/googleAnalytics.ftl

@@ -1,19 +1,26 @@
-<#-- NOTICE: This is SAMPLE Google Analytics code. You must replace it with your institution's code. -->
+<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
 
-<#--
+<#if gatracker??>
-<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 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");
+            var pageTracker = _gat._getTracker("${gatracker}");
-pageTracker._setDomainName("vivo.cornell.edu");
+            <#if gadomain??>
+                pageTracker._setDomainName("${gadomain});
+            </#if>
             pageTracker._setAllowLinker(true);
             pageTracker._trackPageview();
-var rollupTracker = _gat._getTracker("UA-12531954-1");
+
+            <#if gatrackerrollup??>
+                var rollupTracker = _gat._getTracker("${gatrackerrollup}");
                 rollupTracker._setDomainName("none");
                 rollupTracker._setAllowLinker(true);
                 rollupTracker._trackPageview(location.host+location.pathname);
+            </#if>
     }
     catch(err) {}
     </script>
--->
+</#if>

webapp/src/main/webapp/templates/freemarker/page/partials/head.ftl

@@ -8,8 +8,14 @@
 
 <#include "stylesheets.ftl">
 
+<#include "themeStylesheets.ftl">
+
 <#include "headScripts.ftl">
 
+<!--[if (gte IE 6)&(lte IE 8)]>
+<script type="text/javascript" src="${urls.base}/js/selectivizr.js"></script>
+<![endif]-->
+
 <#if metaTags??>
     ${metaTags.list()}
 </#if>
@@ -17,3 +23,5 @@
 <#-- Inject head content specified in the controller. Currently this is used only to generate an rdf link on
 an individual profile page. -->
 ${headContent!}
+
+<link rel="shortcut icon" type="image/x-icon" href="${urls.base}/favicon.ico">

webapp/src/main/webapp/templates/freemarker/page/partials/identity.ftl

@@ -1,7 +1,6 @@
 <#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
 
-<header id="branding" role="banner">
+<h1 class="vitro-logo"><a href="${urls.home}" title="${siteName}"><span class="displace">${siteName}</span></a></h1>
-    <h1 class="vivo-logo"><a href="${urls.home}" title="${siteName}"><span class="displace">${siteName}</span></a></h1>
 <#if siteTagline?has_content>
     <em>${siteTagline}</em>
 </#if>
@@ -40,4 +39,3 @@
         </form>
     </fieldset>
 </section>
-</header>

webapp/src/main/webapp/templates/freemarker/page/partials/menu.ftl

@@ -9,10 +9,3 @@
         </#list>
     </ul>
 </nav>
-
-<div id="wrapper-content" role="main">        
-    <#if flash?has_content>
-        <section id="flash-message" role="alert">
-            ${flash}
-        </section>
-    </#if>

webapp/src/main/webapp/templates/freemarker/page/partials/themeStylesheets.ftl

@@ -0,0 +1 @@
+<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->

webapp/src/main/webapp/templates/freemarker/page/partials/title.ftl

@@ -1,3 +1,3 @@
 <#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
 
-<title>${siteName!}</title>
+<title>${(title?html)!siteName!}</title>

webapp/src/main/webapp/themes/vitro/templates/flash.ftl

@@ -0,0 +1,19 @@
+<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
+
+<#if flash?has_content>
+    <#if flash?starts_with("Welcome") >
+    <section  id="welcome-msg-container" role="container">
+        <section  id="welcome-message" role="alert">${flash}</section>
+    </section>
+    <#else>
+    <section id="flash-message" role="alert">
+    ${flash}
+    </section>
+    </#if>
+</#if>
+
+<!--[if lte IE 8]>
+<noscript>
+    <p class="ie-alert">${i18n().javascript_ie_alert_text} Here are the <a href="http://www.enable-javascript.com" title="javascript instructions">${i18n().to_enable_javascript}</a>.</p>
+</noscript>
+<![endif]-->

webapp/src/main/webapp/themes/vitro/templates/footer.ftl

@@ -1,33 +0,0 @@
-<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
-
-</div> <!-- #wrapper-content -->
-
-<footer role="contentinfo">
-    <p class="copyright">
-        <#if copyright??>
-            <small>&copy;${copyright.year?c}
-            <#if copyright.url??>
-                <a href="${copyright.url}" title="${i18n().copyright}">${copyright.text}</a>
-            <#else>
-                ${copyright.text}
-            </#if>
-             | <a class="terms" href="${urls.termsOfUse}" title="${i18n().terms_of_use}">${i18n().terms_of_use}</a></small> | 
-        </#if>
-        ${i18n().powered_by} <a class="powered-by-vitro" href="http://vitro.sourceforge.net"><strong>Vitro</strong></a>
-        <#if user.hasRevisionInfoAccess>
-             | ${i18n().version} <a href="${version.moreInfoUrl}" title="${i18n().version}">${version.label}</a>
-        </#if>
-    </p>
-    
-    <nav role="navigation">
-        <ul id="footer-nav" role="list">
-            <li role="listitem"><a href="${urls.about}" title="${i18n().about}">${i18n().about}</a></li>
-            <#if urls.contact??>
-                <li role="listitem"><a href="${urls.contact}" title="${i18n().contact_us}">${i18n().contact_us}</a></li>
-            </#if> 
-            <li role="listitem"><a href="http://www.vivoweb.org/support" target="blank" title="${i18n().support}">${i18n().support}</a></li>
-        </ul>
-    </nav>
-</footer>
-
-<#include "scripts.ftl">

webapp/src/main/webapp/themes/vitro/templates/googleAnalytics.ftl

@@ -1,26 +0,0 @@
-<#-- $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. 
-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);  
-} 
-
-catch(err) {}  
-</script>
--->

webapp/src/main/webapp/themes/vitro/templates/head.ftl

@@ -1,26 +0,0 @@
-<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
-
-<meta charset="utf-8" />
-<!-- Google Chrome Frame open source plug-in brings Google Chrome's open web technologies and speedy JavaScript engine to Internet Explorer-->
-<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-
-<title>${(title?html)!siteName!}</title>
-
-<#include "stylesheets.ftl">
-<link rel="stylesheet" href="${urls.theme}/css/screen.css" />
-
-<#include "headScripts.ftl">
-
-<!--[if (gte IE 6)&(lte IE 8)]>
-<script type="text/javascript" src="${urls.base}/js/selectivizr.js"></script>
-<![endif]-->
-
-<#if metaTags??>
-    ${metaTags.list()}
-</#if>
-
-<#-- Inject head content specified in the controller. Currently this is used only to generate an rdf link on
-an individual profile page. -->
-${headContent!}
-
-<link rel="shortcut icon" type="image/x-icon" href="${urls.base}/favicon.ico">

webapp/src/main/webapp/themes/vitro/templates/identity.ftl

@@ -1,6 +1,5 @@
 <#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
 
-<header id="branding" role="banner">
 <h1 class="vitro-logo"><a title="${siteName}" href="${urls.home}"><span class="displace">${siteName}</span></a></h1>
 <#-- Since we are using a graphic text for the tagline, we won't render ${siteTagline}
 <#if siteTagline?has_content>

webapp/src/main/webapp/themes/vitro/templates/menu.ftl

@@ -1,7 +1,5 @@
 <#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
 
-</header>
-
 <#include "developer.ftl">
 
 <nav role="navigation">
@@ -11,22 +9,3 @@
         </#list>
     </ul>
 </nav>
-
-<div id="wrapper-content" role="main">        
-    <#if flash?has_content>
-        <#if flash?starts_with("Welcome") >
-            <section  id="welcome-msg-container" role="container">
-                <section  id="welcome-message" role="alert">${flash}</section>
-            </section>
-        <#else>
-            <section id="flash-message" role="alert">
-                ${flash}
-            </section>
-        </#if>
-    </#if>
-    
-    <!--[if lte IE 8]>
-    <noscript>
-        <p class="ie-alert">${i18n().javascript_ie_alert_text} Here are the <a href="http://www.enable-javascript.com" title="javascript instructions">${i18n().to_enable_javascript}</a>.</p>
-    </noscript>
-    <![endif]-->

webapp/src/main/webapp/themes/vitro/templates/page-home.ftl

@@ -10,10 +10,12 @@
     </head>
     
     <body class="${bodyClasses!}">
+        <header id="branding" role="banner">
             <#include "identity.ftl">
-        
+        </header>
         <#include "menu.ftl">
 
+        <div id="wrapper-content" role="main">
             <section id="intro" role="region">
                 <h2>${i18n().what_is_vitro}</h2>
 
@@ -51,12 +53,11 @@
 
             </section> <!-- #intro -->
 
-            
-            
             <@widget name="login" />
 
             <!-- Statistical information relating to property groups and their classes; displayed horizontally, not vertically-->
             <@lh.allClassGroups vClassGroups! />
+        </div>
         
         <#include "footer.ftl">
         <script>

webapp/src/main/webapp/themes/vitro/templates/page.ftl

@@ -9,12 +9,15 @@
     </head>
     
     <body class="${bodyClasses!}">
+        <header id="branding" role="banner">
             <#include "identity.ftl">
             <#include "search.ftl">
+        </header>
         <#include "menu.ftl">
 
+        <div id="wrapper-content" role="main">
             ${body}
-        
+        </div>
         <#include "footer.ftl">
     </body>
 </html>

webapp/src/main/webapp/themes/vitro/templates/themeStylesheets.ftl

@@ -0,0 +1,3 @@
+<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
+
+<link rel="stylesheet" href="${urls.theme}/css/screen.css" />