From e2e3c8b04149e2c0bd76a3b0be9fd579b0a43803 Mon Sep 17 00:00:00 2001
From: Graham Triggs <gtriggs@duraspace.org>
Date: Thu, 29 Sep 2016 15:22:05 +0100
Subject: [PATCH] Initial template refactoring (paused due to JSP)

---
 .../webapp/templates/freemarker/page/page.ftl | 19 ++---
 .../freemarker/page/partials/copyright.ftl    | 19 +++--
 .../freemarker/page/partials/flash.ftl        |  8 ++
 .../freemarker/page/partials/footer.ftl       | 29 +++----
 .../page/partials/googleAnalytics.ftl         | 43 ++++++-----
 .../freemarker/page/partials/head.ftl         | 12 ++-
 .../freemarker/page/partials/identity.ftl     | 76 +++++++++----------
 .../freemarker/page/partials/menu.ftl         |  7 --
 .../page/partials/themeStylesheets.ftl        |  1 +
 .../freemarker/page/partials/title.ftl        |  2 +-
 .../webapp/themes/vitro/templates/flash.ftl   | 19 +++++
 .../webapp/themes/vitro/templates/footer.ftl  | 33 --------
 .../vitro/templates/googleAnalytics.ftl       | 26 -------
 .../webapp/themes/vitro/templates/head.ftl    | 26 -------
 .../themes/vitro/templates/identity.ftl       | 67 ++++++++--------
 .../webapp/themes/vitro/templates/menu.ftl    | 21 -----
 .../themes/vitro/templates/page-home.ftl      | 31 ++++----
 .../webapp/themes/vitro/templates/page.ftl    | 13 ++--
 .../vitro/templates/themeStylesheets.ftl      |  3 +
 19 files changed, 193 insertions(+), 262 deletions(-)
 create mode 100644 webapp/src/main/webapp/templates/freemarker/page/partials/flash.ftl
 create mode 100644 webapp/src/main/webapp/templates/freemarker/page/partials/themeStylesheets.ftl
 create mode 100644 webapp/src/main/webapp/themes/vitro/templates/flash.ftl
 delete mode 100644 webapp/src/main/webapp/themes/vitro/templates/footer.ftl
 delete mode 100644 webapp/src/main/webapp/themes/vitro/templates/googleAnalytics.ftl
 delete mode 100644 webapp/src/main/webapp/themes/vitro/templates/head.ftl
 create mode 100644 webapp/src/main/webapp/themes/vitro/templates/themeStylesheets.ftl
diff --git a/webapp/src/main/webapp/templates/freemarker/page/page.ftl b/webapp/src/main/webapp/templates/freemarker/page/page.ftl
index a3b39d0de..f2fa58732 100644
--- a/webapp/src/main/webapp/templates/freemarker/page/page.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/page/page.ftl
@@ -7,8 +7,10 @@
 <body class="${bodyClasses!}">
     <div id="wrap" class="container">
         <div id="header">
-        
-            <#include "identity.ftl">
+
+            <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">
@@ -21,21 +23,16 @@
 
         <hr class="hidden" />
 
-        <div id="contentwrap"> 
-            <#if flash?has_content>
-                <div id="flash-message">
-                    ${flash}
-                </div>
-            </#if>
-            
+        <div id="contentwrap">
+            <#include "flash.html">
+
             <div id="content">                      
                 ${body}
             </div> <!-- content -->
         </div> <!-- contentwrap -->
     
         <#include "footer.ftl">
-                                      
-    </div> <!-- wrap --> 
+    </div> <!-- wrap -->
     
     <#include "scripts.ftl"> 
 </body>
diff --git a/webapp/src/main/webapp/templates/freemarker/page/partials/copyright.ftl b/webapp/src/main/webapp/templates/freemarker/page/partials/copyright.ftl
index 06b30d534..4e2b2f251 100644
--- a/webapp/src/main/webapp/templates/freemarker/page/partials/copyright.ftl
+++ b/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$ -->
 
