From 080458b6889ea18d26389ad56d269b574211c7df Mon Sep 17 00:00:00 2001
From: rjy7 <rjy7@43c2fc9b-1942-4403-87b2-35b4218f7473>
Date: Tue, 23 Nov 2010 01:28:43 +0000
Subject: [PATCH] NIHVIVO-1386 Self-editors don't get SiteAdmin link in top
 nav. They also don't get revision info link in footer. Implemented with new
 User template model class. Changed tests for loginName, showFlag1Status in
 templates to use this object.

---
 themes/vivo-basic/templates/identity.ftl |  8 +++---
 themes/vivo-basic/templates/search.ftl   |  4 +--
 themes/wilma/templates/footer.ftl        |  2 +-
 themes/wilma/templates/menu.ftl          | 13 ++++++----
 themes/wilma/templates/page-home.ftl     | 31 ++++++++++++------------
 themes/wilma/templates/page.ftl          | 14 ++++++-----
 6 files changed, 40 insertions(+), 32 deletions(-)

diff --git a/themes/vivo-basic/templates/identity.ftl b/themes/vivo-basic/templates/identity.ftl
index a47ba9c6..be71685a 100644
--- a/themes/vivo-basic/templates/identity.ftl
+++ b/themes/vivo-basic/templates/identity.ftl
@@ -19,11 +19,13 @@
     
     <ul id="otherMenu">  
         <@l.firstLastList>  
-            <#if loginName??>
+            <#if user.loggedIn>
                 <li>
-                    Logged in as <strong>${loginName}</strong> (<a href="${urls.logout}">Log out</a>)
+                    Logged in as <strong>${user.loginName}</strong> (<a href="${urls.logout}">Log out</a>)
                 </li>                                        
-                <li><a href="${urls.siteAdmin}">Site Admin</a></li>
+                <#if user.hasSiteAdminAccess>
+                    <li><a href="${urls.siteAdmin}">Site Admin</a></li>
+                </#if>
             <#else>
                  <li><a title="log in to manage this site" href="${urls.login}">Log in</a></li>
             </#if> 
diff --git a/themes/vivo-basic/templates/search.ftl b/themes/vivo-basic/templates/search.ftl
index f61d64c3..ee3e410e 100644
--- a/themes/vivo-basic/templates/search.ftl
+++ b/themes/vivo-basic/templates/search.ftl
@@ -4,9 +4,9 @@
     <form id="searchForm" action="${urls.search}" >                    
         <label for="search">Search </label>
 
-        <#if showFlag1SearchField??>
+        <#if user.showFlag1SearchField>
             <select id="search-form-modifier" name="flag1" class="form-item" >
-                <option value="nofiltering" selected="selected">entire database (${loginName})</option>
+                <option value="nofiltering" selected="selected">entire database (${user.loginName})</option>
                 <option value="${portalId}">${siteTagline!}</option>
             </select>
         <#else>
