active_scaffold 4.3.2 → 4.4.0

data/app/views/active_scaffold_overrides/_field_search_columns.html.erb

@@ -1,40 +1,36 @@
+<%
+  ol_attrs = {}
+  ol_attrs[:id] = subsection_id unless local_assigns[:subsection_id].nil?
+  ol_attrs[:style] = 'display: none;' if columns.collapsed
+%>
 <% if columns.layout == :multiple -%>
-<div class="form-columns"<%= " id=#{subsection_id}" if local_assigns.key? :subsection_id %><%= ' style="display: none;"'.html_safe if columns.collapsed %>>
-  <% columns.each do |group| %>
-    <%= render 'field_search_columns', local_assigns.merge(columns: group, subsection_id: nil) %>
+  <%= as_element :field_search_fields_columns, **ol_attrs do %>
+    <% columns.each do |group| %>
+      <%= render 'field_search_columns', local_assigns.merge(columns: group) %>
+    <% end %>
   <% end %>
-</div>
 <% else -%>
-<ol class="form" <%= "id=#{subsection_id}" unless local_assigns[:subsection_id].nil? %> <%= 'style="display: none;"'.html_safe if columns.collapsed %>>
-  <% visibles, hiddens = visibles_and_hiddens(active_scaffold_config.field_search, columns) %>
-  <% visibles.each do |column| -%>
-    <% if column.respond_to? :each_column %>
-      <li class="sub-section <%= column.css_class unless column.css_class.is_a?(Proc) %>">
-        <%= render_subsection column, @record, nil, :field_search, partial: 'field_search_columns' %>
-      </li>
-    <% else %>
-      <li class="form-element <%= column.css_class unless column.css_class.is_a?(Proc) %>"><%= search_attribute(column, @record) %></li>
-    <% end %>
-  <% end -%>
-  <% unless hiddens.empty?  -%>
-    <li class="sub-section">
-    <% further_options_id = sub_section_id(sub_section: 'further_options') %>
-    <h5>
-      <%= as_(:optional_attributes) %>
-      <%= link_to_visibility_toggle(further_options_id, default_visible: false) %>
-    </h5>
-    <ol id="<%= further_options_id %>" class="form" style="display:none;">
-    <% hiddens.each do |column| -%>
-      <% if column.respond_to? :each_column %>
-        <li class="sub-section <%= column.css_class unless column.css_class.is_a?(Proc) %>">
-          <%= render_subsection column, @record, nil, :field_search, partial: 'field_search_columns' %>
-        </li>
-      <% else %>
-        <li class="form-element <%= column.css_class unless column.css_class.is_a?(Proc) %>"><%= search_attribute(column, @record) %></li>
+  <%= as_element :field_search_fields_container, class: 'form', **ol_attrs do %>
+    <% visibles, hiddens = visibles_and_hiddens(active_scaffold_config.field_search, columns) %>
+    <% visibles.each do |column| -%>
+      <%= render_field_search_column(column, @record) %>
+    <% end -%>
+    <% unless hiddens.empty?  -%>
+      <%
+        @hidden_section ||= ActiveScaffold::DataStructures::ActionColumns.new.tap do |group|
+          group.label = :optional_attributes
+          group.collapsed = true
+        end
+      %>
+      <%= as_element :field_search_subsection do %>
+        <%= render_subsection(@hidden_section, @record, nil, :field_search, subsection_id: sub_section_id(sub_section: 'further_options')) do |further_options_id| %>
+          <%= as_element :field_search_fields_container, id: further_options_id, class: 'form', style: 'display:none;' do %>
+            <% hiddens.each do |column| -%>
+              <%= render_field_search_column(column, @record) %>
+            <% end -%>
+          <% end %>
+        <% end %>
       <% end %>
     <% end -%>
-    </ol>
-    </li>
   <% end -%>
-</ol>
 <% end -%>

data/app/views/active_scaffold_overrides/_form.html.erb