-<#if copyright??>
-    <div class="copyright">
-        &copy;${copyright.year?c}
+<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>                 
-    </div>
-</#if>
\ No newline at end of file
+        ${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>
diff --git a/webapp/src/main/webapp/templates/freemarker/page/partials/flash.ftl b/webapp/src/main/webapp/templates/freemarker/page/partials/flash.ftl
new file mode 100644
index 000000000..1036175d6
--- /dev/null
+++ b/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>
+
diff --git a/webapp/src/main/webapp/templates/freemarker/page/partials/footer.ftl b/webapp/src/main/webapp/templates/freemarker/page/partials/footer.ftl
index c88e4c186..02531727f 100644
--- a/webapp/src/main/webapp/templates/freemarker/page/partials/footer.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/page/partials/footer.ftl
@@ -2,23 +2,18 @@
 
 <#import "lib-list.ftl" as l>
 
-<div id="footer">
-
-    <#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>
-
+<footer role="contentinfo">
     <#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">
-</div>
+<#include "scripts.ftl">
diff --git a/webapp/src/main/webapp/templates/freemarker/page/partials/googleAnalytics.ftl b/webapp/src/main/webapp/templates/freemarker/page/partials/googleAnalytics.ftl
index 920b72ba1..ad7551fa6 100644
--- a/webapp/src/main/webapp/templates/freemarker/page/partials/googleAnalytics.ftl
+++ b/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$ -->
 
-<#--
-<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>
--->
+<#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>
+
+    <script type="text/javascript">
+        try {
+            var pageTracker = _gat._getTracker("${gatracker}");
+            <#if gadomain??>
+                pageTracker._setDomainName("${gadomain});
+            </#if>
+            pageTracker._setAllowLinker(true);
+            pageTracker._trackPageview();
+
+            <#if gatrackerrollup??>
+                var rollupTracker = _gat._getTracker("${gatrackerrollup}");
+                rollupTracker._setDomainName("none");
+                rollupTracker._setAllowLinker(true);
+                rollupTracker._trackPageview(location.host+location.pathname);
+            </#if>
+    }
+    catch(err) {}
+    </script>
+</#if>
diff --git a/webapp/src/main/webapp/templates/freemarker/page/partials/head.ftl b/webapp/src/main/webapp/templates/freemarker/page/partials/head.ftl
index e99bdcec3..03ea5bec6 100644
--- a/webapp/src/main/webapp/templates/freemarker/page/partials/head.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/page/partials/head.ftl
@@ -8,12 +8,20 @@
 
 <#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>
 
-<#-- Inject head content specified in the controller. Currently this is used only to generate an rdf link on 
+<#-- Inject head content specified in the controller. Currently this is used only to generate an rdf link on
 an individual profile page. -->
-${headContent!}
\ No newline at end of file
+${headContent!}
+
+<link rel="shortcut icon" type="image/x-icon" href="${urls.base}/favicon.ico">
diff --git a/webapp/src/main/webapp/templates/freemarker/page/partials/identity.ftl b/webapp/src/main/webapp/templates/freemarker/page/partials/identity.ftl
index 20ded3f46..6bc7619bd 100644
--- a/webapp/src/main/webapp/templates/freemarker/page/partials/identity.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/page/partials/identity.ftl
@@ -1,43 +1,41 @@
 <#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
 
-<header id="branding" role="banner">
-    <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>
+<h1 class="vitro-logo"><a href="${urls.home}" title="${siteName}"><span class="displace">${siteName}</span></a></h1>
+<#if siteTagline?has_content>
+    <em>${siteTagline}</em>
+</#if>
 
-    <nav role="navigation">
-        <ul id="header-nav" role="list">
-            <#include "languageSelector.ftl">
-            <#if user.loggedIn>
-                <li role="listitem">${user.loginName}</li>
-                <li role="listitem"><a href="${urls.logout}" title="${i18n().end_your_Session}">${i18n().log_out}</a></li>
-                <#if user.hasSiteAdminAccess>
-                    <li role="listitem"><a href="${urls.siteAdmin}" title="${i18n().manage_site}">${i18n().site_admin}</a></li>
-                </#if>
-            <#else>
-                <li role="listitem"><a href="${urls.login}" title="${i18n().login_to_manage_site}" >${i18n().login_button}</a></li>
+<nav role="navigation">
+    <ul id="header-nav" role="list">
+        <#include "languageSelector.ftl">
+        <#if user.loggedIn>
+            <li role="listitem">${user.loginName}</li>
+            <li role="listitem"><a href="${urls.logout}" title="${i18n().end_your_Session}">${i18n().log_out}</a></li>
+            <#if user.hasSiteAdminAccess>
+                <li role="listitem"><a href="${urls.siteAdmin}" title="${i18n().manage_site}">${i18n().site_admin}</a></li>
             </#if>
-            <#-- List of links that appear in submenus, like the header and footer. -->
-                <li role="listitem"><a href="${urls.about}" title="${i18n().more_details_about_site}">${i18n().about}</a></li>
-            <#if urls.contact??>
-                <li role="listitem"><a href="${urls.contact}" title="${i18n().send_feedback_questions}">${i18n().contact_us}</a></li>
-            </#if>
-                <li role="listitem"><a href="http://www.vivoweb.org/support" title="${i18n().visit_project_website}" target="blank">${i18n().support}</a></li>
-                <li role="listitem"><a href="${urls.index}" title="${i18n().view_content_index}">${i18n().index}</a></li>
-        </ul>
-    </nav>
-    
-    <section id="search" role="region">
-        <fieldset>
-            <legend>${i18n().search_form}</legend>
-            
-            <form id="search-form" action="${urls.search}" name="search" role="search" accept-charset="UTF-8" method="POST"> 
-                <div id="search-field">
-                    <input type="text" name="querytext" class="search-vitro" value="${querytext!}" autocapitalize="off" />
-                    <input type="submit" value="${i18n().search_button}" class="submit">
-                </div>
-            </form>
-        </fieldset>
-    </section>
-</header>
+        <#else>
+            <li role="listitem"><a href="${urls.login}" title="${i18n().login_to_manage_site}" >${i18n().login_button}</a></li>
+        </#if>
+        <#-- List of links that appear in submenus, like the header and footer. -->
+            <li role="listitem"><a href="${urls.about}" title="${i18n().more_details_about_site}">${i18n().about}</a></li>
+        <#if urls.contact??>
+            <li role="listitem"><a href="${urls.contact}" title="${i18n().send_feedback_questions}">${i18n().contact_us}</a></li>
+        </#if>
+            <li role="listitem"><a href="http://www.vivoweb.org/support" title="${i18n().visit_project_website}" target="blank">${i18n().support}</a></li>
+            <li role="listitem"><a href="${urls.index}" title="${i18n().view_content_index}">${i18n().index}</a></li>
+    </ul>
+</nav>
+
+<section id="search" role="region">
+    <fieldset>
+        <legend>${i18n().search_form}</legend>
+
+        <form id="search-form" action="${urls.search}" name="search" role="search" accept-charset="UTF-8" method="POST">
+            <div id="search-field">
+                <input type="text" name="querytext" class="search-vitro" value="${querytext!}" autocapitalize="off" />
+                <input type="submit" value="${i18n().search_button}" class="submit">
+            </div>
+        </form>
+    </fieldset>
+</section>
diff --git a/webapp/src/main/webapp/templates/freemarker/page/partials/menu.ftl b/webapp/src/main/webapp/templates/freemarker/page/partials/menu.ftl
index e193960fd..53b0cd1c8 100644
--- a/webapp/src/main/webapp/templates/freemarker/page/partials/menu.ftl
+++ b/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>
\ No newline at end of file
diff --git a/webapp/src/main/webapp/templates/freemarker/page/partials/themeStylesheets.ftl b/webapp/src/main/webapp/templates/freemarker/page/partials/themeStylesheets.ftl
new file mode 100644
index 000000000..cf4b2421f
--- /dev/null
+++ b/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$ -->
diff --git a/webapp/src/main/webapp/templates/freemarker/page/partials/title.ftl b/webapp/src/main/webapp/templates/freemarker/page/partials/title.ftl
index 0cf24952d..78e74164c 100644
--- a/webapp/src/main/webapp/templates/freemarker/page/partials/title.ftl
+++ b/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>
\ No newline at end of file
+<title>${(title?html)!siteName!}</title>
diff --git a/webapp/src/main/webapp/themes/vitro/templates/flash.ftl b/webapp/src/main/webapp/themes/vitro/templates/flash.ftl
new file mode 100644
index 000000000..34cc71619
--- /dev/null
+++ b/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]-->
\ No newline at end of file
diff --git a/webapp/src/main/webapp/themes/vitro/templates/footer.ftl b/webapp/src/main/webapp/themes/vitro/templates/footer.ftl
deleted file mode 100644
index eb57f61e5..000000000
--- a/webapp/src/main/webapp/themes/vitro/templates/footer.ftl
+++ /dev/null
@@ -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">
\ No newline at end of file
diff --git a/webapp/src/main/webapp/themes/vitro/templates/googleAnalytics.ftl b/webapp/src/main/webapp/themes/vitro/templates/googleAnalytics.ftl
deleted file mode 100644
index 1000dbe92..000000000
--- a/webapp/src/main/webapp/themes/vitro/templates/googleAnalytics.ftl
+++ /dev/null
@@ -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>
--->
\ No newline at end of file
diff --git a/webapp/src/main/webapp/themes/vitro/templates/head.ftl b/webapp/src/main/webapp/themes/vitro/templates/head.ftl
deleted file mode 100644
index 10b7af235..000000000
--- a/webapp/src/main/webapp/themes/vitro/templates/head.ftl
+++ /dev/null
@@ -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">
\ No newline at end of file
diff --git a/webapp/src/main/webapp/themes/vitro/templates/identity.ftl b/webapp/src/main/webapp/themes/vitro/templates/identity.ftl
index 478452f34..61153ba15 100644
--- a/webapp/src/main/webapp/themes/vitro/templates/identity.ftl
+++ b/webapp/src/main/webapp/themes/vitro/templates/identity.ftl
@@ -1,38 +1,37 @@
 <#-- $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>
-        <em>${siteTagline}</em>
-    </#if>-->
+<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>
+    <em>${siteTagline}</em>
+</#if>-->
 
-    <nav role="navigation">
-        <ul id="header-nav" role="list">
-            <#include "languageSelector.ftl">
-            <li role="listitem"><a href="${urls.index}" title="${i18n().index}">${i18n().index}</a></li>
-            <#if user.loggedIn>
-                <#if user.hasSiteAdminAccess>
-                    <li role="listitem"><a href="${urls.siteAdmin}" title="${i18n().site_admin}">${i18n().site_admin}</a></li>
-                </#if>
-                    <li>
-                        <ul class="dropdown">
-                            <li id="user-menu"><a href="#" title="${i18n().current_user}">${user.loginName}</a>
-                                <ul class="sub_menu">
-                                     <#if urls.myAccount??>
-                                         <li role="listitem"><a href="${urls.myAccount}" title="${i18n().myAccount_heading}">${i18n().myAccount_heading}</a></li>
-                                     </#if>
-                                     <li role="listitem"><a href="${urls.logout}" title="${i18n().log_out}">${i18n().log_out}</a></li>
-                                </ul>
-                            </li>
-                         </ul>
-                     </li>
-                
-                ${scripts.add('<script type="text/javascript" src="${urls.base}/js/userMenu/userMenuUtils.js"></script>')}
-                
-            <#else>
-                <li role="listitem"><a class="log-out" title="${i18n().login_to_manage_site}" href="${urls.login}">${i18n().login_button}</a></li>
+<nav role="navigation">
+    <ul id="header-nav" role="list">
+        <#include "languageSelector.ftl">
+        <li role="listitem"><a href="${urls.index}" title="${i18n().index}">${i18n().index}</a></li>
+        <#if user.loggedIn>
+            <#if user.hasSiteAdminAccess>
+                <li role="listitem"><a href="${urls.siteAdmin}" title="${i18n().site_admin}">${i18n().site_admin}</a></li>
             </#if>
-        </ul>
-        
-    </nav>
\ No newline at end of file
+                <li>
+                    <ul class="dropdown">
+                        <li id="user-menu"><a href="#" title="${i18n().current_user}">${user.loginName}</a>
+                            <ul class="sub_menu">
+                                 <#if urls.myAccount??>
+                                     <li role="listitem"><a href="${urls.myAccount}" title="${i18n().myAccount_heading}">${i18n().myAccount_heading}</a></li>
+                                 </#if>
+                                 <li role="listitem"><a href="${urls.logout}" title="${i18n().log_out}">${i18n().log_out}</a></li>
+                            </ul>
+                        </li>
+                     </ul>
+                 </li>
+
+            ${scripts.add('<script type="text/javascript" src="${urls.base}/js/userMenu/userMenuUtils.js"></script>')}
+
+        <#else>
+            <li role="listitem"><a class="log-out" title="${i18n().login_to_manage_site}" href="${urls.login}">${i18n().login_button}</a></li>
+        </#if>
+    </ul>
+
+</nav>
\ No newline at end of file
diff --git a/webapp/src/main/webapp/themes/vitro/templates/menu.ftl b/webapp/src/main/webapp/themes/vitro/templates/menu.ftl
index 502cc1625..cb01d34d1 100644
--- a/webapp/src/main/webapp/themes/vitro/templates/menu.ftl
+++ b/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]-->
\ No newline at end of file
diff --git a/webapp/src/main/webapp/themes/vitro/templates/page-home.ftl b/webapp/src/main/webapp/themes/vitro/templates/page-home.ftl
index 85b519eca..4cbe67040 100644
--- a/webapp/src/main/webapp/themes/vitro/templates/page-home.ftl
+++ b/webapp/src/main/webapp/themes/vitro/templates/page-home.ftl
@@ -10,37 +10,39 @@
     </head>
     
     <body class="${bodyClasses!}">
