Make icons clickable in menus

2 files changed, 36 insertions, 8 deletions

diff --git a/app/Helper/ModalHelper.php b/app/Helper/ModalHelper.php
index e6037a8c..b3241b9d 100644
--- a/app/Helper/ModalHelper.php
+++ b/app/Helper/ModalHelper.php
@@ -43,31 +43,36 @@ class ModalHelper extends Base
 
     public function large($icon, $label, $controller, $action, array $params = array())
     {
-        $html = '<i class="fa fa-'.$icon.' fa-fw js-modal-large" aria-hidden="true"></i> '.$label;
+        $html = '<i class="fa fa-'.$icon.' fa-fw js-modal-large" aria-hidden="true"></i>'.$label;
         return $this->helper->url->link($html, $controller, $action, $params, false, 'js-modal-large');
     }
 
     public function medium($icon, $label, $controller, $action, array $params = array())
     {
-        $html = '<i class="fa fa-'.$icon.' fa-fw js-modal-medium" aria-hidden="true"></i> '.$label;
+        $html = '<i class="fa fa-'.$icon.' fa-fw js-modal-medium" aria-hidden="true"></i>'.$label;
         return $this->helper->url->link($html, $controller, $action, $params, false, 'js-modal-medium');
     }
 
     public function small($icon, $label, $controller, $action, array $params = array())
     {
-        $html = '<i class="fa fa-'.$icon.' fa-fw js-modal-small" aria-hidden="true"></i> '.$label;
+        $html = '<i class="fa fa-'.$icon.' fa-fw js-modal-small" aria-hidden="true"></i>'.$label;
         return $this->helper->url->link($html, $controller, $action, $params, false, 'js-modal-small');
     }
 
     public function mediumButton($icon, $label, $controller, $action, array $params = array())
     {
-        $html = '<i class="fa fa-'.$icon.' fa-fw js-modal-medium" aria-hidden="true"></i> '.$label;
+        $html = '<i class="fa fa-'.$icon.' fa-fw js-modal-medium" aria-hidden="true"></i>'.$label;
         return $this->helper->url->link($html, $controller, $action, $params, false, 'js-modal-medium btn');
     }
 
     public function confirm($icon, $label, $controller, $action, array $params = array())
     {
-        $html = '<i class="fa fa-'.$icon.' fa-fw js-modal-confirm" aria-hidden="true"></i> '.$label;
+        $html = '<i class="fa fa-'.$icon.' fa-fw js-modal-confirm" aria-hidden="true"></i>'.$label;
         return $this->helper->url->link($html, $controller, $action, $params, false, 'js-modal-confirm');
     }
+
+    public function confirmLink($label, $controller, $action, array $params = array())
+    {
+        return $this->helper->url->link($label, $controller, $action, $params, false, 'js-modal-confirm');
+    }
 }
diff --git a/app/Helper/UrlHelper.php b/app/Helper/UrlHelper.php
index bfcf07e6..94412cf5 100644
--- a/app/Helper/UrlHelper.php
+++ b/app/Helper/UrlHelper.php
@@ -48,6 +48,29 @@ class UrlHelper extends Base
     }
 
     /**
+     * Link element with icon
+     *
+     * @access public
+     * @param  string  $icon        Icon name
+     * @param  string  $label       Link label
+     * @param  string  $controller  Controller name
+     * @param  string  $action      Action name
+     * @param  array   $params      Url parameters
+     * @param  boolean $csrf        Add a CSRF token
+     * @param  string  $class       CSS class attribute
+     * @param  string  $title       Link title
+     * @param  boolean $newTab      Open the link in a new tab
+     * @param  string  $anchor      Link Anchor
+     * @param  bool    $absolute
+     * @return string
+     */
+    public function icon($icon, $label, $controller, $action, array $params = array(), $csrf = false, $class = '', $title = '', $newTab = false, $anchor = '', $absolute = false)
+    {
+        $html = '<i class="fa fa-fw fa-'.$icon.'" aria-hidden="true"></i>'.$label;
+        return $this->helper->url->link($html, $controller, $action, $params, $csrf, $class, $title, $newTab, $anchor, $absolute);
+    }
+
+    /**
      * Link element
      *
      * @access public
@@ -58,14 +81,14 @@ class UrlHelper extends Base
      * @param  boolean $csrf        Add a CSRF token
      * @param  string  $class       CSS class attribute
      * @param  string  $title       Link title
-     * @param  boolean $new_tab     Open the link in a new tab
+     * @param  boolean $newTab      Open the link in a new tab
      * @param  string  $anchor      Link Anchor
      * @param  bool    $absolute
      * @return string
      */
-    public function link($label, $controller, $action, array $params = array(), $csrf = false, $class = '', $title = '', $new_tab = false, $anchor = '', $absolute = false)
+    public function link($label, $controller, $action, array $params = array(), $csrf = false, $class = '', $title = '', $newTab = false, $anchor = '', $absolute = false)
     {
-        return '<a href="'.$this->href($controller, $action, $params, $csrf, $anchor, $absolute).'" class="'.$class.'" title=\''.$title.'\' '.($new_tab ? 'target="_blank"' : '').'>'.$label.'</a>';
+        return '<a href="'.$this->href($controller, $action, $params, $csrf, $anchor, $absolute).'" class="'.$class.'" title=\''.$title.'\' '.($newTab ? 'target="_blank"' : '').'>'.$label.'</a>';
     }
 
     /**