ui_bibz 2.0.0.beta2.6 → 2.0.0

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

@@ -49,7 +49,7 @@ module UiBibz::Ui::Core::Navigations
     end
 
     # Render html tag
-    def render
+    def pre_render
       content_tag :li, html_options do
         concat link_html
         concat ul_html

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

@@ -46,7 +46,7 @@ module UiBibz::Ui::Core::Navigations
     end
 
     # Render html tag
-    def render
+    def pre_render
       if options[:nav_type] == "nav-links"
         UiBibz::Ui::Core::Navigations::NavLinkLink.new(content, options, html_options).render
       else

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

@@ -25,7 +25,7 @@ module UiBibz::Ui::Core::Navigations
     end
 
     # Render html tag
-    def render
+    def pre_render
       link_to options[:url], html_options do
         concat glyph_and_content_html
         concat tag_html if options[:tag]

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

@@ -21,7 +21,7 @@ module UiBibz::Ui::Core::Navigations
     end
 
     # Render html tag
-    def render
+    def pre_render
       content_tag :li, content, html_options
     end
 

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

@@ -25,7 +25,7 @@ module UiBibz::Ui::Core::Navigations
     end
 
     # Render html tag
-    def render
+    def pre_render
       options[:nav_type] == "nav-links" ? content_html : content_tag(:li, content_html, class: 'nav-item nav-text')
     end
 

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

@@ -22,7 +22,7 @@ module UiBibz::Ui::Core::Navigations
     end
 
     # Render html tag
-    def render
+    def pre_render
       link_to content, brand_url, html_options
     end
 

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

@@ -41,34 +41,40 @@ module UiBibz::Ui::Core::Navigations
   #
   class NavbarForm < UiBibz::Ui::Base
     include Haml::Helpers
-    include SimpleForm::ActionViewExtensions::FormHelper
+    include SimpleForm::ActionViewExtensions::FormHelper if defined?(SimpleForm)
     include UiBibz::Helpers::UtilsHelper
     include ActionView::Helpers#::FormHelper
 
+    attr_accessor :html_options
+
     def initialize model_or_url, options = {}, &block
       init_haml_helpers
-      @options = options
+      @content      = block
+      @model_or_url = model_or_url
+      @options      = options
+      @html_options = !%i(form_for ui_form_for).include?(type) ? html_options_for_form(@model_or_url, new_option)  : new_option
+    end
+
+    # Render html tag
+    def render
       case type
       when :form_for
-        @form = form_for(model_or_url, new_option, &block)
+        @form = form_for(@model_or_url, html_options, &@content)
       when :ui_form_for
-        @form = ui_form_for(model_or_url, new_option, &block)
+        begin
+          @form = ui_form_for(@model_or_url, html_options, &@content)
+        rescue
+          raise 'You must install simple form to use ui_form_for.'
+        end
       else
-        #@form = form_tag(model_or_url, class: "navbar-form form-inline #{ position }", block)
-        html_options = html_options_for_form(model_or_url, new_option)
-        @form = form_tag_with_body(html_options, capture(&block))
+        @form = form_tag_with_body(html_options, capture(&@content))
       end
     end
 
-    # Render html tag
-    def render
-      @form
-    end
-
   private
 
     def new_option
-      (@options || {}).merge({ class: "navbar-form form-inline #{ position } my-2 my-lg-0" })
+      (@options || {}).merge({ class: UiBibz::Utils::Screwdriver.join_classes("navbar-form", "form-inline", "my-lg-0", "my-2", @options[:class]) })
     end
 
     def protect_against_forgery?
@@ -83,9 +89,5 @@ module UiBibz::Ui::Core::Navigations
       @options[:type] || :form_for
     end
 
-    def position
-      "pull-#{ @options[:position] }" unless @options[:position].nil?
-    end
-
   end
 end

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

@@ -39,7 +39,7 @@ module UiBibz::Ui::Core::Navigations
     end
 
     # Render html tag
-    def render
+    def pre_render
       content_tag :span, content, html_options
     end
 

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

@@ -44,7 +44,7 @@ module UiBibz::Ui::Core::Navigations
     end
 
     # Render html tag
-    def render
+    def pre_render
       content_tag :li, html_options do
         link_to content, options[:url], class: 'page-link'
       end

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

@@ -46,8 +46,14 @@ module UiBibz::Ui::Core::Navigations
     end
 
     # Render html tag
