Allow main button labels

mlt · May 22, 2018 · 7c8bd45 · 7c8bd45
1 parent 02d5879
commit 7c8bd45
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/app/views/tabulatr/_tabulatr_buttons.html.slim b/app/views/tabulatr/_tabulatr_buttons.html.slim
@@ -1,7 +1,11 @@
 .btn-group
   - buttons[:buttons].each do |button|
     - o = (button[:options] || {}).merge(class: "btn btn-sm btn-default #{button[:options].try(:[], :class)}")
-    = link_to fa_icon(button[:icon]), button[:path], o
+    = link_to button[:path], o do
+      - if button[:icon].present?
+        => fa_icon(button[:icon])
+      - if button[:label].present?
+        = button[:label]
   - if buttons[:submenu].present?
     button.btn.btn-default.btn-sm.dropdown-toggle data-toggle='dropdown'
       span.caret

diff --git a/lib/tabulatr/data/button_builder.rb b/lib/tabulatr/data/button_builder.rb
@@ -48,7 +48,7 @@ def val
   def button(icon, path, options={})
     label = options.dup.delete(:label)
     if @mode == :buttons
-      @buttons << {icon: icon, path: path, options: options}
+      @buttons << {icon: icon, label: label, path: path, options: options}
     else
       @submenu << {icon: icon, label: label, path: path, options: options}
     end