Merge remote-tracking branch 'origin/master' into feature/redesign-7144

Vagrantfile

@@ -54,7 +54,6 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   # the path on the host to the actual folder. The second argument is
   # the path on the guest to mount the folder. And the optional third
   # argument is a set of non-required options.
-  config.vm.synced_folder "./config", "/vagrant/config"
   config.vm.synced_folder "./var/log", "/vagrant/var/log"
 
   # Provider-specific configuration so you can fine-tune various

application/forms/Config/General/ApplicationConfigForm.php

@@ -31,7 +31,7 @@ class ApplicationConfigForm extends Form
     {
         $this->addElement(
             'text',
-            'global_modulePath',
+            'global_module_path',
             array(
                 'label'         => t('Module Path'),
                 'required'      => true,

application/forms/Config/GeneralConfigForm.php

@@ -41,7 +41,7 @@ class GeneralConfigForm extends ConfigForm
     {
         $sections = array();
         foreach ($this->getValues() as $sectionAndPropertyName => $value) {
-            list($section, $property) = explode('_', $sectionAndPropertyName);
+            list($section, $property) = explode('_', $sectionAndPropertyName, 2);
             if (! isset($sections[$section])) {
                 $sections[$section] = array();
             }

bin/icingacli

@@ -1,5 +1,4 @@
 #!/usr/bin/php
-
 <?php
 // {{{ICINGA_LICENSE_HEADER}}}
 // {{{ICINGA_LICENSE_HEADER}}}

library/Icinga/Application/ApplicationBootstrap.php

@@ -372,7 +372,7 @@ abstract class ApplicationBootstrap
         $this->moduleManager = new ModuleManager(
             $this,
             $this->configDir . '/enabledModules',
-            explode(':', $this->config->fromSection('global', 'modulePath', $this->baseDir . '/modules'))
+            explode(':', $this->config->fromSection('global', 'module_path', $this->baseDir . '/modules'))
         );
         return $this;
     }

modules/doc/application/controllers/StyleController.php

@@ -2,11 +2,19 @@
 
 use Icinga\Application\Icinga;
 use Icinga\Web\Controller;
+use Icinga\Web\Widget;
 
 class Doc_StyleController extends Controller
 {
     public function fontAction()
     {
+        $this->view->tabs = Widget::create('tabs')->add(
+            'fonts',
+            array(
+                'title' => $this->translate('Icons'),
+                'url' => 'doc/style/font'
+            )
+        )->activate('fonts');
         $confFile = Icinga::app()->getApplicationDir('fonts/fontanello-ifont/config.json');
         $this->view->font = json_decode(file_get_contents($confFile));
     }

modules/doc/application/views/scripts/module/chapter.phtml

@@ -0,0 +1,3 @@
+<div class="chapter">
+    <?= $sectionRenderer->render($this, $this->getHelper('Url')); ?>
+</div>

modules/doc/application/views/scripts/module/toc.phtml

@@ -0,0 +1,6 @@
+<div class="controls">
+    <h1><?= $title ?></h1>
+</div>
+<div class="content toc">
+    <?= $tocRenderer->render($this, $this->getHelper('Url')); ?>
+</div>

modules/doc/application/views/scripts/style/font.phtml

@@ -1,4 +1,5 @@
 <div class="controls">
+<?= $this->tabs ?>
 <h1>Icinga Web 2 Icons</h1>
 </div>
 

modules/doc/configuration.php

@@ -17,7 +17,7 @@ $section->add('Icinga Web 2', array(
 $section->add('Module documentations', array(
     'url' => 'doc/module',
 ));
-$section->add($this->translate('Fonts'), array(
+$section->add($this->translate('Developer - Style'), array(
     'url' => 'doc/style/font',
     'priority' => 200,
 ));