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 734deaebdee6754d21683b1113de9671bdcbe2a4..b707237f7d3a67d8f0ed1864fe8ebe614b0312b2 100644 (file)
--- a/templates/webpages/admin/show.html
+++ b/templates/webpages/admin/show.html
@@ -15,7 +15,7 @@
  <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>
  [% IF SELF.is_locked %]
   [% L.link(SELF.url_for(action="unlock_system"), LxERP.t8("Unlock System")) %]
  <span class="link_separator">|</span>
  [% IF SELF.is_locked %]
   [% L.link(SELF.url_for(action="unlock_system"), LxERP.t8("Unlock System")) %]


@@ -74,8 +74,8 @@
 [%- ELSE %]
   <table width="100%">
    <tr class="listheading">
 [%- ELSE %]
   <table width="100%">
    <tr class="listheading">

-    <th>[% LxERP.t8('Client name') %]</th>

     <th>[% LxERP.t8('Database ID') %]</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('Database name') %]</th>
     <th>[% LxERP.t8('Database Host') %]</th>
     <th>[% LxERP.t8('Database User') %]</th>


@@ -84,8 +84,8 @@
 
 [%- FOREACH client = SELF.all_clients %]
    <tr class="listrow">
 
 [%- 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>[% 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>[% 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>