card 1.101.5 → 1.101.6

data/tmpsets/set/{mod011-card-mod-account → mod010-card-mod-account}/type/signup/views.rb

@@ -11,7 +11,7 @@ module HtmlFormat; module_parent.send :register_set_format, Card::Format::HtmlFo
   end
 
   view :new do
-    voo.title = invitation? ? tr(:invite) : tr(:sign_up)
+    voo.title = invitation? ? t(:account_invite) : t(:account_sign_up)
     super()
   end
 
@@ -27,6 +27,7 @@ module HtmlFormat; module_parent.send :register_set_format, Card::Format::HtmlFo
 
   def invite_button
     return unless invitation?
+
     button_tag "Send Invitation", situation: "primary"
   end
 
@@ -53,7 +54,7 @@ module HtmlFormat; module_parent.send :register_set_format, Card::Format::HtmlFo
     if card.account
       verification_lines
     else
-      [tr(:missing_account)]
+      [t(:account_missing_account)]
     end
   end
 
@@ -64,12 +65,14 @@ module HtmlFormat; module_parent.send :register_set_format, Card::Format::HtmlFo
   def verification_sent_line
     account = card.account
     return unless account.email_card.ok?(:read)
+
     "A verification email has been sent to #{account.email}"
   end
 
   def verification_link_line
     links = verification_links
     return if links.empty?
+
     links.join " "
   end
 
@@ -88,6 +91,7 @@ module HtmlFormat; module_parent.send :register_set_format, Card::Format::HtmlFo
 
   def approval_link text, with_or_without
     return unless card.can_approve?
+
     link_to_card card, text,
                  path: { action: :update,
                          card: { trigger: "approve_#{with_or_without}_verification" } }
@@ -95,6 +99,7 @@ module HtmlFormat; module_parent.send :register_set_format, Card::Format::HtmlFo
 
   def deny_link
     return unless card.ok? :delete
+
     link_to_card card, "Deny and delete", path: { action: :delete }
   end
 end

data/tmpsets/set/{mod011-card-mod-account → mod010-card-mod-account}/type/user.rb

@@ -42,7 +42,7 @@ module HtmlFormat; module_parent.send :register_set_format, Card::Format::HtmlFo
   def setup_hidden_fields
     hidden_tags(
       setup: true,
-      success: "REDIRECT: #{path mark: ''}",
+      success: { redirect: true, mark: path(mark: "") },
       "card[type_id]" => Card.default_accounted_type_id
     )
   end

data/tmpsets/set/{mod012-card-mod-edit → mod011-card-mod-edit}/all/bridge.rb

@@ -6,11 +6,11 @@ module Bridge;
 extend Card::Set
 def self.source_location; "/Users/ethan/dev/decko/gem/card-mod-edit/set/all/bridge.rb"; end
 BRIDGE_TABS = { "Account" => :account_tab,
-                "Guide"   => :guide_tab,
-                "Engage"  => :engage_tab,
+                "Guide" => :guide_tab,
+                "Engage" => :engage_tab,
                 "History" => :history_tab,
                 "Related" => :related_tab,
-                "Rules"   => :rules_tab }.freeze
+                "Rules" => :rules_tab }.freeze
 
 module HtmlFormat; module_parent.send :register_set_format, Card::Format::HtmlFormat, self; extend Card::Set::AbstractFormat
   wrapper :bridge do

data/tmpsets/set/{mod012-card-mod-edit → mod011-card-mod-edit}/all/bridge/related_section.rb

@@ -24,7 +24,7 @@ module HtmlFormat; module_parent.send :register_set_format, Card::Format::HtmlFo
 
   def related_by_name_items
     pills = []
-    if card.name.junction?
+    if card.name.compound?
       pills += card.name.ancestors.map { |a| [a, a, { mark: :absolute }] }
     end
     pills += RELATED_ITEMS["by name"]
@@ -36,7 +36,7 @@ module HtmlFormat; module_parent.send :register_set_format, Card::Format::HtmlFo
   end
 
   def related_by_type_items
-    [["#{card.type} cards", [card.type, :type, :by_name], mark: :absolute]]
+    [["#{card.type} cards", [card.type, :type, :by_name], { mark: :absolute }]]
   end
 end
 end;end;end;end;end;

