card 1.19.6 → 1.20.0

data/mod/bootstrap/set/all/bootstrap/helper.rb

@@ -1,10 +1,7 @@
 format :html do
   def glyphicon icon_type, extra_class=""
-    content_tag(
-      :span, "",
-      class: "glyphicon glyphicon-#{icon_type} #{extra_class}",
-      "aria-hidden" => true
-    )
+    wrap_with :span, "", "aria-hidden" => true,
+              class: "glyphicon glyphicon-#{icon_type} #{extra_class}"
   end
 
   def button_link link_text, opts={}
@@ -52,80 +49,6 @@ format :html do
     '<li role="separator" class="divider"></li>'
   end
 
-  def breadcrumb items
-    content_tag :ol, class: "breadcrumb" do
-      items.map do |item|
-        content_tag :li, item, class: "breadcrumb-item"
-      end.join
-    end
-  end
-
-  # Options
-  # header: { content: String, brand: ( String | {name: , href: } ) }
-  def navbar id, opts={}
-    nav_opts = opts[:navbar_opts] || {}
-    nav_opts[:class] ||= opts[:class]
-    add_class nav_opts,
-              "navbar navbar-#{opts.delete(:navbar_type) || 'default'}"
-    header_opts = opts[:header] || {}
-    if opts[:toggle_align] == :left
-      opts[:toggle] = :hide
-      opts[:collapsed_content] ||= ""
-      opts[:collapsed_content] +=
-        navbar_toggle(
-          id, opts[:toggle], "pull-left navbar-link"
-        ).html_safe
-    end
-    wrap_with :nav, nav_opts do
-      [
-        navbar_header(id, header_opts.delete(:content),
-                      header_opts.reverse_merge(toggle: opts[:toggle])),
-        navbar_collapsed_content(opts[:collapsed_content]),
-        content_tag(:div, output(yield).html_safe,
-                    class: "collapse navbar-collapse",
-                    id: "navbar-collapse-#{id}")
-      ]
-    end
-  end
-
-  def navbar_collapsed_content content
-    content_tag(:div, content.html_safe, class: "container-fluid") if content
-  end
-
-  def navbar_header id, content="", opts={}
-    brand =
-      if opts[:brand]
-        if opts[:brand].is_a? String
-          "<a class='navbar-brand' href='#'>#{opts[:brand]}</a>"
-        else
-          link = opts[:brand][:href] || "#"
-          "<a class='navbar-brand' href='#{link}#'>#{opts[:brand][:name]}</a>"
-        end
-      end
-    wrap_with :div, class: "navbar-header" do
-      [
-        (navbar_toggle(id, opts[:toggle]) unless opts[:toggle] == :hide),
-        brand,
-        (content if content)
-      ]
-    end
-  end
-
-  def navbar_toggle id, content=nil, css_class=""
-    content ||= %(
-                  <span class="icon-bar"></span>
-                  <span class="icon-bar"></span>
-                  <span class="icon-bar"></span>
-                )
-    <<-HTML
-      <button type="button" class="navbar-toggle collapsed #{css_class}"
-              data-toggle="collapse" data-target="#navbar-collapse-#{id}">
-        <span class="sr-only">Toggle navigation</span>
-        #{content}
-      </button>
-    HTML
-  end
-
   def split_button button, args={}
     items = yield
     args[:situation] ||= "primary"
@@ -160,69 +83,13 @@ format :html do
     options = content_or_options if block_given?
     content = block_given? ? yield : content_or_options
     content = Array(content)
-    item_options = options.delete(:items) || {}
-    wrap_with :ul, options  do
+    default_item_options = options.delete(:items) || {}
+    wrap_with :ul, options do
       content.map do |item|
-        content_tag :li, item.html_safe, item_options
-      end.join "\n"
-    end
-  end
-
-  def accordion_group list, collapse_id=card.cardname.safe_key
-    accordions = ""
-    index = 1
-    list.each_pair do |title, content|
-      accordions << accordion(title, content, "#{collapse_id}-#{index}")
-      index += 1
-    end
-    content_tag :div, accordions.html_safe,
-                class: "panel-group",
-                id: "accordion-#{collapse_id}",
-                role: "tablist",
-                "aria-multiselectable" => "true"
-  end
-
-  private
-
-  def accordion title, content, collapse_id=card.cardname.safe_key
-    accordion_content =
-      case content
-      when Hash  then accordion_group(content, collapse_id)
-      when Array then content.present? && list_group(content)
-      when String then content
+        i_content, i_opts = item
+        i_opts ||= default_item_options
+        wrap_with :li, i_content, i_opts
       end
