X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=templates%2Fwebpages%2Fadmin%2Fedit_client.html;h=01363b8541920a75faa25f8fa65edd030a8014fa;hb=b52b09d864eb75703562a5fdd8d2b09c66669927;hp=392b6c4e524d5ed2d004dcaf4fa3b9858b5102b3;hpb=9636227ee0ce9cb050db33573e523d68764ebde8;p=kivitendo-erp.git

diff --git a/templates/webpages/admin/edit_client.html b/templates/webpages/admin/edit_client.html
index 392b6c4e5..01363b854 100644
--- a/templates/webpages/admin/edit_client.html
+++ b/templates/webpages/admin/edit_client.html
@@ -5,8 +5,6 @@
 
 <h1>[% HTML.escape(title) %]</h1>
 
-<p>[% L.link(SELF.url_for(action="show"), LxERP.t8("Back")) %]</p>
-
 <form method="post" action="controller.pl" id="form">
  [% L.hidden_tag("client.id", SELF.client.id) %]
  [% L.hidden_tag("action", "") %]
@@ -14,9 +12,16 @@
  <h2>[%- LxERP.t8("Settings") %]</h2>
 
  <table>
+[%- IF SELF.client.id %]
+  <tr>
+   <th align="right">[% LxERP.t8('Database ID') %]</th>
+   <td>[%- HTML.escape(SELF.client.id) %]</td>
+  </tr>
+[%- END %]
+
   <tr>
    <th align="right">[% LxERP.t8('Client name') %]</th>
-   <td>[% L.input_tag("client.name", SELF.client.name) %]</td>
+   <td>[% L.input_tag("client.name", SELF.client.name, class="initial_focus") %]</td>
   </tr>
 
   <tr>
@@ -26,22 +31,29 @@
 
   <tr>
    <th align="right">[% LxERP.t8('Database name') %]</th>
-   <td>[% L.input_tag("client.dbname", SELF.client.dbname, 'data-dbsettings'=1) %]</td>
+   <td>[% L.input_tag("client.dbname", SELF.client.dbname, class="contains_dbsettings") %]</td>
   </tr>
 
   <tr>
    <th align="right">[% LxERP.t8('Database host and port') %]</th>
    <td>
-    [% L.input_tag("client.dbhost", SELF.client.dbhost, 'data-dbsettings'=1) %]
-    [% L.input_tag("client.dbport", SELF.client.dbport, 'data-dbsettings'=1, size=6) %]
+    [% L.input_tag("client.dbhost", SELF.client.dbhost, class="contains_dbsettings") %]
+    [% L.input_tag("client.dbport", SELF.client.dbport, class="contains_dbsettings", size=6) %]
    </td>
   </tr>
 
   <tr>
    <th align="right">[% LxERP.t8('Database user and password') %]</th>
    <td>
-    [% L.input_tag("client.dbuser",   SELF.client.dbuser, 'data-dbsettings'=1) %]
-    [% L.input_tag("client.dbpasswd", SELF.client.dbpasswd, 'data-dbsettings'=1) %]
+    [% L.input_tag("client.dbuser",   SELF.client.dbuser, class="contains_dbsettings") %]
+    [% L.input_tag("client.dbpasswd", SELF.client.dbpasswd, class="contains_dbsettings", type="password") %]
+   </td>
+  </tr>
+
+  <tr>
+   <th align="right">[% LxERP.t8("Run task server for this client with the following user") %]</th>
+   <td>
+    [% L.select_tag("client.task_server_user_id", SELF.all_users, with_empty=1, empty_title=LxERP.t8("Do not run the task server for this client"), title_key="login", default=SELF.client.task_server_user_id) %]
    </td>
   </tr>
  </table>
@@ -58,7 +70,7 @@
  </p>
 
  <div class="clearfix">
-  [% L.select_tag("client.users[]", SELF.all_users, id="client_users", title_key="login", default=SELF.client.users, default_key='id', multiple=1) %]
+  [% L.select_tag("client.users[]", SELF.all_users, id="client_users", title_key="login", default=SELF.client.users, default_value_key='id', multiple=1) %]
   [% L.multiselect2side("client_users", labelsx => LxERP.t8("All users"), labeldx => LxERP.t8("Users that have access to this client")) %]
  </div>
 
@@ -76,7 +88,7 @@
  </p>
 
  <div class="clearfix">
-  [% L.select_tag("client.groups[]", SELF.all_groups, id="client_groups", title_key="name", default=SELF.client.groups, default_key='id', multiple=1) %]
+  [% L.select_tag("client.groups[]", SELF.all_groups, id="client_groups", title_key="name", default=SELF.client.groups, default_value_key='id', multiple=1) %]
   [% L.multiselect2side("client_groups", labelsx => LxERP.t8("All groups"), labeldx => LxERP.t8("Groups valid for this client")) %]
  </div>
 
@@ -118,10 +130,12 @@
   }
 
   function test_database_connectivity() {
-    open_jqm_window({
-      url:  'controller.pl?action=Admin/test_database_connectivity',
-      data: $("INPUT[data-dbsettings=1]").serialize(),
-      type: 'POST'
+    kivi.popup_dialog({
+      url:    'controller.pl?action=Admin/test_database_connectivity',
+      data:   $(".contains_dbsettings").serialize(),
+      type:   'POST',
+      id:     'test_db_connection_window',
+      dialog: { title: kivi.t8('Database Connection Test') }
     });
     return true;
   }