active_scaffold 4.1.6 → 4.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 32a8692802d39053416d7af7e631ab4c83ba65ebeca2e1f5e8c61d36f5290521
-  data.tar.gz: 352724ef265132cdcbc025700ef45b4d5699d16f25ceefbd84e6e9890911b2d3
+  metadata.gz: 0ce255799e0bff6d3854d55afdf9278d3a283f68f6d0b1a639acf5bd229b359a
+  data.tar.gz: 62761ad0b3530526880f7d8ac464f1f61623f76a6cbdd55512ab6e6102b6f963
 SHA512:
-  metadata.gz: 2e28a6a5db3582b4a7175320f799b1fcf1c69e9cfcc4c6740937be291d5c86b111e93e544caad63bc6c1cc9089dd1c3d965fd899cb5c74a96172147b24be5191
-  data.tar.gz: eae22752d95d2b141396d8f1c78421fee01f5bacca00c834012d42ce024f98ac0098c540ef17554ac4fd901c40a5fdff017221e508a6c703190213fe5f576025
+  metadata.gz: ad75a5aef07ab0ed9a6997847249ebfd30b749ffe6502472a74066e86ff08fd196b85579bdec112108a71d149f7918af79cfeec64cdee23d095440594a33dba0
+  data.tar.gz: 6bcb9392ee5554b46ebb708d957b061c890b23fc613298c8296370276480b27bae10c4dc7fbb683aeed615aec9bbb1c83de7ac11ada6e1714fcf1d5b6958813b

data/CHANGELOG.rdoc

@@ -1,3 +1,35 @@
+= 4.2.1
+- Fix replacing tinymce fields with update_columns
+- Support refresh_link in radio form UI
+- Rewrite refresh_link JS event handler to find the field without relying in the html structure
+
+= 4.2.0
+- Integrate LogicalQueryParser, supporting full logical search, or simplified searches with 'all keywords' and 'any keyword' operators.
+- Display unauthorized column in form as show action, so show_ui or show override is used if exists.
+- Display unauthorized subform with show_ui as show action, to display readonly subform tables.
+- Add subform_includes to column, and preload_for_form method to preload associations on edit action, speed up on big forms with long subforms or many nested subforms.
+- Speedup on refreshing columns and saving big forms.
+- Support add_new with chosen bridge.
+- Added translations for millisec and microsec prompts in jquery UI datetime picker.
+- Speed up validating big forms (e.g. nested subforms with many records on each subform).
+- Support hiding field descriptions by default and show them with hover or click.
+- Fix for usage with frozen literal strings enabled, add magic comments to enable frozen string literals in ActiveScaffold.
+- Update code for tabs to work with bootstrap 5.
+- Add ActiveScaffold.setup_callbacks array, so functions can be added to be called when ActiveScaffold.setup is called (form open, page load).
+- Add add_new_link to config.nested, adding a link to create form on an association, refreshing this record instead of adding new row in the list.
+- Support hashes in update_columns, keys are association names or :__root__ to refresh fields on subforms or at top of the form, values are list of columns or nested hashes.
+- Add custom_modules, in active_scaffold_config and global, to add modules which will be included after ActiveScaffold action modules, to customize the controllers.
+- Add active_scaffold_subform_record_actions helper to render the destroy action on the rows of a subform, so it can be used to add more actions.
+- Improve ActiveStorage bridge to keep existing files in has_many_attachments.
+- Helpers used by file upload bridges have been renamed and moved the JS code to active_scaffold.js.
+- Support action link groups to open with click, like actions showing dynamic action link group.
+- Open dynamic action link group nested in the menu tree, under the action opening it.
+- Add sort_joins to column, defaults to includes value, so it's possible to set sort by SQL without joining the includes, or join with some associations, and preload others.
+- Fix when textarea is required and uses tinymce, show the validation error if it's empty and sync the content before submitting.
+- Support add_new in collection associations too, only with popup mode (add_new: true will default to popup in such associations)
+- Support for rails 8.0 and 8.1
+_ Cache action link generation to speed up list rendering
+
 = 4.1.6
 - Fix add_existing
 

