ui_bibz 2.0.0.alpha32 → 2.0.0.beta2

data/lib/ui_bibz/ui/core/forms/buttons/button_choice.rb

@@ -1,3 +1,4 @@
+require 'ui_bibz/ui/core/forms/buttons/components/choice'
 module UiBibz::Ui::Core::Forms::Buttons
 
   # Create a button choice
@@ -49,55 +50,42 @@ module UiBibz::Ui::Core::Forms::Buttons
   #
   # ==== Helper
   #
-  #   button_choice(content, options = {}, html_options = {})
+  #   ui_button_choice(content, options = {}, html_options = {})
   #
-  #   button_choice(options = {}, html_options = {}) do
+  #   ui_button_choice(options = {}, html_options = {}) do
   #     content
   #   end
   #
-  class ButtonChoice < UiBibz::Ui::Core::Forms::Buttons::Button
+  class ButtonChoice < UiBibz::Ui::Core::Forms::Buttons::ButtonGroup
 
     # See UiBibz::Ui::Core::Forms::Buttons::Button.initialize
     def initialize content = nil, options = nil, html_options = nil, &block
       super
     end
 
-    # Render html tag
-    def render
-      content_tag :label, html_options do
-        concat tag(:input,input_options)
-        concat @content
+    def button content = nil, options = nil, html_options = nil, &block
+      if block.nil?
+        options = @options.merge(options || {})
+      else
+        content = @options.merge(content || {})
       end
+
+      @items << Choice.new(content, options, html_options, &block).render
     end
 
     private
 
     def component_html_classes
-      ['btn', size]
-    end
-
-    def input_options
-      { type: type, autocomplete: :off }.merge(checked).merge(name).merge(id).merge(input_html_options)
-    end
-
-    def checked
-      @options[:state] == :active ? { checked: :checked } : {}
+      super << ['button-choice']
     end
 
-    def name
-      @options[:name].nil? ? {} : { name: @options[:name] }
+    def component_html_options
+      {}
     end
 
-    def id
-      @options[:id].nil? ? {} : { id: @options[:id] }
-    end
-
-    def input_html_options
-      @options[:input_html_options].nil? ? {} : @options[:input_html_options]
-    end
-
-    def type
-      @options[:type] || :checkbox
+    def component_html_data
+      super
+      add_html_data "toggle", "buttons"
     end
 
   end

data/lib/ui_bibz/ui/core/forms/buttons/button_group.rb

@@ -23,23 +23,22 @@ module UiBibz::Ui::Core::Forms::Buttons
   #
   # ==== Signatures
   #
-  #   UiBibz::Ui::Core::Forms::Buttons::ButtonGroup.new(options = nil, html_options = nil) do
+  #   UiBibz::Ui::Core::Forms::Buttons::ButtonGroup.new(options = nil, html_options = nil) do |bg|
   #     ...
   #   end
   #
   # ==== Examples
   #
-  #   UiBibz::Ui::Core::Forms::Buttons::ButtonGroup.new(position: :vertical, size: :xs) do
-  #     UiBibz::Ui::Core::Forms::Buttons.Button.new('test').render
-  #     UiBibz::Ui::Core::Forms::Buttons.Button.new('test2').render
+  #   UiBibz::Ui::Core::Forms::Buttons::ButtonGroup.new(position: :vertical, size: :xs) do |bg|
+  #     bg.ui_button 'test'
+  #     bg.ui_button 'test2'
   #   end.render
   #
   # ==== Helper
   #
-  #   button_group(content, options = {}, html_options = {})
-  #
-  #   button_group(options = {}, html_options = {}) do
-  #     content
+  #   ui_button_group(options = {}, html_options = {}) do |bg|
+  #     bg.ui_button 'content'
+  #     bg.ui_button_link 'Link', url: '#'
   #   end
   #
   class ButtonGroup < UiBibz::Ui::Core::Component