@@ -1,47 +1,56 @@
-<% if columns.layout == :multiple %>
-  <div class="form-columns"<%= " id=#{subsection_id}" if local_assigns.key? :subsection_id %><%= ' style="display: none;"'.html_safe if columns.collapsed %>>
+<%
+  ol_attrs = {}
+  ol_attrs[:id] = subsection_id unless local_assigns[:subsection_id].nil?
+  ol_attrs[:style] = 'display: none;' if columns.collapsed
+%>
+<% if columns.layout == :multiple -%>
+  <%= as_element :form_fields_columns, **ol_attrs do %>
     <% columns.each do |group| %>
       <%= render 'form', local_assigns.merge(columns: group, subsection_id: nil) %>
     <% end %>
-  </div>
+  <% end %>
 <% else %>
 <%
   scope ||= nil
-  subsection_id ||= nil
-  tab_value ||= nil
   tabbed_by ||= nil
   tab_id ||= nil
   show_unauthorized_columns = active_scaffold_config.send(form_action).show_unauthorized_columns if active_scaffold_config.actions.include? form_action
 %>
-<ol class="form" <%= "id=#{subsection_id}" unless subsection_id.nil? %> <%= 'style="display: none;"'.html_safe if columns.collapsed %>>
+<%= as_element :fields_container, class: 'form', **ol_attrs do %>
   <% columns.each_column(for: @record, crud_type: (:read if show_unauthorized_columns)) do |column| %>
-  <% column_css_class = column.css_class unless column.css_class.nil? || column.css_class.is_a?(Proc) %>
-  <% renders_as = column_renders_as(column) %>
-  <% authorized = show_unauthorized_columns || renders_as == :subsection ? @record.authorized_for?(crud_type: form_action, column: column.name) : true %>
-  <% if renders_as == :subsection -%>
-    <% next unless authorized %>
-  <li class="sub-section <%= column_css_class %>">
-    <%= render_subsection(column, @record, scope, form_action) %>
-  </li>
-  <% elsif renders_as == :subform && (authorized || column.show_ui) -%>
-    <%
-      subform_attrs = active_scaffold_subform_attributes(column, column_css_class, tab_id: tab_id)
-      subform_attrs[:class] = "#{subform_attrs[:class]} read-only".strip unless authorized
-      tab_options = local_assigns.slice(:tabbed_by, :tab_id, :tab_value)
-      tab_options[:tabbed_by] = column.options[:tabbed_by] if tabbed_by && column.options[:tabbed_by]
-    %>
-  <%= content_tag :li, subform_attrs do %>
-    <% if authorized %>
-    <%= render_column(column, @record, renders_as, scope, **tab_options) %>
-    <% else %>
-    <%= show_column_value(@record, column, **tab_options) %>
-    <% end %>
-  <% end %>
-  <% else -%>
-  <li class="form-element <%= 'required' if column.required?(action_for_validation(@record)) %> <%= column.form_ui %> <%= column_css_class %>">
-    <%= render_column(column, @record, renders_as, scope, only_value: !authorized) %>
-  </li>
-  <% end -%>
+    <% column_css_class = column.css_class unless column.css_class.is_a?(Proc) %>
+    <% renders_as = column_renders_as(column) %>
+    <% authorized = show_unauthorized_columns || renders_as == :subsection ? @record.authorized_for?(crud_type: form_action, column: column.name) : true %>
+    <% if renders_as == :subsection -%>
+      <% next unless authorized %>
+      <%= as_element :form_subsection, class: column_css_class do %>
+        <%= render_subsection(column, @record, scope, form_action) %>
+      <% end %>
+    <% elsif renders_as == :subform && (authorized || column.show_ui) -%>
+      <%
+        subform_attrs = active_scaffold_subform_attributes(column, column_css_class, tab_id: tab_id)
+        subform_attrs[:class] = "#{subform_attrs[:class]} read-only".strip unless authorized
+        tab_options = local_assigns.slice(:tabbed_by, :tab_id, :tab_value)
+        tab_options[:tabbed_by] = column.options[:tabbed_by] if tabbed_by && column.options[:tabbed_by]
+      %>
+      <%= as_element :subform, **subform_attrs do %>
+        <% if authorized %>
+        <%= render_column(column, @record, renders_as, scope, **tab_options) %>
+        <% else %>
+        <%= show_column_value(@record, column, **tab_options) %>
+        <% end %>
+      <% end %>
+    <% else -%>
+      <%
+        classes = ['form-element']
+        classes << 'required' if column.required?(action_for_validation(@record))
+        classes << form_ui_class(column.form_ui)
+        classes << column.css_class
+      %>
+      <%= as_element :form_element, class: classes.compact.join(' ') do %>
+        <%= render_column(column, @record, renders_as, scope, only_value: !authorized) %>
+      <% end -%>
+    <% end -%>
   <% end -%>
