ui_bibz 2.0.0.alpha32 → 2.0.0.beta2

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

@@ -18,6 +18,13 @@ module UiBibz::Ui::Core::Navs
   # You can pass arguments in options attribute:
   # * +type+ - Symbol
   #   (+:pills+, +:tab+)
+  # * +position+ - Symbol
+  #   (+:left+, +:right+, +:center+)
+  # * +stacked+ - Boolean
+  # * +tag+ - Symbol
+  #   (+:a+, +:li)
+  # * +justify+ - Boolean
+  # * +fill+ - Boolean
   #
   # ==== Signatures
   #
@@ -90,7 +97,7 @@ module UiBibz::Ui::Core::Navs
   private
 
     def component_html_classes
-      ["nav", type, position, stacked]
+      ["nav", type, position, stacked, justify, fill]
     end
 
     # tabs or pills
@@ -99,11 +106,32 @@ module UiBibz::Ui::Core::Navs
     end
 
     def position
-      "pull-#{ @options[:position] }" unless @options[:position].nil?
+      case @options[:position]
+      when :center
+        "justify-content-center"
+      when :right
+        "justify-content-end"
+      else
+        nil
+      end
+    end
+
+    def justify
+      if @options[:justify]
+        if type == "nav-links"
+          "nav-justified"
+        else
+          "nav-fill"
+        end
+      end
+    end
+
+    def fill
+      "nav-fill" if @options[:fill]
     end
 
     def stacked
-      "nav-stacked" unless @options[:stacked].nil?
+      "flex-column" if @options[:stacked]
     end
 
     def tag

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

@@ -25,6 +25,8 @@ module UiBibz::Ui::Core::Navs
   #   (+:secondary+, +:primary+, +:info+, +:warning+, +:danger+, +inverse+)
   # * +position+ - Symbol
   #   (+:top+, +:bottom+)
+  # * +position_type+ - Symbol
+  #   (+:fixed+, +:sticky+)
   # * +title+ - String
   #
   # ==== Signatures
@@ -55,13 +57,15 @@ module UiBibz::Ui::Core::Navs
   #
   # ==== Helper
   #
-  #   navbar(options = { tap: true }, html_options = {}) do |nb|
+  #   ui_navbar(options = { tap: true }, html_options = {}) do |nb|
   #     nb.nav(options = { tap: true }, html_options = {}) do |n|
   #       n.link(content, options = {}, html_options = {})
   #       n.link(options = {}, html_options = {}) do
   #         content
   #       end
   #     end
+  #     nb.brand content
+  #     nb.link 'toto', "#"
   #   end
   #
   class Navbar < UiBibz::Ui::Core::Component
@@ -75,10 +79,10 @@ module UiBibz::Ui::Core::Navs
     # Render html tag
     def render
       content_tag :nav, html_options do
-        content_tag :div, class: 'container-fluid' do
-          concat header_html
-          concat body_html
-        end
+        concat title if brand_position == :left
+        concat navbar_toggle_button_html
+        concat title if brand_position == :right
+        concat body_html
       end
     end
 
@@ -98,24 +102,22 @@ module UiBibz::Ui::Core::Navs
     # 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::NavbarText.new(content, options, html_options, &block).render
-    #end
+    def text content = nil, options = nil, html_options = nil, &block
+      @items << UiBibz::Ui::Core::Navs::NavbarText.new(content, options, html_options, &block).render
+    end
 
     def brand content = nil, options = nil, html_options = nil, &block
       @brand = UiBibz::Ui::Core::Navs::NavbarBrand.new(content, options, html_options, &block).render
     end
 
+    def id
+      @id ||= generate_id("navbar-id")
+    end
+
   private
 
     def component_html_classes
-      ['navbar', type, position]
-    end
-
-    def header_html
-      content_tag :div, class: 'navbar-header' do
-        concat navbar_toggle_button_html
-      end
+      ['navbar', type, position, expand_size]
     end
 
     def title