@@ -47,17 +46,50 @@ module UiBibz::Ui::Core::Forms::Buttons
     # See UiBibz::Ui::Core::Component.initialize
     def initialize content = nil, options = nil, html_options = nil, &block
       super
+      @items = []
     end
 
     # Render html tag
     def render
-      content_tag :div, content, html_options
+      content_tag :div, @items.join.html_safe, html_options
+    end
+
+    def button content = nil, options = nil, html_options = nil, &block
+      if block.nil?
+        options = @options.merge(options || {})
+      else
+        content = @options.merge(content || {})
+      end
+
+      @items << Button.new(content, options, html_options, &block).render
+    end
+
+    def button_link content = nil, options = nil, html_options = nil, &block
+      if block.nil?
+        options = @options.merge(options || {})
+      else
+        content = @options.merge(content || {})
+      end
+
+      @items << ButtonLink.new(content, options, html_options, &block).render
+    end
+
+    def dropdown content, options = {}, html_options = nil, &block
+      options = @options.merge(options)
+
+      @items << UiBibz::Ui::Core::Dropdowns::Dropdown.new(content, options, html_options).tap(&block).render
+    end
+
+    def input attribute_name, options = {}, &block
+      options = @options.merge(options)
+
+      @items << @options[:form].input(attribute_name, options.merge({ label: false, wrapper: false }), &block)
     end
 
   private
 
     def component_html_classes
-      ["btn-#{ type }", size, position]
+      super << [class_name, size, position, space]
     end
 
     def component_html_options
@@ -70,7 +102,10 @@ module UiBibz::Ui::Core::Forms::Buttons
 
     def component_html_data
       super
-      add_html_data "toggle", "buttons"
+    end
+
+    def class_name
+      "btn-group" if options[:position] != :vertical
     end
 
     def size
@@ -81,5 +116,10 @@ module UiBibz::Ui::Core::Forms::Buttons
       "btn-group-#{ options[:position] }" if options[:position]
     end
 
+    # 1 to 5
+    def space
+      "mr-#{ options[:space] }" if options[:space]
+    end
+
   end
 end

data/lib/ui_bibz/ui/core/forms/buttons/button_link.rb

@@ -45,9 +45,9 @@ module UiBibz::Ui::Core::Forms::Buttons
   #
   # ==== Helper
   #
-  #   button_link(content, options = {}, html_options = {})
+  #   ui_button_link(content, options = {}, html_options = {})
   #
-  #   button_link(options = {}, html_options = {}) do
+  #   ui_button_link(options = {}, html_options = {}) do
   #     content
   #   end
   #
@@ -60,17 +60,30 @@ module UiBibz::Ui::Core::Forms::Buttons
 
     # Render html tag
     def render
-      link_to glyph_and_content_html, link_url, html_options
+      button_link_html_tag
     end
 
   private
 
+    def component_html_options
+      opts = super
+      opts = opts.merge({ role: "button" })
+      opts
+    end
+
+    def button_link_html_tag
+      link_to link_url, html_options do
+        concat glyph_and_content_html
+        concat badge_html unless options[:badge].nil?
+      end
+    end
+
     def link_url
       options[:url] || "#"
     end
 
-    def component_html_classes
-      ['btn', size, type]
+    def status
+      "btn-#{ options[:status] || :secondary }"
     end
 
   end

data/lib/ui_bibz/ui/core/forms/buttons/button_refresh.rb

@@ -1,3 +1,4 @@
+require 'ui_bibz/ui/extensions/core/forms/connect_extension'
 module UiBibz::Ui::Core::Forms::Buttons
 
   # Create a Button Refrash
@@ -48,26 +49,30 @@ module UiBibz::Ui::Core::Forms::Buttons
   #   end.render
   #
   class ButtonRefresh < UiBibz::Ui::Core::Forms::Buttons::Button
+    include ConnectExtension
 
     # See UiBibz::Ui::Core::Component.initialize
     def initialize content = nil, options = nil, html_options = nil, &block
       super
     end
 
