card 1.93.5 → 1.93.6

data/mod/search/template/abstract/search/checkbox_item.haml

@@ -0,0 +1,7 @@
+
+%table.search-checkbox-item._search-checkbox-item.w-100
+  %tr
+    %td.checkbox-side
+      = check_box_tag "checkbox-#{unique_id}", item_card.key
+    %td.item-view-side{ style: "background: #fff" }
+      = nest_item item_card

data/mod/search/template/abstract/search/select_item.haml

@@ -0,0 +1,14 @@
+.card-header
+  %h5
+    Select Item
+    .badge.badge-secondary
+      = card.count
+.p-3
+  %input#select-all._select-all{name: "", type: "checkbox", value: ""}
+  %label{for: "select-all"}
+  - if card.count > 0
+    select
+    %span._unselected-items
+      = search_with_params.size
+    following
+= render :checkbox_list

data/mod/standard/set/all/rich_html/editing.rb

@@ -31,9 +31,9 @@ format :html do
     submit_button class: "submit-button"
   end
 
-  def standard_cancel_button href=nil
-    href ||= path
-    cancel_button class: "cancel-button", href: href
+  def standard_cancel_button args={}
+    args.reverse_merge! class: "cancel-button", href: path
+    cancel_button args
   end
 
   view :edit_name, perms: :update do
@@ -125,7 +125,7 @@ format :html do
   def edit_type_buttons
     cancel_path = path view: :edit
     button_formgroup do
-      [standard_submit_button, standard_cancel_button(cancel_path)]
+      [standard_submit_button, standard_cancel_button(href: cancel_path)]
     end
   end
 

data/mod/standard/set/all/rich_html/form_elements.rb

@@ -46,8 +46,17 @@ format :html do
     text = args.delete(:text) || "Cancel"
     args[:type] ||= "button"
     args[:situation] ||= "outline-secondary"
-    add_class args, (args[:href] ? "slotter" : "redirecter")
-    args[:href] ||= Card.path_setting("/*previous")
+    add_class args, cancel_strategy(args[:redirect], args[:href])
+    args[:href] ||= path_to_previous
     button_tag text, args
   end
+
+  def cancel_strategy redirect, href
+    redirect = href.blank? if redirect.nil?
+    redirect ? "redirecter" : "slotter"
+  end
+
+  def path_to_previous
+    Card.path_setting "/*previous"
+  end
 end

data/mod/standard/set/all/rich_html/modal.rb

@@ -1,19 +1,23 @@
 format :html do
-  view :modal_link do |args|
-    opts = args[:link_opts] || {}
-    opts[:path] ||= {}
-    opts[:path][:layout] = :modal
-    opts["data-target"] = "#modal-main-slot"
-    opts["data-toggle"] = "modal"
+  view :modal_link, tags: :unknown_ok do |args|
+    opts = args[:link_opts]
+    opts[:path][:layout] ||= :modal
     text = args[:link_text] || _render_title(args)
     link_to text, opts
   end
 
+  def default_modal_link_args args
+    args[:link_opts] ||= {}
+    args[:link_opts].reverse_merge! path: {},
+                                    "data-target": "#modal-main-slot",
+                                    "data-toggle": "modal"
+  end
+
   view :modal_slot, tags: :unknown_ok do |args|
     id = "modal-#{args[:modal_id] || 'main-slot'}"
     dialog_args = { class: "modal-dialog" }
     add_class dialog_args, args[:dialog_class]
-    wrap_with(:div, class: "modal fade", role: "dialog", id: id) do
+    wrap_with(:div, class: "modal fade _modal-slot", role: "dialog", id: id) do
       wrap_with(:div, dialog_args) do
         wrap_with :div, class: "modal-content" do
           ""
@@ -23,21 +27,24 @@ format :html do
   end
 
   view :modal_menu, tags: :unknown_ok do
-    popout_params = {}
-    popout_params[:view] = params[:view] if params[:view]
+    wrap_with :div, class: "modal-menu w-100" do
+      [close_modal_window, popop_out_modal_window]
+    end
+  end
+
+  def close_modal_window
+    link_to icon_tag(:close), path: "",
+                              class: "close-modal float-right close",
+                              "data-dismiss": "modal"
+  end
+
+  def popop_out_modal_window
     # we probably want to pass on a lot more params than just view,
     # but not all of them
     # (eg we don't want layout, id, controller...)
-    wrap_with :div, class: "modal-menu" do
-      [
-        link_to(glyphicon("remove"),
-                path: "", class: "close-modal float-right close",
-                "data-dismiss" => "modal"),
-        link_to(glyphicon("new-window"),
-                path: popout_params,
-                class: "pop-out-modal float-right close ")
-      ]
-    end
+    popout_params = params[:view] ? { view: params[:view] } : {}
+    link_to icon_tag :new_window, path: popout_params,
+                                  class: "pop-out-modal float-right close "
   end
 
   view :modal_footer, tags: :unknown_ok do