-</ol>
+<% end -%>
 <% end %>

data/app/views/active_scaffold_overrides/_form_association.html.erb

@@ -22,12 +22,12 @@
   columns = (column.form_ui_options || column.options)[:subform_columns]
   columns = active_scaffold_config_for(column.association.klass).subform.build_action_columns(columns) if columns
 -%>
-<h5>
+<%= as_element :subform_header do %>
   <%= column.label -%>
   <%= link_to_visibility_toggle(subform_div_id, default_visible: !column.collapsed) -%>
-</h5>
+<% end %>
 <%= content_tag :span, column.description, class: 'description' if column.description.present? %>
-<div id ="<%= subform_div_id %>" <%= 'style="display: none;"'.html_safe if column.collapsed -%>>
+<div id="<%= subform_div_id %>" <%= 'style="display: none;"'.html_safe if column.collapsed -%>>
 <%# HACK: to be able to delete all associated records %>
   <%= hidden_field_tag "#{(opts = active_scaffold_input_options(column, scope, object: parent_record))[:name]}[0]", '', id: "#{opts[:id]}_0" if column.association.collection? %>
   <%= render subform_partial_for_column(column), column: column, parent_record: parent_record, columns: columns, associated: associated, show_blank_record: show_blank_record, scope: scope, tab_id: tab_id %>

data/app/views/active_scaffold_overrides/_form_association_footer.html.erb

@@ -28,17 +28,19 @@ end
 
 -%>
 <div class="footer-wrapper">
-  <div class="footer">
+  <%= as_element :subform_footer do %>
     <% if show_add_new -%>
-    <% if column.association.collection?
-         add_label = as_(:create_another, model: column.association.klass.model_name.human)
-         add_class = 'as_create_another'
-       else
-         add_label = as_(:replace_with_new)
-         add_class = 'as_replace_with_new'
-       end
-       create_another_id = "#{subform_div_id}-create-another" %>
-    <%= link_to add_label, add_new_url, id: create_another_id, remote: true, class: "as-js-button #{add_class}", style: 'display: none;' %>
+    <%
+      if column.association.collection?
+        add_label = as_(:create_another, model: column.association.klass.model_name.human)
+        add_class = 'create_another'
+      else
+        add_label = as_(:replace_with_new)
+        add_class = 'replace_with_new'
+      end
+      add_button_attrs = {id: "#{subform_div_id}-create-another", remote: true, class: "as-js-button as_#{add_class}", style: 'display: none;'}
+    %>
+    <%= link_to add_label, add_new_url, as_element_attributes(:"subform_#{add_class}", **add_button_attrs) %>
     <% end -%>
 
     <%= '|' if show_add_new && show_add_existing %>
@@ -47,13 +49,15 @@ end
       <% if remote_controller.respond_to?(:uses_record_select?) && remote_controller.uses_record_select? -%>
         <%= link_to_record_select as_(:add_existing), remote_controller.controller_path, record_select_params_for_add_existing(column.association, edit_associated_url, parent_record) -%>
       <% else -%>
-        <% helper_method = association_helper_method(column.association, :sorted_association_options_find)
-           select_options = options_from_collection_for_select(send(helper_method, column.association, nil, parent_record), :to_param, :to_label)
-           add_existing_id = "#{subform_div_id}-add-existing"
-           add_existing_label = column.association.collection? ? :add_existing : :replace_existing %>
+        <%
+          helper_method = association_helper_method(column.association, :sorted_association_options_find)
+          select_options = options_from_collection_for_select(send(helper_method, column.association, nil, parent_record), :to_param, :to_label)
+          add_existing_label = column.association.collection? ? :add_existing : :replace_existing
+          add_existing_attrs = {id: "#{subform_div_id}-add-existing", remote: true, class: "as-js-button as_#{add_existing_label}", style: 'display: none;'}
+        %>
         <%= select_tag 'associated_id', content_tag(:option, as_(:_select_), value: '') + select_options %>