-    # Render with span not a button to avoid submit form bug
     def render
-      content_tag :span, glyph_and_content_html, html_options
+      button_refresh_html_tag
     end
 
     private
 
+    def button_refresh_html_tag
+      content_tag :span, glyph_and_content_html, html_options
+    end
+
     def component_options
       options[:connect] = cnt_opts
-      { glyph: 'refresh', status: options[:status] }
+      super.merge({ glyph: 'refresh', status: options[:status] })
     end
 
     def component_html_classes
-      ['input-refresh-button', 'btn']
+      super << ['input-refresh-button', 'btn']
     end
 
     def cnt_opts
@@ -82,5 +87,9 @@ module UiBibz::Ui::Core::Forms::Buttons
       }
     end
 
+    def status
+      "btn-#{ options[:status] || :secondary }"
+    end
+
   end
 end

data/lib/ui_bibz/ui/core/forms/buttons/button_toolbar.rb

@@ -0,0 +1,90 @@
+module UiBibz::Ui::Core::Forms::Buttons
+
+  # Create a button toolbar
+  #
+  # This element is an extend of UiBibz::Ui::Core::Component.
+  #
+  # ==== Attributes
+  #
+  # * +content+ - Content of element
+  # * +options+ - Options of element
+  # * +html_options+ - Html Options of element
+  #
+  # ==== Options
+  #
+  # You can add HTML attributes using the +html_options+.
+  # You can pass arguments in options attribute:
+  # * +status+ - status of element with +symbol+ value:
+  #   (+:primary+, +:secondary+, +:info+, +:warning+, +:danger+)
+  # * +size+ - Size of element with +symbol+ value:
+  #   (+:xs+, +:sm+, +:lg+)
+  # * +position+ - Position vertical or horizontal with +symbol+ value:
+  #   (+:vertical+, +:horizontal+)
+  #
+  # ==== Signatures
+  #
+  #   UiBibz::Ui::Core::Forms::Buttons::ButtonToolbar.new(options = nil, html_options = nil) do |bt|
+  #     ...
+  #   end
+  #
+  # ==== Examples
+  #
+  #   UiBibz::Ui::Core::Forms::Buttons::ButtonToolbar.new(status: :primary, size: :xs) do |bt|
+  #     bt.button_group do |bg|
+  #       bg.ui_button 'test 1'
+  #       bg.ui_button 'test 2'
+  #     end
+  #     bt.button_group do |bg|
+  #       bg.ui_button 'test 3'
+  #       bg.ui_button 'test 4'
+  #     end
+  #   end.render
+  #
+  # ==== Helper
+  #
+  #   ui_button_toolbar(options = {}, html_options = {}) do |bt|
+  #     bt.button_group do |bg|
+  #       bg.ui_button 'content'
+  #       bg.ui_button_link 'Link', url: '#'
+  #     end
+  #   end
+  #
+  class ButtonToolbar < UiBibz::Ui::Core::Component
+
+    # See UiBibz::Ui::Core::Component.initialize
+    def initialize content = nil, options = nil, html_options = nil, &block
+      super
+      @items = []
+    end
+
+    # Render html tag
+    def render
+      content_tag :div, @items.join.html_safe, html_options
+    end
+
+    def button_group content = nil, options = nil, html_options = nil, &block
+      if block.nil?
+        options = @options.merge(options || {})
+      else
+        content = @options.merge(content || {})
+      end
+
+      @items << ButtonGroup.new(content, options, html_options).tap(&block).render
+    end
+
+  private
+
+    def component_html_classes
+      super << ["btn-toolbar", justify]
+    end
+
+    def component_html_options
+      { role: 'toolbar' }
+    end
+
+    def justify
+      "justify-content-between" if options[:justify]
+    end
+
+  end
+end

data/lib/ui_bibz/ui/core/forms/buttons/components/choice.rb