-    def render
-      link_to content, options[:url] || '#', html_options
+    def pre_render
+      link_to glyph_and_content_html, options[:url] || '#', html_options
+    end
+
+    private
+
+    def text
+      @options[:text].nil? ? true : @options[:text]
     end
 
   end

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

@@ -73,7 +73,7 @@ module UiBibz::Ui::Core::Navigations
     end
 
     # Render html tag
-    def render
+    def pre_render
       content_tag tag, @items.map(&:render).join.html_safe, html_options
     end
 

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

@@ -77,7 +77,7 @@ module UiBibz::Ui::Core::Navigations
     end
 
     # Render html tag
-    def render
+    def pre_render
       content_tag :nav, html_options do
         concat title if brand_position == :left
         concat navbar_toggle_button_html
@@ -90,26 +90,31 @@ module UiBibz::Ui::Core::Navigations
     # See UiBibz::Ui::Core::NavbarNav
     def nav content = nil, options = nil, html_options = nil, &block
       options = options || {}
-      @items << UiBibz::Ui::Core::Navigations::NavbarNav.new(content, options, html_options).tap(&block).render
+      @items << UiBibz::Ui::Core::Navigations::NavbarNav.new(content, options, html_options).tap(&block)
     end
 
     # Add navbar form items
     # See UiBibz::Ui::Core::NavbarForm
     def form model_or_url, options = {}, &block
-      @items << UiBibz::Ui::Core::Navigations::NavbarForm.new(model_or_url, options, &block).render
+      @items << UiBibz::Ui::Core::Navigations::NavbarForm.new(model_or_url, options, &block)
     end
 
     # Not use !!!!!
     # Add navbar text items
     # See UiBibz::Ui::Core::NavbarText
     def text content = nil, options = nil, html_options = nil, &block
-      @items << UiBibz::Ui::Core::Navigations::NavbarText.new(content, options, html_options, &block).render
+      @items << UiBibz::Ui::Core::Navigations::NavbarText.new(content, options, html_options, &block)
     end
 
     def brand content = nil, options = nil, html_options = nil, &block
       @brand = UiBibz::Ui::Core::Navigations::NavbarBrand.new(content, options, html_options, &block).render
     end
 
+    def spacer num = "auto"
+      kls = " mr-#{ num }"
+      @items.last.html_options[:class].nil? ? @items.last.html_options[:class] = kls : @items.last.html_options[:class] << kls
+    end
+
     def id
       @id ||= generate_id("navbar-id")
     end
@@ -130,7 +135,7 @@ module UiBibz::Ui::Core::Navigations
 
     def body_html
       content_tag :div, class: "collapse navbar-collapse", id: id do
-        concat @items.join.html_safe
+        concat @items.map(&:render).join.html_safe
       end
     end
 

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

@@ -60,7 +60,7 @@ module UiBibz::Ui::Core::Navigations
     end
 
     # Render html tag
-    def render
+    def pre_render
       content_tag :nav do
         content_tag :ul, @items.join.html_safe, html_options
       end

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

@@ -58,17 +58,14 @@ module UiBibz::Ui::Core::Navigations
     end
 
     # Render html tag
-    def render
+    def pre_render
       content_tag :div, @items.map(&:render).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 << UiBibz::Ui::Core::Forms::Buttons::ButtonGroup.new(content, options, html_options).tap(&block)
+    def button_group c = nil, o = nil, ho = nil, &block
+      c = @options.merge(c || {})
+      (c || {}).delete(:class)
+      @items << UiBibz::Ui::Core::Forms::Buttons::ButtonGroup.new(c, o, ho).tap(&block)
     end
 
     def spacer num = "auto"

data/lib/ui_bibz/ui/core/notifications/alert.rb

@@ -56,7 +56,7 @@ module UiBibz::Ui::Core::Notifications
     end
 
     # Render html tag
-    def render
+    def pre_render
       content_tag :div, html_options do
         concat @header
         concat @body unless @body.nil?

data/lib/ui_bibz/ui/core/notifications/badge.rb

@@ -55,7 +55,7 @@ module UiBibz::Ui::Core::Notifications
     end
 
     # Render html tag
-    def render
+    def pre_render
       content_tag :span, glyph_and_content_html, html_options
     end
 

data/lib/ui_bibz/ui/core/notifications/components/alert_body.rb

@@ -36,7 +36,7 @@ module UiBibz::Ui::Core::Notifications::Components
       super
     end
 
-    def render
+    def pre_render
       tag(:hr) + content_tag(:p, content, html_options)
     end
 

data/lib/ui_bibz/ui/core/notifications/components/alert_header.rb

