From 1d2b6b821fb9955334c38e88652c02b150209d6c Mon Sep 17 00:00:00 2001
From: nac26 <nac26@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Mon, 17 Jan 2011 02:28:45 +0000
Subject: [PATCH] NIHVIVO-1760 Updated logic for data checking templates. Will
 only suggest logging in if no authenticated session exists.

---
 webapp/web/templates/freemarker/body/menupage/menupage.ftl | 2 +-
 .../freemarker/body/partials/classgroups-checkForData.ftl  | 7 +++++--
 .../body/partials/menupage/menupage-checkForData.ftl       | 7 +++++--
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/webapp/web/templates/freemarker/body/menupage/menupage.ftl b/webapp/web/templates/freemarker/body/menupage/menupage.ftl
index 450edee0b..e64d82254 100644
--- a/webapp/web/templates/freemarker/body/menupage/menupage.ftl
+++ b/webapp/web/templates/freemarker/body/menupage/menupage.ftl
@@ -2,7 +2,7 @@
 
 <#include "menupage-checkForData.ftl">
 
-<#if (!noData)>
+<#if !noData>
     <section id="intro-menupage" role="region">
         <h3>${page.title}</h3>
     
diff --git a/webapp/web/templates/freemarker/body/partials/classgroups-checkForData.ftl b/webapp/web/templates/freemarker/body/partials/classgroups-checkForData.ftl
index 7e8b22f22..2f45a0c37 100644
--- a/webapp/web/templates/freemarker/body/partials/classgroups-checkForData.ftl
+++ b/webapp/web/templates/freemarker/body/partials/classgroups-checkForData.ftl
@@ -1,7 +1,8 @@
 <#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
 
+<#assign populatedClassGroups = 0 />
+
 <#list classGroups as classGroup>
-    <#assign populatedClassGroups = 0 />
     <#-- Check to see if any of the class groups have individuals -->
     <#if (classGroup.individualCount > 0)>
         <#assign populatedClassGroups = populatedClassGroups + 1 />
@@ -16,5 +17,7 @@
 <#assign noDataNotification>
     <h3>There is currently no content in the system</h3>
     
-    <p>Please <a href="${urls.login}" title="log in to manage this site">login</a> to manage content.</p>
+    <#if !user.loggedIn>
+        <p>Please <a href="${urls.login}" title="log in to manage this site">log in</a> to manage content.</p>
+    </#if>
 </#assign>
\ No newline at end of file
diff --git a/webapp/web/templates/freemarker/body/partials/menupage/menupage-checkForData.ftl b/webapp/web/templates/freemarker/body/partials/menupage/menupage-checkForData.ftl
index 138c8356c..b7295758a 100644
--- a/webapp/web/templates/freemarker/body/partials/menupage/menupage-checkForData.ftl
+++ b/webapp/web/templates/freemarker/body/partials/menupage/menupage-checkForData.ftl
@@ -1,7 +1,8 @@
 <#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
 
+<#assign populatedClasses = 0 />
+
 <#list vClassGroup as vClass>
-    <#assign populatedClasses = 0 />
     <#-- Check to see if any of the classes in this class group have individuals -->
     <#if (vClass.entityCount > 0)>
         <#assign populatedClasses = populatedClasses + 1 />
@@ -16,7 +17,9 @@
 <#assign noDataNotification>
     <h3>There are currently no ${page.title?lower_case} in the system</h3>
     
-    <p>Please <a href="${urls.login}" title="log in to manage this site">log in</a> to manage content.</p>
+    <#if !user.loggedIn>
+        <p>Please <a href="${urls.login}" title="log in to manage this site">log in</a> to manage content.</p>
+    </#if>
     
     <p>You can browse all of the public content currently in the system using the <a href="${urls.index}" title="browse all content">index page</a>.</p>
 </#assign>
\ No newline at end of file