@@ -127,22 +129,30 @@ module UiBibz::Ui::Core::Navs
     end
 
     def body_html
-      content_tag :div, class: "collapse navbar-toggleable-xs", id: id do
-        concat title
+      content_tag :div, class: "collapse navbar-collapse", id: id do
         concat @items.join.html_safe
       end
     end
 
-    def id
-      @id ||= "navbar-collapse-#{ Random.new_seed }"
-    end
-
     def navbar_toggle_button_html
       content_tag :button, "☰", class: 'navbar-toggler hidden-sm-up', type: :button, data: { toggle: 'collapse', target:"##{ id }" }
     end
 
+    def expand_size
+      "navbar-expand-#{ @options[:expand_size] || :lg }" #unless @options[:expand_size].nil?
+    end
+
     def position
-      "navbar-fixed-#{ @options[:position] }" unless @options[:position].nil?
+      "#{ position_type }-#{ @options[:position] }" unless @options[:position].nil?
+    end
+
+    def brand_position
+      @options[:brand_position] || :left
+    end
+
+    # fixed || sticky
+    def position_type
+      @options[:position_type] || "fixed"
     end
 
     def type

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

@@ -0,0 +1,97 @@
+require 'ui_bibz/ui/core/navs/components/pagination_link'
+module UiBibz::Ui::Core::Navs
+
+  # Create a Pagination
+  #
+  # 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:
+  # * +position+ - Symbol
+  #   (+:left+, +:right+, +:center+)
+  # * +size+
+  #   (+:sm+, +:lg+)
+  #
+  # ==== Signatures
+  #
+  #   UiBibz::Ui::Core::Navs::Pagination.new(content, options = nil, html_options = nil)
+  #
+  #   UiBibz::Ui::Core::Navs::Pagination.new(options = nil, html_options = nil).tap do |n|
+  #     ...
+  #     n.link content = nil, options = nil, html_options = nil, block
+  #     n.link content = nil, options = nil, html_options = nil, block
+  #     n.dropdown content = nil, options = nil, html_options = nil, block
+  #     ...
+  #   end
+  #
+  # ==== Examples
+  #
+  #   UiBibz::Ui::Core::Navs::Pagination.new(type: :pills).tap do |n|
+  #     n.link 'Test', url: '#test'
+  #     n.link 'Test2', url: '#test2', state: :active
+  #     n.dropdown('Action') do |d|
+  #       d.list content = nil, options = nil, html_options = nil, &block
+  #     end
+  #   end.render
+  #
+  # ==== Helper
+  #
+  #   ui_pagination(options = { tap: true }, html_options = {}) do |n|
+  #     n.link(content, options = {}, html_options = {})
+  #     n.link(options = {}, html_options = {}) do
+  #       content
+  #     end
+  #   end
+  #
+  class Pagination < 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 :nav do
+        content_tag :ul, @items.join.html_safe, html_options
+      end
+    end
+
+    # Add nav link items
+    # See UiBibz::Ui::Core::Navs::NavLink
+    def link content = nil, options = {}, html_options = nil, &block
+      @items << PaginationLink.new(content, options, html_options, &block).render
+    end
+
+  private
+
+    def component_html_classes
+      ["pagination", position, size]
+    end
+
+    def position
+      case @options[:position]
+      when :center
+        "justify-content-center"
+      when :right
+        "justify-content-end"
+      else
+        nil
+      end
+    end
+
+    def size
+      "pagination-#{ @options[:size] }" if @options[:size]
+    end
+
+  end
+end

data/lib/ui_bibz/ui/core/{alert.rb → notifications/alert.rb}

@@ -1,4 +1,6 @@
-module UiBibz::Ui::Core
+require 'ui_bibz/ui/core/notifications/components/alert_header'
+require 'ui_bibz/ui/core/notifications/components/alert_body'
+module UiBibz::Ui::Core::Notifications
 
   # Create an alert
   #
@@ -45,21 +47,38 @@ module UiBibz::Ui::Core
   #     content
   #   end
   #