-    <<-HTML.html_safe
-      <div class="panel panel-default">
-        #{accordion_panel(title, accordion_content, collapse_id)}
-      </div>
-    HTML
-  end
-
-  def accordion_panel title, body, collapse_id
-    if body
-      <<-HTML
-        <div class="panel-heading" role="tab" id="heading-#{collapse_id}">
-          <h4 class="panel-title">
-            <a data-toggle="collapse" data-parent="#accordion-#{collapse_id}" \
-               href="##{collapse_id}" aria-expanded="true" \
-               aria-controls="#{collapse_id}">
-              #{title}
-            </a>
-          </h4>
-        </div>
-        <div id="#{collapse_id}" class="panel-collapse collapse" \
-               role="tabpanel" aria-labelledby="heading-#{collapse_id}">
-          <div class="panel-body">
-            #{body}
-          </div>
-        </div>
-      HTML
-    else
-      <<-HTML
-        <li class="list-group-item">
-          <h4 class="panel-title">#{title}</h4>
-        </li>
-      HTML
     end
   end
 end

data/mod/bootstrap/set/all/bootstrap/navbar.rb

@@ -0,0 +1,74 @@
+format :html do
+  # Options
+  # header: { content: String, brand: ( String | {name: , href: } ) }
+  def navbar id, opts={}
+    nav_opts = opts[:navbar_opts] || {}
+    nav_opts[:class] ||= opts[:class]
+    add_class nav_opts,
+              "navbar navbar-#{opts.delete(:navbar_type) || 'default'}"
+    header_opts = opts[:header] || {}
+    if opts[:toggle_align] == :left
+      opts[:toggle] = :hide
+      opts[:collapsed_content] ||= ""
+      opts[:collapsed_content] +=
+        navbar_toggle(
+          id, opts[:toggle], "pull-left navbar-link"
+        ).html_safe
+    end
+    wrap_with :nav, nav_opts do
+      [
+        navbar_header(id, header_opts.delete(:content),
+                      header_opts.reverse_merge(toggle: opts[:toggle])),
+        navbar_collapsed_content(opts[:collapsed_content]),
+        wrap_with(:div, class: "collapse navbar-collapse",
+                        id: "navbar-collapse-#{id}") { yield }
+      ]
+    end
+  end
+
+  def navbar_collapsed_content content
+    wrap_with(:div, content, class: "container-fluid") if content
+  end
+
+  def navbar_header id, content="", opts={}
+    brand =
+      if opts[:brand]
+        if opts[:brand].is_a? String
+          "<a class='navbar-brand' href='#'>#{opts[:brand]}</a>"
+        else
+          link = opts[:brand][:href] || "#"
+          "<a class='navbar-brand' href='#{link}#'>#{opts[:brand][:name]}</a>"
+        end
+      end
+    wrap_with :div, class: "navbar-header" do
+      [
+        (navbar_toggle(id, opts[:toggle]) unless opts[:toggle] == :hide),
+        brand,
+        (content if content)
+      ]
+    end
+  end
+
+  def navbar_toggle id, content=nil, css_class=""
+    content ||= %(
+                  <span class="icon-bar"></span>
+                  <span class="icon-bar"></span>
+                  <span class="icon-bar"></span>
+                )
+    <<-HTML
+      <button type="button" class="navbar-toggle collapsed #{css_class}"
+              data-toggle="collapse" data-target="#navbar-collapse-#{id}">
+        <span class="sr-only">Toggle navigation</span>
+        #{content}
+      </button>
+    HTML
+  end
+
+  def breadcrumb items
+    wrap_with :ol, class: "breadcrumb" do
+      items.map do |item|
+        wrap_with :li, item, class: "breadcrumb-item"
+      end.join
+    end
+  end
+end

data/mod/bootstrap/set/all/bootstrap/table.rb

@@ -1,61 +1,91 @@
 format :html do