-        <#include "identity.ftl">
-        
+        <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>
-                
+
                 <p>${i18n().vitro_description}</p>
                 <p>${i18n().with_vitro}</p>
-                
+
                 <ul>
                     <li>${i18n().vitro_bullet_one}</li>
                     <li>${i18n().vitro_bullet_two}</li>
                     <li>${i18n().vitro_bullet_three}</li>
                     <li>${i18n().vitro_bullet_four}</li>
                 </ul>
-                
+
                 <section id="search-home" role="region">
                     <h3>${i18n().search_vitro} <span class="search-filter-selected">filteredSearch</span></h3>
-                    
+
                     <fieldset>
                         <legend>${i18n().search_form}</legend>
-                        <form id="search-homepage" action="${urls.search}" name="search-home" role="search" method="post" > 
+                        <form id="search-homepage" action="${urls.search}" name="search-home" role="search" method="post" >
                             <div id="search-home-field">
                                 <input type="text" name="querytext" class="search-homepage" value="${querytext!}" autocapitalize="off" />
                                 <input type="submit" value="${i18n().search_button}" class="search" />
                                 <input type="hidden" name="classgroup" class="search-homepage" value="" autocapitalize="off" />
                             </div>
-                            
+
                             <a class="filter-search filter-default" href="#" title="${i18n().filter_search}"><span class="displace">${i18n().filter_search}</span></a>
