Merge pull request #42 from grouse/html-icon-options

Reuse HtmlHelper::tag and allow for options to be passed to function,…

Author: Holt59

src/View/Helper/BootstrapHtmlHelper.php

@@ -49,26 +49,32 @@ public function __construct (\Cake\View\View $view, array $config = []) {
      * @param $icon Name of the icon.
      *
     **/
-    public function icon ($icon) {
-        return $this->_useFontAwesome ? $this->faIcon($icon) : $this->glIcon($icon);
+    public function icon ($icon, $options = array()) {
+        return $this->_useFontAwesome ? $this->faIcon($icon, $options) : $this->glIcon($icon, $options);
     }
 
     /**
      * Create a font awesome icon.
      *
      * @param $icon Name of the icon.
      */
-    public function faIcon ($icon) {
-        return '<i class="fa fa-'.$icon.'"></i>' ;
+    public function faIcon ($icon, $options = array()) {
+        $options = $this->addClass($options, 'fa');
+        $options = $this->addClass($options, 'fa-'.$icon);
+
+        return $this->tag('i', '', $options);
     }
 
     /**
      * Create a glyphicon icon.
      *
      * @param $icon Name of the icon.
      */
-    public function glIcon ($icon) {
-        return '<i class="glyphicon glyphicon-'.$icon.'"></i>';
+    public function glIcon ($icon, $options = array()) {
+        $options = $this->addClass($options, 'glyphicon');
+        $options = $this->addClass($options, 'glyphicon-'.$icon);
+
+        return $this->tag('i', '', $options);
     }
 
     /**