ui_bibz 2.0.0.beta2.6 → 2.0.0

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

@@ -51,7 +51,7 @@ module UiBibz::Ui::Core::Forms::Choices
     end
 
     # Render html tag
-    def render
+    def pre_render
       checkbox_field_html_tag
     end
 

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

@@ -59,7 +59,7 @@ module UiBibz::Ui::Core::Forms::Choices
     end
 
     # Render html tag
-    def render
+    def pre_render
       button_choice_html_tag
     end
 

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

@@ -51,7 +51,7 @@ module UiBibz::Ui::Core::Forms::Choices
     end
 
     # Render html tag
-    def render
+    def pre_render
       radio_field_html_tag
     end
 

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

@@ -50,7 +50,7 @@ module UiBibz::Ui::Core::Forms::Choices
     end
 
     # Render html tag
-    def render
+    def pre_render
       switch_field_html_tag
     end
 

data/lib/ui_bibz/ui/core/forms/dates/date_picker_field.rb

@@ -50,7 +50,7 @@ module UiBibz::Ui::Core::Forms::Dates
     end
 
     # Render html tag
-    def render
+    def pre_render
       date_picker_field_html_tag
     end
 

data/lib/ui_bibz/ui/core/forms/dropdowns/components/dropdown_header.rb

@@ -39,7 +39,7 @@ module UiBibz::Ui::Core::Forms::Dropdowns::Components
     end
 
     # Render html tag
-    def render
+    def pre_render
       content_tag :h6, content, html_options
     end
 

data/lib/ui_bibz/ui/core/forms/dropdowns/components/dropdown_link.rb

@@ -48,7 +48,7 @@ module UiBibz::Ui::Core::Forms::Dropdowns::Components
     end
 
     # Render html tag
-    def render
+    def pre_render
       link_to glyph_and_content_html, link_url, html_options
     end
 

data/lib/ui_bibz/ui/core/forms/dropdowns/dropdown.rb

@@ -69,7 +69,7 @@ module UiBibz::Ui::Core::Forms::Dropdowns
     end
 
     # Render html tag
-    def render
+    def pre_render
       content_tag :div, html_options do
         concat button_html
         concat ul_html

data/lib/ui_bibz/ui/core/forms/dropdowns/split_dropdown.rb

@@ -61,7 +61,7 @@ module UiBibz::Ui::Core::Forms::Dropdowns
     end
 
     # Render html tag
-    def render
+    def pre_render
       content_tag :div, html_options do
         concat button_html
         concat split_html

data/lib/ui_bibz/ui/core/forms/numbers/formula_field.rb

@@ -44,14 +44,14 @@ module UiBibz::Ui::Core::Forms::Numbers
     end
 
     # Render html tag
-    def render
+    def pre_render
       formula_field_html_tag
     end
 
     private
 
     def formula_field_html_tag
-      UiBibz::Ui::Core::Forms::Surrounds::SurroundField.new(class: join_classes('formula_field', status)).tap do |sf|
+      UiBibz::Ui::Core::Forms::Surrounds::SurroundField.new(class: join_classes('formula_field', status, size)).tap do |sf|
         sf.text_field formula_field_name, nil, text_field_formula_html_options
         sf.addon '=', class: 'formula-field-sign'
         sf.text_field content, nil, text_field_input_html_options
@@ -94,5 +94,10 @@ module UiBibz::Ui::Core::Forms::Numbers
       "has-#{ options[:status] }" if options[:status]
     end
 
+    # :lg, :sm or :xs
+    def size
+      "input-group-#{ options[:size] }" if options[:size]
+    end
+
   end
 end

data/lib/ui_bibz/ui/core/forms/numbers/number_field.rb

@@ -0,0 +1,63 @@
+require 'ui_bibz/ui/extensions/core/forms/surround_extension'
+module UiBibz::Ui::Core::Forms::Numbers
+
+  # Create a NumberField
+  #
+  # 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:
+  # * +prepend+ - String, Html
+  # * +append+ - String, Html
+  #
+  # ==== Signatures
+  #
+  #   UiBibz::Ui::Core::Forms::Numbers::NumberField.new(content, options = {}, html_options = {}).render
+  #
+  #   UiBibz::Ui::Core::Forms::Numbers::NumberField.new(options = {}, html_options = {}) do
+  #     content
+  #   end.render
+  #
+  # ==== Examples
+  #
+  #   UiBibz::Ui::Core::Forms::Numbers::NumberField.new('search', prepend: 'Prepend content', append: 'Append content', class: 'test')
+  #
+  #   UiBibz::Ui::Core::Forms::Numbers::NumberField.new(prepend: glyph('pencil'), append: glyph('camera-retro')) do
+  #     #content
+  #   end
+  #
+  # ==== Helper
+  #
+  #   ui_number_field(options = {}, html_options = {}) do
+  #    # content
+  #   end
+  #
+  class NumberField < UiBibz::Ui::Core::Forms::Texts::TextField
+
+    # See UiBibz::Ui::Core::Component.initialize
+    def initialize content = nil, options = nil, html_options = nil, &block
+      super
+    end
+
+    # Render html tag
+    def pre_render
+      surround_field number_field_input_tag
+    end
+
+    private
+
+    # Simple_form or not
+    def number_field_input_tag
+      number_field_tag content, options[:value] || html_options[:value], html_options
+    end
+
+  end
+end

