X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=templates%2Fwebpages%2Fadmin%2Flist_users.html;h=17778c28f931a79ea31a58fd78bc06ea71d7f85f;hb=c0318621a7eb2c05cfec74d2fbbd37025a03dc3d;hp=6d7309f42ceec8232e2cc4ee2046f2530f1ff3bd;hpb=b61f5c3df68e3a3b4fb6a8a287172b0989215748;p=kivitendo-erp.git

diff --git a/templates/webpages/admin/list_users.html b/templates/webpages/admin/list_users.html
index 6d7309f42..17778c28f 100644
--- a/templates/webpages/admin/list_users.html
+++ b/templates/webpages/admin/list_users.html
@@ -8,35 +8,47 @@
   <p>
    <table width="100%">
     <tr>
-     <th class="listtop">[% 'Login' | $T8 %]</th>
+     <th class="listtop">[% 'Login Name' | $T8 %]</th>
      <th class="listtop">[% 'Name' | $T8 %]</th>
      <th class="listtop">[% 'Company' | $T8 %]</th>
-     <th class="listtop">[% 'Driver' | $T8 %]</th>
-     <th class="listtop">[% 'Host' | $T8 %]</th>
-     <th class="listtop">[% 'Dataset' | $T8 %]</th>
      <th class="listtop">[% 'Templates' | $T8 %]</th>
+     <th class="listtop">[% 'Print' | $T8 %]</th>
+     <th class="listtop">[% 'Language' | $T8 %]</th>
+     <th class="listtop">[% 'Dataset' | $T8 %]</th>
+     <th class="listtop">[% 'Host' | $T8 %]</th>
+     <th class="listtop">[% 'Last Action' | $T8 %]</th>
+<!-- <th class="listtop">[% 'Driver' | $T8 %]</th> -->
     </tr>
 
     [% FOREACH row = MEMBERS %]
      <tr class="listrow[% loop.count % 2 %]">
-      <td><a href="admin.pl?action=edit&login=[% HTML.url(row.login) %]">[% HTML.escape(row.login) %]</a></td>
-      <td>[% HTML.escape(row.name) %]</td>
-      <td>[% HTML.escape(row.company) %]</td>
-      <td>[% HTML.escape(row.dbdriver) %]</td>
-      <td>[% IF row.dbhost %][% HTML.escape(row.dbhost) %][% ELSE %]localhost[% END %]</td>
-      <td>[% HTML.escape(row.dbname) %]</td>
-      <td>[% HTML.escape(row.templates) %]</td>
+      <td>&nbsp;<a href="admin.pl?action=edit&user.id=[% HTML.url(row.id) %]">[% HTML.escape(row.login) %]</a></td>
+      <td>&nbsp;[% HTML.escape(row.name) %]</td>
+      <td>&nbsp;[% HTML.escape(row.company) %]</td>
+      <td>&nbsp;[% HTML.escape(row.templates) %]</td>
+      <td>&nbsp;[% HTML.escape(row.template_format) %]</td>
+      <td>&nbsp;[% HTML.escape(row.countrycode) %]</td>
+      <td>&nbsp;[% HTML.escape(row.dbname) %]</td>
+      <td>&nbsp;[% IF row.dbhost %][% HTML.escape(row.dbhost) %][% ELSE %]localhost[% END %]</td>
+      <td>&nbsp;
+        [% IF( row.last_action ) %]
+          [% HTML.escape(row.last_action) %]
+        [% ELSE %]
+          [% 'not logged in' | $T8 %]
+        [% END %]</td>
+<!--  <td>&nbsp;[% HTML.escape(row.dbdriver) %]</td> -->
      </tr>
     [% END %]
 
-    <td colspan="7"><hr size="3" noshade></td>
    </table>
+  <hr size="3" noshade>
   </p>
 
 
   <input type="submit" class="submit" name="action" value="[% 'Add User' | $T8 %]">
   <input type="submit" class="submit" name="action" value="[% 'Edit groups' | $T8 %]">
   <input type="submit" class="submit" name="action" value="[% 'Pg Database Administration' | $T8 %]">
+  <input type="submit" class="submit" name="action" value="[% 'Printer Management' | $T8 %]">
   [% IF LOCKED %]
    <input type="submit" class="submit" name="action" value="[% 'Unlock System' | $T8 %]">
    [% ELSE %]
@@ -44,18 +56,19 @@
   [% END %]
   <input type="submit" class="submit" name="action" value="[% 'Logout' | $T8 %]">
 
+  <div style="background-color: #FFFFDA; font-size: 12px; padding: 0.5em; max-width: 720px; margin: 1em;">
   <p>[% 'Click on login name to edit!' | $T8 %]</p>
-
-  <p>[% 'To add a user to a group edit a name, change the login name and save. A new user with the same variables will then be saved under the new login name.' | $T8 %]</p>
+  <p>[% 'To add a user to a group edit a name, change the login name and save.  A new user with the same variables will then be saved under the new login name.' | $T8 %]</p>
+  </div>
  </form>
 
  <form method="post" action="login.pl">
 
-  <div class="listheading">Lx-Office ERP [% 'Login' | $T8 %]</div>
+  <div class="listheading">[% 'User Login' | $T8 %]</div>
 
   <table border="0">
    <tr>
-    <th align="right">[% 'Name' | $T8 %]</th>
+    <th align="right">[% 'Login Name' | $T8 %]</th>
     <td><input class="login" name="login"></td>
     <td>&nbsp;</td>
    </tr>