[icinga-checkins] icinga.org: icingaweb2-module-director/feature/icinga1-config-12919: Data: flip field/list order, as fields are...

git at icinga.org git at icinga.org
Wed Oct 19 13:17:42 CEST 2016


Module: icingaweb2-module-director
Branch: feature/icinga1-config-12919
Commit: 8c2d5ec7f9efc43c832bc5afd68938fcef715ef1
URL:    https://git.icinga.org/?p=icingaweb2-module-director.git;a=commit;h=8c2d5ec7f9efc43c832bc5afd68938fcef715ef1

Author: Thomas Gelf <thomas at gelf.net>
Date:   Mon Oct 17 17:24:27 2016 +0000

Data: flip field/list order, as fields are...

...more important

---

 application/views/scripts/index/index.phtml          |    2 +-
 library/Director/Web/Controller/ActionController.php |   12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/application/views/scripts/index/index.phtml b/application/views/scripts/index/index.phtml
index ea24956..6113bf6 100644
--- a/application/views/scripts/index/index.phtml
+++ b/application/views/scripts/index/index.phtml
@@ -109,8 +109,8 @@ $all = array(
         array('database',     $this->translate('Import data sources'), 'director/list/importsource', $this->translate('Define and manage imports from various data sources'), $this->importState),
         array('flapping',     $this->translate('Synchronize'), 'director/list/syncrule', $this->translate('Define how imported data should be synchronized with Icinga'), $this->syncState),
         array('clock',     $this->translate('Jobs'), 'director/jobs', $this->translate('Schedule and automate Import, Syncronization, Config Deployment, Housekeeping and more'), $this->jobState),
-        array('sort-name-up', $this->translate('Provide data lists'), 'director/data/lists', $this->translate('Provide data lists to make life easier for your users')),
         array('edit',         $this->translate('Define data fields'), 'director/data/fields', $this->translate('Data fields make sure that configuration fits your rules')),
+        array('sort-name-up', $this->translate('Provide data lists'), 'director/data/lists', $this->translate('Provide data lists to make life easier for your users')),
     )
 );
 ?>
diff --git a/library/Director/Web/Controller/ActionController.php b/library/Director/Web/Controller/ActionController.php
index d1de32c..b83f742 100644
--- a/library/Director/Web/Controller/ActionController.php
+++ b/library/Director/Web/Controller/ActionController.php
@@ -128,17 +128,17 @@ abstract class ActionController extends Controller
     protected function setDataTabs()
     {
         $this->view->tabs = Widget::create('tabs')->add(
-            'datalist',
-            array(
-                'label' => $this->translate('Data lists'),
-                'url'   => 'director/data/lists'
-            )
-        )->add(
             'datafield',
             array(
                 'label' => $this->translate('Data fields'),
                 'url'   => 'director/data/fields'
             )
+        )->add(
+            'datalist',
+            array(
+                'label' => $this->translate('Data lists'),
+                'url'   => 'director/data/lists'
+            )
         );
         return $this->view->tabs;
     }



More information about the icinga-checkins mailing list