data/lib/ui_bibz/ui/core/forms/selects/abstract_select.rb

@@ -75,7 +75,7 @@ module UiBibz::Ui::Core::Forms::Selects
     end
 
     # Render html tag
-    def render
+    def pre_render
       surround_field select_field_html_tag
     end
 

data/lib/ui_bibz/ui/core/forms/selects/select_field.rb

@@ -75,12 +75,16 @@ module UiBibz::Ui::Core::Forms::Selects
     private
 
     def component_html_classes
-      super << ["select-field", "form-control"]
+      super << ["select-field", "form-control", size]
     end
 
     def component_options
       options[:status].nil? ? super : super.merge({ surrounded: true })
     end
 
+    def size
+      "form-control-#{ options[:size] }" unless options[:size].nil?
+    end
+
   end
 end

data/lib/ui_bibz/ui/core/forms/surrounds/components/surround_addon.rb

@@ -7,7 +7,7 @@ module UiBibz::Ui::Core::Forms::Surrounds
     end
 
     # Render html tag
-    def render
+    def pre_render
       surround_addon_html_tag
     end
 

data/lib/ui_bibz/ui/core/forms/surrounds/components/surround_button.rb

@@ -6,7 +6,7 @@ module UiBibz::Ui::Core::Forms::Surrounds
       super
     end
 
-    def render
+    def pre_render
       content_tag :div, class: 'input-group-btn' do
         button_html_tag
       end

data/lib/ui_bibz/ui/core/forms/surrounds/components/surround_button_link.rb

@@ -6,7 +6,7 @@ module UiBibz::Ui::Core::Forms::Surrounds
       super
     end
 
-    def render
+    def pre_render
       content_tag :div, class: 'input-group-btn' do
         button_link_html_tag
       end

data/lib/ui_bibz/ui/core/forms/surrounds/components/surround_button_refresh.rb

@@ -6,7 +6,7 @@ module UiBibz::Ui::Core::Forms::Surrounds
       super
     end
 
-    def render
+    def pre_render
       content_tag :div, class: 'input-group-btn' do
         button_refresh_html_tag
       end

data/lib/ui_bibz/ui/core/forms/surrounds/surround_field.rb

@@ -57,7 +57,7 @@ module UiBibz::Ui::Core::Forms::Surrounds
     end
 
     # Render html tag
-    def render
+    def pre_render
       content_tag :div, @items.join.html_safe, html_options
     end
 

data/lib/ui_bibz/ui/core/forms/textareas/markdown_editor_field.rb

@@ -52,7 +52,7 @@ module UiBibz::Ui::Core::Forms::Textareas
     end
 
     # Render html tag
-    def render
+    def pre_render
       text_area_tag content, html_options[:value], html_options
     end
 

data/lib/ui_bibz/ui/core/forms/texts/text_field.rb

@@ -49,7 +49,7 @@ module UiBibz::Ui::Core::Forms::Texts
     end
 
     # Render html tag
-    def render
+    def pre_render
       surround_field text_field_input_tag
     end
 
@@ -66,16 +66,20 @@ module UiBibz::Ui::Core::Forms::Texts
     end
 
     def component_html_classes
-      ['form-control', status]
+      super << ['form-control', status, size]
     end
 
     def component_html_options
       options[:state] == :disabled ? { disabled: 'disabled' } : {}
     end
-
+                                             62+9
     def status
       "form-control-#{ options[:status] }" unless options[:status].nil?
     end
 
+    def size
+      "form-control-#{ options[:size] }" unless options[:size].nil?
+    end
+
   end
 end

data/lib/ui_bibz/ui/core/icons/glyph.rb

@@ -63,7 +63,7 @@ module UiBibz::Ui::Core::Icons
     end
 
     # Render html tag
-    def render
+    def pre_render
       [content_tag(:i, '', html_options), options[:label]].compact.join(' ').html_safe
     end
 
@@ -74,7 +74,7 @@ module UiBibz::Ui::Core::Icons
     end
 
     def classes
