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

NIHVIVO-2492 Fix misspelling of has_content, add guards against trying to use empty URLs.

Browse source
This commit is contained in:
j2blake 2011-04-20 16:20:41 +00:00
parent c89c7b2b30
commit 4d78b2896d
2 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
webapp/web/templates/freemarker/body/siteAdmin/siteAdmin-dataInput.ftl
View file

@ -4,7 +4,7 @@
<#import "lib-form.ftl" as form> <#import "lib-form.ftl" as form>
<#if dataInput?hasContent> <#if dataInput?has_content>
<div class="pageBodyGroup"> <div class="pageBodyGroup">
<h3>Data Input</h3> <h3>Data Input</h3>

12
webapp/web/templates/freemarker/body/siteAdmin/siteAdmin-siteConfiguration.ftl
View file

@ -9,17 +9,23 @@
<ul> <ul>
<#if siteConfig.urls.portals??> <#if siteConfig.urls.portals??>
<li><a href="${siteConfig.urls.siteInfo}">Current portal information</a></li> <#if siteConfig.urls.siteInfo??>
<li><a href="${siteConfig.urls.siteInfo}">Current portal information</a></li>
</#if>
<li><a href="${siteConfig.urls.portals}">List all portals</a></li> <li><a href="${siteConfig.urls.portals}">List all portals</a></li>
<#else> <#else>
<li><a href="${siteConfig.urls.siteInfo}">Site information</a></li> <#if siteConfig.urls.siteInfo??>
<li><a href="${siteConfig.urls.siteInfo}">Site information</a></li>
</#if>
</#if> </#if>
<#if siteConfig.urls.menuN3Editor??> <#if siteConfig.urls.menuN3Editor??>
<li><a href="${siteConfig.urls.menuN3Editor}">Menu management</a></li> <li><a href="${siteConfig.urls.menuN3Editor}">Menu management</a></li>
</#if> </#if>
<li><a href="${siteConfig.urls.tabs}">Tab management</a></li> <#if siteConfig.urls.tabs??>
<li><a href="${siteConfig.urls.tabs}">Tab management</a></li>
</#if>
<#if siteConfig.urls.users??> <#if siteConfig.urls.users??>
<li><a href="${siteConfig.urls.users}">User accounts</a></li> <li><a href="${siteConfig.urls.users}">User accounts</a></li>