litvinovg/vitro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

NIHVIVO-1760 Updated logic for data checking templates. Will only suggest logging in if no authenticated session exists.

Browse source
This commit is contained in:
nac26 2011-01-17 02:28:45 +00:00
parent 3bcb46de1b
commit 1d2b6b821f
3 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
webapp/web/templates/freemarker/body/menupage/menupage.ftl
View file

@ -2,7 +2,7 @@
<#include "menupage-checkForData.ftl"> <#include "menupage-checkForData.ftl">
<#if (!noData)> <#if !noData>
<section id="intro-menupage" role="region"> <section id="intro-menupage" role="region">
<h3>${page.title}</h3> <h3>${page.title}</h3>

7
webapp/web/templates/freemarker/body/partials/classgroups-checkForData.ftl
View file

@ -1,7 +1,8 @@
<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> <#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
<#assign populatedClassGroups = 0 />
<#list classGroups as classGroup> <#list classGroups as classGroup>
<#assign populatedClassGroups = 0 />
<#-- Check to see if any of the class groups have individuals --> <#-- Check to see if any of the class groups have individuals -->
<#if (classGroup.individualCount > 0)> <#if (classGroup.individualCount > 0)>
<#assign populatedClassGroups = populatedClassGroups + 1 /> <#assign populatedClassGroups = populatedClassGroups + 1 />
@ -16,5 +17,7 @@
<#assign noDataNotification> <#assign noDataNotification>
<h3>There is currently no content in the system</h3> <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> </#assign>

7
webapp/web/templates/freemarker/body/partials/menupage/menupage-checkForData.ftl
View file

@ -1,7 +1,8 @@
<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> <#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
<#assign populatedClasses = 0 />
<#list vClassGroup as vClass> <#list vClassGroup as vClass>
<#assign populatedClasses = 0 />
<#-- Check to see if any of the classes in this class group have individuals --> <#-- Check to see if any of the classes in this class group have individuals -->
<#if (vClass.entityCount > 0)> <#if (vClass.entityCount > 0)>
<#assign populatedClasses = populatedClasses + 1 /> <#assign populatedClasses = populatedClasses + 1 />
@ -16,7 +17,9 @@
<#assign noDataNotification> <#assign noDataNotification>
<h3>There are currently no ${page.title?lower_case} in the system</h3> <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> <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> </#assign>