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

NIHVIVO-2280: Formatted date and time for Last login column in main account management. Changed Last login time for Last login, so I have some space for including Login count.

Browse source
This commit is contained in:
manolobevia 2011-07-08 16:56:26 +00:00
parent e9b939e1c5
commit 9db4328321
2 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

3
webapp/web/css/account/account.css
View file

@ -50,6 +50,9 @@ table#account td {
padding-top: .5em; padding-top: .5em;
padding-bottom: .5em; padding-bottom: .5em;
} }
table#account td a{
word-wrap: break-word;
}
#filter-roles { #filter-roles {
float: left; float: left;
padding-bottom: 20px; padding-bottom: 20px;

15
webapp/web/templates/freemarker/body/accounts/userAccounts-list.ftl
View file

@ -116,16 +116,16 @@
<th scope="col">Roles</th> <th scope="col">Roles</th>
<#--<th scope="col"> <th scope="col">
Login count Login&nbsp;count
<nav class="account-alpha-browse"> <nav class="account-alpha-browse">
<a class="sort-asc" href="?accountsPerPage=${accountsPerPage}&orderField=count&orderDirection=ASC" title="ascending order"></a> <a class="sort-asc" href="?accountsPerPage=${accountsPerPage}&orderField=count&orderDirection=ASC" title="ascending order"></a>
<a class="sort-desc" href="?accountsPerPage=${accountsPerPage}&orderField=count&orderDirection=DESC" title="descending order"></a> <a class="sort-desc" href="?accountsPerPage=${accountsPerPage}&orderField=count&orderDirection=DESC" title="descending order"></a>
</nav> </nav>
</th>--> </th>
<th scope="col"> <th scope="col">
Last Login Time Last&nbsp;Login
<nav class="account-alpha-browse"> <nav class="account-alpha-browse">
<a class="sort-asc" href="?accountsPerPage=${accountsPerPage}&orderField=lastLogin&orderDirection=ASC" title="ascending order"></a> <a class="sort-asc" href="?accountsPerPage=${accountsPerPage}&orderField=lastLogin&orderDirection=ASC" title="ascending order"></a>
<a class="sort-desc" href="?accountsPerPage=${accountsPerPage}&orderField=lastLogin&orderDirection=DESC" title="descending order"></a> <a class="sort-desc" href="?accountsPerPage=${accountsPerPage}&orderField=lastLogin&orderDirection=DESC" title="descending order"></a>
@ -152,12 +152,11 @@
<div>${permissionSet}</div> <div>${permissionSet}</div>
</#list> </#list>
</td> </td>
<#--<td>${account.loginCount}</td>--> <td>${account.loginCount}</td>
<td> <td>
<#if account.lastLoginTime??> <#if account.lastLoginTime??>
${account.lastLoginTime?datetime?string.full} ${account.lastLoginTime?date?string.medium}
<#else> <br />${account.lastLoginTime?time?string.short}
&nbsp;
</#if> </#if>
</td> </td>
</tr> </tr>