@@ -0,0 +1,116 @@
+module UiBibz::Ui::Core::Forms::Buttons
+
+  # Create a button choice
+  #
+  # This element is an extend of UiBibz::Ui::Core::Forms::Buttons::Button
+  #
+  # ==== Attributes
+  #
+  # * +content+ - Content of element
+  # * +options+ - Options of element
+  # * +html_options+ - Html Options of element
+  #
+  # ==== Options
+  #
+  # You can add HTML attributes using the +html_options+.
+  # You can pass arguments in options attribute:
+  # * +type+ - Symbol (+:checkbox+, +:radio+)
+  # * +status+ - status of élement with symbol value:
+  #   (+:primary+, +:secondary+, +:info+, +:warning+, +:danger+)
+  # * +size+
+  #   (+:xs+, +:sm+, +:lg+)
+  # * +url+ - String url
+  # * +outline+ - Boolean
+  # * +state+ - Symbol (+:active+, +:disabled)
+  # * +type+ - Symbol (+:block)
+  # * +name+ - String name of input checkbox
+  # * +id+ - String id of input checkbox
+  # * +input_html_options+ - Hash of input html options
+  # * +glyph+ - Add glyph with name or hash options
+  #   * +name+ - String
+  #   * +size+ - Integer
+  #   * +type+ - Symbol
+  #
+  # ==== Signatures
+  #
+  #   UiBibz::Ui::Core::Forms::Buttons::Choice.new(content, options = nil, html_options = nil)
+  #
+  #   UiBibz::Ui::Core::Forms::Buttons::Choice.new(options = nil, html_options = nil) do
+  #     content
+  #   end
+  #
+  # ==== Examples
+  #
+  #   UiBibz::Ui::Core::Forms::Buttons::Choice.new('test', state: :active)
+  #
+  #   UiBibz::Ui::Core::Forms::Buttons::Choice.new({id: 'state', input_html_options: { class: 'state'}}, { class: 'lable-class'}) do
+  #     test
+  #   end.render
+  #
+  # ==== Helper
+  #
+  #   choice(content, options = {}, html_options = {})
+  #
+  #   choice(options = {}, html_options = {}) do
+  #     content
+  #   end
+  #
+  class Choice < UiBibz::Ui::Core::Forms::Buttons::Button
+
+    # See UiBibz::Ui::Core::Forms::Buttons::Button.initialize
+    def initialize content = nil, options = nil, html_options = nil, &block
+      super
+    end
+
+    # Render html tag
+    def render
+      button_choice_html_tag
+    end
+
+    private
+
+    def button_choice_html_tag
+      content_tag :label, html_options do
+        concat tag(:input, input_options)
+        concat glyph_and_content_html
+      end
+    end
+
+    def component_html_classes
+      ['btn', size]
+    end
+
+    def input_options
+      { type: type, autocomplete: :off }.merge(checked).merge(value).merge(name).merge(id).merge(input_html_options)
+    end
+
+    def checked
+      @options[:state] == :active ? { checked: :checked } : {}
+    end
+
+    def value
+      @options[:value].nil? ? {} : { value: options[:value] }
+    end
+
+    def name
+      @options[:name].nil? ? {} : { name: @options[:name] }
+    end
+
+    def id
+      @options[:id].nil? ? {} : { id: @options[:id] }
+    end
+
+    def input_html_options
+      @options[:input_html_options].nil? ? {} : @options[:input_html_options]
+    end
+
+    def type
+      @options[:type] || :checkbox
+    end
+
+    def status
+      "btn-#{ @options[:status] || :secondary }"
+    end
+
+  end
+end

data/lib/ui_bibz/ui/core/forms/choices/checkbox_field.rb

@@ -52,26 +52,39 @@ module UiBibz::Ui::Core::Forms::Choices
 
     # Render html tag
     def render
+      checkbox_field_html_tag
+    end
+
+  private
+
+    def checkbox_field_html_tag
       content_tag :div, html_options.except(:id) do
         concat check_box_tag content, options[:value], options[:checked] || false, checkbox_html_options
