From 9db43283218e644e3765cdc8781a42b774205c2a Mon Sep 17 00:00:00 2001
From: manolobevia <manolobevia@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Fri, 8 Jul 2011 16:56:26 +0000
Subject: [PATCH] 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.

---
 webapp/web/css/account/account.css                |  3 +++
 .../body/accounts/userAccounts-list.ftl           | 15 +++++++--------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/webapp/web/css/account/account.css b/webapp/web/css/account/account.css
index 1b7e4c7f6..b17cf82fc 100644
--- a/webapp/web/css/account/account.css
+++ b/webapp/web/css/account/account.css
@@ -50,6 +50,9 @@ table#account td {
     padding-top: .5em;
     padding-bottom: .5em;
 }
+table#account td  a{
+    word-wrap: break-word;
+}
 #filter-roles {
     float: left;
     padding-bottom: 20px;
diff --git a/webapp/web/templates/freemarker/body/accounts/userAccounts-list.ftl b/webapp/web/templates/freemarker/body/accounts/userAccounts-list.ftl
index f935c0bf5..f34a5e2e2 100644
--- a/webapp/web/templates/freemarker/body/accounts/userAccounts-list.ftl
+++ b/webapp/web/templates/freemarker/body/accounts/userAccounts-list.ftl
@@ -116,16 +116,16 @@
                 
                 <th scope="col">Roles</th>
                 
-                <#--<th scope="col">
-                    Login count
+                <th scope="col">
+                    Login&nbsp;count
                     <nav class="account-alpha-browse">
                         <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>
                     </nav>
-                </th>-->
+                </th>
 
                 <th scope="col">
-                    Last Login Time
+                    Last&nbsp;Login
                     <nav class="account-alpha-browse">
                         <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>
@@ -152,12 +152,11 @@
                             <div>${permissionSet}</div>
                         </#list>
                     </td>
-                    <#--<td>${account.loginCount}</td>-->
+                    <td>${account.loginCount}</td>
                     <td>
                         <#if account.lastLoginTime??>
-                            ${account.lastLoginTime?datetime?string.full}
-                        <#else>
-                            &nbsp;
+                            ${account.lastLoginTime?date?string.medium}
+                            <br />${account.lastLoginTime?time?string.short}
                         </#if>
                     </td>
                 </tr>