-  # @param [Array<Array,String>] content the content for the table. Accepts
-  # strings or arrays for each row.
-  # @param [Hash] opts
-  # @option opts [String, Array] :header use first row of content as header or
-  # value of this option if it is a string
-  # @return [HTML] bootstrap table
-  def table content, opts={}
-    add_class opts, "table"
-    if opts[:header]
-      header = opts[:header].is_a?(Array) ? opts[:header] : content.shift
+  class TableHelper
+    def initialize format, content, opts={}
+      @format = format
+      @div_table = opts.delete :div_table
+      if opts[:header]
+        @header = opts[:header].is_a?(Array) ? opts[:header] : content.shift
+      end
+      @rows = content
+      @opts = opts
+      @format.add_class opts, :table
     end
-    wrap_with :table, class: opts[:class] do
-      [
-        (table_header(header) if header),
-        table_body(content)
-      ]
+
+    def render
+      tag :table, class: @opts[:class] do
+        [header, body]
+      end
     end
-  end
 
-  def table_header entries
-    content_tag :thead do
-      content_tag :tr do
-        entries.map do |item|
-          content_tag :th, item
-        end.join "\n"
+    def header
+      return unless @header
+      tag :thead do
+        tag :tr do
+          @header.map do |item|
+            tag(:th) { item }
+          end.join "\n"
+        end
       end
     end
-  end
 
-  def table_body rows
-    content_tag :tbody do
-      rows.map do |row|
-        table_row row
-      end.join "\n"
+    def body
+      tag :tbody do
+        @rows.map do |row_content|
+          row row_content
+        end.join "\n"
+      end
     end
-  end
 
-  def table_cell cell
-    if cell.is_a? Hash
-      content_tag :td, cell.delete(:content).to_s.html_safe, cell
-    else
-      content_tag :td, String(cell).html_safe
+    def row row
+      row_data, row_class =
+        case row
+        when Hash then
+          [row.delete(:content), row]
+        else
+          [row, {}]
+        end
+      row_content =
+        if row_data.is_a?(Array)
+          row_data.map { |item| cell item }.join "\n"
+        else
+          row_data
+        end
+      tag :tr, row_content, row_class
     end
-  end
 
-  def table_row row
-    row_data, row_class =
-      case row
-      when Hash then [row.delete(:content), row]
-      else [row, nil]
-      end
-    row_content =
-      if row_data.is_a?(Array)
-        row_data.map { |item| table_cell item }.join "\n"
+    def cell cell
+      if cell.is_a? Hash
+        content = cell.delete(:content).to_s
+        tag :td, cell do
+          content
+        end
       else
-        row_data
+        tag :td do
+          String(cell)
+        end
+      end
+    end
+
+    def tag elem, content_or_opts={}, opts={}, &block
+      if @div_table
+        if content_or_opts.is_a? Hash
+          @format.add_class content_or_opts, elem
+        else
+          @format.add_class opts, elem
+        end
+        elem = :div
       end
-    content_tag :tr, row_content.html_safe, row_class
+      @format.wrap_with elem, content_or_opts, opts, &block
+    end
+  end
+
+  # @param [Array<Array,String>] content the content for the table. Accepts
+  # strings or arrays for each row.
+  # @param [Hash] opts
+  # @option opts [String, Array] :header use first row of content as header or
+  # value of this option if it is a string
+  # @return [HTML] bootstrap table
+  def table content, opts={}
+    TableHelper.new(self, content, opts).render
   end
 end

data/mod/bootstrap/set/all/bootstrap/tabs.rb

@@ -1,10 +1,12 @@
+
+
 format :html do
   # @param tab_type [String] 'tabs' or 'pills'
   # @param tabs [Hash] keys are the labels, values the content for the tabs
   # @param active_name [String] label of the tab that should be active at the
   # beginning (default is the first)
   # @return [HTML] bootstrap tabs element with all content preloaded
-  def static_tabs tabs, active_name=nil,  tab_type="tabs"
+  def static_tabs tabs, active_name=nil, tab_type="tabs"
     tab_buttons = ""
     tab_panes = ""
     tabs.each do |tab_name, tab_content|
@@ -17,56 +19,89 @@ format :html do
     tab_panel tab_buttons, tab_panes, tab_type
   end
 