data/tmpsets/set/{mod012-card-mod-edit → mod011-card-mod-edit}/all/bridge/tab_visibility.rb

@@ -41,15 +41,13 @@ module HtmlFormat; module_parent.send :register_set_format, Card::Format::HtmlFo
   end
 
   def show_discussion?
-    d_card = discussion_card
-    return unless d_card
+    return unless (d_card = discussion_card)
 
-    permission_task = d_card.new_card? ? :update : :read
-    d_card.ok? permission_task
+    d_card.ok? discussion_permission_task(d_card)
   end
 
   def discussion_card?
-    card.junction? && card.name.tag_name.key == :discussion.cardname.key
+    card.compound? && card.name.tag_name.key == :discussion.cardname.key
   end
 
   def discussion_card
@@ -57,6 +55,13 @@ module HtmlFormat; module_parent.send :register_set_format, Card::Format::HtmlFo
 
     card.fetch :discussion, skip_modules: true, new: {}
   end
+
+  private
+
+  def discussion_permission_task d_card=nil
+    d_card ||= discussion_card
+    d_card.new_card? ? :update : :read
+  end
 end
 end;end;end;end;end;
 # ~~ generated from /Users/ethan/dev/decko/gem/card-mod-edit/set/all/bridge/tab_visibility.rb ~~

data/tmpsets/set/{mod012-card-mod-edit → mod011-card-mod-edit}/all/edit_name.rb

@@ -6,61 +6,59 @@ module EditName;
 extend Card::Set
 def self.source_location; "/Users/ethan/dev/decko/gem/card-mod-edit/set/all/edit_name.rb"; end
 module HtmlFormat; module_parent.send :register_set_format, Card::Format::HtmlFormat, self; extend Card::Set::AbstractFormat
-  # note: depends on js with selector ".edit_name-view .card-form"
   view :edit_name, perms: :update do
     frame { name_form }
   end
 
-  # note: depends on js with selector ".name_form-view .card-form"
   view :name_form, perms: :update, wrap: :slot, cache: :never do
     name_form :edit_name_row
   end
 
   def name_form success_view=nil
     card_form({ action: :update, id: card.id },
-              # "main-success" => "REDIRECT",
+              "data-main-success": JSON(redirect: true, view: ""),
               "data-update-origin": "true",
+              class: "_rename-form",
               success: edit_name_success(success_view)) do
