From 3a0465cecd96531f2bd5306f7b1a6fa8b2802860 Mon Sep 17 00:00:00 2001
From: rjy7 <rjy7@43c2fc9b-1942-4403-87b2-35b4218f7473>
Date: Wed, 9 Jun 2010 19:37:17 +0000
Subject: [PATCH] Added Support link to header and footer link lists. Modified
 firstLastList macro so it doesn't require delimiters separating the list
 items.

---
 .../vivo-basic/templates/page/partials/footer.ftl   |  5 +----
 .../vivo-basic/templates/page/partials/identity.ftl | 13 +++++--------
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/themes/vivo-basic/templates/page/partials/footer.ftl b/themes/vivo-basic/templates/page/partials/footer.ftl
index 98176322..d3b2ffd3 100644
--- a/themes/vivo-basic/templates/page/partials/footer.ftl
+++ b/themes/vivo-basic/templates/page/partials/footer.ftl
@@ -11,10 +11,7 @@
     <div class="footerLinks">
         <ul class="otherNav">  
             <@l.firstLastList> 
-                <li><a href="${urls.about}" title="more about this web site">About</a></li>,
-                <#if urls.contact??>    
-                    <li><a href="${urls.contact}" title="feedback form">Contact Us</a></li>
-                </#if> 
+                <#include "subMenuLinks.ftl">
             </@l.firstLastList>
         </ul>
     </div>
diff --git a/themes/vivo-basic/templates/page/partials/identity.ftl b/themes/vivo-basic/templates/page/partials/identity.ftl
index 89885c9d..0bd86625 100644
--- a/themes/vivo-basic/templates/page/partials/identity.ftl
+++ b/themes/vivo-basic/templates/page/partials/identity.ftl
@@ -16,17 +16,14 @@
         <@l.firstLastList>  
             <#if loginName??>
                 <li>
-                    Logged in as <strong>${loginName}</strong> (<a href="${urls.logout}">Log out</a>)     
-                </li>, 
-                <li><a href="${urls.siteAdmin}">Site Admin</a></li>, 
+                    Logged in as <strong>${loginName}</strong> (<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>,
+                 <li><a title="log in to manage this site" href="${urls.login}">Log in</a></li>
             </#if> 
             
-            <li><a href="${urls.about}">About</a></li>,
-            <#if urls.contact??>
-                <li><a href="${urls.contact}">Contact Us</a></li>
-            </#if> 
+            <#include "subMenuLinks.ftl">
         </@l.firstLastList>       
     </ul>   
 </div>
\ No newline at end of file