inline_forms 8.1.20 → 8.1.40

data/app/assets/stylesheets/inline_forms/inline_forms.scss

@@ -1,8 +1,19 @@
 // inline_forms
-@import url(http://fonts.googleapis.com/css?family=Open+Sans:400,400italic);
-@import 'inline_forms/foundation_icons';
-@import '../jquery_ui/themes/jquery.ui.sunny.css.scss';
-@import '../jquery_ui/jquery.ui.all.css.scss';
+// Open Sans @font-face lives in inline_forms_fonts.css.erb (self-hosted,
+// Sprockets-served; linked from the layouts) — no external font CDN.
+//
+// Module-system status (8.1.24): `foundation_icons` is a self-contained
+// partial and loads via @use. Everything else must stay on @import until
+// the Foundation question is settled: foundation-rails 6.9 is @import-only
+// internally and its settings globals ($body-background, rem-calc, ...)
+// flow into foundation_and_overrides/theme/devise, which @use cannot
+// replicate without a Foundation that ships a module API (it never will —
+// the framework is unmaintained). See stuff/improvement-plan.md §1.
+//
+// jQuery UI SCSS (sunny theme + widget styles) was dropped in 8.1.26 along
+// with the last jQuery UI widgets (native date/time/month/range/datalist
+// inputs replaced them).
+@use 'inline_forms/foundation_icons';
 @import 'foundation_and_overrides';
 
 // Foundation 6 makes `.row` a flex container (`display: flex`); a nested
@@ -20,7 +31,7 @@
 }
 
 .contain-to-grid {
-  background-color: $body-background !important;
+  background-color: var(--if-color-body-bg) !important;
 }
 
 // Foundation 5 used to position .contain-to-grid.fixed at the top of the
@@ -65,15 +76,15 @@
   .menu > li > a {
     line-height: 45px;
     padding: 0 1rem;
-    color: #FFFFFF;
+    color: var(--if-color-on-dark);
   }
   // F6 dropdown-menu paints the `::after` triangle indicator with
   // `border-color: $primary-color transparent ...` (default blue). The
   // app top bar is dark red, so the blue arrow next to "More" / "Admin"
   // looks broken; force the triangle to white to match the link text.
   .is-dropdown-submenu-parent > a::after {
-    border-top-color: #FFFFFF;
-    border-color: #FFFFFF transparent transparent;
+    border-top-color: var(--if-color-on-dark);
+    border-color: var(--if-color-on-dark) transparent transparent;
   }
   // F6 ships `.is-dropdown-submenu-parent > a { padding-right: 1.5rem }`
   // to reserve space for the `::after` triangle, but our `.menu > li > a`