-      [hidden_edit_name_fields,
+      [edit_name_hidden_fields,
        _render_name_formgroup,
-       rename_confirmation_alert,
+       edit_name_confirmation,
        edit_name_buttons]
     end
   end
 
   def edit_name_success view=nil
-    success = { id: "_self" }
+    success = { name: "_self", redirect: "" }
     success[:view] = view if view
     success
   end
 
-  def hidden_edit_name_fields
+  def edit_name_hidden_fields
     hidden_tags old_name: card.name, card: { update_referers: false }
   end
 
   def edit_name_buttons
+    class_up "button-form-group", "rename-button-form-group"
     button_formgroup do
       [rename_and_update_button, rename_button, standard_cancel_button]
     end
   end
 
-  # LOCALIZE
-  def rename_and_update_button
-    submit_button text: "Rename and Update", disable_with: "Renaming",
-                  class: "renamer-updater"
+  def edit_name_confirmation
+    alert "warning", false, false, class: "hidden-alert" do
+      haml :edit_name_confirmation, referer_count: card.references_in.count
+    end
   end
 
-  def rename_button
-    button_tag "Rename", data: { disable_with: "Renaming" }, class: "renamer"
+  def rename_and_update_button
+    submit_button text: t(:core_rename_and_update),
+                  disable_with: t(:core_renaming),
+                  class: "_renamer-updater"
   end
 
-  # LOCALIZE
-  def rename_confirmation_alert
-    msg = "<h5>Are you sure you want to rename <em>#{safe_name}</em>?</h5>"
-    msg << %(<h6>This may change names referred to by other cards.</h6>)
-    msg << %(<p>You may choose to <em>update or ignore</em> the referers.</p>)
-    msg << hidden_field_tag(:referers, 1)
-    alert("warning", false, false, class: "hidden-alert") { msg }
+  def rename_button
+    button_tag t(:core_rename),
+               class: "renamer", data: { disable_with: t(:core_renaming) }
   end
 end
 end;end;end;end;

data/tmpsets/set/{mod012-card-mod-edit → mod011-card-mod-edit}/all/edit_type.rb

@@ -49,61 +49,80 @@ module HtmlFormat; module_parent.send :register_set_format, Card::Format::HtmlFo
     end
   end
 
+  def type_field args={}
+    @no_current_type = args.delete :no_current_type # just a test artifact?
+    action_view.select_tag "card[type]", type_field_options,
+                           args.merge("data-select2-id": "#{unique_id}-#{Time.now.to_i}")
+  end
+
+  private
+
+  def raw_type_options
+    return @raw_type_options if @raw_type_options
+
+    options = Auth.createable_types
+    if !@no_current_type && card.real? && !options.include?(card.type_name)
+      # current type should be an option on existing cards,
+      # regardless of create perms
+      options.push(card.type_name).sort!
+    end
+    @raw_type_options = ::Set.new options
+  end
+
   def wrap_type_formgroup
     formgroup "Type", input: "type", class: "type-formgroup", help: false do
       output [yield, hidden_field_tag(:assign, true)]
     end
   end
 
-  def type_field args={}
-    typelist = Auth.createable_types
-    current_type = type_field_current_value args, typelist
-    action_view.select_tag "card[type]", type_field_options(current_type),
-                           args.merge("data-select2-id": "#{unique_id}-#{Time.now.to_i}")
+  def type_field_options
+    if grouped_types.size == 1
+      simple_type_field_options
+    else
+      multi_type_field_options
+    end
   end
 
-  def type_field_options current_type
-    types = grouped_types(current_type)
+  def simple_type_field_options
+    options_for_select grouped_types.flatten[1], current_type_value
+  end
 
-    if types.size == 1
-      options_for_select types.flatten[1], current_type
-    else
-      grouped_options_for_select types, current_type
-    end
+  def multi_type_field_options
+    grouped_options_for_select grouped_types, current_type_value
+  end
+
+  def current_type_value
+    return if @no_current_type
+
+    @current_type_value ||= card.type_name_or_default
   end
 
-  def grouped_types current_type
+  def grouped_types
     groups = Hash.new { |h, k| h[k] = [] }
-    allowed = ::Set.new Auth.createable_types
-    allowed << current_type if current_type
 
-    visible_cardtype_groups.each_pair do |name, items|
+    visible_cardtype_groups.each_pair.with_object(groups) do |(name, items), grps|
       if name == "Custom"
-        Auth.createable_types.each do |type|
-          groups["Custom"] << type unless ::Card::Set::Self::Cardtype::GROUP_MAP[type]
-        end
+        custom_grouped_types grps
       else
-        items.each do |i|
-          groups[name] << i if allowed.include?(i)
-        end
+        standard_grouped_types grps, name, items
       end
     end
-    groups
   end
 
-  def visible_cardtype_groups
-    ::Card::Set::Self::Cardtype::GROUP
+  def custom_grouped_types groups
+    Auth.createable_types.each do |type|
+      groups["Custom"] << type unless ::Card::Set::Self::Cardtype::GROUP_MAP[type]
+    end
   end
 
-  def type_field_current_value args, typelist
-    return if args.delete :no_current_type
-
-    if !card.new_card? && !typelist.include?(card.type_name)
-      # current type should be an option on existing cards,
-      # regardless of create perms
-      typelist.push(card.type_name).sort!
+  def standard_grouped_types groups, name, items
+    items.each do |i|
+      groups[name] << i if raw_type_options.include?(i)
     end
-    card.type_name_or_default
+  end
+
+  def visible_cardtype_groups
+    ::Card::Set::Self::Cardtype::GROUP
   end
 end
 end;end;end;end;

data/tmpsets/set/{mod012-card-mod-edit → mod011-card-mod-edit}/all/editor.rb

@@ -5,7 +5,6 @@ class Card; module Set; class All
 module Editor;
 extend Card::Set
 def self.source_location; "/Users/ethan/dev/decko/gem/card-mod-edit/set/all/editor.rb"; end
-
 Self::InputOptions.add_to_basket :options, "text area"
 Self::InputOptions.add_to_basket :options, "text field"
 
@@ -31,9 +30,8 @@ module HtmlFormat; module_parent.send :register_set_format, Card::Format::HtmlFo
 
   # move somewhere more accessible?
   def with_card mark
-    return nil unless (card = Card[mark])
-
-    yield card
+    card = Card[mark]
+    yield card if card
   rescue Card::Error::CodenameNotFound
     nil
   end
@@ -54,7 +52,7 @@ module HtmlFormat; module_parent.send :register_set_format, Card::Format::HtmlFo
 
   def text_area_input
     text_area :content, rows: 5, class: "d0-card-content",
-                        "data-card-type-code" => card.type_code
+                        "data-card-type-code": card.type_code
   end
 
   def text_field_input

data/tmpsets/set/{mod012-card-mod-edit → mod011-card-mod-edit}/all/form.rb

@@ -37,15 +37,13 @@ module HtmlFormat; module_parent.send :register_set_format, Card::Format::HtmlFo
     hidden_field :last_action_id_before_edit, class: "current_revision_id"
   end
 
-  def wrap_content_formgroup
+  def wrap_content_formgroup &block
     formgroup("Content", input: :content, help: false,
-                         class: classy("card-editor")) { yield }
+                         class: classy("card-editor"), &block)
   end
 
