card 1.91 → 1.92

data/mod/bootstrap/lib/bootstrap/component/form.rb

@@ -5,26 +5,59 @@ class Bootstrap
         form *args, &@build_block
       end
 
-      add_tag_method :form, nil, optional_classes: {
-        horizontal: "form-horizontal",
-        inline: "form-inline"
-      }
-      add_div_method :group, "form-group"
-      add_tag_method :label, nil
-      add_tag_method :input, "form-control" do |opts, extra_args|
-        type, label = extra_args
-        prepend { label label, for: opts[:id] } if label
-        opts[:type] = type
-        opts
+      #
+      # def_tag_method :form, nil, optional_classes: {
+      #   horizontal: "form-horizontal",
+      #   inline: "form-inline"
+      # }
+      # def_div_method :group, "form-group"
+      # def_tag_method :label, nil
+      # def_tag_method :input, "form-control" do |opts, extra_args|
+      #   type, label = extra_args
+      #   prepend { label label, for: opts[:id] } if label
+      #   opts[:type] = type
+      #   opts
+      # end
+
+      def form opts={}, &block
+        add_class opts, "form-horizontal" if opts.delete(:horizontal)
+        add_class opts, "form-inline" if opts.delete(:inline)
+        @html.form opts do
+          instance_exec &block
+        end
+      end
+
+      def group text=nil, &block
+        @html.div text, class: "form-group" do
+          instance_exec &block
+        end
+      end
+
+      def label text=nil, &block
+        @html.label text, &block
+      end
+
+      def input type, text: nil, label: nil, id: nil
+        @html.input id: id, class: "form-control", type: type do
+          @html.label label, for: id if label
+          @html.text! text if text
+        end
       end
 
       %i[text password datetime datetime-local date month time
          week number email url search tel color].each do |tag|
-        add_tag_method tag, "form-control", attributes: { type: tag },
-                                            tag: :input do |opts, extra_args|
-          label, = extra_args
-          prepend { label label, for: opts[:id] } if label
-          opts
+        # def_tag_method tag, "form-control", attributes: { type: tag },
+        #                                     tag: :input do |opts, extra_args|
+        #   label, = extra_args
+        #   prepend { label label, for: opts[:id] } if label
+        #   opts
+        # end
+
+        define_method tag do |text: nil, id:, label: |
+          @html.input id: id, class: "form-control", type: tag do
+            @html.label label, for: id if label
+            @html.text! text
+          end
         end
       end
     end

data/mod/bootstrap/lib/bootstrap/component/horizontal_form.rb

@@ -9,23 +9,38 @@ class Bootstrap
         @child_args.last && @child_args.last[1] || 10
       end
 
-      add_tag_method :form, "form-horizontal"
+      def_tag_method :form, "form-horizontal"
 
-      add_tag_method :label, "control-label" do |opts, _extra_args|
+      def_tag_method :label, "control-label" do |opts, _extra_args|
         prepend_class opts, "col-sm-#{left_col_width}"
         opts
       end
 
-      add_div_method :input, nil do |opts, extra_args|
-        type, label = extra_args
-        prepend { tag :label, nil, for: opts[:id] } if label
-        insert { inner_input opts.merge(type: type) }
-        { class: "col-sm-#{right_col_width}" }
+      # def_div_method :input, nil do |opts, extra_args, &block|
+      #   type, label = extra_args
+      #   prepend { tag(:label, nil, for: opts[:id]) { label } } if label
+      #   insert { inner_input opts.merge(type: type) }
+      #   { class: "col-sm-#{right_col_width}" }
+      # end
+
+      def label_col label, id:
+        @html.label label, for: id, class: "col-sm-#{left_col_width} control-label"
       end
-      add_tag_method :inner_input, "form-control", tag: :input
-      add_div_method :inner_checkbox, "checkbox"
 
-      add_div_method :checkbox, nil do |opts, extra_args|
+      def input type, label:, id:, &block
+        label_col label, id: id
+        @html.div class: "col-sm-#{right_col_width}" do
+          @html.input type: type, id: id, class: "form-control"
+        end
+        # block.call class: "col-sm-#{right_col_width}" do
+        #   inner_input opts.merge(type: type)
+        # end
+      end
+
+      def_tag_method :inner_input, "form-control", tag: :input
+      def_div_method :inner_checkbox, "checkbox"
+
+      def_div_method :checkbox, nil do |opts, extra_args|
         inner_checkbox do
           label do
             inner_input "checkbox", extra_args.first, opts
@@ -33,6 +48,16 @@ class Bootstrap
         end
         { class: "col-sm-offset-#{left_col_width} col-sm-#{right_col_width}" }
       end
+
+      def checkbox text, extra_args
+        @html.div class: "col-sm-offset-#{left_col_width} col-sm-#{right_col_width}" do
+          @html.div class: "checkbox" do
+            label_cllabel do
+              inner_input "checkbox"
+            end
+          end
+        end
+      end
     end
   end
 end

