tyler.durden/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2025-07-29 16:54:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Johannes Meyer 2015-09-30 12:38:31 +02:00
commit 8b0c820f89
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
application/forms/Config/Resource/DbResourceForm.php
View File

@ -138,6 +138,14 @@ class DbResourceForm extends Form
'description' => $this->translate('The password to use for authentication') '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( $this->addElement(
'checkbox', 'checkbox',
'persistent', 'persistent',

4
modules/setup/application/views/scripts/index/parts/finish.phtml
View File

@ -8,7 +8,7 @@
<?php if ($success): ?> <?php if ($success): ?>
<?= $this->qlink( <?= $this->qlink(
$this->translate('Login to Icinga Web 2'), $this->translate('Login to Icinga Web 2'),
'authentication/login', 'authentication/login?renderLayout',
null, null,
array( array(
'class' => 'button-like login', 'class' => 'button-like login',
@ -30,4 +30,4 @@
<pre class="log-output"><?= join("\n\n", array_map(function($a) { <pre class="log-output"><?= join("\n\n", array_map(function($a) {
return join("\n", $a); return join("\n", $a);
}, $report)); ?></pre> }, $report)); ?></pre>
</div> </div>