Merge pull request #2236 from splitbrain/AddSVGToButtons

feat: add optionally an SVG to html_btn
dokuwiki · Jan 24, 2018 · a409094 · a409094
2 parents e6517f1 + e824d63
commit a409094
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/inc/Menu/Item/AbstractItem.php b/inc/Menu/Item/AbstractItem.php
@@ -171,7 +171,6 @@ public function asHtmlLink($classprefix = 'menuitem ', $svg = true) {
      *
      * Uses html_btn()
      *
-     * @todo this does currently not support the SVG icon
      * @return string
      */
     public function asHtmlButton() {
@@ -182,7 +181,8 @@ public function asHtmlButton() {
             $this->getParams(),
             $this->method,
             $this->getTitle(),
-            $this->getLabel()
+            $this->getLabel(),
+            $this->getSvg()
         );
     }
 

diff --git a/inc/html.php b/inc/html.php
@@ -188,9 +188,10 @@ function html_topbtn(){
  * @param string         $method
  * @param string         $tooltip
  * @param bool|string    $label  label text, false: lookup btn_$name in localization
+ * @param string         $svg (optional) svg code, inserted into the button
  * @return string
  */
-function html_btn($name, $id, $akey, $params, $method='get', $tooltip='', $label=false){
+function html_btn($name, $id, $akey, $params, $method='get', $tooltip='', $label=false, $svg=null){
     global $conf;
     global $lang;
 
@@ -233,7 +234,12 @@ function html_btn($name, $id, $akey, $params, $method='get', $tooltip='', $label
         $ret .= 'accesskey="'.$akey.'" ';
     }
     $ret .= 'title="'.$tip.'">';
-    $ret .= hsc($label);
+    if ($svg) {
+        $ret .= '<span>' . hsc($label) . '</span>';
+        $ret .= inlineSVG($svg);
+    } else {
+        $ret .= hsc($label);
+    }
     $ret .= '</button>';
     $ret .= '</div></form>';
 
@@ -2314,4 +2320,4 @@ function html_sizechange($sizechange, Doku_Form $form) {
         $form->addElement($value);
         $form->addElement(form_makeCloseTag('span'));
     }
-}
+}