[icinga-checkins] icinga.org: icingaweb2-module-director/feature/nested-apply-rules-12033: FormDataFilter: change icon for expression

git at icinga.org git at icinga.org
Fri Oct 21 10:08:08 CEST 2016


Module: icingaweb2-module-director
Branch: feature/nested-apply-rules-12033
Commit: 84dfb17d154e07adc4bc7dc06f8e78734f65709c
URL:    https://git.icinga.org/?p=icingaweb2-module-director.git;a=commit;h=84dfb17d154e07adc4bc7dc06f8e78734f65709c

Author: Thomas Gelf <thomas at gelf.net>
Date:   Fri Oct 21 06:18:05 2016 +0000

FormDataFilter: change icon for expression

---

 application/views/helpers/FormDataFilter.php |   11 ++++++++++-
 library/Director/Web/Form/IconHelper.php     |   11 ++++++-----
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/application/views/helpers/FormDataFilter.php b/application/views/helpers/FormDataFilter.php
index d689f3c..e648ca2 100644
--- a/application/views/helpers/FormDataFilter.php
+++ b/application/views/helpers/FormDataFilter.php
@@ -171,7 +171,7 @@ class Zend_View_Helper_FormDataFilter extends Zend_View_Helper_FormElement
              . $this->selectSign($filter)
              . $this->element($filter)
              . $this->removeLink($filter)
-             . $this->addLink($filter);
+             . $this->expandLink($filter);
     }
 
     protected function renderFilterExpression(FilterExpression $filter, $level)
@@ -441,6 +441,15 @@ class Zend_View_Helper_FormDataFilter extends Zend_View_Helper_FormElement
         );
     }
 
+    protected function expandLink(Filter $filter)
+    {
+        return $this->filterActionButton(
+            $filter,
+            'angle-double-right',
+            t('Wrap this expression into an operator')
+        );
+    }
+
     protected function stripLink(Filter $filter)
     {
         return $this->filterActionButton(
diff --git a/library/Director/Web/Form/IconHelper.php b/library/Director/Web/Form/IconHelper.php
index 91259b5..1f7de58 100644
--- a/library/Director/Web/Form/IconHelper.php
+++ b/library/Director/Web/Form/IconHelper.php
@@ -22,11 +22,12 @@ use Icinga\Exception\ProgrammingError;
 class IconHelper
 {
     private $icons = array(
-        'minus'  => 'e806',
-        'trash'  => 'e846',
-        'plus'   => 'e805',
-        'cancel' => 'e804',
-        'help'   => 'e85b',
+        'minus'              => 'e806',
+        'trash'              => 'e846',
+        'plus'               => 'e805',
+        'cancel'             => 'e804',
+        'help'               => 'e85b',
+        'angle-double-right' => 'e87b',
     );
 
     private $mappedUtf8Icons;



More information about the icinga-checkins mailing list