data/mod/standard/set/all/rich_html/new.rb

@@ -1,3 +1,5 @@
+
+
 format :html do
   view :new, perms: :create, tags: :unknown_ok, cache: :never do
     with_nest_mode :edit do
@@ -97,12 +99,16 @@ format :html do
   end
 
   view :new_buttons do
-    cancel_path = !main? && path(view: :missing)
     button_formgroup do
-      [standard_create_button, standard_cancel_button(cancel_path)]
+      [standard_create_button, standard_cancel_button(cancel_button_new_args)]
     end
   end
 
+  # path to redirect to after canceling a new form
+  def cancel_button_new_args
+    { href: (main? ? path_to_previous : path(view: :missing)) }
+  end
+
   def standard_create_button
     submit_button class: "submit-button create-submit-button"
   end

data/mod/standard/set/all/rich_html/wrapper.rb

@@ -3,30 +3,34 @@ format :html do
   # (1) gives CSS classes for styling and
   # (2) adds card data for javascript - including the "card-slot" class,
   #     which in principle is not supposed to be in styles
-  def wrap slot=true
+  def wrap slot=true, &block
+    method_wrap :wrap_with, slot, &block
+  end
+
+  def haml_wrap slot=true, &block
+    method_wrap :haml_tag, slot, &block
+  end
+
+  def method_wrap method, slot, &block
     @slot_view = @current_view
     debug_slot do
-      wrap_with :div, yield, id: card.name.url_key,
-                             class: wrap_classes(slot),
-                             data:  wrap_data
+      attribs = { id: card.name.url_key,
+                  class: wrap_classes(slot),
+                  data:  wrap_data }
+      send method, :div, attribs, &block
     end
   end
 
-  def haml_wrap slot=true
-    @slot_view = @current_view
-    debug_slot do
-      haml_tag :div, id: card.name.url_key,
-                     class: wrap_classes(slot),
-                     data:  wrap_data do
-        yield
-      end
+  def wrap_data slot=true
+    with_slot_data slot do
+      { "card-id": card.id, "card-name": h(card.name) }
     end
   end
 
-  def wrap_data
-    { "card-id"           => card.id,
-      "card-name"         => h(card.name),
-      "slot"              => slot_options }
+  def with_slot_data slot
+    hash = yield
+    hash[:slot] = slot_options if slot
+    hash
   end
 
   def slot_options_json
@@ -34,7 +38,7 @@ format :html do
   end
 
   def slot_options
-    options = voo.slot_options
+    options = voo ? voo.slot_options : {}
     name_context_slot_option options
     options
   end
@@ -61,7 +65,7 @@ format :html do
   def wrap_classes slot
     list = slot ? ["card-slot"] : []
     list += ["#{@current_view}-view", card.safe_set_keys]
-    list << "STRUCTURE-#{voo.structure.to_name.key}" if voo.structure
+    list << "STRUCTURE-#{voo.structure.to_name.key}" if voo&.structure
     classy list
   end
 

data/mod/standard/set/type/cardtype.rb

@@ -10,11 +10,11 @@ format :html do
     super args
   end
 
-  view :type_formgroup do |args|
+  view :type_formgroup do
     if card.cards_of_type_exist?
       wrap_with :div, tr(:cards_exist, cardname: card.name)
     else
-      super args
+      super()
     end
   end
 

data/mod/standard/spec/set/all/rich_html/editing_spec.rb

@@ -20,7 +20,6 @@ describe Card::Set::All::RichHtml::Editing do
     it "shows editors for both absolute and relative nests" do
       mycard.content = "{{absolute}} AND {{+relative}}"
       view = myformat.render :edit_nests
-      puts view
       expect(view).to have_tag "div.SELF-a" do
         with_tag "div.card-editor", with: { card_name: "absolute" }
         with_tag "div.card-editor", with: { card_name: "A+relative" }

data/mod/utility/set/abstract/utility.rb

@@ -0,0 +1,13 @@
+
+def fetch_params params
+  Env.params.select { |key, val| val && params.include?(key) }
+     .with_indifferent_access
+end
+
+def param_to_i key, default
+  if (value = Env.params[key])
+    value.to_i
+  else
+    default
+  end
+end

data/mod/utility/spec/set/abstract/utility_spec.rb

@@ -0,0 +1,16 @@
+describe Card::Set::Abstract::Utility do
+  describe "#params_to_i" do
+    subject do
+      Card["A"].with_set(described_class).param_to_i "offset", 0
+    end
+
+    it "returns value from params" do
+      Card::Env.params["offset"] = "5"
+      is_expected.to eq(5)
+    end
+
+    it "returns default" do
+      is_expected.to eq(0)
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: card
 version: !ruby/object:Gem::Version
-  version: 1.93.5
+  version: 1.93.6
 platform: ruby
 authors:
 - Ethan McCutchen