-        <%= link_to as_(add_existing_label), edit_associated_url, id: add_existing_id, remote: true, class: "as-js-button as_#{add_existing_label}", style: 'display: none;' %>
+        <%= link_to as_(add_existing_label), edit_associated_url, as_element_attributes(:subform_add_existing, **add_existing_attrs) %>
       <% end -%>
     <% end -%>
-  </div>
+  <% end %>
 </div>

data/app/views/active_scaffold_overrides/_form_association_record.html.erb

@@ -1,6 +1,6 @@
 <%
   record_column = column
-  ui_options = record_column.form_ui_options || record_column.options
+  ui_options = record_column.form_ui_options || record_column.options if record_column
   readonly = record.readonly? || !record.authorized_for?(crud_type: :update)
   crud_type = record.new_record? ? :create : (readonly ? :read : :update)
   show_actions = false
@@ -8,7 +8,7 @@
   config = active_scaffold_config_for(record.class)
   columns ||= config.subform.columns
   column_names = columns.visible_columns_names
-  scope = column_scope(record_column, scope, record)
+  scope = column_scope(record_column, scope, record) if record_column
   options = active_scaffold_input_options(config.columns[record.class.primary_key], scope, object: record)
   tr_id = "association-#{options[:id]}"
   layout ||= ui_options[:layout] || config.subform.layout
@@ -30,14 +30,13 @@
     default_col_class = ['form-element']
     flatten ||= false
   end
-  index ||= form_association_record_counter ||= nil
 
   columns_length = 0
   columns_groups = []
 -%>
 <%= content_tag record_tag, class: 'sub-form-record' do %>
   <% unless record.errors.empty? -%>
-  <%= content_tag error_tag, class: 'association-record-errors', id: element_messages_id(action: record.class.name.underscore, id: "#{parent_record.id}-#{index}") do %>
+  <%= content_tag error_tag, class: 'association-record-errors', id: element_messages_id(action: record.class.name.underscore) do %>
     <% errors = active_scaffold_error_messages_for(:record, object: record) %>
     <%= error_inner_tag ? content_tag(error_inner_tag, errors, colspan: (active_scaffold_config_for(record.class).subform.columns.length + 1 if error_inner_tag == :td)) : errors %>
   <% end %>

data/app/views/active_scaffold_overrides/_horizontal_subform_header.html.erb

@@ -2,7 +2,8 @@
   <tr>
     <%
     columns ||= active_scaffold_config_for(record_class).subform.columns
-    columns.each_column(for: record_class, crud_type: :read) do |column|
+    crud_type ||= :read
+    columns.each_column(for: record_class, crud_type: crud_type) do |column|
       next unless column.is_a? ActiveScaffold::DataStructures::Column
       next unless in_subform?(column, parent_record, parent_column)
       hidden = column_renders_as(column) == :hidden

data/app/views/active_scaffold_overrides/_list.html.erb

@@ -9,15 +9,16 @@
   </tbody>
 </table>
 <% end %>
-<table>
-  <thead>
-    <tr>
+<%= list_table_html do %>
+<table <%= as_element_attributes :list_table, class: "list-table #{'local-sorting' if local_sorting?}" %>>
+  <thead <%= as_element_attributes :list_table_head %>>
+    <tr <%= as_element_attributes :list_table_head_row %>>
       <% columns = list_columns %>
       <%= render 'list_column_headings', columns: columns %>
     </tr>
   </thead>
   <%= render 'list_messages', columns: columns %>
-  <tbody class="records" id="<%= active_scaffold_tbody_id %>" data-refresh-record="<%= url_for(params_for(action: :index, id: '--ID--')) %>">
+  <tbody <%= as_element_attributes :list_records, class: 'records', id: active_scaffold_tbody_id, data: {refresh_record: url_for(params_for(action: :index, id: '--ID--'))} %>>
     <% if !@page.empty? -%>
       <%= render partial: list_record_view, collection: @page.items, locals: {hidden: false, columns: columns, action_links: active_scaffold_config.action_links.member} %>
     <% end -%>
@@ -28,4 +29,5 @@
   </tfoot>
   <% end -%>
 </table>
+<% end %>
 <%= render 'list_pagination' %>

data/app/views/active_scaffold_overrides/_list_calculations.html.erb

@@ -1,5 +1,5 @@
 <% columns ||= list_columns -%>
