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

NIHVIVO-2299 NIHVIVO-2279 Merge from the dev branch - replace User with UserAccounts, implement the root user policy.

Browse source
This commit is contained in:
j2blake 2011-06-09 14:42:09 +00:00
commit 253c8a3082
65 changed files with 1190 additions and 2029 deletions
Download patch file Download diff file Expand all files Collapse all files

9
webapp/web/templates/freemarker/body/admin/admin-showAuth.ftl
View file

@ -10,12 +10,15 @@ ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/showAuth.css" /
<#if currentUser?has_content>
<table summary="Information about the current user" style="border: 1">
<caption>Current user</caption>
<tr><th>URI:</th><td>${currentUser.URI}</td></tr>
<tr><th>URI:</th><td>${currentUser.uri}</td></tr>
<tr><th>First name:</th><td>${currentUser.firstName}</td></tr>
<tr><th>Last name:</th><td>${currentUser.lastName}</td></tr>
<tr><th>Username:</th><td>${currentUser.username}</td></tr>
<tr><th>Email:</th><td>${currentUser.emailAddress}</td></tr>
<tr><th>External Auth ID:</th><td>${currentUser.externalAuthId}</td></tr>
<tr><th>Login count:</th><td>${currentUser.loginCount}</td></tr>
<tr><th>Role:</th><td>${currentUser.roleURI}</td></tr>
<#list currentUser.permissionSetUris as role>
<tr><th>Role:</th><td>${role}</td></tr>
</#list>
</table>
<#else>
<h3>Not logged in</h3>

8
webapp/web/templates/freemarker/body/login/adminLogin.ftl
View file

@ -5,7 +5,7 @@
<section id="internalLogin" role="region">
<h2>Internal Login</h2>
<#if errorNoUser??>
<#if errorNoEmail??>
<#assign errorMessage = "No email supplied." />
</#if>
@ -52,11 +52,11 @@
<label for="confirmPassword">Confirm Password</label>
<input id="confirmPassword" name="confirmPassword" class="text-field" type="password" required />
<input id="username" name="username" type="hidden" value="${username!}" />
<input id="email" name="email" type="hidden" value="${email!}" />
<input id="password" name="password" type="hidden" value="${password!}" />
<#else>
<label for="username">Email</label>
<input id="username" name="username" class="text-field focus" type="text" value="${username!}" required autofocus />
<label for="email">Email</label>
<input id="email" name="email" class="text-field focus" type="text" value="${email!}" required autofocus />
<label for="password">Password</label>
<input id="password" name="password" class="text-field" type="password" required />

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

@ -17,8 +17,8 @@
<li><a href="${siteConfig.urls.menuN3Editor}">Menu management</a></li>
</#if>
<#if siteConfig.urls.users??>
<li><a href="${siteConfig.urls.users}">User accounts</a></li>
<#if siteConfig.urls.userList??>
<li><a href="${siteConfig.urls.userList}">User accounts</a></li>
</#if>
</ul>