@@ -36,7 +36,7 @@ module UiBibz::Ui::Core::Notifications::Components
       super
     end
 
-    def render
+    def pre_render
       if options[:tap]
         content_tag :h4, html_content, html_options
       else

data/lib/ui_bibz/ui/core/notifications/components/bar.rb

@@ -48,7 +48,7 @@ module UiBibz::Ui::Core::Notifications::Components
     end
 
     # Render html tag
-    def render
+    def pre_render
       content_tag :div, '', html_options
     end
 

data/lib/ui_bibz/ui/core/notifications/progress_bar.rb

@@ -62,7 +62,7 @@ module UiBibz::Ui::Core::Notifications
     end
 
     # Render html tag
-    def render
+    def pre_render
       content_tag :div, bars.join.html_safe, html_options
     end
 

data/lib/ui_bibz/ui/core/windows/components/modal_body.rb

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

data/lib/ui_bibz/ui/core/windows/components/modal_footer.rb

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

data/lib/ui_bibz/ui/core/windows/components/modal_header.rb

@@ -37,7 +37,7 @@ module UiBibz::Ui::Core::Windows::Components
     end
 
     # Render html tag
-    def render
+    def pre_render
       content_tag :div, html_options do
         concat content_tag :h5, glyph_and_content_html, class: 'modal-title'
         concat close_button_html

data/lib/ui_bibz/ui/core/windows/modal.rb

@@ -60,7 +60,7 @@ module UiBibz::Ui::Core::Windows
     end
 
     # Render html tag
-    def render
+    def pre_render
       content_tag :div, html_options do
         content_tag :div, class: "modal-dialog #{ size }", role: 'document' do
           content_tag :div, class: 'modal-content' do

data/lib/ui_bibz/ui/extensions/core/component/glyph_extension.rb

@@ -2,18 +2,36 @@ module GlyphExtension
 
   # Render glyph and content html
   def glyph_and_content_html content_html = nil
-    [glyph_with_space, content_html || content].compact.join.html_safe
+    [glyph_with_space, ct_html(content_html)].compact.join(' ').html_safe
+  end
+
+  def ct_html content_html
+    if options[:text].nil? || options[:text] == true
+      content_html || content
+    end
   end
 
   # Render glyph with space html
   def glyph_with_space
-    "#{ glyph } " unless glyph.nil?
+    out = [glyph]
+    out << " " if options[:text] != false
+    out.join unless glyph.nil?
   end
 
   # Render glyph html
   def glyph
-    glyph_info = options[:glyph] if options.kind_of?(Hash)
-    UiBibz::Ui::Core::Icons::Glyph.new(glyph_info).render unless glyph_info.nil?
+    if options.kind_of?(Hash)
+      if options[:glyph].kind_of?(Hash)
+        glyph_name = options[:glyph].try(:[], :name)
+        glyph_opts = options[:glyph]
+      else
+        glyph_name = options[:glyph]
+        glyph_opts = {}
+      end
+      glyph_html_opts = options[:text].nil? ? {} : (options[:text] ? {} : { title: content })
+    end
+
+    UiBibz::Ui::Core::Icons::Glyph.new(glyph_name, glyph_opts, glyph_html_opts).render unless glyph_name.nil?
   end
 
 end

data/lib/ui_bibz/ui/ux/containers/components/panel_body.rb

@@ -0,0 +1,51 @@
+module UiBibz::Ui::Ux::Containers::Components
+
+  # Create a card body
+  #
+  # ==== 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:
+  #
+  # ==== Signatures
+  #
+  #   UiBibz::Ui::Core::Boxes::PanelBody.new(content, options = nil, html_options = nil)
+  #
+  #   UiBibz::Ui::Core::Boxes::PanelBody.new(options = nil, html_options = nil) do
+  #     content
+  #   end
+  #
+  # ==== Examples
+  #
+  #   UiBibz::Ui::Core::Boxes::PanelBody.new.render
+  #
+  #   UiBibz::Ui::Core::Boxes::PanelBody.new do
+  #     'Exemple'
+  #   end.render
+  #
+  class PanelBody < UiBibz::Ui::Core::Component
+
+    # See UiBibz::Ui::Core::Component.initialize
+    def initialize content = nil, options = nil, html_options = nil, &block
+      super
+    end
+
+    # Render html tag
+    def pre_render
+      content_tag :div, glyph_and_content_html, html_options
+    end
+
+  private
+
+    def component_html_classes
+      super << ["panel-body"]
+    end
+
+  end
+end