card 1.21.0 → 1.91

data/mod/bootstrap/set/abstract/bootstrap_code_file.rb

@@ -0,0 +1,39 @@
+def self.included host_class
+  host_class.include_set Abstract::CodeFile
+  host_class.mattr_accessor :stylesheets_dir, :bootstrap_path
+  host_class.stylesheets_dir =
+    File.join(Cardio.gem_root, "mod",
+              host_class.file_content_mod_name, "lib", "stylesheets")
+  host_class.bootstrap_path =
+    File.join(host_class.stylesheets_dir, "bootstrap", "scss")
+end
+
+def add_bs_subdir sub_dir
+  Dir.glob("#{bootstrap_path}/#{sub_dir}/*.scss").each do |path|
+    load_from_path path
+  end
+end
+
+def add_stylesheet filename, type: :scss
+  load_from_path File.join(stylesheets_dir, "#{filename}.#{type}")
+end
+
+def add_bs_stylesheet filename, type: :scss, subdir: nil
+  path = File.join(*[bootstrap_path, subdir, "_#{filename}.#{type}"].compact)
+  load_from_path path
+end
+
+def load_from_path path
+  @stylesheets ||= []
+  Rails.logger.info "reading file: #{path}"
+  @stylesheets << File.read(path)
+end
+
+def stylesheets
+  load_stylesheets unless @stylesheets
+  @stylesheets
+end
+
+view :raw do |_args|
+  card.stylesheets.join "\n"
+end

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

@@ -1,24 +1,79 @@
 format :html do
-  def glyphicon icon_type, extra_class=""
-    return "" unless icon_type
+  ICON_MAP = {
+    material: {
+      plus: :add,
+      pencil: :edit,
+      trash: :delete,
+      wrench: :build,
+      new_window: :open_in_new,
+      history: :history,
+      triangle_left: :expand_less,
+      triangle_right: :expand_more,
+      flag: :flag,
+      option_horizontal: :more_horiz,
+      pushpin: :pin_drop,
+      baby_formula: :device_hub,
+      log_out: :call_made,
+      log_in: :call_received,
+      explore: :explore,
+      remove: :close,
+      expand: :expand_more,
+      collapse_down: :expand_less
+    },
+    font_awesome: {
+      option_horizontal: :ellipsis_h,
+      pushpin: "thumb-tack"
+    },
+    glyphicon: {
+      option_horizontal: "option-horizontal",
+      triangle_left: "triangle-left",
+      triangle_right: "triagnle-right",
+      baby_formula: "baby-formula",
+      log_out: "log-out",
+      log_in: "log-in",
+      collapse_down: "collaps-down"
+    }
+
+  }.freeze
+
+  def icon_class library, icon
+    ICON_MAP[library][icon] || icon
+  end
+
+  def icon_tag icon, extra_class=""
+    return "" unless icon.present?
+    material_icon icon_class(:material, icon), extra_class
+  end
+
+  def glyphicon icon, extra_class=""
+    return "" unless icon
     wrap_with :span, "",
               "aria-hidden" => true,
-              class: "glyphicon glyphicon-#{icon_type} #{extra_class}"
+              class: "glyphicon glyphicon-#{icon_class(:glyphicon, icon)} #{extra_class}"
+  end
+
+  def fa_icon icon, extra_class=""
+    return "" unless icon
+    %{<i class="fa fa-#{icon_class(:font_awesome, icon)} #{extra_class}"></i>}
+  end
+
+  def material_icon icon, extra_class=""
+    %{<i class="material-icons #{extra_class}">#{icon_class(:material, icon)}</i>}
   end
 
   def button_link link_text, opts={}
     btn_type = opts.delete(:btn_type) || "primary"
     opts[:class] = [opts[:class], "btn btn-#{btn_type}"].compact.join " "
-    smart_link_to link_text, opts.merge(type: "button")
+    smart_link_to link_text, opts
   end
 
   def dropdown_button name, opts={}
     <<-HTML
-      <div class="btn-group" role="group">
-        <button type="button" class="btn btn-primary dropdown-toggle"
+      <div class="btn-group btn-group-sm" role="group">
+        <button class="btn btn-primary dropdown-toggle"
                 data-toggle="dropdown" title="#{name}" aria-expanded="false"
                 aria-haspopup="true">
-          #{glyphicon opts[:icon] if opts[:icon]} #{name}
+          #{icon_tag opts[:icon] if opts[:icon]} #{name}
           <span class="caret"></span>
         </button>
         #{dropdown_list yield, opts[:class], opts[:active]}
@@ -49,7 +104,7 @@ format :html do
   end
 
   def split_button main_button, active_item
-    wrap_with :div, class: "btn-group" do
+    wrap_with :div, class: "btn-group btn-group-sm" do
       [
         main_button,
         split_button_toggle,
@@ -83,7 +138,8 @@ format :html do
     content = block_given? ? yield : content_or_options
     content = Array(content)
     default_item_options = options.delete(:items) || {}
-    wrap_with :ul, options do
+    tag = options[:ordered] ? :ol : :ul
+    wrap_with tag, options do
       content.map do |item|
         i_content, i_opts = item
         i_opts ||= default_item_options

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

@@ -1,71 +1,57 @@
+
+
 format :html do
   # Options
-  # header: { content: String, brand: ( String | {name: , href: } ) }
+  # @param opts [Hash]
+  # @option opts [String, Hash<name, href>] brand
+  # @option opts [String] class
+  # @option opts [Boolean] no_collapse
+  # @option opts [:left, :right] toggle_align
   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'}"
-    return navbar_nocollapse(yield, nav_opts) if opts[:no_collapse]
-    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 }
-      ]
+              "navbar navbar-inverse bg-#{opts.delete(:navbar_type) || 'primary'}"
+    content = yield
+    if opts[:no_collapse]
+      navbar_nocollapse content, nav_opts
+    else
+      navbar_responsive id, content, opts, nav_opts
     end
   end
 
   def navbar_nocollapse content, nav_opts