-        concat label_tag label_name, label_content
+        concat label_tag label_name, label_content, label_html_options
       end
     end
 
-  private
-
     def checkbox_html_options
-      opts = { class: 'styled' }
-      opts = opts.merge({ disabled: true}) if options[:state] == :disabled
-      opts
+      { class: 'styled', disabled: options[:state] == :disabled }
     end
 
     def label_name
       html_options[:id] || content
     end
 
+    def label_html_options
+      options[:label] == false ? { class: 'fix-label' } : nil
+    end
+
     def label_content
-      options[:label] || content
+      case options[:label]
+      when nil
+        content
+      when false
+        " "
+      else
+        options[:label]
+      end
     end
 
     def status
@@ -91,7 +104,7 @@ module UiBibz::Ui::Core::Forms::Choices
     end
 
     def component_html_classes
-      ["checkbox", "abc-checkbox", type, indeterminate, inline]
+      super << ["checkbox", "abc-checkbox", type, indeterminate, inline]
     end
 
   end

data/lib/ui_bibz/ui/core/forms/choices/radio_field.rb

@@ -37,9 +37,9 @@ module UiBibz::Ui::Core::Forms::Choices
   #
   # ==== Helper
   #
-  #   radio(content, options = {}, html_options = {})
+  #   ui_radio_field(content, options = {}, html_options = {})
   #
-  #   radio(options = {}, html_options = {}) do
+  #   ui_radio_field(options = {}, html_options = {}) do
   #     content
   #   end
   #
@@ -52,18 +52,24 @@ module UiBibz::Ui::Core::Forms::Choices
 
     # Render html tag
     def render
+      radio_field_html_tag
+    end
+
+  private
+
+    def radio_field_html_tag
       content_tag :div, html_options.except(:id) do
         concat radio_button_tag content, options[:value], options[:checked] || false, checkbox_html_options
-        concat label_tag label_name, label_content
+        concat label_tag label_name, label_content, label_html_options
       end
     end
 
-  private
-
     def checkbox_html_options
-      opts = {}
-      opts = opts.merge({ disabled: true}) if options[:state] == :disabled
-      opts
+      { disabled: options[:state] == :disabled }
+    end
+
+    def label_html_options
+      options[:label] == false ? { class: 'fix-label' } : nil
     end
 
     def label_name
@@ -71,7 +77,14 @@ module UiBibz::Ui::Core::Forms::Choices
     end
 
     def label_content
-      options[:label] || content
+      case options[:label]
+      when nil
+        content
+      when false
+        " "
+      else
+        options[:label]
+      end
     end
 
     def status

data/lib/ui_bibz/ui/core/forms/choices/switch_field.rb

@@ -51,20 +51,28 @@ module UiBibz::Ui::Core::Forms::Choices
 
     # Render html tag
     def render
-      content_tag :div, class: 'switch-field-container' do
+      switch_field_html_tag
+    end
+
+    private
+
+    def switch_field_html_tag
+      content_tag :div, class: component_wrapper_html_classes do
         concat hidden_field_tag content, '0'
         concat check_box_tag content, '1', html_options[:checked], html_options
       end
     end
 
-    private
-
     def value
       options[:value]
     end
 
+    def component_wrapper_html_classes
+      join_classes('switch-field-container', inline)
+    end
+
     def component_html_classes
-      "switch-field"
+      super << "switch-field"
     end
 
     def component_html_data
@@ -85,7 +93,7 @@ module UiBibz::Ui::Core::Forms::Choices
     end
 
     def matching_size
-      { xs: 'small', md: 'normal', lg: 'large' }
+      { sm: 'small', md: 'normal', lg: 'large' }
     end
 
     # true, false => default : true
@@ -123,5 +131,9 @@ module UiBibz::Ui::Core::Forms::Choices
       add_html_data('label_text', options[:middle_text]) unless options[:middle_text].nil?
     end
 
+    def inline
+      "btn-group" unless options[:inline].nil?
+    end
+
   end
 end