card-mod-edit 0.11.4 → 0.11.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c4585a2392445ad135ba9d2ca3d5281ac157e60c985a13065ab40fe616833dd1
-  data.tar.gz: 411c89a8efe8b6340e712265a7b57b2b4a32d97cb4a3ce767a06f647baa74891
+  metadata.gz: 4a54a9e3aa482aa83ddee3fbca1e2a2ffbbb733124cf681aab56a159e6a943e2
+  data.tar.gz: 7a719d423cb25de68e1974e4d73c87c6719398d0b7e1bb1d787256f93330d6a9
 SHA512:
-  metadata.gz: 0b593eeb1dcd1c28e11154cf4a2d97708901d5fdaf087441e641767070c74061b9d39bc89368b5f37f82c9f0070070a33d88076ce2fb29d096a4998244769735
-  data.tar.gz: ae37bbd8b63506434029f7acb2627070912a0bf2211ecc0e63140ff2941c8801516dcdc7c6a300ce6d1e9167b6f10b5d01d7f51daf2f580a64cde0269b3b6e51
+  metadata.gz: 9c879f60df6bce6723ba0d1d05f2dc423594a5ca02d661640d3d708ab8f66f00dc2b4ca05768166c1fcee10fdb304023ceb4cd6c3f1000159990f290fa7dacc8
+  data.tar.gz: 691b4cff469c27bc9d5e0d64e61074a7b709a00701ff9fce21c0705454407b3ae606b3fefe673991a0c9e564640fd524bdca85087d68e1f7155cd1614b2eef39

data/set/all/bridge.rb

@@ -1,9 +1,9 @@
 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
 
 format :html do
   wrapper :bridge do

data/set/all/bridge/related_section.rb

@@ -17,7 +17,7 @@ format :html do
 
   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"]
@@ -29,6 +29,6 @@ format :html do
   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

data/set/all/bridge/tab_visibility.rb

@@ -40,7 +40,7 @@ format :html do
   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

data/set/all/edit_name.rb

@@ -1,10 +1,8 @@
 format :html do
-  # 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
@@ -13,10 +11,11 @@ format :html do
     card_form({ action: :update, id: card.id },
               "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
@@ -27,32 +26,31 @@ format :html do
     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

data/set/all/edit_name_confirmation.haml

@@ -0,0 +1,7 @@
+%h5
+  = t :core_rename_confirm
+  %em
+    = safe_name
+  ?
+%p._rename-reference-confirm{ data: { referer_count: referer_count } }
+  = t :core_rename_reference_confirm, count: referer_count

data/set/all/edit_type.rb

@@ -52,6 +52,7 @@ format :html do
 
   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,

data/set/all/editor.rb

@@ -1,4 +1,3 @@
-
 Self::InputOptions.add_to_basket :options, "text area"
 Self::InputOptions.add_to_basket :options, "text field"
 
@@ -46,7 +45,7 @@ format :html do
 
   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/set/all/form.rb

@@ -30,15 +30,13 @@ format :html do
     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
@@ -234,18 +232,16 @@ format :html do
     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/set/all/form_buttons.rb

@@ -5,6 +5,7 @@ format :html do
 
   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"

data/set/all/form_elements.rb

@@ -52,6 +52,7 @@ format :html do
   # redirect to *previous if no :href is given
   def cancel_button args={}
     return unless voo.show? :cancel_button
+
     text = args.delete(:text) || "Cancel"
     add_class args, "btn btn-#{args.delete(:situation) || 'secondary'}"
     add_class args, cancel_strategy(args[:redirect], args[:href])

data/set/all/template_nest.rb

@@ -39,4 +39,4 @@ format do
 
     tmpl_set_name.left_name
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: card-mod-edit
 version: !ruby/object:Gem::Version
-  version: 0.11.4
+  version: 0.11.5
 platform: ruby
 authors:
 - Ethan McCutchen
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-05 00:00:00.000000000 Z
+date: 2021-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: card
@@ -18,14 +18,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.101.4
+        version: 1.101.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.101.4
+        version: 1.101.5
 description: ''
 email:
 - info@decko.org
@@ -43,6 +43,7 @@ files:
 - set/all/edit_content.rb
 - set/all/edit_inline.rb
 - set/all/edit_name.rb
+- set/all/edit_name_confirmation.haml
 - set/all/edit_type.rb
 - set/all/editing.rb
 - set/all/editor.rb