-                            
+
                             <ul id="filter-search-nav">
                                 <li><a class="active" href="">${i18n().all_capitalized}</a></li>
                                 <@lh.allClassGroupNames vClassGroups! />
@@ -48,15 +50,14 @@
                         </form>
                     </fieldset>
                 </section> <!-- #search-home -->
-                
+
             </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>
diff --git a/webapp/src/main/webapp/themes/vitro/templates/page.ftl b/webapp/src/main/webapp/themes/vitro/templates/page.ftl
index 7bdc24f56..aa286f1e8 100644
--- a/webapp/src/main/webapp/themes/vitro/templates/page.ftl
+++ b/webapp/src/main/webapp/themes/vitro/templates/page.ftl
@@ -9,12 +9,15 @@
     </head>
     
     <body class="${bodyClasses!}">
-        <#include "identity.ftl">
-        <#include "search.ftl">
+        <header id="branding" role="banner">
+            <#include "identity.ftl">
+            <#include "search.ftl">
+        </header>
         <#include "menu.ftl">
-        
-        ${body}
-        
+
+        <div id="wrapper-content" role="main">
+            ${body}
+        </div>
         <#include "footer.ftl">
     </body>
 </html>
\ No newline at end of file
diff --git a/webapp/src/main/webapp/themes/vitro/templates/themeStylesheets.ftl b/webapp/src/main/webapp/themes/vitro/templates/themeStylesheets.ftl
new file mode 100644
index 000000000..46a2ddb82
--- /dev/null
+++ b/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" />
