tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Cleanup preferences, add them to the menu

This commit is contained in:
Thomas Gelf 2014-03-07 17:02:43 +00:00
parent 9963a21236
commit 13f827a0ef
5 changed files with 24 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
.vagrant-puppet/files/etc/icingaweb/menu.ini
View File

@ -1,15 +1,18 @@
[Dashboard] [Dashboard]
title = "Dashboard" title = "Dashboard"
url = "dashboard" url = "dashboard"
icon = "img/icons/dashboard.png" icon = "img/icons/dashboard.png"
priority = 10 priority = 10
[System] [System]
icon = img/icons/configuration.png icon = img/icons/configuration.png
priority = 200 priority = 200
[System.Configuration] [System.Configuration]
title = "Configuration" title = "Configuration"
url = "config/index" url = "config"
[System.Preferences]
title = "Preferences"
url = "preference"

4
application/controllers/PreferenceController.php
View File

@ -49,9 +49,8 @@ class PreferenceController extends BasePreferenceController
public static function createProvidedTabs() public static function createProvidedTabs()
{ {
return array( return array(
'preference' => new Tab( 'general' => new Tab(
array( array(
'name' => 'general',
'title' => 'General settings', 'title' => 'General settings',
'url' => Url::fromPath('/preference') 'url' => Url::fromPath('/preference')
) )
@ -65,6 +64,7 @@ class PreferenceController extends BasePreferenceController
public function indexAction() public function indexAction()
{ {
$form = new GeneralForm(); $form = new GeneralForm();
$this->getTabs()->activate('general');
$form->setConfiguration(IcingaConfig::app()) $form->setConfiguration(IcingaConfig::app())
->setRequest($this->getRequest()); ->setRequest($this->getRequest());
if ($form->isSubmittedAndValid()) { if ($form->isSubmittedAndValid()) {

2
application/forms/Preference/GeneralForm.php
View File

@ -256,7 +256,7 @@ class GeneralForm extends Form
$this->addTimezoneSelection($global); $this->addTimezoneSelection($global);
$this->addDateFormatSettings($global); $this->addDateFormatSettings($global);
$this->setSubmitLabel('{{SAVE_ICON}} Save Changes'); $this->setSubmitLabel('Save Changes');
$this->addElement( $this->addElement(
'checkbox', 'checkbox',

14
application/views/scripts/preference/index.phtml
View File

@ -1,15 +1,7 @@
<div class="controls">
<?= $this->tabs->render($this); ?> <?= $this->tabs->render($this); ?>
<?php if (isset($this->successMessage)) : ?>
<div class="alert alert-success">
<h4>{{SUCCESS_ICON}} <?= $this->successMessage ?></h4>
</div> </div>
<?php endif; ?>
<?php if (isset($this->exceptionMessage)): ?>
<div class="alert alert-danger">
<h4>Could not update preferences due to an internal exception (<?= $this->exceptionMessage ?>)</h4>
</div>
<?php endif; ?>
<div class="content">
<?= $this->form ?> <?= $this->form ?>
</div>

15
config/menu.ini
View File

@ -1,15 +1,18 @@
[Dashboard] [Dashboard]
title = "Dashboard" title = "Dashboard"
url = "dashboard" url = "dashboard"
icon = "img/icons/dashboard.png" icon = "img/icons/dashboard.png"
priority = 10 priority = 10
[System] [System]
icon = img/icons/configuration.png icon = img/icons/configuration.png
priority = 200 priority = 200
[System.Configuration] [System.Configuration]
title = "Configuration" title = "Configuration"
url = "config/index" url = "config"
[System.Preferences]
title = "Preferences"
url = "preference"