data/mod/bootstrap/lib/bootstrap/component/layout.rb

@@ -16,7 +16,15 @@ class Bootstrap
     #     add_html "<span> some extra html</span>"
     #     row 6, 6, ["unicorn", "rainbow"], class: "horn"
     #   end
-    class Layout < Component
+    class Layout < OldComponent
+
+      def render
+        @rendered = begin
+          render_content
+          @content[-1]
+        end
+      end
+
       def render_content
         content = instance_exec *@args, &@build_block
         add_content content
@@ -55,7 +63,7 @@ class Bootstrap
         opts
       end
 
-      alias_method :col, :column
+     alias_method :col, :column
 
       private
 

data/mod/bootstrap/lib/bootstrap/component/panel.rb

@@ -1,9 +1,9 @@
 class Bootstrap
   class Component
-    class Panel < Component
-      add_div_method :panel, "card"
-      add_div_method :heading, "card-header"
-      add_div_method :body, "card-block"
+    class Panel < OldComponent
+      def_div_method :panel, "card"
+      def_div_method :heading, "card-header"
+      def_div_method :body, "card-block"
     end
   end
 end

data/mod/bootstrap/lib/bootstrap/old_component.rb

@@ -0,0 +1,182 @@
+#! no set module
+class Bootstrap
+  class OldComponent < Component
+    def initialize context, *args, &block
+      @context = context
+      @content = ["".html_safe]
+      @args = args
+      @child_args = []
+      @append = []
+      @wrap = []
+      @build_block = block
+    end
+
+    class << self
+      def render format, *args, &block
+        new(format, *args, &block).render
+      end
+
+      # Like add_tag_method but always generates a div tag
+      # The tag option is not available
+      def add_div_method name, html_class, opts={}, &tag_block
+        add_tag_method name, html_class, opts.merge(tag: :div), &tag_block
+      end
+
+      # Defines a method that generates a html tag
+      # @param name [Symbol, String] the name of the method. If no :tag option in tag_opts is defined then the name is also the name of the tag that the method generates
+      # @param html_class [String] a html class that is added to tag. Use nil if you don't want a html_class
+      # @param tag_opts [Hash] additional argument that will be added to the tag
+      # @option tag_opts [Symbol, String] tag the name of the tag
+      # @example
+      #   add_tag_method :link, "known-link", tag: :a, id: "uniq-link"
+      #   link  # => <a class="known-link" id="uniq-link"></a>
+      def add_tag_method name, html_class, tag_opts={}, &tag_block
+        define_method name do |*args, &block|
+          process_tag tag_opts[:tag] || name do
+            content, opts, new_child_args = standardize_args args, &tag_block
+            add_classes opts, html_class, tag_opts.delete(:optional_classes)
+            if (attributes = tag_opts.delete(:attributes))
+              opts.merge! attributes
+            end
+
+            content = with_child_args new_child_args do
+              generate_content content,
+                               tag_opts[:content_processor],
+                               &block
+            end
+
+            [content, opts]
+          end
+        end
+      end
+
+      alias_method :def_div_method, :add_div_method
+      alias_method :def_tag_method, :add_tag_method
+    end
+
+    def render
+      @rendered = begin
+        render_content
+        @content[-1]
+      end
+    end
+
+    def prepend &block
+      tmp = @content.pop
+      instance_exec &block
+      @content << tmp
+    end
+
+    def insert &block
+      instance_exec &block
+    end
+
+    def append &block
+      @append[-1] << block
+    end
+
+    def wrap tag=nil, &block
+      @wrap[-1] << (block_given? ? block : tag)
+    end
+
+    private
+
+    def render_content
+      # if @build_block.arity > 0
+      instance_exec *@args, &@build_block
+    end
+
+    def generate_content content, processor, &block
+      content = instance_exec &block if block.present?
+      return content if !processor || !content.is_a?(Array)
+      content.each {|item| send processor, item}
+      ""
+    end
+
+    def with_child_args args
+      @child_args << args if args.present?
+      res = yield
+      @child_args.pop if args.present?
+      res
+    end
+
+    def add_content content
+      @content[-1] << "\n#{content}".html_safe if content.present?
+    end
+
+    def process_tag tag_name, &content_block
+      @content.push "".html_safe
+      @append << []
+      @wrap << []
+
+
+      content, opts = content_block.call
+      wrappers = @wrap.pop
+      if wrappers.present?
+        while wrappers.present? do
+          wrapper = wrappers.shift
+          if wrapper.is_a? Symbol
+            send wrapper, &content_block
+          else
+            instance_exec(content, &wrappers.shift)
+          end
+        end
+      else
+        add_content content
+      end
+
+      collected_content = @content.pop
+      tag_name = opts.delete(:tag) if tag_name == :yield
+      add_content content_tag(tag_name, collected_content, opts, false)
+      @append.pop.each do |block|
+        add_content instance_exec(&block)
+      end
+      ""
+    end
+
+    def standardize_args args, &block
+      opts = args.last.is_a?(Hash) ? args.pop : {}
+      items = ((args.one? && args.last.is_a?(String)) || args.last.is_a?(Array)) &&
+        args.pop
+      if block.present?
+        opts, args = instance_exec opts, args, &block
+        unless opts.is_a?(Hash)
+          raise Card::Error, "first return value of a tag block has to be a hash"
+        end
+      end
+
+      [items, opts, args]
+    end
+
+    def add_classes opts, html_class, optional_classes
+      prepend_class opts, html_class if html_class
+      Array.wrap(optional_classes).each do |k, v|
+        prepend_class opts, v if opts.delete k
+      end
+    end
+
+    # include BasicTags
+    def html content
+      add_content String(content).html_safe
+      ""
+    end
+
+    add_div_method :div, nil do |opts, extra_args|
+      prepend_class opts, extra_args.first if extra_args.present?
+      opts
+    end
+
+    add_div_method :span, nil do |opts, extra_args|
+      prepend_class opts, extra_args.first if extra_args.present?
+      opts
+    end
+
+    add_tag_method :tag, nil, tag: :yield do |opts, extra_args|
+      prepend_class opts, extra_args[1] if extra_args[1].present?
+      opts[:tag] = extra_args[0]
+      opts
+    end
+
+    include Delegate
+  end
+end