-<tr id="<%= active_scaffold_calculations_id %>" class="active-scaffold-calculations">
+<tr <%= as_element_attributes :list_calculations, id: active_scaffold_calculations_id, class: 'active-scaffold-calculations' %>>
   <% columns.each do |column| -%>
     <% if column.calculation? %>
     <td id="<%= active_scaffold_calculations_id(column: column) %>"><%= render_column_calculation(column) %></td>

data/app/views/active_scaffold_overrides/_list_header.html.erb

@@ -1,8 +1,8 @@
 <% action_links = active_scaffold_config.action_links.collection -%>
 <% filters = active_scaffold_config.list.filters %>
-<div class="actions">
+<%= as_element :list_actions, class: 'actions' do %>
   <%= display_filters(filters) %>
   <%= display_action_links(action_links, nil, skip_unauthorized: true) unless action_links.empty? %>
   <%= loading_indicator_tag(action: :table) %>
-</div>
-<h2><%= active_scaffold_config.list.user.label %></h2>
+<% end %>
+<%= as_element :list_title, active_scaffold_config.list.user.label %>

data/app/views/active_scaffold_overrides/_list_messages.html.erb

@@ -1,33 +1,33 @@
 <% column_count ||= columns.length + (grouped_search? ? 0 : 1) -%>
-<tbody class="messages">
+<tbody <%= as_element_attributes :list_messages %>>
   <tr class="record even-record">
-    <td colspan="<%= column_count -%>" class="messages-container">
+    <td <%= as_element_attributes :list_messages_container, colspan: column_count, class: 'messages-container' %>>
       <%= render 'list_messages_content' unless active_scaffold_config.list.messages_above_header %>
-      <%= content_tag :div, class: 'filtered-message',
-                      style: ('display:none;' unless @filtered),
-                      data: ({search: search_params || ''} if active_scaffold_config.store_user_settings && respond_to?(:search_params)) do %>
+      <%= as_element :filtered_message,
+                     style: ('display:none;' unless @filtered),
+                     data: ({search: search_params || ''} if active_scaffold_config.store_user_settings && respond_to?(:search_params)) do %>
         <div><%= @filtered.is_a?(Array) ? render('human_conditions', columns: @filtered) : as_(active_scaffold_config.list.filtered_message) %></div>
         <% if active_scaffold_config.list.show_search_reset && @filtered -%>
-        <div class="reset">
-          <%= loading_indicator_tag(action: :record, id: nil) %>
-          <%= render_action_link(active_scaffold_config.list.reset_link) %>
-        </div>
-        <% end -%>
+          <%= as_element :message_reset do %>
+            <%= loading_indicator_tag(action: :record, id: nil) %>
+            <%= render_action_link(active_scaffold_config.list.reset_link) %>
+          <% end -%>
+        <% end %>
       <% end %>
-      <%= content_tag :div, class: 'filtered-message applied-filters',
-                      style: ('display:none;' unless active_scaffold_config.list.filter_human_message && @applied_filters.present?),
-                      data: ({search: search_params || ''} if active_scaffold_config.store_user_settings && respond_to?(:search_params)) do %>
-        <div><%= render('human_filters', filters: @applied_filters) if active_scaffold_config.list.filter_human_message && @applied_filters.present? %></div>
-        <% if active_scaffold_config.list.show_filter_reset && @applied_filters.present? -%>
-          <div class="reset">
+      <% applied_filters = (@filter_states || {}).values.filter_map { |filter| filter[:option] if filter[:status] == :applied && !filter[:default] } %>
+      <%= as_element :applied_filters_message,
+                      style: ('display:none;' unless active_scaffold_config.list.filter_human_message && applied_filters.present?) do %>
+        <div><%= render('human_filters', filters: applied_filters) if active_scaffold_config.list.filter_human_message && applied_filters.present? %></div>
+        <% if active_scaffold_config.list.show_filter_reset && applied_filters.present? -%>
+          <%= as_element :message_reset do %>
             <%= loading_indicator_tag(action: :record, id: nil) %>
             <%= render_action_link(active_scaffold_config.list.reset_filter_link) %>
-          </div>
+          <% end -%>
         <% end -%>
       <% end %>