-      cls = ["glyph", "fa", "fa-#{ content }"]
+      cls = ["glyph", style, "fa-#{ content }"]
       cls << "fa-#{ size }x"         unless size.nil?
       cls << "fa-rotate-#{ rotate }" unless rotate.nil?
       cls << "fa-flip-#{ flip }"     unless flip.nil?
@@ -97,6 +97,10 @@ module UiBibz::Ui::Core::Icons
       end
     end
 
+    def style
+      match_style[@options[:style] || :solid]
+    end
+
     def stack
       @options[:stack]
     end
@@ -125,5 +129,9 @@ module UiBibz::Ui::Core::Icons
       "glyph-#{ @options[:status] }" unless @options[:status].nil?
     end
 
+    def match_style
+      {solid: 'fas', regular: 'far', light: 'fal', brands: 'fab'}
+    end
+
   end
 end

data/lib/ui_bibz/ui/core/icons/star.rb

@@ -50,7 +50,7 @@ module UiBibz::Ui::Core::Icons
     end
 
     # Render html tag
-    def render
+    def pre_render
       content_tag :span, star_notation.join(' ').html_safe, html_options
     end
 

data/lib/ui_bibz/ui/core/layouts/col.rb

@@ -55,7 +55,7 @@ module UiBibz::Ui::Core::Layouts
     end
 
     # Render html tag
-    def render
+    def pre_render
       content_tag :div, content, html_options
     end
 

data/lib/ui_bibz/ui/core/layouts/container.rb

@@ -47,7 +47,7 @@ module UiBibz::Ui::Core::Layouts
     end
 
     # Render html tag
-    def render
+    def pre_render
       content_tag :div, content, html_options
     end
 

data/lib/ui_bibz/ui/core/layouts/row.rb

@@ -40,7 +40,7 @@ module UiBibz::Ui::Core::Layouts
     end
 
     # Render html tag
-    def render
+    def pre_render
       content_tag :div, content, html_options
     end
 

data/lib/ui_bibz/ui/core/lists/components/list.rb

@@ -63,7 +63,7 @@ module UiBibz::Ui::Core::Lists::Components
     end
 
     # Render html tag
-    def render
+    def pre_render
       content_tag tag_type, html_options do
         concat glyph_and_content_html if @content
         concat header_html if @body

data/lib/ui_bibz/ui/core/lists/components/list/list_body.rb

@@ -22,7 +22,7 @@ module UiBibz::Ui::Core::Lists::Components
     end
 
     # Render html tag
-    def render
+    def pre_render
       output = [content_tag(:p, content, html_options)]
       output << content_tag(:small, options[:extra])
       output.join.html_safe

data/lib/ui_bibz/ui/core/lists/components/list/list_header.rb

@@ -22,7 +22,7 @@ module UiBibz::Ui::Core::Lists::Components
     end
 
     # Render html tag
-    def render
+    def pre_render
       content_tag :div, html_options do
         concat content_tag(:h5, content, class: 'mb-1')
         concat content_tag(:small, options[:extra])

data/lib/ui_bibz/ui/core/lists/list_group.rb

@@ -77,7 +77,7 @@ module UiBibz::Ui::Core::Lists
     end
 
     # Render html tag
-    def render
+    def pre_render
       content_tag tag_type, @lists.join().html_safe, html_options
     end
 

data/lib/ui_bibz/ui/core/navigations/breadcrumb.rb

@@ -58,7 +58,7 @@ module UiBibz::Ui::Core::Navigations
     end
 
     # Render html tag
-    def render
+    def pre_render
       generate_links unless store.nil?
       content_tag :ol, @links.join.html_safe, html_options
     end

data/lib/ui_bibz/ui/core/navigations/components/breadcrumb_link.rb

@@ -38,7 +38,7 @@ module UiBibz::Ui::Core::Navigations::Components
   #     'Home'
   #   end.render
   #
-  class BreadcrumbLink < UiBibz::Ui::Core::Component
+  class BreadcrumbLink < UiBibz::Ui::Core::Navigations::Link
 
     # See UiBibz::Ui::Core::Component.initialize
     def initialize content = nil, options = nil, html_options = nil, &block
@@ -46,7 +46,7 @@ module UiBibz::Ui::Core::Navigations::Components
     end
 
     # Render html tag
-    def render
+    def pre_render
       content_tag :li, link_html, html_options
     end
 
@@ -58,7 +58,7 @@ module UiBibz::Ui::Core::Navigations::Components
 
     def link_html
       if options[:url]
-        link_to glyph_and_content_html, options[:url], options[:link_html_options]
+        link_to glyph_and_content_html, options[:url] || '#'
       else
         glyph_and_content_html
       end