-    content = wrap_with(:div, content, class: "container-fluid")
+    content = wrap_with(:div, content)
     wrap_with :nav, content, nav_opts
   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
+  def navbar_responsive id, content, opts, nav_opts
+    opts[:toggle_align] ||= :right
+    wrap_with :nav, nav_opts do
       [
-        (navbar_toggle(id, opts[:toggle]) unless opts[:toggle] == :hide),
-        brand,
-        (content if content)
+        navbar_header(opts[:brand]),
+        navbar_toggle(id, opts[:toggle_align]),
+        wrap_with(:div, class: "collapse navbar-collapse",
+                  id: "navbar-collapse-#{id}") { 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>
-                )
+  def navbar_header brand
+    return "" unless brand
+    if brand.is_a? String
+      "<span class='navbar-brand'>#{brand}</span>"
+    else
+      link = brand[:href] || "#"
+      "<a class='navbar-brand' href='#{link}#'>#{brand[:name]}</a>"
+    end
+  end
+
+  def navbar_toggle id, align
+    content ||= %(<span class="navbar-toggler-icon"></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 class="navbar-toggler navbar-toggler-#{align}" type="button" data-toggle="collapse" data-target="#navbar-collapse-#{id}" aria-controls="navbar-collapse-#{id}" aria-expanded="false" aria-label="Toggle navigation">
+          #{content}
       </button>
     HTML
   end

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

@@ -99,13 +99,14 @@ format :html do
   end
 
   def tab_button target, text, active=false, link_attr={}
+    add_class link_attr, "active" if active
     link = tab_button_link target, text, link_attr
-    li_args = { role: :presentation }
-    li_args[:class] = "active" if active
+    li_args = { role: :presentation, class: "nav-item" }
     wrap_with :li, link, li_args
   end
 
   def tab_button_link target, text, link_attr={}
+    add_class link_attr, "nav-link"
     link_to fancy_title(text), link_attr.merge(
       path: target, role: "tab", "data-toggle" => "tab"
     )

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

@@ -1,17 +1,20 @@
 format :html do
   def frame
-    class_up "card-header", "panel-heading"
-    class_up "card-header-title", "panel-title"
-    class_up "card-body", "panel-body"
+    class_up "d0-card-header" , "card-header"
+    class_up "d0-card-body", "card-block card-text"
     super
   end
 
   def standard_frame slot=true
-    class_up "card-frame", "panel panel-#{panel_state}"
+    if panel_state
+      class_up "d0-card-frame", "card card-#{panel_state} card-inverse"
+    else
+      class_up "d0-card-frame", "card"
+    end
     super
   end
 
   def panel_state
-    "default"
   end
 end
+

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

@@ -1,6 +1,6 @@
 format :html do
   view :closed do
-    class_up "card-body", "closed-content"
+    class_up "d0-card-body", "closed-content"
     super()
   end
 

data/mod/bootstrap/set/self/bootstrap_js.rb

@@ -1,5 +1,5 @@
 include_set Abstract::CodeFile
 
 def source_files
-  %w[bootstrap.js bootstrap_modal_wagn.js]
+  %w[tether.min.js bootstrap.js bootstrap_modal_wagn.js]
 end

data/mod/bootstrap/set/self/bootswatch_shared.rb

@@ -1,40 +1,28 @@
-include_set Abstract::CodeFile
+include_set Abstract::BootstrapCodeFile
 
-view :raw do |_args|
-  bootstrap_path = File.join Cardio.gem_root, "mod",
-                             card.file_content_mod_name, "lib",
-                             "stylesheets", "bootstrap"
-
-  # variables
-  content = File.read("#{bootstrap_path}/_variables.scss")
-  content += %(
-      $bootstrap-sass-asset-helper: false;
-      $icon-font-path: "#{card_url 'assets/fonts/'}";
-    )
-  # mixins
-  content += Dir.glob("#{bootstrap_path}/mixins/*.scss").map do |name|
-    File.read name
-  end.join("\n")
-  content += [
+def load_stylesheets
+  add_stylesheet "font-awesome", type: :css
+  add_stylesheet "material-icons", type: :css
+  add_bs_stylesheet "variables"
+  add_bs_stylesheet "mixins"
+  add_bs_subdir "mixins"
+  [
+    %w[custom],
     # Reset and dependencies
-    %w[normalize print glyphicons],
+    %w[normalize print],
     # Core CSS
-    %w[scaffolding type code grid tables forms buttons],
+    %w[reboot type images code grid tables forms buttons],
     # Components
-    %w[component-animations dropdowns button-groups input-groups navs navbar
-       breadcrumbs pagination pager labels badges jumbotron thumbnails alerts
-       progress-bars media list-group panels responsive-embed wells close],
+    %w[transitions dropdown button-group input-group custom-forms nav navbar card
+       breadcrumb pagination badge jumbotron alert progress media list-group
+       responsive-embed close],
     # Components w/ JavaScript
-    %w[modals tooltip popovers carousel],
-    # Utility classes
-    %w[utilities responsive-utilities]
-  ].map do |names|
+    %w[modal tooltip popover carousel]
+  ].each do |names|
     names.map do |name|
-      path = File.join(bootstrap_path, "_#{name}.scss")
-      Rails.logger.info "reading file: #{path}"
-      File.read path
-    end.join "\n"
-  end.join "\n"
-
-  content
+      add_bs_stylesheet name
+    end
+  end
+  add_bs_subdir "utilities"
 end
+

data/mod/bootstrap/set/self/script_load_select2.rb

@@ -0,0 +1 @@
+include_set Abstract::CodeFile

data/mod/bootstrap/set/self/script_select2.rb

@@ -0,0 +1 @@
+include_set Abstract::CodeFile

data/mod/bootstrap/set/self/style_bootstrap_breakpoints.rb

@@ -0,0 +1,6 @@
+include_set Abstract::BootstrapCodeFile
+
+def load_stylesheets
+  add_bs_stylesheet "breakpoints", subdir: "mixins"
+end
+

data/mod/bootstrap/set/self/style_bootstrap_mixins.rb

@@ -0,0 +1,7 @@
+include_set Abstract::BootstrapCodeFile
+
+def load_stylesheets
+  add_bs_stylesheet "mixins"
+  add_bs_subdir "mixins"
+end
+

data/mod/bootstrap/set/self/style_select2.rb

@@ -0,0 +1 @@
+include_set Abstract::CodeFile

data/mod/carrierwave/set/abstract/attachment/storage_type.rb

@@ -147,8 +147,17 @@ end
 
 def bucket
   @bucket ||= cloud? &&
-              ((new_card? && bucket_from_config) || bucket_from_content ||
-                bucket_from_config)
+              (new_card_bucket || bucket_from_content || bucket_from_config)
+end
+
+def new_card_bucket
+  return unless new_card?
+  # If the file is assigned before the bucket option we have to
+  # check if there is a bucket options in set_specific.
+  # That happens for exmaple when the file appears before the bucket in the
+  # options hash:
+  #   Card.create file: file_handle, bucket: "my_bucket"
+  set_specific[:bucket] || set_specific["bucket"] || bucket_from_config
 end
 
 def bucket_config

data/mod/carrierwave/set/type/file.rb

@@ -84,11 +84,15 @@ format :html do
 
   view :editor do
     if card.web? || card.no_upload?
-      return text_field(:content, class: "card-content")
+      return text_field(:content, class: "d0-card-content")
     end
     file_chooser
   end
 
+  def humanized_attachment_name
+    card.attachment_name.to_s.humanize
+  end
+
   def preview
     ""
   end
@@ -139,7 +143,7 @@ format :html do
         <span class="btn btn-success fileinput-button">
             <i class="glyphicon glyphicon-cloud-upload"></i>
             <span>
-                #{card.new_card? ? 'Add' : 'Replace'} #{card.attachment_name}...
+                #{card.new_card? ? 'Add' : 'Replace'} #{humanized_attachment_name}...
             </span>
              <input class="file-upload slotter form-control" type="file"
                 name="card[#{card.type_code}]" id="card_#{card.type_code}">