diff --git a/ChangeLog b/ChangeLog
index 88623a95d..5eb184475 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,7 @@ Improvements:
* Rewrite dialog and confirmation boxes (inline popup)
* Remove TaskGanttCreationController
* Add helpers to open modal boxes
+* Make icons clickable in menus
Version 1.0.36 (Dec 30, 2016)
-----------------------------
diff --git a/app/Helper/ModalHelper.php b/app/Helper/ModalHelper.php
index e6037a8cc..b3241b9df 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 = ' '.$label;
+ $html = ''.$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 = ' '.$label;
+ $html = ''.$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 = ' '.$label;
+ $html = ''.$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 = ' '.$label;
+ $html = ''.$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 = ' '.$label;
+ $html = ''.$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 bfcf07e67..94412cf5f 100644
--- a/app/Helper/UrlHelper.php
+++ b/app/Helper/UrlHelper.php
@@ -47,6 +47,29 @@ class UrlHelper extends Base
return $this->link($html, $controller, $action, $params, false, $class);
}
+ /**
+ * 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 = ''.$label;
+ return $this->helper->url->link($html, $controller, $action, $params, $csrf, $class, $title, $newTab, $anchor, $absolute);
+ }
+
/**
* Link element
*
@@ -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 ''.$label.'';
+ return ''.$label.'';
}
/**
diff --git a/app/Template/activity/project.php b/app/Template/activity/project.php
index e8e62777d..6d1e4a2e8 100644
--- a/app/Template/activity/project.php
+++ b/app/Template/activity/project.php
@@ -2,10 +2,10 @@
projectHeader->render($project, 'ActivityController', $this->app->getRouterAction()) ?>
-