-  # @param [Hash] tabs keys are the labels for the tabs, values the urls to
-  # load the content from
+  # @param [Hash] tabs keys are the views, values the title unless you pass a
+  #   hash as value
+  # @option tabs [String] :title
+  # @option tabs [path] :path
+  # @option tabs [Symbol] :view
   # @param [String] active_name label of the tab that should be active at the
   # beginning
   # @param [String] active_content content of the active tab
+  #   can also be passed via a block
   # @param [Hash] args options
   # @option args [String] :type ('tabs') use pills or tabs
   # @option args [Hash] :panel_args html args used for the panel div
   # @option args [Hash] :pane_args html args used for the pane div
   # @return [HTML] bootstrap tabs element with content only for the active
   # tab; other tabs get loaded via ajax when selected
-  def lazy_loading_tabs tabs, active_name, active_content, args={}
+  def lazy_loading_tabs tabs, active_name, active_content="", args={}, &block
     tab_buttons = ""
     tab_panes = ""
-    tabs.each do |tab_name, url|
-      active_tab = (active_name == tab_name)
-      id = "#{card.cardname.safe_key}-#{tab_name.to_name.safe_key}"
-      tab_buttons += tab_button(
-        "##{id}", tab_name, active_tab,
-        "data-url" => url.html_safe,
-        class: (active_tab ? nil : "load")
-      )
-      tab_content = active_tab ? active_content : ""
-      tab_panes += tab_pane(id, tab_content, active_tab, args[:pane_args])
+    standardize_tabs(tabs, active_name) do |tab_name, url, id, active_tab|
+      tab_buttons += lazy_tab_button tab_name, id, url, active_tab
+      tab_panes += lazy_tab_pane id, active_tab, active_content,
+                                 args[:pane_args], &block
     end
     tab_type = args.delete(:type) || "tabs"
     tab_panel tab_buttons, tab_panes, tab_type, args[:panel_args]
   end
 
+  def lazy_tab_button tab_name, id, url, active_tab
+    tab_button(
+      "##{id}", tab_name, active_tab,
+      "data-url" => url.html_safe,
+      class: (active_tab ? nil : "load")
+    )
+  end
+
+  def lazy_tab_pane id, active_tab, active_content, args
+    tab_content =
+      if active_tab
+        block_given? ? yield : active_content
+      else
+        ""
+      end
+    tab_pane(id, tab_content, active_tab, args)
+  end
+
+  def standardize_tabs tabs, active_name
+    tabs.each do |tab_view_name, tab_details|
+      tab_title, url =
+        if tab_details.is_a? Hash
+          [tab_details[:title], tab_details[:path] || path(tab_details[:view])]
+        else
+          [tab_details, path(view: tab_view_name)]
+        end
+      id = "#{card.cardname.safe_key}-#{tab_view_name.to_name.safe_key}"
+      active_tab = (active_name == tab_view_name)
+      yield tab_title, url, id, active_tab
+    end
+  end
+
   def tab_panel tab_buttons, tab_panes, tab_type="tabs", args=nil
     args ||= {}
     add_class args, "tabbable"
     args.reverse_merge! role: "tabpanel"
     wrap_with :div, args do
       [
-        content_tag(:ul, tab_buttons.html_safe,
-                    class: "nav nav-#{tab_type}",
-                    role: "tablist"),
-        content_tag(:div, tab_panes.html_safe, class: "tab-content")
+        wrap_with(:ul, tab_buttons, class: "nav nav-#{tab_type}",
+                                    role: "tablist"),
+        wrap_with(:div, tab_panes, class: "tab-content")
       ]
     end
   end
 
   def tab_button target, text, active=false, link_attr={}
-    link = link_to fancy_title(text), link_attr.merge(
-      path: target, role: "tab", "data-toggle" => "tab"
-    )
+    link = tab_button_link target, text, link_attr
     li_args = { role: :presentation }
     li_args[:class] = "active" if active
-    content_tag :li, link, li_args
+    wrap_with :li, link, li_args
+  end
+
+  def tab_button_link target, text, link_attr={}
+    link_to fancy_title(text), link_attr.merge(
+      path: target, role: "tab", "data-toggle" => "tab"
+    )
   end
 
   def tab_pane id, content, active=false, args=nil
@@ -75,6 +110,6 @@ format :html do
                         id: id
     add_class args, "tab-pane"
     add_class args, "active" if active
-    content_tag :div, content.html_safe, args
+    wrap_with :div, content, args
   end
 end