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

NIHVIVO-1386 Self-editors don't get SiteAdmin link in top nav. They also don't get revision info link in footer. Implemented with new User template model class. Changed tests for loginName, showFlag1Status in templates to use this object.

Browse source
This commit is contained in:
rjy7 2010-11-23 01:28:43 +00:00
parent 8e4339cdfe
commit 080458b688
6 changed files with 40 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

6
themes/vivo-basic/templates/identity.ftl
View file

@ -19,11 +19,13 @@
<ul id="otherMenu">
<@l.firstLastList>
<#if loginName??>
<#if user.loggedIn>
<li>
Logged in as <strong>${loginName}</strong> (<a href="${urls.logout}">Log out</a>)
Logged in as <strong>${user.loginName}</strong> (<a href="${urls.logout}">Log out</a>)
</li>
<#if user.hasSiteAdminAccess>
<li><a href="${urls.siteAdmin}">Site Admin</a></li>
</#if>
<#else>
<li><a title="log in to manage this site" href="${urls.login}">Log in</a></li>
</#if>

4
themes/vivo-basic/templates/search.ftl
View file

@ -4,9 +4,9 @@
<form id="searchForm" action="${urls.search}" >
<label for="search">Search </label>
<#if showFlag1SearchField??>
<#if user.showFlag1SearchField>
<select id="search-form-modifier" name="flag1" class="form-item" >
<option value="nofiltering" selected="selected">entire database (${loginName})</option>
<option value="nofiltering" selected="selected">entire database (${user.loginName})</option>
<option value="${portalId}">${siteTagline!}</option>
</select>
<#else>

2
themes/wilma/templates/footer.ftl
View file

@ -11,7 +11,7 @@
${copyright.text}
</#if>
All Rights Reserved | <a class="terms" href="${urls.termsOfUse}">Terms of Use</a></small> | Powered by <a class="powered-by-vivo" href="http://vivoweb.org" target="_blank"><strong>VIVO</strong></a>
<#if loginName??>
<#if user.hasRevisionInfoAccess>
| Version <a href="${version.moreInfoUrl}">${version.label}</a>
</#if>
</p>

11
themes/wilma/templates/menu.ftl
View file

@ -13,10 +13,12 @@
<nav role="navigation">
<ul id="header-nav">
<#if loginName??>
<li><span class="pictos-arrow-10">U</span> ${loginName}</li>
<#if user.loggedIn>
<li><span class="pictos-arrow-10">U</span> ${user.loginName}</li>
<li><a href="${urls.logout}">Log out</a></li>
<#if user.hasSiteAdminAccess>
<li><a href="${urls.siteAdmin}">Site Admin</a></li>
</#if>
<#else>
<li><a title="log in to manage this site" href="${urls.login}">Log in</a></li>
</#if>
@ -37,9 +39,10 @@
<legend>Search form</legend>
<form id="searchForm" action="${urls.search}" name="searchForm" role="search">
<#if showFlag1SearchField??>
<#if user.showFlag1SearchField>
<select id="search-form-modifier" name="flag1" class="form-item" >
<option value="nofiltering" selected="selected">entire database (${loginName})</option>
<option value="nofiltering" selected="selected">entire database (${user.loginName})</option>
<option value="${portalId}">${siteTagline!}</option>
</select>
<#else>

13
themes/wilma/templates/page-home.ftl
View file

@ -35,11 +35,12 @@
<nav role="navigation">
<ul id="header-nav">
<#if loginName??>
<li><span class="pictos-arrow-10">U</span> ${loginName}</li>
<#if user.loggedIn>
<li><span class="pictos-arrow-10">U</span> ${user.loginName}</li>
<li><a href="${urls.logout}">Log out</a></li>
<#if user.hasSiteAdminAccess>
<li><a href="${urls.siteAdmin}">Site Admin</a></li>
</#if>
<#else>
<li><a title="log in to manage this site" href="${urls.login}">Log in</a></li>
</#if>
@ -58,9 +59,9 @@
<legend>Search form</legend>
<form id="searchForm" action="${urls.search}" name="searchForm" role="search">
<#if showFlag1SearchField??>
<#if user.showFlag1SearchField>
<select id="search-form-modifier" name="flag1" class="form-item" >
<option value="nofiltering" selected="selected">entire database (${loginName})</option>
<option value="nofiltering" selected="selected">entire database (${user.loginName})</option>
<option value="${portalId}">${siteTagline!}</option>
</select>
<#else>
@ -225,7 +226,7 @@
${copyright.text}
</#if>
All Rights Reserved | <a class="terms" href="${urls.termsOfUse}">Terms of Use</a></small> | Powered by <a class="powered-by-vivo" href="http://vivoweb.org" target="_blank"><strong>VIVO</strong></a>
<#if loginName??>
<#if user.hasRevisionInfoAccess>
| Version <a href="${version.moreInfoUrl}">${version.label}</a>
</#if>
</p>

12
themes/wilma/templates/page.ftl
View file

@ -35,10 +35,12 @@
<nav role="navigation">
<ul id="header-nav">
<#if loginName??>
<li><span class="pictos-arrow-10">U</span> ${loginName}</li>
<#if user.loggedIn>
<li><span class="pictos-arrow-10">U</span> ${user.loginName}</li>
<li><a href="${urls.logout}">Log out</a></li>
<#if user.hasSiteAdminAccess>
<li><a href="${urls.siteAdmin}">Site Admin</a></li>
</#if>
<#else>
<li><a title="log in to manage this site" href="${urls.login}">Log in</a></li>
</#if>
@ -56,9 +58,9 @@
<legend>Search form</legend>
<form id="searchForm" action="${urls.search}" name="searchForm" role="search">
<#if showFlag1SearchField??>
<#if user.showFlag1SearchField>
<select id="search-form-modifier" name="flag1" class="form-item" >
<option value="nofiltering" selected="selected">entire database (${loginName})</option>
<option value="nofiltering" selected="selected">entire database (${user.loginName})</option>
<option value="${portalId}">${siteTagline!}</option>
</select>
@ -108,7 +110,7 @@
<#else>
</#if>
All Rights Reserved | <a class="terms" href="${urls.termsOfUse}">Terms of Use</a></small> | Powered by <a class="powered-by-vivo" href="http://vivoweb.org" target="_blank"><strong>VIVO</strong></a>
<#if loginName??>
<#if user.hasRevisionInfoAccess>
| Version <a href="${version.moreInfoUrl}">${version.label}</a>
</#if>
</p>