@@ -99,7 +110,7 @@
   .menu-text,
   .menu-text h1,
   .menu-text h1 a {
-    color: #FFFFFF;
+    color: var(--if-color-on-dark);
   }
   .menu-text h1 {
     margin: 0 !important;
@@ -135,38 +146,38 @@ input {
 }
 
 select {
-  background-color: #fff8e0 !important;
+  background-color: var(--if-color-input-bg) !important;
   border: 0 !important;
   margin: 2px 0 !important;
   padding: 0;
 
 }
 select:hover, select:focus {
-  background-color: lighten(#fff8e0, 2%) !important;
+  background-color: var(--if-color-input-bg-hover) !important;
   border: 0 !important;
 }
 
 #inline_forms_application_top_bar {
-  background-color: #A3381E;
-  color: #FFFFFF;
+  background-color: var(--if-color-primary);
+  color: var(--if-color-on-dark);
   &,
   .menu,
   .menu li,
   .menu a {
-    background-color: #A3381E;
-    color: #FFFFFF;
+    background-color: var(--if-color-primary);
+    color: var(--if-color-on-dark);
   }
 }
 
 #inline_forms_model_top_bar {
-  background-color: #E1C150;
+  background-color: var(--if-color-secondary);
   padding-top: 45px;
   height: 90px;
   .top-bar-right,
   .menu,
   .menu li,
   .menu > li > a {
-    background-color: #E1C150;
+    background-color: var(--if-color-secondary);
   }
   // F6 buttons (`.button`) and inputs (`input[type=text]`) ship with
   // different default heights -- buttons size to padding+line-height
@@ -192,8 +203,8 @@ select:hover, select:focus {
     margin: 0 !important;
   }
   .new_button {
-    background-color: #E1C150;
-    color: #B94C32;
+    background-color: var(--if-color-secondary);
+    color: var(--if-color-accent);
     font-size: 1.3rem;
     padding: 0 2rem 0 1rem;
   }
@@ -203,7 +214,7 @@ select:hover, select:focus {
     transition-property: color;
   }
   input[type=text]:hover, input[type=text]:focus {
-    background-color: lighten(#fff8e0, 5%);
+    background-color: var(--if-color-input-bg-focus);
     -webkit-transition-property: background-color;
     transition-property: background-color;
   }
@@ -240,10 +251,10 @@ turbo-frame {
     margin: 0 auto !important;
   }
   .odd {
-    background-color: #FBE38E;
+    background-color: var(--if-color-row-odd);
   }
   .even {
-    background-color: #FBEEC1;
+    background-color: var(--if-color-row-even);
   }
 }
 
@@ -253,8 +264,8 @@ turbo-frame {
     font-weight: normal !important;
   }
   .row.form_element_header {
-    border-top: 1px solid #B94C32;
-    background-color: rgb(239, 202, 75);
+    border-top: 1px solid var(--if-color-accent);
+    background-color: var(--if-color-header-band);
     font-weight: normal !important;
     font-size: 1.3rem !important;
   }
@@ -292,17 +303,17 @@ turbo-frame {
 }
 
 .object_presentation {
-  background-color: #B94C32;
+  background-color: var(--if-color-accent);
   color: white;
   .close_button  {
-    background-color: #B94C32;
+    background-color: var(--if-color-accent);
     font-size: 1.3rem;
     padding: 0 1rem 0 1rem;
     margin: 0;
   }
   .close_button:hover, .close_button:focus {
-    background-color: #B94C32;
-    color: #FBEEC1;
+    background-color: var(--if-color-accent);
+    color: var(--if-color-row-even);
     -webkit-transition-property: color;
     transition-property: color;
   }
@@ -314,8 +325,8 @@ turbo-frame {
     font-weight: normal !important;
   }
   .row.form_element_header {
-    border-top: 1px solid #B94C32;
-    background-color: rgb(239, 202, 75);
+    border-top: 1px solid var(--if-color-accent);
+    background-color: var(--if-color-header-band);
     font-weight: normal !important;
     font-size: 1.3rem !important;
   }
@@ -324,29 +335,29 @@ turbo-frame {
 
 
 .associated_auto_header {
-  border-top: 1px solid #B94C32;
+  border-top: 1px solid var(--if-color-accent);
   .new_button  {
-    background-color: rgb(239, 202, 75);
+    background-color: var(--if-color-header-band);
     font-size: 1.5rem;
-    color: #B94C32;
+    color: var(--if-color-accent);
     padding: 0 0.5rem 0 1rem;
     margin: 0;
   }
   .new_button:hover, .new_button:focus {
-    background-color: rgb(239, 202, 75);
+    background-color: var(--if-color-header-band);
     color: white;
     -webkit-transition-property: color;
     transition-property: color;
   }
   .close_button  {
-    background-color: rgb(239, 202, 75);
+    background-color: var(--if-color-header-band);
     font-size: 1.5rem;
-    color: #B94C32;
+    color: var(--if-color-accent);
     padding: 0 0.5rem 0 1rem;
     margin: 0;
   }
   .close_button:hover, .new_button:focus {
-    background-color: rgb(239, 202, 75);
+    background-color: var(--if-color-header-band);
     color: white;
     -webkit-transition-property: color;
     transition-property: color;
@@ -370,14 +381,14 @@ turbo-frame {
     display: inline-block;
   }
   a:hover {
-    color: #B94C32;
+    color: var(--if-color-accent);
     -webkit-transition-property: color;
     -webkit-transition-duration: 0.3s;
     transition-property: color;
     transition-duration: 0.3s;
   }
   em {
-    color: #B94C32;
+    color: var(--if-color-accent);
     font-weight: bold;
     font-style: normal;
   }
@@ -387,32 +398,12 @@ turbo-frame {
 }
 
 .record_footer {
-  background-color: rgb(239, 202, 75);
+  background-color: var(--if-color-header-band);
   height: 0.2em;
-  border-bottom: 1px solid #B94C32;
+  border-bottom: 1px solid var(--if-color-accent);
   margin-bottom: 1.5em;
 }
 
-  .custom-combobox {
-    position: relative;
-    display: inline-block;
-  }
-  .custom-combobox-toggle {
-    position: absolute;
-    top: 0;
-    bottom: 0;
-    margin-left: -1px;
-    padding: 0;
-    /* support: IE7 */
-    *height: 1.7em;
-    *top: 0.1em;
-  }
-  .custom-combobox-input {
-    margin: 0;
-    padding: 0.3em;
-  }
-
-
 .column {
     padding-right: 0 !important;
 }
@@ -443,31 +434,31 @@ turbo-frame {
 
 .flash {
   padding: 0.3em;
-  color: #A3381E;
+  color: var(--if-color-primary);
   font-size: 130%;
   font-weight: bold;
   line-height: 120%;
   background-color: white;
-  border-top: 0.3em solid #fade7a;
+  border-top: 0.3em solid var(--if-color-flash-accent);
 }
 
 .error {
-  color: #ffffff;
+  color: var(--if-color-on-dark);
   font-weight: bold;
-  background-color: #a70f0f;
+  background-color: var(--if-color-error-bg);
   padding: 0.3em;
   margin-bottom: 0.5em;
 }
 .success {
-  color: #ffffff;
+  color: var(--if-color-on-dark);
   font-weight: bold;
   border-bottom: 1px solid #cccccc;
-  background-color: #4f8d0d;
+  background-color: var(--if-color-success-bg);
   padding: 0.3em;
   margin-bottom: 0.5em;
 }
 
-/* jQuery ui Slider 8 */
+/* slider_with_values: native range/progress (8.1.26) */
 .slider {
     width: 300px;
     float: left;

data/app/assets/stylesheets/inline_forms_fonts.css.erb

@@ -0,0 +1,39 @@
+/*
+ * Self-hosted fonts for inline_forms, served through Sprockets (ERB) so
+ * asset_path emits correct digested URLs in every environment.
+ *
+ * - Open Sans v44 latin 400 / 400 italic: replaces the external
+ *   `@import url(http://fonts.googleapis.com/...)` that lived in
+ *   inline_forms.scss / devise.scss (insecure scheme + runtime third-party
+ *   dependency). Files live in app/assets/fonts/.
+ * - Foundation Icons v3 (MIT, ZURB): the @font-face moved here from
+ *   _foundation_icons.scss because the Dart Sass-built CSS is served from
+ *   /assets/inline_forms/inline_forms.css, so its relative font reference
+ *   resolved to /assets/inline_forms/foundation-icons.woff and 404'd; the
+ *   fonts' real logical paths are flat (/assets/foundation-icons.*).
+ */
+
+@font-face {
+  font-family: "Open Sans";
+  font-style: normal;
+  font-weight: 400;
+  font-display: swap;
+  src: url(<%= asset_path("opensans-v44-latin-regular.woff2") %>) format("woff2");
+}
+
+@font-face {
+  font-family: "Open Sans";
+  font-style: italic;
+  font-weight: 400;
+  font-display: swap;
+  src: url(<%= asset_path("opensans-v44-latin-italic.woff2") %>) format("woff2");
+}
+
+@font-face {
+  font-family: "foundation-icons";
+  src: url(<%= asset_path("foundation-icons.woff") %>) format("woff"),
+       url(<%= asset_path("foundation-icons.ttf") %>) format("truetype"),
+       url(<%= asset_path("foundation-icons.svg") %>#fontcustom) format("svg");
+  font-weight: normal;
+  font-style: normal;
+}

data/app/controllers/inline_forms_application_controller.rb

@@ -1,4 +1,5 @@
 # -*- encoding : utf-8 -*-
+
 class InlineFormsApplicationController < ActionController::Base
   protect_from_forgery
   # `layout 'devise' if :devise_controller?` was wrong: `:devise_controller?` is a
@@ -7,10 +8,14 @@ class InlineFormsApplicationController < ActionController::Base
   # defaults to `layouts/inline_forms` (actions may still override via `render`).
   layout ->(controller) { controller.devise_controller? ? "devise" : "inline_forms" }
 
-  # limit available locales by setting this. Override in applicaton_controller.
-  I18n.available_locales = [ :en, :nl, :pp ]
+  # NOTE (8.1.31): this class no longer clobbers I18n.available_locales.
+  # It used to hard-assign `[ :en, :nl, :pp ]` at class-load time, which ran
+  # *after* the host app's initializers in development (classes load lazily)
+  # and silently stomped any `config.i18n.available_locales` the app set.
+  # Configure available locales in the app: config/application.rb
+  #   config.i18n.available_locales = [:en, :nl, :pp]
 
-  #set the locale based on the subdomain
+  # set the locale based on the subdomain
   def set_locale
     I18n.locale = extract_locale_from_subdomain || I18n.default_locale
   end
@@ -21,5 +26,4 @@ class InlineFormsApplicationController < ActionController::Base
     return nil if locale.nil?
     I18n.available_locales.include?(locale.to_sym) ? locale.to_s : nil
   end
-
 end

data/app/controllers/inline_forms_controller.rb

@@ -1,4 +1,5 @@
 # -*- encoding : utf-8 -*-
+
 # == Generic controller for the inline_forms plugin.
 # === Usage
 # If you have an Example class, make an ExampleController
@@ -28,7 +29,7 @@ class InlineFormsController < ApplicationController
 
   before_action :getKlass
 
-  load_and_authorize_resource :except => :revert, :no_params => true if cancan_enabled?
+  load_and_authorize_resource except: :revert, no_params: true if cancan_enabled?
   # :index shows a list of all objects from class @Klass, using will_paginate,
   # including a link to 'new', that allows you to create a new record.
   def index
@@ -56,7 +57,7 @@ class InlineFormsController < ApplicationController
       @objects = @objects.merge(@Klass.inline_forms_search(params[:search]))
     end
     @objects = @objects.where(fk_conditions) if fk_conditions
-    @objects = @objects.paginate(:page => params[:page])
+    @objects = @objects.paginate(page: params[:page])
     respond_to do |format|
       # `not_accessible_through_html?` is about preventing direct top-level
       # HTML CRUD on this resource (e.g. /photos when only Apartment is the
@@ -137,7 +138,7 @@ class InlineFormsController < ApplicationController
     attributes = @inline_forms_attribute_list || @object.inline_forms_attribute_list
     attributes.each do | attribute, form_element |
       InlineForms.assert_plain_text_column!(object: @object, attribute: attribute, form_element: form_element)
-      send("#{form_element.to_s}_update", @object, attribute) unless form_element == :associated || (cancan_enabled? && cannot?(:read, @object, attribute))
+      send("#{form_element}_update", @object, attribute) unless form_element == :associated || (cancan_enabled? && cannot?(:read, @object, attribute))
     end
     @parent_class = params[:parent_class]
     @parent_id = params[:parent_id]
@@ -150,20 +151,26 @@ class InlineFormsController < ApplicationController
     end
 
     if @object.save
-      flash.now[:success] = t('success', :message => @object.class.model_name.human)
+      flash.now[:success] = t("success", message: @object.class.model_name.human)
       @objects = cancan_enabled? ? @Klass.accessible_by(current_ability) : @Klass.all
       @objects = @objects.merge(@Klass.inline_forms_list) if @Klass.respond_to?(:inline_forms_list)
       if fk_conditions.nil? && params[:search].present? && @Klass.respond_to?(:inline_forms_search)
         @objects = @objects.merge(@Klass.inline_forms_search(params[:search]))
       end
       @objects = @objects.where(fk_conditions) if fk_conditions
-      @objects = @objects.paginate(:page => params[:page])
+      @objects = @objects.paginate(page: params[:page])
+      created_object = @object
       @object = nil
       respond_to do |format|
-        format.html { render_list_frame_after_save } if html_list_flow_allowed?
+        if html_list_flow_allowed?
+          if open_created_row?(created_object, attributes)
+            format.turbo_stream { render_created_row_open_streams(created_object) }
+          end
+          format.html { render_list_frame_after_save }
+        end
       end
     else
-      flash.now[:header] = ["Kan #{@object.class.to_s.underscore} niet aanmaken."]
+      flash.now[:header] = [ "Kan #{@object.class.to_s.underscore} niet aanmaken." ]
       flash.now[:error] = @object.errors.to_a
       respond_to do |format|
         @object.inline_forms_attribute_list = attributes
@@ -180,7 +187,7 @@ class InlineFormsController < ApplicationController
     @sub_id = params[:sub_id]
     @update_span = params[:update]
     InlineForms.assert_plain_text_column!(object: @object, attribute: @attribute, form_element: @form_element)
-    send("#{@form_element.to_s}_update", @object, @attribute)
+    send("#{@form_element}_update", @object, @attribute)
     # Branch on the actual save result. Previously the return value of
     # `@object.save` was ignored and `field_show` was rendered
     # unconditionally from the in-memory `@object`. When a save failed
@@ -262,7 +269,7 @@ class InlineFormsController < ApplicationController
   def destroy
     @update_span = params[:update]
     @object = referenced_object
-    if current_user.role? :superadmin
+    if destroy_permitted?
       @object.destroy
       # Capture after destroy: `.last` before destroy was the latest *update*
       # (e.g. a plain_text_area edit), so undo reified the pre-edit state.
@@ -291,7 +298,9 @@ class InlineFormsController < ApplicationController
     @version = PaperTrail::Version.find(params[:id])
     @parent = revert_authorization_subject(@version)
     authorize!(:revert, @parent || @Klass) if cancan_enabled?
-    return head :forbidden unless current_user.role? :superadmin
+    # Same gate as :destroy (see destroy_permitted?): superadmin when the host
+    # has the Devise+roles system, otherwise no extra gate beyond CanCan.
+    return head :forbidden unless destroy_permitted?
     return head :not_found unless @parent
 
     @object = @version.reify(
@@ -343,6 +352,19 @@ class InlineFormsController < ApplicationController
 
   private
 
+  # Hard-destroy gate. Generated apps restrict destroy to a Devise user with
+  # `role?(:superadmin)` (Role model + roles HABTM). Hosts without that role
+  # system (e.g. the engine's test/dummy harness, or apps using a different
+  # auth stack) have no gatekeeper here beyond CanCan's
+  # `load_and_authorize_resource`; pre-8.1.27 this crashed with
+  # `NoMethodError` on `nil.role?` instead of deciding either way.
+  def destroy_permitted?
+    user = respond_to?(:current_user, true) ? current_user : nil
+    return true unless user.respond_to?(:role?)
+
+    user.role?(:superadmin)
+  end
+
   # Persist a reified *primary* record (Apartment, Photo, ...) for +revert+.
   #
   # +reify+ on a +destroy+ version returns a record with +new_record? == true+
@@ -459,13 +481,13 @@ class InlineFormsController < ApplicationController
     row_html = render_to_string(
       "inline_forms/row_close",
       layout: false,
-      formats: [:html],
+      formats: [ :html ],
       locals: { update_span: row_id, object: @parent, inline_forms_turbo_row: true }
     )
     versions_html = render_to_string(
       "inline_forms/versions_panel",
       layout: false,
-      formats: [:html],
+      formats: [ :html ],
       locals: { update_span: versions_id, object: @parent, inline_forms_turbo_row: true }
     )
     render turbo_stream: [
@@ -523,6 +545,44 @@ class InlineFormsController < ApplicationController
     render "inline_forms/create_list_frame", layout: associated_list_frame_layout
   end
 
+  # "Open after create" (stuff/2026-07-10-nested-creation-options.md, Option A).
+  #
+  # An `:associated` (has_many) panel only exists on a persisted record, so the
+  # new form hides it and the user historically had to find and reopen the
+  # record to add children. When a *top-level* create succeeds for a class
+  # whose attribute list has an `:associated` panel, respond with Turbo
+  # Streams that refresh the list *and* open the new record's row, landing the
+  # user where the nested panel (and its "new" link) is immediately usable.
+  #
+  # Nested creates are excluded (they already return to the parent's panel),
+  # and requests without a turbo-stream Accept header fall through to the
+  # plain list-frame response.
+  def open_created_row?(created_object, attributes)
+    return false if @parent_class.present?
+    attributes.any? { |_attribute, form_element, *| form_element.to_sym == :associated }
+  end
+
+  def render_created_row_open_streams(created_object)
+    list_frame_id = @update_span
+    @ul_needed = true
+    list_html = render_to_string(partial: "inline_forms/list", formats: [ :html ])
+
+    row_id = helpers.inline_forms_row_turbo_frame_id(created_object)
+    @object = created_object
+    @update_span = row_id
+    @inline_forms_turbo_row = true
+    row_html = render_to_string("inline_forms/row_show", layout: false, formats: [ :html ])
+
+    # Streams apply in order: the first inserts the fresh list (containing the
+    # new record's closed row frame), the second swaps that row open. If the
+    # new record sorted onto another page, the second replace finds no target
+    # and degrades silently to today's list-refresh behavior.
+    render turbo_stream: [
+      turbo_stream.replace(list_frame_id, list_html),
+      turbo_stream.replace(row_id, row_html)
+    ]
+  end
+
   def associated_list_frame_layout
     # Use full inline_forms chrome so the swapped frame is styled; Turbo extracts
     # the matching <turbo-frame id="…"> from the response body.
@@ -579,7 +639,7 @@ class InlineFormsController < ApplicationController
   # Get the class from the controller name.
   # CountryController < InlineFormsController, so what class are we?
   # TODO think about this a bit more.
-  def getKlass #:doc:
+  def getKlass # :doc:
     @Klass = self.controller_name.classify.constantize
     InlineForms.validate_plain_text_configuration_for!(@Klass)
     @Klass
@@ -596,5 +656,4 @@ class InlineFormsController < ApplicationController
   def revert_params
     params.require(:id).permit(:update)
   end
-
 end