NIHVIVO 2836 Merged r8772 from maint-rel-vivo-1.3 branch.

webapp/web/templates/freemarker/body/individualList-checkForData.ftl

@@ -0,0 +1,28 @@
+<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
+
+<#if (individuals?size == 0)>
+    <#assign noData = true />
+<#else>
+    <#assign noData = false />
+</#if>
+
+<#assign noDataNotification>    
+    <#if user.loggedIn>
+        <#if user.authorizedToRebuildSearchIndex>
+            <span class="contentNote">
+                <h4>Expecting content?</h4>
+                <p>Try <a title="Rebuild the search index for this site" href="${urls.base}/SearchIndex">rebuilding the search index</a>.</p>
+            </span>
+        </#if>
+    <#else>
+        <span class="contentNote">
+            <p>Please <a href="${urls.login}" title="log in to manage this site">log in</a> to manage content.</p>
+        </span>
+    </#if>
+    
+    <h3>There is currently no ${title} content in the system</h3>
+    
+    <#if user.loggedIn && user.hasSiteAdminAccess>
+        <p>You can <a href="${urls.siteAdmin}" title="Manage content">add content and manage this site</a> from the Site Administration page.</p>
+    </#if>
+</#assign>

webapp/web/templates/freemarker/body/individualList.ftl

@@ -4,6 +4,8 @@
 
 <#import "lib-list.ftl" as l>
 
+<#include "individualList-checkForData.ftl">
+
 ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/browseIndex.css" />')}
 
 <section class="individualList">
@@ -16,6 +18,7 @@ ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/browseIndex.css
         <h4>${subtitle}</h4>
     </#if>
     
+    <#if (!noData)>
         <#if errorMessage?has_content>
             <p>${errorMessage}</p>
         <#else>
@@ -47,4 +50,7 @@ ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/browseIndex.css
             
             ${pagination}
         </#if>
+    <#else>
+        ${noDataNotification}
+    </#if>
 </section> <!-- .individualList -->