-      <p id="<%= empty_message_id %>" class="empty-message" <%= ' style="display:none;" '.html_safe unless @page.empty? %>>
+      <%= as_element :empty_message, id: empty_message_id, class: 'empty-message', style: ('display:none;' unless @page.empty?) do %>
         <%= as_(active_scaffold_config.list.no_entries_message) %>
-      </p>
+      <% end %>
     </td>
   </tr>
 </tbody>    

data/app/views/active_scaffold_overrides/_list_messages_content.html.erb

@@ -1,8 +1,8 @@
-<p class="error-message message server-error" style="display:none;">
+<%= server_error_msg class: 'as-msg', style: 'display:none;' do %>
   <%= as_(:internal_error).html_safe %>
   <span class="error-500"><%= as_(:error_500).html_safe %></span>
-  <a href="#" class="close" title="<%= as_(:close).html_safe %>"><%= as_(:close).html_safe %></a>
-</p>
-<div id="<%= active_scaffold_messages_id -%>" class="action-messages">
+  <%= as_element :message_close, as_(:close), class: 'msg-close', title: as_(:close) %>
+<% end %>
+<%= as_element :list_action_messages, id: active_scaffold_messages_id, class: 'action-messages' do %>
   <%= render 'messages' %>
-</div>
+<% end %>

data/app/views/active_scaffold_overrides/_list_pagination.html.erb

@@ -1,11 +1,13 @@
-<div class="active-scaffold-footer">
+<%= as_element :list_footer do %>
 <% if active_scaffold_config.list.pagination != :infinite -%>
-  <div class="active-scaffold-found"><span class="active-scaffold-records"><%= @page.pager.count -%></span> <%= as_(:found, count: @page.pager.count) %></div>
+  <%= as_element :list_found, class: 'active-scaffold-found' do %>
+    <%= as_element :list_found_count, @page.pager.count, class: 'active-scaffold-records' -%> <%= as_(:found, count: @page.pager.count) %>
+  <% end %>
 <% end -%>
 <% if active_scaffold_config.list.pagination -%>
-  <div class="active-scaffold-pagination<%= ' auto-paginate' if active_scaffold_config.list.auto_pagination %>">
+  <%= as_element :pagination_links, class: "active-scaffold-pagination #{'auto-paginate' if active_scaffold_config.list.auto_pagination}" do %>
     <%= render 'list_pagination_links', current_page: @page if @page.pager.infinite? || @page.pager.number_of_pages > 1 %>
-  </div>
+  <% end -%>
 <% end -%>
   <br /><!-- to clear this block -->
-</div>
+<% end -%>

data/app/views/active_scaffold_overrides/_list_pagination_links.html.erb

@@ -3,7 +3,9 @@
   <% options = {'data-page-history' => controller_id, remote: true, method: :get} -%>
 
   <%= loading_indicator_tag action: :pagination %>
-  <%= link_to as_(:previous), url_options.merge(page: current_page.number - 1), options.merge(class: 'as_paginate previous') if current_page.prev? %>
-  <%= pagination_ajax_links current_page, url_options, options, active_scaffold_config.list.page_links_inner_window, active_scaffold_config.list.page_links_outer_window %>
-  <%= link_to as_(:next), url_options.merge(page: current_page.number + 1), options.merge(class: 'as_paginate next') if current_page.next? %>
+  <%= pagination_html do %>
+    <%= pagination_ajax_link current_page.number - 1, url_options, options.merge(class: 'previous'), text: :previous if current_page.prev? %>
+    <%= pagination_ajax_links current_page, url_options, options, active_scaffold_config.list.page_links_inner_window, active_scaffold_config.list.page_links_outer_window %>
+    <%= pagination_ajax_link current_page.number + 1, url_options, options.merge(class: 'next'), text: :next if current_page.next? %>
+  <% end %>
 <% end -%>

data/app/views/active_scaffold_overrides/_list_record.html.erb

@@ -11,18 +11,23 @@ data_refresh ||= record.to_param
     <% authorized = record.authorized_for?(crud_type: :read, column: column.name) -%>
     <% column_value = authorized ? get_column_value(record, column) : empty_field_text -%>
     <% attrs = column_attributes(column, record).merge(class: column_class(column, column_value, record)) %>