@@ -19,14 +19,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.3.5
+        version: 0.3.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.3.5
+        version: 0.3.6
 - !ruby/object:Gem::Dependency
   name: haml
   requirement: !ruby/object:Gem::Requirement
@@ -3294,6 +3294,7 @@ files:
 - mod/core/layout/noside.html
 - mod/core/layout/pre.html
 - mod/core/layout/simple.html
+- mod/core/layout/simple_modal.html
 - mod/core/set/abstract/code_file.rb
 - mod/core/set/abstract/haml_file.rb
 - mod/core/set/abstract/lock.rb
@@ -3355,6 +3356,7 @@ files:
 - mod/core/spec/set/all/content_spec.rb
 - mod/core/spec/set/all/event_conditions_spec.rb
 - mod/core/spec/set/all/export_spec.rb
+- mod/core/spec/set/all/fetch_helper_spec.rb
 - mod/core/spec/set/all/fetch_spec.rb
 - mod/core/spec/set/all/i18n_spec.rb
 - mod/core/spec/set/all/initialize_spec.rb
@@ -3494,6 +3496,7 @@ files:
 - mod/pointer/set/abstract/01_paging/paging_links.rb
 - mod/pointer/set/abstract/02_pointer.rb
 - mod/pointer/set/abstract/02_pointer/edit.rb
+- mod/pointer/set/abstract/02_pointer/filtered.rb
 - mod/pointer/set/abstract/02_pointer/item.rb
 - mod/pointer/set/abstract/02_pointer/options.rb
 - mod/pointer/set/abstract/code_pointer.rb
@@ -3508,26 +3511,35 @@ files:
 - mod/pointer/template/abstract/02_pointer/edit/autocomplete_input.haml
 - mod/pointer/template/abstract/02_pointer/edit/list_input.haml
 - mod/pointer/template/abstract/02_pointer/edit/list_item.haml
+- mod/pointer/template/abstract/02_pointer/filtered/filter_items.haml
+- mod/pointer/template/abstract/02_pointer/filtered/filtered_list_input.haml
 - mod/prosemirror_editor/db/migrate_cards/20160804112547_add_prosemirror_cards.rb
 - mod/prosemirror_editor/lib/javascript/script_prosemirror.js
 - mod/prosemirror_editor/lib/javascript/script_prosemirror_config.js.coffee
 - mod/prosemirror_editor/set/abstract/prosemirror_editor.rb
 - mod/prosemirror_editor/set/self/script_prosemirror.rb
 - mod/prosemirror_editor/set/self/script_prosemirror_config.rb
+- mod/search/lib/card/filter_query.rb
+- mod/search/set/abstract/00_filter_helper.rb
+- mod/search/set/abstract/01_filter_form_helper.rb
 - mod/search/set/abstract/01_search_params.rb
+- mod/search/set/abstract/02_filter_formgroups.rb
+- mod/search/set/abstract/03_filter.rb
+- mod/search/set/abstract/04_right_filter_form.rb
 - mod/search/set/abstract/search.rb
 - mod/search/set/abstract/wql_search.rb
-- mod/search/set/all/filter.rb
 - mod/search/set/self/navbox.rb
 - mod/search/set/self/recent.rb
 - mod/search/set/self/search.rb
 - mod/search/set/type/search_type.rb
-- mod/search/spec/set/all/filter_spec.rb
+- mod/search/spec/set/abstract/filter_spec.rb
 - mod/search/spec/set/self/navbox_spec.rb
 - mod/search/spec/set/self/recent_spec.rb
 - mod/search/spec/set/self/search_spec.rb
-- mod/search/template/all/filter/_filter_input.haml
-- mod/search/template/all/filter/filter_form.haml
+- mod/search/template/abstract/03_filter/_filter_input.haml
+- mod/search/template/abstract/03_filter/filter_form.haml
+- mod/search/template/abstract/search/checkbox_item.haml
+- mod/search/template/abstract/search/select_item.haml
 - mod/settings/lib/card/setting.rb
 - mod/settings/set/abstract/permission.rb
 - mod/settings/set/right/add_help.rb
@@ -3693,6 +3705,8 @@ files:
 - mod/twitter/Gemfile
 - mod/twitter/db/migrate_cards/20170305112346_add_twitter_cards.rb
 - mod/twitter/set/type/twitter_template.rb
+- mod/utility/set/abstract/utility.rb
+- mod/utility/spec/set/abstract/utility_spec.rb
 - tmpsets/set/mod001-admin/self/admin.rb
 - tmpsets/set/mod001-admin/self/admin_info.rb
 - tmpsets/set/mod001-admin/self/version.rb

data/mod/search/set/all/filter.rb

@@ -1,9 +0,0 @@
-format :html do
-  # @param data [Hash] the filter categories. The hash needs for every category
-  #   a hash with a label and a input_field entry.
-  def filter_form data={}, sort_input_field=nil, form_args={}
-    haml :filter_form, categories: data,
-                       sort_input_field: sort_input_field,
-                       form_args: form_args
-  end
-end