-  class Alert < Component
+  class Alert < UiBibz::Ui::Core::Component
 
     # See UiBibz::Ui::Core::Component.initialize
     def initialize content = nil, options = nil, html_options = nil, &block
       super
+      header(@content) if @options[:tap].nil?
     end
 
     # Render html tag
     def render
       content_tag :div, html_options do
-        concat glyph_and_content_html
-        concat close_html if options[:closable]
+        concat @header
+        concat @body unless @body.nil?
       end
     end
 
+    # Add Header which is a component
+    def header content = nil, options = nil, html_options = nil, &block
+      if block.nil?
+        options = @options.merge(options || {})
+      else
+        content = @options.merge(content || {})
+      end
+
+      @header = UiBibz::Ui::Core::Notifications::Components::AlertHeader.new(content, options, html_options, &block).render
+    end
+
+    # Add Body which is a component
+    def body content = nil, options = nil, html_options = nil, &block
+      @body = UiBibz::Ui::Core::Notifications::Components::AlertBody.new(content, options, html_options, &block).render
+    end
+
   private
 
     def component_html_classes
@@ -70,13 +89,6 @@ module UiBibz::Ui::Core
       { role: 'alert'}
     end
 
-    def close_html
-      content_tag :button, type: 'button', class: 'close', "data-dismiss" => "alert", "aria-label" => "Close" do
-        concat content_tag :span, "×", "aria-hidden" => true
-        concat content_tag :span, "Close", class: "sr-only"
-      end
-    end
-
     def status
       "alert-#{ options[:status] || :info  }"
     end

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

@@ -0,0 +1,50 @@
+module UiBibz::Ui::Core::Notifications::Components
+
+  # Create a alert 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::Notifications::AlertBody.new(content, options = nil, html_options = nil)
+  #
+  #   UiBibz::Ui::Core::Notifications::AlertBody.new(options = nil, html_options = nil) do
+  #     content
+  #   end
+  #
+  # ==== Examples
+  #
+  #   UiBibz::Ui::Core::Notifications::AlertBody.new.render
+  #
+  #   UiBibz::Ui::Core::Notifications::AlertBody.new do
+  #     'Exemple'
+  #   end.render
+  #
+  class AlertBody < UiBibz::Ui::Core::Component
+
+    # See UiBibz::Ui::Core::Component.initialize
+    def initialize content = nil, options = nil, html_options = nil, &block
+      super
+    end
+
+    def render
+      tag(:hr) + content_tag(:p, content, html_options)
+    end
+
+  private
+
+    def component_html_classes
+      "alert-body mb-0"
+    end
+
+  end
+end

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

@@ -0,0 +1,67 @@
+module UiBibz::Ui::Core::Notifications::Components
+
+  # Create a alert 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::Notifications::AlertHeader.new(content, options = nil, html_options = nil)
+  #
+  #   UiBibz::Ui::Core::Notifications::AlertHeader.new(options = nil, html_options = nil) do
+  #     content
+  #   end
+  #
+  # ==== Examples
+  #
+  #   UiBibz::Ui::Core::Notifications::AlertHeader.new.render
+  #
+  #   UiBibz::Ui::Core::Notifications::AlertHeader.new do
+  #     'Exemple'
+  #   end.render
+  #
+  class AlertHeader < UiBibz::Ui::Core::Component
+
+    # See UiBibz::Ui::Core::Component.initialize
+    def initialize content = nil, options = nil, html_options = nil, &block
+      super
+    end
+
+    def render
+      if options[:tap]
+        content_tag :h4, html_content, html_options
+      else
+        html_content
+      end
+    end
+
+  private
+
+    def component_html_classes
+      "alert-header"
+    end
+
+    def html_content
+      output = [glyph_and_content_html]
+      output << close_html if options[:closable]
+      output.join.html_safe
+    end
+
+    def close_html
+      content_tag :button, type: 'button', class: 'close', "data-dismiss" => "alert", "aria-label" => "Close" do
+        concat content_tag :span, "×", "aria-hidden" => true
+        concat content_tag :span, "Close", class: "sr-only"
+      end
+    end
+
+  end
+end

