Merge branch 'master' into bugfix/separate-configuration-files-for-navigation-items-10246

application/forms/Config/Resource/DbResourceForm.php

@@ -138,6 +138,14 @@ class DbResourceForm extends Form
                 'description'       => $this->translate('The password to use for authentication')
             )
         );
+        $this->addElement(
+            'text',
+            'charset',
+            array (
+                'description'   => $this->translate('The character set for the database'),
+                'label'         => $this->translate('Character Set')
+            )
+        );
         $this->addElement(
             'checkbox',
             'persistent',

modules/setup/application/views/scripts/index/parts/finish.phtml

@@ -8,7 +8,7 @@
   <?php if ($success): ?>
     <?= $this->qlink(
         $this->translate('Login to Icinga Web 2'),
-        'authentication/login',
+        'authentication/login?renderLayout',
         null,
         array(
             'class' => 'button-like login',