diff --git a/themes/wilma/templates/footer.ftl b/themes/wilma/templates/footer.ftl
index 11708c26..6021286a 100644
--- a/themes/wilma/templates/footer.ftl
+++ b/themes/wilma/templates/footer.ftl
@@ -11,7 +11,7 @@
             ${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> 
-            <#if loginName??>
+            <#if user.hasRevisionInfoAccess>
                 | Version <a href="${version.moreInfoUrl}">${version.label}</a>
             </#if>
         </p>
diff --git a/themes/wilma/templates/menu.ftl b/themes/wilma/templates/menu.ftl
index 61346edb..0324ce93 100644
--- a/themes/wilma/templates/menu.ftl
+++ b/themes/wilma/templates/menu.ftl
@@ -13,10 +13,12 @@
 
     <nav role="navigation">
         <ul id="header-nav">    
-            <#if loginName??>
-                <li><span class="pictos-arrow-10">U</span> ${loginName}</li>
+            <#if user.loggedIn>
+                <li><span class="pictos-arrow-10">U</span> ${user.loginName}</li>
                 <li><a href="${urls.logout}">Log out</a></li>
-                <li><a href="${urls.siteAdmin}">Site Admin</a></li>
+                <#if user.hasSiteAdminAccess>
+                    <li><a href="${urls.siteAdmin}">Site Admin</a></li>
+                </#if>
             <#else>
                 <li><a title="log in to manage this site" href="${urls.login}">Log in</a></li>
             </#if>
@@ -37,9 +39,10 @@
             <legend>Search form</legend>
 
             <form id="searchForm" action="${urls.search}" name="searchForm" role="search"> 
-                <#if showFlag1SearchField??>
+            
+                <#if user.showFlag1SearchField>
                     <select id="search-form-modifier" name="flag1" class="form-item" >
-                        <option value="nofiltering" selected="selected">entire database (${loginName})</option>
+                        <option value="nofiltering" selected="selected">entire database (${user.loginName})</option>
                         <option value="${portalId}">${siteTagline!}</option>
                     </select>
                 <#else>
diff --git a/themes/wilma/templates/page-home.ftl b/themes/wilma/templates/page-home.ftl
index 91f0970e..7831b123 100644
--- a/themes/wilma/templates/page-home.ftl
+++ b/themes/wilma/templates/page-home.ftl
@@ -35,20 +35,21 @@
 
             <nav role="navigation">
                 <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. -->
+                    <#if user.loggedIn>
+                        <li><span class="pictos-arrow-10">U</span> ${user.loginName}</li>
+                        <li><a href="${urls.logout}">Log out</a></li>
+                        <#if user.hasSiteAdminAccess>
+                            <li><a href="${urls.siteAdmin}">Site Admin</a></li>
+                        </#if>
+                    <#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> 
+                    <#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>
@@ -58,9 +59,9 @@
                     <legend>Search form</legend>
 
                     <form id="searchForm" action="${urls.search}" name="searchForm" role="search"> 
-                       <#if showFlag1SearchField??>
+                       <#if user.showFlag1SearchField>
                            <select id="search-form-modifier" name="flag1" class="form-item" >
-                               <option value="nofiltering" selected="selected">entire database (${loginName})</option>
+                               <option value="nofiltering" selected="selected">entire database (${user.loginName})</option>
                                <option value="${portalId}">${siteTagline!}</option>
                            </select>
                        <#else>
@@ -225,7 +226,7 @@
                     ${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> 
-                    <#if loginName??>
+                    <#if user.hasRevisionInfoAccess>
                         | Version <a href="${version.moreInfoUrl}">${version.label}</a>
                     </#if>
                 </p>
diff --git a/themes/wilma/templates/page.ftl b/themes/wilma/templates/page.ftl
index fb223c0e..ac9c4c7d 100644
--- a/themes/wilma/templates/page.ftl
+++ b/themes/wilma/templates/page.ftl
@@ -35,10 +35,12 @@
 
             <nav role="navigation">
                 <ul id="header-nav">
-                    <#if loginName??>
-                        <li><span class="pictos-arrow-10">U</span> ${loginName}</li>
+                    <#if user.loggedIn>
+                        <li><span class="pictos-arrow-10">U</span> ${user.loginName}</li>
                         <li><a href="${urls.logout}">Log out</a></li>
-                        <li><a href="${urls.siteAdmin}">Site Admin</a></li>
+                        <#if user.hasSiteAdminAccess>
+                            <li><a href="${urls.siteAdmin}">Site Admin</a></li>
+                        </#if>
                     <#else>
                         <li><a title="log in to manage this site" href="${urls.login}">Log in</a></li>
                     </#if>
@@ -56,9 +58,9 @@
                     <legend>Search form</legend>
                     
                     <form id="searchForm" action="${urls.search}" name="searchForm" role="search"> 
-                        <#if showFlag1SearchField??>
+                        <#if user.showFlag1SearchField>
                             <select id="search-form-modifier" name="flag1" class="form-item" >
-                                <option value="nofiltering" selected="selected">entire database (${loginName})</option>
+                                <option value="nofiltering" selected="selected">entire database (${user.loginName})</option>
                                 <option value="${portalId}">${siteTagline!}</option>
                             </select>
                         
@@ -108,7 +110,7 @@
                 <#else>
                 </#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> 
-                    <#if loginName??>
+                    <#if user.hasRevisionInfoAccess>
                         | Version <a href="${version.moreInfoUrl}">${version.label}</a>
                     </#if>
                 </p>