+    <% if local_sorting? && column.sortable? && attrs&.dig(:data, :sort_value).nil? && !column.text? && column.column %>
+      <% (attrs[:data] ||= {})[:sort_value] = column_sort_value(record, column) %>
+    <% end %>
 
     <%= content_tag :td, authorized ? render_list_column(column_value, column, record) : column_value, attrs %>
   <% end -%>
 
   <% unless grouped_search? -%>
-  <td class="actions"><table>
-    <tr>
-      <td class="indicator-container">
-        <%= loading_indicator_tag(action: :record, id: record.id) %>
-      </td>
-      <%= display_action_links(action_links, record, level_0_tag: :td, for: record.persisted? ? record : record.class) %>
-    </tr>
-  </table></td>
+  <td <%= as_element_attributes :record_actions_cell, class: 'actions' %>>
+    <table <%= as_element_attributes :record_action_links %>>
+      <tr>
+        <td class="indicator-container">
+          <%= loading_indicator_tag(action: :record, id: record.id) %>
+        </td>
+        <%= display_action_links(action_links, record, level_0_tag: :td, for: record.persisted? ? record : record.class) %>
+      </tr>
+    </table>
+  </td>
   <% end -%>
 <% end %>

data/app/views/active_scaffold_overrides/_list_with_header.html.erb

@@ -1,8 +1,8 @@
-<%= content_tag(:div, id: active_scaffold_id, class: as_main_div_class, data: as_main_div_data) do %>
-  <div class="active-scaffold-header">
+<%= as_element(:list, id: active_scaffold_id, class: as_main_div_class, data: as_main_div_data) do %>
+  <%= as_element :list_header, class: 'active-scaffold-header' do %>
     <%= render 'list_header' %>
-  </div>
-  <table>
+  <% end %>
+  <%= as_element :before_header_table do %>
     <tbody class="before-header" id="<%= before_header_id -%>">
       <% if active_scaffold_config.list.always_show_search %>
       <% old_record, @record = @record, active_scaffold_config.model.new %>
@@ -21,7 +21,7 @@
       <% old_record, @record = @record, new_model %>
         <tr>
           <td>
-            <div  class="active-scaffold create-view <%= "#{id_from_controller params[:controller]}-view" %> view">
+            <div class="active-scaffold create-view <%= "#{id_from_controller params[:controller]}-view" %> view">
               <%= render 'create_form_on_list' %>
             </div>
           </td>
@@ -29,8 +29,8 @@
       <% @record = old_record %>
       <% end %>
     </tbody>
-  </table>
-  <div id="<%= active_scaffold_content_id-%>" class="as_content">
+  <% end %>
+  <%= as_element :list_content, id: active_scaffold_content_id, class: 'as_content' do %>
     <%= render 'list' %>
-  </div>
+  <% end %>
 <% end %>

data/app/views/active_scaffold_overrides/_messages.html.erb

@@ -1,11 +1,11 @@
 <% for name in %i[info warning error] %>
   <% if flash[name].present? %>
-    <div class="<%= "#{name}-message message" %>">
+    <%= as_element :"#{name}_message", class: 'as-msg' do %>
       <%= display_message flash[name] %>
       <% flash.delete name %>
       <% if request.xhr? %>
-        <a href="#" class="close" title="<%= as_(:close) %>"><%= as_(:close) %></a>
+        <%= as_element :message_close, as_(:close), class: 'msg-close', title: as_(:close) %>
       <% end %>
-    </div>
+    <% end %>
   <% end %>
 <% end %>

data/app/views/active_scaffold_overrides/_render_field.js.erb

@@ -1,9 +1,11 @@
 <%
   record ||= @record
   active_scaffold_config ||= self.active_scaffold_config
-  if render_field.is_a?(Hash)
+  ActiveScaffold.deprecator.warn "use `as: :column` when rendering render_field partial" if local_assigns[:render_field]
+  column ||= render_field
+  if column.is_a?(Hash)
     traverse ||= []
-    render_field.each do |assoc_name, columns|
+    column.each do |assoc_name, columns|
       if assoc_name == :__root__
         config = params[:parent_controller] ? active_scaffold_config_for(params[:parent_controller].singularize.camelize) : controller.active_scaffold_config
         value = @form_record