data/lib/ui_bibz/ui/core/{progress.rb → progresses/components/bar.rb}

@@ -1,6 +1,6 @@
-module UiBibz::Ui::Core
+module UiBibz::Ui::Core::Progresses::Components
 
-  # Create a progress bar
+  # Create a bar
   #
   # This element is an extend of UiBibz::Ui::Core::Component.
   #
@@ -17,69 +17,62 @@ module UiBibz::Ui::Core
   # * +status+ - status of élement with symbol value:
   #   (+:secondary+, +:primary+, +:info+, +:warning+, +:danger+)
   # * +max+ - Max value (default: 100)
+  # * +min+ - Min value (default: 0)
   # * +value+ - Value of percentage (default: content)
   # * +animated+ - Boolean
   # * +striped+ - Boolean
   #
-  #
   # ==== Signatures
   #
-  #   UiBibz::Ui::Core::Progress.new(percentage, options = nil, html_options = nil)
+  #   UiBibz::Ui::Core::Bar.new(percentage, options = nil, html_options = nil)
   #
-  #   UiBibz::Ui::Core::Progress.new(options = nil, html_options = nil) do
+  #   UiBibz::Ui::Core::Bar.new(options = nil, html_options = nil) do
   #     percentage
   #   end
   #
   # ==== Examples
   #
-  #   UiBibz::Ui::Core::Progress.new(50%, { value: 50})
+  #   UiBibz::Ui::Core::Bar.new(50%, { value: 50})
   #   # or
-  #   UiBibz::Ui::Core::Progress.new(10%, { value: 10, status: :success },{ class: 'test' }).render
+  #   UiBibz::Ui::Core::Bar.new(10%, { value: 10, status: :success },{ class: 'test' }).render
   #   # or
-  #   UiBibz::Ui::Core::Progress.new({ value: 10, status: :success},{ class: 'test' }) do
+  #   UiBibz::Ui::Core::Bar.new({ value: 10, status: :success},{ class: 'test' }) do
   #     10%
   #   end.render
   #
-  # ==== Helper
-  #
-  #   progress(integer, options = {}, html_options = {})
-  #
-  #   progress(options = { tap: true }, html_options = {}) do |pb|
-  #     pb.bar(integer, options = {}, html_options = {})
-  #     pb.bar(options = {}, html_options = {}) do
-  #       integer
-  #     end
-  #   end
-  #
-  class Progress < Component
+  class Bar < UiBibz::Ui::Core::Component
 
     # See UiBibz::Ui::Core::Component.initialize
     def initialize content = nil, options = nil, html_options = nil, &block
       super
-      @bars = []
     end
 
     # Render html tag
     def render
-      content_tag :progress, content, html_options
+      content_tag :div, '', html_options
     end
 
   private
 
     def component_html_classes
-      ['progress', striped, animated]
+      ['progress-bar', striped, animated]
     end
 
     def component_html_options
-      { max: max, value: value }
+      { "aria-valuenow": value, "aria-valuemin": min, "aria-valuemax": max, style: "width: #{ value }%", role: 'progressbar' }
     end
 
     def striped
-      'progress-striped' unless options[:striped].nil?
+      'progress-bar-striped' unless options[:striped].nil?
     end
 
     def animated
-      'progress-animated' unless options[:animated].nil?
+      'progress-bar-animated' unless options[:animated].nil?
+    end
+
+
+    def min
+      options[:min] || 0
     end
 
     def max
@@ -87,11 +80,11 @@ module UiBibz::Ui::Core
     end
 
     def value
-      options[:value] || content.to_i
+      options[:value] || content.to_f
     end
 
     def status
-      "progress-#{ options[:status] }" unless options[:status].nil?
+      "bg-#{ options[:status] }" unless options[:status].nil?
     end
 
   end

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