data/README.md

@@ -2,8 +2,8 @@
 Overview
 ========
 [![Build status](https://github.com/activescaffold/active_scaffold/actions/workflows/ci.yml/badge.svg)](https://github.com/activescaffold/active_scaffold/actions/workflows/ci.yml)
-[![Code Climate](https://codeclimate.com/github/activescaffold/active_scaffold/badges/gpa.svg)](https://codeclimate.com/github/activescaffold/active_scaffold)
-[![Test Coverage](https://codeclimate.com/github/activescaffold/active_scaffold/badges/coverage.svg)](https://codeclimate.com/github/activescaffold/active_scaffold)
+[![Maintainability](https://qlty.sh/gh/activescaffold/projects/active_scaffold/maintainability.svg)](https://qlty.sh/gh/activescaffold/projects/active_scaffold)
+[![Code Coverage](https://qlty.sh/gh/activescaffold/projects/active_scaffold/coverage.svg)](https://qlty.sh/gh/activescaffold/projects/active_scaffold)
 [![Gem Version](https://badge.fury.io/rb/active_scaffold.svg)](https://badge.fury.io/rb/active_scaffold)
 [![Inline docs](https://inch-ci.org/github/activescaffold/active_scaffold.svg?branch=master)](https://inch-ci.org/github/activescaffold/active_scaffold)
 [![License: MIT](https://img.shields.io/badge/License-MIT-blue.svg)](https://opensource.org/licenses/MIT)
@@ -12,11 +12,13 @@ ActiveScaffold provides a quick and powerful user interfaces for CRUD (create, r
 
 Branch Details
 --------------
-master supports rails >= 7.0.x and <= 7.2.x, and ruby >= 3.1.0  
-4-0-stable supports rails >= 6.1.x and <= 7.2.x, and ruby >= 3.0.0
+master supports rails >= 7.2.x and ruby >= 3.2.0  
+4-2-stable supports rails >= 7.2.x and ruby >= 3.2.0
 
 These versions are not supported anymore:  
-3-7-stable supports rails >= 5.2.x and <= 7.1.x, and ruby >= 2.5.0
+4-1-stable supports rails >= 7.0.x and <= 7.2.x, and ruby >= 3.1.0  
+4-0-stable supports rails >= 6.1.x and <= 7.2.x, and ruby >= 2.5.0  
+3-7-stable supports rails >= 5.2.x and <= 7.1.x, and ruby >= 2.5.0  
 3-6-stable supports rails >= 4.2.x and <= 6.1.x, and ruby >= 2.3.0  
 3-5-stable supports rails >= 4.0.x and <= 5.1.x, and ruby >= 2.0.0  
 3-4-stable supports rails >= 3.2.x and <= 4.2.x, and ruby >= 1.9.3  
@@ -69,7 +71,7 @@ When upgrading from 3.x, add `active_scaffold/manifest.js` to `app/assets/config
 
 Changing column settings on a request has changed, it must use `active_scaffold_config.columns.override(:name)` at least the first time. After calling `columns.override(:name)`, calling it again or calling `columns[:name]` will return the overrided column. It also supports a block. See [Per Request Configuration](https://github.com/activescaffold/active_scaffold/wiki/Per-Request-Configuration) for examples and more comprehensive explanation.
 
-Changing columns for an action (e.g. add or exclude) on a request must use active_scaffold_config.actions.override_columns, the first time, or use assignment.
+Changing columns for an action (e.g. add or exclude) on a request must use active_scaffold_config.action.override_columns, e.g. active_scaffold_config.list.override_columns, the first time, or use assignment.
 
 If you have a `_form_association_record` partial view overrided, use `record` local variable instead of `form_association_record`.
 

data/app/assets/javascripts/jquery/active_scaffold.js

@@ -40,7 +40,11 @@
       jQuery(document).on('focus', ':input', function() { ActiveScaffold.last_focus = this; });
       jQuery(document).on('blur', ':input', function(e) { ActiveScaffold.last_focus = e.relatedTarget; });
       jQuery(document).click(function(event) {
-        jQuery('.action_group.dyn > ul').hide(); // only hide so action links loading still work
+        if (!jQuery(event.target).closest('.action_group.dyn').length) {
+          jQuery('.action_group.dyn > .dynamic-menu').each(function() {
+            ActiveScaffold.remove_dynamic_action_group(this);
+          });
+        }
       });
       jQuery(document).on('ajax:beforeSend', 'form.as_form', function(event) {
         var as_form = jQuery(this).closest("form");
@@ -115,6 +119,7 @@
           if (action_link.is_disabled()) {
             return false;
           } else {
+            if (action_link.position == 'popup') ActiveScaffold.open_popup('<div class="loading"></div>', action_link);
             if (action_link.loading_indicator) action_link.loading_indicator.css('visibility','visible');
             action_link.disable();
           }
@@ -150,6 +155,8 @@
         var action_link = ActiveScaffold.ActionLink.get(jQuery(this));
         if (action_link) {
           ActiveScaffold.report_500_response(action_link.scaffold_id(), xhr);
+          if (action_link.position == 'popup') action_link.close();
+          if (action_link.loading_indicator) action_link.loading_indicator.css('visibility','hidden');
           action_link.enable();
         }
         return true;
@@ -241,6 +248,22 @@
         if (span.data('editInPlace')) span.trigger('click.editInPlace');
         else ActiveScaffold.in_place_editor_field_clicked(span);
       });
+      jQuery(document).on('click', '.file-input-controls .remove-file-btn', function(event) {
+        event.preventDefault();
+        var btn = jQuery(this), file_line = btn.closest('.file-input-controls');
+        if (file_line.find('.remove_file').val('true').length) {
+          btn.parent().hide();
+          file_line.find('input').show();
+          if (file_line.attr('required')) file_line.find('input').attr('required', 'required');
+        } else {
+          file_line.remove();
+        }
+        return false;
+      });
+      jQuery(document).on('change', '.file-input-controls input[type=file]', function(event) {
+        var file_line = jQuery(this).closest('.file-input-controls');
+        file_line.find('.remove_file').val('false');
+      });
       jQuery(document).on('ajax:before', 'a.as_paginate',function(event) {
         var as_paginate = jQuery(this);
         as_paginate.prevAll('img.loading-indicator').css('visibility','visible');
@@ -270,10 +293,14 @@
           return true;
         } else return false;
       });
-      jQuery(document).on('ajax:complete', '.action_group.dyn > ul a', function(event) {
-        var action_link = ActiveScaffold.find_action_link(event.target);
-        if (action_link && action_link.loading_indicator) action_link.loading_indicator.css('visibility','hidden');
-        jQuery(event.target).closest('.action_group.dyn > ul').remove();
+      jQuery(document).on('ajax:complete', '.action_group.dyn > .dynamic-menu a', function(event) {
+        var action_link = ActiveScaffold.find_action_link(event.target), link = jQuery(event.target);
+        if (action_link && action_link.loading_indicator) action_link.loading_indicator.css('visibility', 'hidden');
+        setTimeout(function() {
+          if (!link.parent().is('.action_group.dyn')) {
+            ActiveScaffold.remove_dynamic_action_group(link.closest('.action_group.dyn > .dynamic-menu'));
+          }
+        }, 100);
       });
 
       jQuery(document).on('change', 'input.update_form:not(.recordselect), textarea.update_form, select.update_form, .checkbox-list.update_form input:checkbox', function(event, additional_params) {
@@ -294,14 +321,15 @@
       });
       jQuery(document).on('click', 'a.refresh-link', function(event) {
         event.preventDefault();
-        var element = jQuery(this);
-        var form_element = element.prev();
-        var value;
+        var element = jQuery(this), selector = element.data('field-selector'), value, form_element;
+        form_element = selector.startsWith('#') ? jQuery(selector) : element.closest('.form-element').find(selector);
+        if (form_element.is('.draggable-list')) form_element = form_element.closest('.draggable-lists-container');
         if (form_element.is(".field_with_errors")) form_element = form_element.children().last();
         if (form_element.is(".checkbox-list")) {
           value = form_element.find(':checked').map(function(item) { return jQuery(this).val(); }).toArray();
           form_element = form_element.parent().find("input:checkbox"); // parent is needed for draggable-list, checked list may be empty
-        } else value = form_element.is("input:checkbox:not(:checked)") ? null : form_element.val();
+        } else if (form_element.is(':radio, :checkbox')) value = form_element.filter(':checked').val() || null;
+        else value = form_element.val();
         ActiveScaffold.update_column(form_element, element.attr('href'), element.data('update_send_form'), form_element.attr('id'), value);
       });
       jQuery(document).on('click', 'a.visibility-toggle', function(e) {
@@ -334,7 +362,7 @@
 
       jQuery(document).on('click', '.active-scaffold .sub-form a.destroy', function(event) {
         event.preventDefault();
-        ActiveScaffold.delete_subform_record(jQuery(this).data('delete-id'));
+        ActiveScaffold.remove(jQuery(this).closest('.sub-form-record'));
       });
 
       jQuery(document).on("click", '.hover_click', function(event) {
@@ -367,8 +395,8 @@
       });
 
       jQuery(document).on('click', '.hide-new-subform, .show-new-subform', function(e) {
-        var $this = jQuery(this), line = $this.closest('.form-element, td'),
-          subform = line.find('#' + $this.data('subform-id')), radio = false, hide, select;
+        var $this = jQuery(this), line = $this.closest('.form-element'),
+          subform = line.find('#' + $this.data('subform-id')), radio = false, hide, field;
         if ($this.is('[type=radio]')) {
           radio = true;
           hide = $this.is('.hide-new-subform');
@@ -377,17 +405,16 @@
           hide = subform.is(':visible');
         }
         if ($this.data('select-id')) {
-          select = line.find('#' + $this.data('select-id'));
-          if (select.hasClass('recordselect') || select.is('.no-options')) select = select.next(':hidden').addBack();
+          field = line.find('#' + $this.data('select-id')).closest('.select-field');
         }
         if (hide) {
           subform.hide().find("input:enabled,select:enabled,textarea:enabled").prop('disabled', true);
-          if (select) select.show().prop('disabled', false);
+          if (field) field.show().find('input:disabled,select:disabled,textarea:disabled').prop('disabled', false);
           if (radio) {
             $this.closest('.form-element').find('[name="' + $this.attr('name') + '"].show-new-subform').prop('disabled', false);
           } else $this.html($this.data('select-text'));
         } else {
-          if (select) select.hide().prop('disabled', true);
+          if (field) field.hide().find('input:enabled,select:enabled,textarea:enabled').prop('disabled', true);
           subform.show().find("input:disabled,select:disabled,textarea:disabled").prop('disabled', false);
           if (radio) $this.prop('disabled', true);
           else {
@@ -401,7 +428,7 @@
         jQuery(this).parent().find('[type=submit]').click();
       }));
 
-      jQuery(document).on('click', 'form.search .reset[data-reset]', function(e){
+      jQuery(document).on('click', 'form.search [data-reset]', function(e){
         e.preventDefault();
         var form = jQuery(this).closest('form.search');
         form.find(
@@ -468,6 +495,14 @@
         e.preventDefault();
         ActiveScaffold.update_all_checkboxes(jQuery(this), false);
       });
+      jQuery(document).on('click', '.descriptions-click .description:not(.visible)', function(e) {
+        e.preventDefault();
+        $(this).addClass('visible');
+      });
+      jQuery(document).on('click', '.descriptions-click .description.visible .close', function(e) {
+        e.preventDefault();
+        $(this).closest('.description').removeClass('visible');
+      });
     });
 
     jQuery(document).on('turbolinks:load turbo:load', function($) {
@@ -556,7 +591,7 @@
         ActiveScaffold.auto_paginate(container);
         ActiveScaffold.draggable_lists('.draggable-lists', container);
         ActiveScaffold.sliders(container);
-        ActiveScaffold.disable_optional_subforms(container);
+        setTimeout(function() { ActiveScaffold.disable_optional_subforms(container) }); // delay hiding fields, in case some field need to be visible, e.g. chosen
         ActiveScaffold.update_floating_form_footer(); // check other forms too, state may change
         if (container != document) {
           jQuery('[data-rs-type]', container).each(function() { RecordSelect.from_attributes(jQuery(this)); });
@@ -612,9 +647,8 @@
             var line = $this.closest('.form-element'), toggle = line.find('.show-new-subform[data-subform-id="' + $this.attr('id') + '"]').first();
             if (toggle.is('[type=radio]')) toggle.prop('disabled', true);
             else if (toggle.data('select-id')) {
-              var select = line.find('#' + toggle.data('select-id'));
-              if (select.hasClass('recordselect') || select.is('.no-options')) select = select.next(':hidden').addBack();
-              select.hide().prop('disabled', true);
+              var field = line.find('#' + toggle.data('select-id')).closest('.select-field');
+              field.hide().find('input:enabled,select:enabled,textarea:enabled').prop('disabled', true);
             }
           } else $this.find("input:enabled,select:enabled,textarea:enabled").prop('disabled', true);
         });
@@ -885,12 +919,6 @@
         });
       },
 
-      delete_subform_record: function(record) {
-        if (typeof(record) == 'string') record = '#' + record;
-        record = jQuery(record).closest('.sub-form-record');
-        this.remove(record);
-      },
-
       report_500_response: function(active_scaffold_id, xhr) {
         var server_error = jQuery(active_scaffold_id).find('.messages-container p.server-error').first();
         if (server_error.is(':visible')) {
@@ -911,16 +939,21 @@
       display_dynamic_action_group: function(link, html) {
         var container;
         if (typeof(link) == 'string') link = jQuery('#' + link);
-        if (link.closest('td.actions').length) {
-          container = link.closest('td').addClass('action_group dyn');
-        } else {
-          if (link.parent('div.actions').length) link.wrap(jQuery('<div>'));
-          container = link.parent().addClass('action_group dyn');
+        if (link.parent('.actions').length) link.wrap(jQuery('<div>'));
+        container = link.parent().addClass('action_group dyn');
+        if (ActiveScaffold.config.dynamic_group_parent_class) {
+          container.addClass(ActiveScaffold.config.dynamic_group_parent_class);
         }
-        container.find('> ul').remove();
+        container.find('> .dynamic-menu').remove();
         container.append(html);
       },
 
+      remove_dynamic_action_group: function(group) {
+        group = jQuery(group);
+        group.closest('.action_group.dyn').removeClass(ActiveScaffold.config.dynamic_group_parent_class);
+        group.remove();
+      },
+
       scroll_to: function(element, checkInViewport) {
         if (typeof checkInViewport == 'undefined') checkInViewport = true;
         if (typeof(element) == 'string') element = '#' + element;
@@ -1004,7 +1037,14 @@
         var element, container = source.closest('.sub-form-record'), selector = '';
         if (container.length === 0) {
           container = source.closest('form > ol.form');
-          selector = 'li';
+          selector = '>';
+        }
+        if (options.traverse) {
+          selector = '';
+          options.traverse.forEach(function(step) {
+            if (step === '__root__') container = container.closest('form');
+            else container = container.find(step);
+          });
         }
         // find without entering new subforms
         element = container.find(selector + ':not(.sub-form) .' + options.field_class);
@@ -1012,17 +1052,17 @@
           element = element.filter(function() { return jQuery(this).closest('.sub-form-record').get(0) === container.get(0); });
         else element = element.filter(function() { return jQuery(this).closest('.sub-form-record').length === 0; });
         if (element.length)
-          element = element.first().closest('dl');
+          element = element.first().closest('.form-element');
         else if (options.subform_class)
           element = container.find(selector + '.' + options.subform_class).first();
 
         if (element.length) {
-          var parent = element.is('li, td') ? element : element.parent('li, td');
-          if (element.is('li'))
+          var parent = element.is('.sub-form, .form-element') ? element : element.parent('.form-element, .sub-form');
+          if (element.is('.sub-form, .form-element'))
             this.replace_html(element, content);
           else
             this.replace(element, content);
-          if (parent.is('li')) {
+          if (parent.is('.form-element, .sub-form')) {
             for (var attr in options.attrs)
               parent.attr(attr, options.attrs[attr]);
           }
@@ -1262,9 +1302,13 @@
       },
 
       open_popup: function(content, link) {
-        var element = jQuery(content).filter(function(){ return this.tagName; }).dialog({
+        var element = jQuery(content).filter(function(){ return this.tagName; })
+        if (link.adapter) link.adapter.dialog('close');
+        element.dialog({
           modal: true,
-          close: function() { link.close(); },
+          close: function () {
+            if (!link.adapter.is('.loading')) link.close();
+          },
           width: ActiveScaffold.config.popup_width || '80%'
         });
         link.set_adapter(element);
@@ -1273,6 +1317,7 @@
       close_popup: function(link, callback) {
         link.adapter.dialog('close');
         ActiveScaffold.remove(link.adapter, callback);
+        link.set_adapter(null);
       }
     }
 
@@ -1444,9 +1489,11 @@
 
       set_adapter: function(element) {
         this.adapter = element;
-        this.adapter.addClass('as_adapter');
-        this.adapter.data('action_link', this);
-        if (this.refresh_url) jQuery('.as_cancel', this.adapter).attr('href', this.refresh_url);
+        if (element) {
+          this.adapter.addClass('as_adapter');
+          this.adapter.data('action_link', this);
+          if (this.refresh_url) jQuery('.as_cancel', this.adapter).attr('href', this.refresh_url);
+        }
       },
 
       keep_open: function() {
@@ -1519,14 +1566,19 @@
       close: function(refreshed_content_or_reload) {
         this._super();
         if (refreshed_content_or_reload) {
-          if (typeof refreshed_content_or_reload == 'string') {
-            ActiveScaffold.update_row(this.target, refreshed_content_or_reload);
-          } else if (this.refresh_url) {
-            var target = this.target;
-            jQuery.get(this.refresh_url, function(e, status, xhr) {
-              ActiveScaffold.update_row(target, xhr.responseText);
-            });
-          }
+          if (typeof refreshed_content_or_reload == 'string') this.refresh(refreshed_content_or_reload);
+          else this.refresh();
+        }
+      },
+
+      refresh: function(content) {
+        if (content) {
+          ActiveScaffold.update_row(this.target, content);
+        } else if (this.refresh_url) {
+          var target = this.target;
+          jQuery.get(this.refresh_url, function(e, status, xhr) {
+            ActiveScaffold.update_row(target, xhr.responseText);
+          });
         }
       },
 

data/app/assets/javascripts/jquery/tiny_mce_bridge.js

@@ -7,6 +7,26 @@
     action_link_close.apply(this);
   };
 
+  ActiveScaffold.remove_tinymce = function(element) {
+    if (typeof(element) == 'string') element = '#' + element;
+    element = jQuery(element);
+    element.find('textarea.mceEditor').each(function(index, elem) {
+      tinymce.remove('#' + elem.id);
+    });
+  };
+
+  var as_replace = ActiveScaffold.replace,
+    as_replace_html = ActiveScaffold.replace_html;
+
+  ActiveScaffold.replace = function(element) {
+    this.remove_tinymce(element);
+    return as_replace.apply(this, arguments);
+  };
+  ActiveScaffold.replace_html = function(element) {
+    this.remove_tinymce(element);
+    return as_replace_html.apply(this, arguments);
+  };
+
   function loadTinyMCE() {
     var global_settings = ActiveScaffold.config.tiny_mce_settings || {};
     var local_settings = jQuery(this).data('tinymce');
@@ -20,14 +40,27 @@
     var id = jQuery(this).attr('id');
     if (tinymce && tinymce.majorVersion >= 6) {
       settings.selector = '#' + id;
-      if (settings.setup) settings.setup = eval(settings.setup);
+      var userSetup = settings.setup ? eval(settings.setup) : function () {};
+      settings.setup = function(editor) {
+        userSetup(editor);                  // run what the user already had
+
+        /* keep textarea in sync */
+        var sync = function() { editor.save(); };  // same as triggerSave()
+        editor.on('change input NodeChange Undo Redo', sync);
+      };
       tinymce.init(settings);
     } else { // tinyMCE.majorVersion < 6
+      settings.init_instance_callback = function(editor) {
+        var sync = function () { editor.save(); };   // same as triggerSave()
+        editor.on('change input NodeChange Undo Redo', sync);
+        if (userInit) userInit(editor);              // run user’s callback too
+      };
       tinyMCE.settings = settings;
       tinyMCE.execCommand('mceAddEditor', false, id);
     }
   }
-
+/*const sync = () => editor.save();   // same as triggerSave for this editor
+        editor.on('change input NodeChange Undo Redo', sync);*/
   jQuery(document).on('submit', 'form.as_form', function() {
     tinymce.triggerSave();
     jQuery('textarea.mceEditor', this).each(function() { tinymce.remove('#'+jQuery(this).attr('id')); });

data/app/assets/stylesheets/active_scaffold_images.scss

@@ -57,3 +57,9 @@ background-image: image-url('active_scaffold/close_touch.png');
 .active-scaffold .refresh-link {
 background-image: image-url('active_scaffold/refresh.png');
 }
+
+.ui-dialog .loading::after {
+  background: image-url('active_scaffold/indicator.gif') no-repeat;
+  content: 'Loading...';
+  padding-left: 20px;
+}

data/app/assets/stylesheets/{active_scaffold_layout.css → active_scaffold_layout.scss}

@@ -751,6 +751,14 @@ float: left;
 margin-top: 6px;
 }
 
+.active-scaffold li.form-element dd .select-field:not(.draggable-lists-container) {
+  display: inline-block;
+}
+.active-scaffold li.form-element dd .select-field ~ .as_action {
+  vertical-align: top;
+  margin-left: 5px;
+}
+
 .active-scaffold .form dd {
 margin: 0;
 }
@@ -761,6 +769,95 @@ display: inline-block;
 font-size: 10px;
 margin-left: 5px;
 }
+.active-scaffold .description .close {
+  display: none;
+}
+
+.active-scaffold .descriptions-hover, .active-scaffold .descriptions-click {
+  .horizontal-sub-form td .description {
+    display: none;
+  }
+  dd > .description {
+    position: absolute;
+  }
+  .horizontal-sub-form th, dd {
+    position: relative;
+    .description {
+      display: inline-block;
+      width: 1.5em;
+      height: 1.5em;
+      overflow: hidden;
+      white-space: nowrap;
+      color: blue;
+      top: 2px;
+      font-weight: normal;
+
+      &::before {
+        display: flex;
+        content: '?';
+        border-radius: 0.75em;
+        background: lightgray;
+        height: 1.5em;
+        width: 1.5em;
+        align-items: center;
+        justify-content: center;
+      }
+    }
+  }
+  .horizontal-sub-form th .description {
+    left: 0;
+  }
+  dd > .description {
+    right: -1em;
+  }
+}
+
+.active-scaffold .descriptions-hover .horizontal-sub-form th .description:hover,
+.active-scaffold .descriptions-hover dd .description:hover,
+.active-scaffold .descriptions-click .horizontal-sub-form th .description.visible,
+.active-scaffold .descriptions-click dd .description.visible {
+  position: absolute;
+  width: auto;
+  height: auto;
+  white-space: normal;
+  background: white;
+  padding: 2px 5px;
+  z-index: 100; /* Ensure it's above other content */
+  display: block;
+  &::before {
+    display: none;
+  }
+}
+
+.active-scaffold .descriptions-click {
+  .horizontal-sub-form th .description, dd .description {
+    cursor: pointer;
+    &.visible {
+      overflow: visible;
+      cursor: auto;
+      padding-right: 10px;
+    }
+    &.visible .close {
+      &::before {
+        content: 'x';
+      }
+      position: absolute;
+      top: -10px;
+      right: -5px;
+      background: lightgray;
+      border-radius: 10px;
+      width: 20px;
+      height: 20px;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+    }
+  }
+}
+
+.active-scaffold .sub-form.optional[style=""] ~ .description {
+  display: none;
+}
 
 .active-scaffold .required label {
 font-weight: bold;
@@ -961,7 +1058,7 @@ clear: left;
 
 .active-scaffold .sub-form .association-record a.destroy {
 font-weight: bold;
-display: block;
+display: inline-block;
 height: 16px;
 padding: 0;
 width: 16px;
@@ -969,6 +1066,9 @@ text-indent: -4000px;
 background: 0 0 no-repeat;
 overflow: hidden;
 }
+.active-scaffold .sub-form .association-record * + a.destroy {
+  margin-left: 5px;
+}
 
 .active-scaffold .sub-form .locked a.destroy {
 display: none;
@@ -1052,9 +1152,9 @@ font-size: 100%;
   text-decoration: none;
   background-color: #eee;
 }
-.active-scaffold .tabbed .nav-tabs > li.active > a,
-.active-scaffold .tabbed .nav-tabs > li.active > a:focus,
-.active-scaffold .tabbed .nav-tabs > li.active > a:hover {
+.active-scaffold .tabbed .nav-tabs > li > a.active,
+.active-scaffold .tabbed .nav-tabs > li > a.active:focus,
+.active-scaffold .tabbed .nav-tabs > li > a.active:hover {
   border-color: #ddd;
   border-bottom-color: transparent;
   cursor: default;

data/app/assets/stylesheets/tiny_mce_bridge.scss

@@ -0,0 +1,11 @@
+.active-scaffold textarea.mceEditor {
+  opacity: 0;
+  pointer-events: none;
+  display: inline !important;
+  height: 0;
+  margin: 0;
+  padding: 0;
+  width: 0 !important;
+  float: left;
+  margin-left: -5px;
+}

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

@@ -7,6 +7,7 @@
      multipart ||= action_config.multipart? unless local_assigns.key? :multipart
      columns ||= action_config.columns unless local_assigns.key? :columns
      persistent ||= action_config.persistent unless local_assigns.key? :persistent
+     field_descriptions ||= action_config.field_descriptions
      if !local_assigns.key?(:floating_footer) && action_config.respond_to?(:floating_footer)
        floating_footer = action_config.floating_footer
      end
@@ -17,6 +18,7 @@
      multipart ||= false
      columns ||= nil
      persistent ||= false
+     field_descriptions ||= :show
    end
    floating_footer ||= false
    method ||= :post
@@ -29,11 +31,10 @@
 <%=
 options = {id: form_id,
            multipart: multipart,
-           class: "as_form #{form_action}",
+           class: "as_form #{form_action} #{'floating-footer' if floating_footer} #{"descriptions-#{field_descriptions}" if field_descriptions != :show}",
            method: method,
            'data-loading' => defined?(loading) ? loading : true}
 cancel_options = {class: 'as_cancel'}
-options[:class] << ' floating-footer' if floating_footer
 cancel_options[:remote] = true if xhr # cancel link does nt have to care about multipart forms
 if xhr && multipart # file_uploads
   form_remote_upload_tag url_options.merge(iframe: true), options