-  def button_formgroup
-    wrap_with :div, class: classy("form-group") do
-      wrap_with :div, yield
-    end
+  def button_formgroup &block
+    wrap_with :div, class: "form-group #{classy 'button-form-group'}", &block
   end
 
   def name_field
@@ -221,9 +219,16 @@ module HtmlFormat; module_parent.send :register_set_format, Card::Format::HtmlFo
     add_class opts, "card-form"
     add_class opts, "slotter" unless opts[:redirect] || opts[:no_slotter]
     add_class opts, "autosave" if action == :update
+    interpret_main_success_opts opts
     opts
   end
 
+  def interpret_main_success_opts opts
+    return unless (hash = opts.delete :main_success)
+
+    opts["data-main-success"] = JSON hash
+  end
+
   def card_form_url_and_action action
     case action
     when Symbol then [path(action: action), action]
@@ -234,18 +239,16 @@ module HtmlFormat; module_parent.send :register_set_format, Card::Format::HtmlFo
     end
   end
 
-  def editor_wrap type=nil
+  def editor_wrap type=nil, &block
     html_class = "editor"
     html_class << " #{type}-editor" if type
-    wrap_with :div, class: html_class do
-      yield
-    end
+    wrap_with :div, class: html_class, &block
   end
 
   # FIELD VIEWS
 
   def add_junction_class
-    return unless card.name.junction?
+    return unless card.name.compound?
 
     class_up "card-editor", "RIGHT-#{card.name.tag_name.safe_key}"
   end

data/tmpsets/set/{mod012-card-mod-edit → mod011-card-mod-edit}/all/form_buttons.rb

@@ -12,6 +12,7 @@ module HtmlFormat; module_parent.send :register_set_format, Card::Format::HtmlFo
 
   def standard_save_button opts={}
     return if voo&.hide?(:save_button)
+
     add_class opts, "submit-button btn-sm mr-3 _update-history-pills"
     opts[:text] ||= "Save"
     opts["data-cy"] = "save"
@@ -49,6 +50,8 @@ module HtmlFormat; module_parent.send :register_set_format, Card::Format::HtmlFo
   end
 
   def delete_button opts={}
+    return unless card.real?
+
     link_to "Delete", delete_button_opts(opts)
   end
 
@@ -56,7 +59,7 @@ module HtmlFormat; module_parent.send :register_set_format, Card::Format::HtmlFo
     add_class opts,  "slotter btn btn-outline-danger ml-auto btn-sm"
     opts["data-confirm"] = delete_confirm opts
     opts[:path] = { action: :delete }
-    opts[:path][:success] = delete_success(opts) unless opts.delete(:no_success)
+    opts[:path][:success] = delete_success(opts)
     opts[:remote] = true
     opts
   end
@@ -66,7 +69,13 @@ module HtmlFormat; module_parent.send :register_set_format, Card::Format::HtmlFo
   end
 
   def delete_success opts
-    opts.delete(:success) || (main? ? "REDIRECT: *previous" : { view: :just_deleted })
+    if opts[:success]
+      opts.delete :success
+    elsif main?
+      { redirect: true, mark: "*previous" }
+    else
+      { view: :just_deleted }
+    end
   end
 end
 end;end;end;end;