Focus in Admin-Masken setzen; DB-Super-User aus Auth-DB-Konfiguration vorbelegen

diff --git a/SL/Controller/Admin.pm b/SL/Controller/Admin.pm
index ac4aca5..d633b98 100644 (file)
--- a/SL/Controller/Admin.pm
+++ b/SL/Controller/Admin.pm
@@ -375,8 +375,6 @@ sub action_database_administration {
   $::form->{dbpasswd}  ||= $::auth->{DB_config}->{password};
   $::form->{dbdefault} ||= 'template1';
 
-  $::request->layout->focus('#dbhost');
-
   $self->render('admin/dbadmin', title => t8('Database Administration'));
 }
 
@@ -547,7 +545,6 @@ sub use_multiselect_js {
 
 sub login_form {
   my ($self, %params) = @_;
-  $::request->layout->focus('#admin_password');
   $self->render('admin/adminlogin', title => t8('kivitendo v#1 administration', $::form->read_version), %params);
 }
 

diff --git a/templates/webpages/admin/adminlogin.html b/templates/webpages/admin/adminlogin.html
index 263bef8..8c0d821 100644 (file)
--- a/templates/webpages/admin/adminlogin.html
+++ b/templates/webpages/admin/adminlogin.html
@@ -24,7 +24,7 @@
           <table>
            <tr>
             <th align="right">[% 'Password' | $T8 %]</th>
-            <td>[%- L.input_tag("{AUTH}admin_password", '', type="password", class="login", id="admin_password", size="30") %]</td>
+            <td>[%- L.input_tag("{AUTH}admin_password", '', type="password", class="login", id="admin_password", size="30", class="initial_focus") %]</td>
            </tr>
           </table>
 

diff --git a/templates/webpages/admin/check_auth_database.html b/templates/webpages/admin/check_auth_database.html
index 2a3c51d..80f0698 100644 (file)
--- a/templates/webpages/admin/check_auth_database.html
+++ b/templates/webpages/admin/check_auth_database.html
@@ -34,7 +34,7 @@
    [% 'Please enter the name of the database that will be used as the template for the new database:' | $T8 %]
   </p>
 
-  <p>[% 'Template database' | $T8 %]: <input name="db_template" value="template1"></p>
+  <p>[% 'Template database' | $T8 %]: [% L.input_tag('db_template', "template1") %]</p>
 
   <p>
    [% 'If the database user listed above does not have the right to create a database then enter the name and password of the superuser below:' | $T8 %]
@@ -43,12 +43,12 @@
   <table border="0">
    <tr>
     <td>[% 'Superuser name' | $T8 %]:</td>
-    <td>[% L.input_tag('db_superuser', '') %]</td>
+    <td>[% L.input_tag('db_superuser', AUTH.DB_config.user, class="initial_focus") %]</td>
    </tr>
 
    <tr>
     <td>[% 'Password' | $T8 %]:</td>
-    <td>[% L.input_tag('db_superuser_password', '', type='password') %]</td>
+    <td>[% L.input_tag('db_superuser_password', AUTH.DB_config.password, type='password') %]</td>
    </tr>
   </table>
 

diff --git a/templates/webpages/admin/create_dataset.html b/templates/webpages/admin/create_dataset.html
index 220ed84..8b999f0 100644 (file)
--- a/templates/webpages/admin/create_dataset.html
+++ b/templates/webpages/admin/create_dataset.html
@@ -20,7 +20,7 @@
 
   <tr>
    <th align="right" nowrap>[% LxERP.t8('Create Dataset') %]</th>
-   <td>[% L.input_tag('db', FORM.db) %]</td>
+   <td>[% L.input_tag('db', FORM.db, class="initial_focus") %]</td>
   </tr>
 
   <tr>

diff --git a/templates/webpages/admin/dbadmin.html b/templates/webpages/admin/dbadmin.html
index a0e91a7..dc0a214 100644 (file)
--- a/templates/webpages/admin/dbadmin.html
+++ b/templates/webpages/admin/dbadmin.html
@@ -10,7 +10,7 @@
  <table>
   <tr>
    <th align="right">[% LxERP.t8('Host') %]</th>
-   <td>[% L.input_tag('dbhost', FORM.dbhost, size=30) %]</td>
+   <td>[% L.input_tag('dbhost', FORM.dbhost, size=30, class="initial_focus") %]</td>
    <th align="right">[% LxERP.t8('Port') %]</th>
    <td>[% L.input_tag('dbport', FORM.dbport, size=6) %]</td>
   </tr>

diff --git a/templates/webpages/admin/delete_dataset.html b/templates/webpages/admin/delete_dataset.html
index b32f1ed..e27657e 100644 (file)
--- a/templates/webpages/admin/delete_dataset.html
+++ b/templates/webpages/admin/delete_dataset.html
@@ -16,7 +16,7 @@
 <form method="post" action="controller.pl">
  <p>
   [% LxERP.t8('Please select the dataset you want to delete:') %]
-  [% L.select_tag('db', SELF.all_unused_dbsources) %]
+  [% L.select_tag('db', SELF.all_unused_dbsources, class="initial_focus") %]
  </p>
 
  [% L.hidden_tag("dbhost", FORM.dbhost) %]

diff --git a/templates/webpages/admin/edit_client.html b/templates/webpages/admin/edit_client.html
index e6cacaa..8dd3298 100644 (file)
--- a/templates/webpages/admin/edit_client.html
+++ b/templates/webpages/admin/edit_client.html
@@ -23,7 +23,7 @@
 
   <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>
@@ -33,22 +33,22 @@
 
   <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") %]
    </td>
   </tr>
  </table>
@@ -127,7 +127,7 @@
   function test_database_connectivity() {
     open_jqm_window({
       url:  'controller.pl?action=Admin/test_database_connectivity',
-      data: $("INPUT[data-dbsettings=1]").serialize(),
+      data: $(".contains_dbsettings]").serialize(),
       type: 'POST',
       id:   'test_db_connection_window'
     });

diff --git a/templates/webpages/admin/edit_group.html b/templates/webpages/admin/edit_group.html
index 78e1fb6..6313717 100644 (file)
--- a/templates/webpages/admin/edit_group.html
+++ b/templates/webpages/admin/edit_group.html
@@ -16,7 +16,7 @@
  <table>
   <tr>
    <th align="right">[% LxERP.t8('Name') %]</th>
-   <td>[% L.input_tag("group.name", SELF.group.name) %]</td>
+   <td>[% L.input_tag("group.name", SELF.group.name, class="initial_focus") %]</td>
   </tr>
 
   <tr>
@@ -33,12 +33,12 @@
   [% SET section_number = loop.count %]
   [% SET num_checked = 0 %]
   [% FOREACH right = section.rights %][% SET name = right.name %][% IF granted_rights.$name %][% SET num_checked = num_checked + 1 %][% END %][% END %]
-  <h3>[% L.checkbox_tag('dummy' _ section_number, label=LxERP.t8('Section "#1"', section.description), checkall='[data-checkallgroup=' _ section_number _ ']', checked=(num_checked == section.rights.size)) %]</h3>
+  <h3>[% L.checkbox_tag('dummy' _ section_number, label=LxERP.t8('Section "#1"', section.description), checkall='[.checkallgroup' _ section_number _ ']', checked=(num_checked == section.rights.size)) %]</h3>
 
   <div class="clearfix">
    [% FOREACH right = section.rights %]
     [% SET name = right.name %]
-    [% L.checkbox_tag("group.rights_map." _ name, label=right.description, checked=granted_rights.$name, 'data-checkallgroup'=section_number) %]
+    [% L.checkbox_tag("group.rights_map." _ name, label=right.description, checked=granted_rights.$name, class="checkallgroup" _ section_number) %]
     <br>
    [%- END %]
   </div>

diff --git a/templates/webpages/admin/edit_printer.html b/templates/webpages/admin/edit_printer.html
index 8e2f5a2..7064416 100644 (file)
--- a/templates/webpages/admin/edit_printer.html
+++ b/templates/webpages/admin/edit_printer.html
@@ -12,7 +12,7 @@
  <table>
   <tr>
    <th align="right">[% LxERP.t8('Printer Description') %]</th>
-   <td>[% L.input_tag("printer.printer_description", SELF.printer.printer_description, size=30) %]</td>
+   <td>[% L.input_tag("printer.printer_description", SELF.printer.printer_description, size=30, class="initial_focus") %]</td>
   <tr>
   <tr>
    <th align="right">[% LxERP.t8('Printer Command') %]</th>

diff --git a/templates/webpages/admin/edit_user.html b/templates/webpages/admin/edit_user.html
index f8154bf..b8b5dc4 100644 (file)
--- a/templates/webpages/admin/edit_user.html
+++ b/templates/webpages/admin/edit_user.html
@@ -20,7 +20,7 @@
     <table>
      <tr>
       <th align="right">[% LxERP.t8('Login Name') %]</th>
-      <td>[% L.input_tag("user.login", SELF.user.login) %]</td>
+      <td>[% L.input_tag("user.login", SELF.user.login, class="initial_focus") %]</td>
      </tr>
 
      [%- IF AUTH.can_change_password %]