@@ -24,17 +26,12 @@
         step = traverse_by_record ? "#{sub_form}:has([id$=\"#{assoc_name}_#{r.id || temp_id}\"])" : sub_form
         next_scope = column_scope(assoc_column, scope, r, temp_id) unless assoc_name == :__root__
 %>
-<%= render(partial: 'render_field', collection: columns, locals: {source_id: source_id, scope: next_scope, record: r, active_scaffold_config: config, traverse: traverse + [step]}) %>
+<%= render(partial: 'render_field', collection: columns, as: :column, locals: {source_id: source_id, scope: next_scope, record: r, active_scaffold_config: config, traverse: traverse + [step]}) %>
 <%
       end
     end
   else
-    column =
-      if render_field.is_a? ActiveScaffold::DataStructures::Column
-        render_field
-      else
-        active_scaffold_config.columns[render_field]
-      end
+    column = active_scaffold_config.columns[column] unless column.is_a? ActiveScaffold::DataStructures::Column
     return if column.nil? # using hash may include __root__ to update parent columns when used as subform, and fail if it can be in different model's form, or when edited without subform
     return if local_assigns[:traverse].nil? && @main_columns.exclude?(column.name)
     rendered = (@rendered ||= {})[record] ||= Set.new
@@ -54,7 +51,7 @@
       if renders_as == :subform
         active_scaffold_subform_attributes(column, column_css_class)
       else
-        {class: "form-element #{:required if column.required?(@form_action)} #{column.form_ui} #{column_css_class}", id: ''}
+        as_element_attributes(:form_element, class: "form-element #{:required if column.required?(@form_action)} #{form_ui_class column.form_ui} #{column_css_class}", id: '')
       end
     options[:traverse] = traverse if local_assigns[:traverse]
     html =
@@ -71,5 +68,5 @@
 -%>
 
 ActiveScaffold.render_form_field('<%= source_id %>','<%= escape_javascript(html) %>', <%= options.to_json.html_safe %>);
-<%= render(partial: 'render_field', collection: column.update_columns, locals: local_assigns) if column.update_columns.present? %>
+<%= render(partial: 'render_field', collection: column.update_columns, as: :column, locals: local_assigns) if column.update_columns.present? %>
 <% end %>

data/app/views/active_scaffold_overrides/_search.html.erb

@@ -3,13 +3,14 @@
   url_options = params_for(action: :index, id: nil, search: nil)
   submit_text ||= :search
   xhr ||= request.xhr?
-  options = {
+  options = as_element_attributes(
+    :search_form,
     id: element_form_id(action: 'search'),
     class: "as_form search#{' live' if live_search}",
     remote: xhr,
     data: {loading: true},
     method: :get
-  }
+  )
   
   hidden_params = url_options.except(:controller, :action, :id, :search).to_query.split(Rack::Utils::DEFAULT_SEP)
 -%>
@@ -20,16 +21,16 @@
     <%= hidden_field_tag(key, value) %>
   <% end -%>
   <% field_placeholder = as_(live_search ? :live_search : :search_terms) %>
-  <%= search_field_tag :search, (search_params if search_params.is_a? String), class: 'text-input', id: search_input_id, size: 50, autocomplete: :off, placeholder: field_placeholder %>
-  <%= submit_tag as_(submit_text), class: 'submit', style: ('display:none;' if live_search) %>
+  <%= search_field_tag :search, (search_params if search_params.is_a? String), as_element_attributes(:search_field, id: search_input_id, placeholder: field_placeholder) %>
+  <%= submit_tag as_(submit_text), as_element_attributes(:search_submit, style: ('display:none;' if live_search)) %>
   <%
-    reset_attrs = {class: 'as_cancel reset'}
+    reset_attrs = {class: 'as_cancel'}
     if active_scaffold_config.search.reset_form
       reset_attrs[:data] = {reset: true}
     else
       reset_attrs.merge! remote: true, data: {refresh: true}
     end
   %>
-  <%= link_to as_(:reset), url_for(url_options.merge(search: '')), reset_attrs unless local_assigns[:skip_reset] %>
+  <%= link_to as_(:reset), url_for(url_options.merge(search: '')), as_element_attributes(:search_reset, **reset_attrs) unless local_assigns[:skip_reset] %>
   <%= loading_indicator_tag(action: :search) %>
 <% end %>