data/mod/bootstrap/lib/javascript/bootstrap_modal_wagn.js

@@ -1,4 +1,4 @@
-wagn.slotReady(function(slot) {
+decko.slotReady(function(slot) {
   slot.find('.modal.fade').on('loaded.bs.modal', function(e) {
     $(this).trigger('slotReady');
   });

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

@@ -1,5 +1,6 @@
 format :html do
-  def accordion_group list, collapse_id=card.cardname.safe_key, args={}
+  def accordion_group list, collapse_id=nil, args={}
+    collapse_id ||= card.cardname.safe_key
     accordions = ""
     index = 1
     case list
@@ -11,8 +12,7 @@ format :html do
         index += 1
       end
     end
-    add_class args, "panel-group"
-
+    add_class args, "act-accordion-group w-100"
     wrap_with :div, class: args[:class], id: "accordion-#{collapse_id}",
                     role: "tablist", "aria-multiselectable" => "true" do
       accordions
@@ -27,7 +27,7 @@ format :html do
       when String then content
       end
     <<-HTML.html_safe
-      <div class="panel panel-default">
+      <div class="card">
         #{accordion_panel(title, accordion_content, collapse_id)}
       </div>
     HTML
@@ -36,18 +36,18 @@ format :html do
   def accordion_panel title, body, collapse_id, _panel_heading_link=false
     if body
       <<-HTML
-        <div class="panel-heading" role="tab" id="heading-#{collapse_id}">
-          <h4 class="panel-title">
+        <div class="card-header" role="tab" id="heading-#{collapse_id}">
+          <h5 class="mb-0">
             <a data-toggle="collapse" data-parent="#accordion-#{collapse_id}" \
                href="##{collapse_id}" aria-expanded="true" \
                aria-controls="#{collapse_id}">
               #{title}
             </a>
-          </h4>
+          </h5>
         </div>
-        <div id="#{collapse_id}" class="panel-collapse collapse" \
+        <div id="#{collapse_id}" class="collapse" \
                role="tabpanel" aria-labelledby="heading-#{collapse_id}">
-          <div class="panel-body">
+          <div class="card-block">
             #{body}
           </div>
         </div>
@@ -55,7 +55,7 @@ format :html do
     else
       <<-HTML
         <li class="list-group-item">
-          <h4 class="panel-title">#{title}</h4>
+          <h4 class="card-header">#{title}</h4>
         </li>
       HTML
     end

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

@@ -11,6 +11,7 @@ format :html do
       triangle_right: :expand_more,
       flag: :flag,
       option_horizontal: :more_horiz,
+      option_vertical: :more_vert,
       pushpin: :pin_drop,
       baby_formula: :device_hub,
       log_out: :call_made,
@@ -26,6 +27,7 @@ format :html do
     },
     glyphicon: {
       option_horizontal: "option-horizontal",
+      option_vertical: "option-vertical",
       triangle_left: "triangle-left",
       triangle_right: "triagnle-right",
       baby_formula: "baby-formula",

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

@@ -107,7 +107,7 @@ format :html do
 
   def tab_button_link target, text, link_attr={}
     add_class link_attr, "nav-link"
-    link_to fancy_title(text), link_attr.merge(
+    link_to text, link_attr.merge(
       path: target, role: "tab", "data-toggle" => "tab"
     )
   end