Admin: bei Admin/login direkt Redirect zu show, falls bereits eingeloggt

[mfinanz.git] / templates / webpages / admin / show.html

diff --git a/templates/webpages/admin/show.html b/templates/webpages/admin/show.html
index 06d0e917605df2dc2a1e161bd37d44f782c0b433..b707237f7d3a67d8f0ed1864fe8ebe614b0312b2 100644 (file)
--- a/templates/webpages/admin/show.html
+++ b/templates/webpages/admin/show.html
@@ -7,17 +7,17 @@
 <div>
  [% LxERP.t8("Actions") %]:
  <span class="link_separator"></span>
 <div>
  [% LxERP.t8("Actions") %]:
  <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="new_user"), LxERP.t8("Add User")) %]
  <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="edit_groups"), LxERP.t8("Edit groups")) %]
+ [% L.link(SELF.url_for(action="new_client"), LxERP.t8("Add Client")) %]
+ <span class="link_separator">|</span>
+ [% L.link(SELF.url_for(action="new_group"), LxERP.t8("Add User Group")) %]

  <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>
  <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")) %]
+ [% L.link(SELF.url_for(action="list_printers"), LxERP.t8("Printer Management")) %]

  <span class="link_separator">|</span>
  <span class="link_separator">|</span>

- [% IF LOCKED %]
+ [% IF SELF.is_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")) %]
   [% 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")) %]


@@ -34,24 +34,25 @@
  <ul>
   <li><a href="#user_list">[%- LxERP.t8("User list") %]</a></li>
   <li><a href="#client_list">[%- LxERP.t8("Client list") %]</a></li>
  <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">
  </ul>
 
  <div id="user_list">

-[%- IF !USERS.size %]
+[%- IF !SELF.all_users.size %]

   <p>
    [% LxERP.t8("No users have been created yet.") %]
   <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 %]
   <table width="100%">
   </p>
 
 [%- ELSE %]
   <table width="100%">

-   <tr>
-    <th class="listtop">[% LxERP.t8('Login Name') %]</th>
-    <th class="listtop">[% LxERP.t8('Name') %]</th>
-    <th class="listtop">[% LxERP.t8('Language') %]</th>
+   <tr class="listheading">
+    <th>[% LxERP.t8('Login Name') %]</th>
+    <th>[% LxERP.t8('Name') %]</th>
+    <th>[% LxERP.t8('Language') %]</th>

    </tr>
 
    </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>
 [%- 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,29 +65,55 @@
  </div>
 
  <div id="client_list">
  </div>
 
  <div id="client_list">

-[%- IF !CLIENTS.size %]
+[%- IF !SELF.all_clients.size %]

   <p>
    [% LxERP.t8("No clients have been created yet.") %]
   <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%">
   </p>
 
 [%- ELSE %]
   <table width="100%">

-   <tr>
-    <th class="listtop">[% LxERP.t8('Client name') %]</th>
-    <th class="listtop">[% LxERP.t8('Database ID') %]</th>
-    <th class="listtop">[% LxERP.t8('Database name') %]</th>
-    <th class="listtop">[% LxERP.t8('Database Host') %]</th>
-    <th class="listtop">[% LxERP.t8('Database User') %]</th>
+   <tr class="listheading">
+    <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>

    </tr>
 
    </tr>
 

-[%- FOREACH client = CLIENTS %]
+[%- FOREACH client = SELF.all_clients %]

    <tr class="listrow">
    <tr class="listrow">

-    <td>[% L.link(SELF.url_for(action="edit_client", client_id=client.id), HTML.escape(client.name)) %]</td>
-    <td>[% HTML.escape(client.id) %]</td>
+    <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.dbname) %]</td>
     <td>[% HTML.escape(client.dbhost) %][% IF client.dbport %]:[%- HTML.escape(client.dbport) %][%- END %]</td>
     <td>[% HTML.escape(client.dbuser) %]</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>
+   </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>
    </tr>
 [%- END %]
   </table>