X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=templates%2Fwebpages%2Fadmin%2Fshow.html;h=2ae4acbd5e0002b32ef9bb5dd5ffced96e67fd8f;hb=77807bf531a9c3f945b2de1fc970439be5e95e70;hp=1f1a834ab2fc7745f2a57e2ac614fca7621ad2fe;hpb=9636227ee0ce9cb050db33573e523d68764ebde8;p=kivitendo-erp.git

diff --git a/templates/webpages/admin/show.html b/templates/webpages/admin/show.html
index 1f1a834ab..2ae4acbd5 100644
--- a/templates/webpages/admin/show.html
+++ b/templates/webpages/admin/show.html
@@ -2,45 +2,20 @@
 
 [% INCLUDE 'common/flash.html' %]
 
-<h1>[% title %]</h1>
-
-<div>
- [% LxERP.t8("Actions") %]:
- <span class="link_separator"></span>
- [% L.link(SELF.url_for(action="new_user"), LxERP.t8("Add User")) %]
- <span class="link_separator">|</span>
- [% L.link(SELF.url_for(action="new_client"), LxERP.t8("Add Client")) %]
- <span class="link_separator">|</span>
- [% L.link(SELF.url_for(action="edit_groups"), LxERP.t8("Edit groups")) %]
- <span class="link_separator">|</span>
- [% L.link(SELF.url_for(action="pg_database_administration", controller="admin.pl"), LxERP.t8("Pg Database Administration")) %]
- <span class="link_separator">|</span>
- [% L.link(SELF.url_for(action="printer_management", controller="admin.pl"), LxERP.t8("Printer Management")) %]
- <span class="link_separator">|</span>
- [% IF LOCKED %]
-  [% L.link(SELF.url_for(action="unlock_system"), LxERP.t8("Unlock System")) %]
- [% ELSE %]
-  [% L.link(SELF.url_for(action="lock_system"), LxERP.t8("Lock System")) %]
- [% END %]
- <span class="link_separator">|</span>
- [% L.link(SELF.url_for(action="logout"), LxERP.t8("Logout")) %]
- <span class="link_separator">|</span>
- [% L.link(SELF.url_for(controller="LoginScreen", action="user_login"), LxERP.t8("To user login")) %]
-</div>
-
-<hr>
+<h1>[% HTML.escape(title) %]</h1>
 
 <div class="tabwidget">
  <ul>
   <li><a href="#user_list">[%- LxERP.t8("User list") %]</a></li>
   <li><a href="#client_list">[%- LxERP.t8("Client list") %]</a></li>
+  <li><a href="#group_list">[%- LxERP.t8("Group list") %]</a></li>
  </ul>
 
  <div id="user_list">
-[%- IF !USERS.size %]
+[%- IF !SELF.all_users.size %]
   <p>
    [% LxERP.t8("No users have been created yet.") %]
-   [% LxERP.t8("In order to use kivitendo you have to create at least one client, one user, and grant that user access to the client.") %]
+   [% LxERP.t8("In order to use kivitendo you have to create at least a client, a user and a group.") %]
   </p>
 
 [%- ELSE %]
@@ -51,7 +26,7 @@
     <th>[% LxERP.t8('Language') %]</th>
    </tr>
 
-[% FOREACH user = USERS %]
+[% FOREACH user = SELF.all_users %]
 [%- SET config = user.config_values %]
    <tr class="listrow">
     <td>[% L.link(SELF.url_for(action="edit_user", id=user.id), HTML.escape(user.login)) %]</td>
@@ -64,31 +39,63 @@
  </div>
 
  <div id="client_list">
-[%- IF !CLIENTS.size %]
+[%- IF !SELF.all_clients.size %]
   <p>
    [% LxERP.t8("No clients have been created yet.") %]
-   [% LxERP.t8("In order to use kivitendo you have to create at least one client, one user, and grant that user access to the client.") %]
+   [% LxERP.t8("In order to use kivitendo you have to create at least a client, a user and a group.") %]
   </p>
 
 [%- ELSE %]
   <table width="100%">
    <tr class="listheading">
-    <th>[% LxERP.t8('Client name') %]</th>
     <th>[% LxERP.t8('Database ID') %]</th>
+    <th>[% LxERP.t8('Client name') %]</th>
     <th>[% LxERP.t8('Database name') %]</th>
     <th>[% LxERP.t8('Database Host') %]</th>
     <th>[% LxERP.t8('Database User') %]</th>
     <th>[% LxERP.t8('Default client') %]</th>
+    <th>[% LxERP.t8('Task server') %]</th>
    </tr>
 
-[%- FOREACH client = CLIENTS %]
+[%- FOREACH client = SELF.all_clients %]
    <tr class="listrow">
+    <td>[% L.link(SELF.url_for(action="edit_client", id=client.id), HTML.escape(client.id)) %]</td>
     <td>[% L.link(SELF.url_for(action="edit_client", id=client.id), HTML.escape(client.name)) %]</td>
-    <td>[% HTML.escape(client.id) %]</td>
     <td>[% HTML.escape(client.dbname) %]</td>
     <td>[% HTML.escape(client.dbhost) %][% IF client.dbport %]:[%- HTML.escape(client.dbport) %][%- END %]</td>
     <td>[% HTML.escape(client.dbuser) %]</td>
     <td>[% IF client.is_default %][% LxERP.t8("Yes") %][%- ELSE %][% LxERP.t8("No") %][%- END %]</td>
+    <td>
+     [% IF client.task_server_user %]
+      [% LxERP.t8("execution as user '#1'", client.task_server_user.login) %]
+     [% ELSE %]
+      [% LxERP.t8("no execution for this client") %]
+     [% END %]
+    </td>
+   </tr>
+[%- END %]
+  </table>
+[%- END %]
+ </div>
+
+ <div id="group_list">
+[%- IF !SELF.all_groups.size %]
+  <p>
+   [% LxERP.t8("No groups have been created yet.") %]
+   [% LxERP.t8("In order to use kivitendo you have to create at least a client, a user and a group.") %]
+  </p>
+
+[%- ELSE %]
+  <table width="100%">
+   <tr class="listheading">
+    <th>[% LxERP.t8('Name') %]</th>
+    <th>[% LxERP.t8('Description') %]</th>
+   </tr>
+
+[%- FOREACH group = SELF.all_groups %]
+   <tr class="listrow">
+    <td>[% L.link(SELF.url_for(action="edit_group", id=group.id), HTML.escape(group.name)) %]</td>
+    <td>[% HTML.escape(group.description) %]</td>
    </tr>
 [%- END %]
   </table>