@@ -0,0 +1,115 @@
+require 'ui_bibz/ui/core/progresses/components/bar'
+module UiBibz::Ui::Core::Progresses
+
+  # Create a progress bar
+  #
+  # 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 élement with symbol value:
+  #   (+:secondary+, +:primary+, +:info+, +:warning+, +:danger+)
+  # * +value+ - Value of percentage (default: content)
+  # * +animated+ - Boolean
+  # * +striped+ - Boolean
+  # * +stacked+ - Boolean
+  # * +line+ - Boolean
+  #
+  #
+  # ==== Signatures
+  #
+  #   UiBibz::Ui::Core::ProgressBar.new(percentage, options = nil, html_options = nil)
+  #
+  #   UiBibz::Ui::Core::ProgressBar.new(options = nil, html_options = nil) do
+  #     percentage
+  #   end
+  #
+  # ==== Examples
+  #
+  #   UiBibz::Ui::Core::ProgressBar.new(50%, { value: 50})
+  #   # or
+  #   UiBibz::Ui::Core::ProgressBar.new(10%, { value: 10, status: :success },{ class: 'test' }).render
+  #   # or
+  #   UiBibz::Ui::Core::ProgressBar.new({ value: 10, status: :success},{ class: 'test' }) do
+  #     10%
+  #   end.render
+  #
+  # ==== Helper
+  #
+  #   ui_progress_bar(integer, options = {}, html_options = {})
+  #
+  #   ui_progress_bar(options = { tap: true }, html_options = {}) do |pb|
+  #     pb.bar(integer, options = {}, html_options = {})
+  #     pb.bar(options = {}, html_options = {}) do
+  #       integer
+  #     end
+  #   end
+  #
+  class ProgressBar < UiBibz::Ui::Core::Component
+
+    # See UiBibz::Ui::Core::Component.initialize
+    def initialize content = nil, options = nil, html_options = nil, &block
+      super
+      @bars = []
+    end
+
+    # Render html tag
+    def render
+      content_tag :div, bars.join.html_safe, html_options
+    end
+
+    def bar content = nil, options = nil, html_options = nil, &block
+      @bars << UiBibz::Ui::Core::Progresses::Components::Bar.new(content, options, html_options, &block).render
+    end
+
+  private
+
+    def component_html_classes
+      ['progress', line]
+    end
+
+    def bars
+      if @bars.size > 0
+        @bars
+      elsif options[:stacked]
+        stacked_bars
+      else
+        [UiBibz::Ui::Core::Progresses::Components::Bar.new(content, options).render]
+      end
+    end
+
+    def line
+      "progress-bar-line" if options[:line]
+    end
+
+    def stacked_bars
+      percentages = [7.4, 15.3, 21.1, 25.9, 30.3, 100]
+      stacked_colors.map.with_index do |color, i|
+        if percentages[0, i].sum <= content.to_f
+          if content.to_f.between?(percentages[0, i].sum , percentages[0, i+1].sum)
+            UiBibz::Ui::Core::Progresses::Components::Bar.new((content.to_f*percentages[i]/100), min: 0, striped: options[:striped], animated: options[:animated], max: 100, status: color).render
+          else
+            UiBibz::Ui::Core::Progresses::Components::Bar.new(percentages[i], min: 0, striped: options[:striped], animated: options[:animated], max: 100, status: color).render
+          end
+        end
+      end
+    end
+
+    def stacked_colors
+      if options[:inverse]
+        %i(success primary info warning danger).reverse
+      else
+        %i(success primary info warning danger)
+      end
+    end
+
+  end
+end

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

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

data/lib/ui_bibz/ui/{core → extensions/core}/component/glyph_extension.rb

@@ -1,8 +1,8 @@
 module GlyphExtension
 
   # Render glyph and content html
-  def glyph_and_content_html
-    [glyph_with_space, content].compact.join.html_safe
+  def glyph_and_content_html content_html = nil
+    [glyph_with_space, content_html || content].compact.join.html_safe
   end
 
   # Render glyph with space html