active_scaffold 3.6.20 → 3.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5a6a07cc017cbfdb8a278a7297ac61d6e6d4f3802240a157a366b2829cf3661e
-  data.tar.gz: 00d4f1bcbacca4e2a04f87db162be697ebd82f73aae9b23dbd1ffd3e43614610
+  metadata.gz: d7debc9ce2befd3f2d71287600caa1d45a0667064315e6666564feaf4cc7dd9e
+  data.tar.gz: 47315a56e65cad1164aba74b672aaeba53d404c2e82106a7765f51fd2f059d34
 SHA512:
-  metadata.gz: 78f5e7472c1cbb36fd40c6f0a3b06f797e87e2969127d5506eee6f7b25d1f2b794c35684f477b1204e08d9c2c696b78c3c849b481d3b43c169ecf16b7f99c0f6
-  data.tar.gz: 98f6fed6e5ac8512b74e27155285c0b81f0cd422e0cfbab3f0a01ba5e4a9e92a32cb8f4a199ef8118e71aceb188f9137e5d8bed48bc9ee0903ad420b92e771b5
+  metadata.gz: fbf8863ff656077485d071eebef80706b91d34c474f9f08f4edd1a1e98448eeb24b5ef4df36e8c06e5edb72da60b1ccf9e32e3e73972dcc6466d3fe653bea22c
+  data.tar.gz: 1cd3b5d872b7f62be2a7eebfbb8b974ac8fa4cd2ff30ced0cbb37352f6e6a4990f6a616a527d4b41b1af47f8851ce959d81259796ceed061c994eeb20218b93c

data/CHANGELOG.rdoc

@@ -1,3 +1,50 @@
+- Nullable boolean columns default to use :boolean form_ui instead of :checkbox
+- Display the value set in options[:include_blank] for boolean columns when value is nil, to match the label in the form
+- Support :select_multiple in search_ui, and :draggable in form_ui and search_ui, as shorthands
+- Support assigning options next to the UI type in form_ui, list_ui, show_ui, search_ui, so they are used instead of common options
+- Support :refresh_link option in :select form_ui for non-association columns
+- Support using a hash in :refresh_link option instead of true, with html
+- Support select with multiple attribute for plural associations using :select form_ui, instead of checkboxes, using {html_options: {multiple: true}}, or :select_multiple
+- Support attributes= in column, to set multiple settings with a hash
+- Fix update_columns in type column of polymorphic association, when foreign key has value, it will look for old id with new type and may fail
+- Support changing between subform and form_ui with update_columns
+- Deprecate automatic :select form_ui for associations in subforms, set :select in the controller config to remove deprecation warning, or enable new behaviour of nested subforms with ActiveScaffold.nested_subforms = true
+- Some fixes for human conditions with some search UI
+- Add more string comparators in field search
+- Support date and datetime searches with operators using html5 inputs, as was supported when using date picker. The different bridges, date_picker and calendar_date_select, will just replace the input fields.
+- Support disabling default usage of jquery UI date picker, in case of sortable is wanted, so jquery-ui-rails is loaded, but wants to use HTML5 date input.
+- Support multiple id in constraints for polymorphic association, and don't register constrained field if value is an array.
+- Support subqueries in field_search, with new syntax for search_sql, so search in polymorphic associations is possible.
+- Better support for active model attributes
+- Load files on boot using initializer blocks and use hooks to patch rails classes, run hook :active_scaffold_routing when routing is loaded so other plugins can extend routes
+
+= 3.7.0
+- Drop support for rails < 5.2 and ruby < 2.5
+- Support adding settings for chosen and tinyMCE in initializer (ActiveScaffold.js_config) or JavaScript code (ActiveScaffold.config, needed for callbacks)
+- Support ruby 3.0 and 3.1
+- Check action link security method in process_action_link_action with no id
+- Add thumbnail_variant setting to ActiveStorage bridge
+- Support Postgres citext column type
+- Fix date picker bridge for ruby >= 2.7
+- Fix keeping_errors for rails >= 6.1
+- Fix usage of field_error_proc on record_select bridge for rails 7
+- Support TinyMCE 6
+- Add hide_form_column_if to columns
+- Re-enable form which is sent to iframe when response is received, e.g. if form is downloading a file
+- Use hash order for bitfields value instead of bit order, so options can be re-ordered as `2**1 => opt1, 2**0 => opt0, 2**2 => opt2`
+- Remove delayed_setup, as it didn't work since rails 5.2
+- Support Turbo
+- Fix detecting when form submit to iframe has ended, for downloads too (using cookie)
+- Fix list deleted records on nested listings using JSON column or serializer in PaperTrail versions table
+- Support procs in description of columns, passing record, column, and scope to the proc
+- Fix displaying errors in forms in rails 7.1
+- Support for mongoid 7
+- Support update_columns in field_search, so cascading behaviour is available to field search as in create or update forms
+- Support floating footer in field_search, create and update, so footer may float to keep it visible when form is too long to fit
+- Support hide/show link in form columns with option :collapsible
+- Improve support for three-state boolean (nullable boolean columns), allowing to change the label for NULL
+- Improve support for nullable boolean columns in field search, allowing to search for NULL
+
 = 3.6.20
 - Fix numeric search on field search for rails >= 5.0
 

data/README.md

@@ -1,7 +1,7 @@
 
 Overview
 ========
-[![Build status](https://travis-ci.com/activescaffold/active_scaffold.svg?branch=master)](https://travis-ci.com/activescaffold/active_scaffold)
+[![Build status](https://api.travis-ci.com/activescaffold/active_scaffold.svg?branch=master)](https://app.travis-ci.com/activescaffold/active_scaffold)
 [![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)
 [![Dependency Status](https://gemnasium.com/activescaffold/active_scaffold.svg)](https://gemnasium.com/activescaffold/active_scaffold)
@@ -9,10 +9,14 @@ Overview
 [![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)
 
-ActiveScaffold provides a quick and powerful user interfaces for CRUD (create, read, update, delete) operations for Rails applications. It offers additonal features including searching, pagination & layout control.  Rails >= 4.2.0 and Rails <= 6.1 is supported, ruby >= 2.3 required.
+ActiveScaffold provides a quick and powerful user interfaces for CRUD (create, read, update, delete) operations for Rails applications. It offers additonal features including searching, pagination & layout control.  Rails >= 5.2.0 is supported, ruby >= 2.5 required.
 
 Branch Details
 --------------
+3-7-stable supports rails >= 5.2.x and <= 7.1.x, and ruby >= 2.5.0
+
+These versions are not supported anymore:  
+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  
 3-3-stable supports rails 3.2.x and ruby >= 1.8  
@@ -24,33 +28,42 @@ To get started with a new Rails project
 
 Added to Gemfile
 
-    gem 'active_scaffold'
+```ruby
+gem 'active_scaffold'
+```
 
 For rails >= 5.1, add jquery-rails to Gemfile, and install generator will jquery to application.js before rails-ujs. Also it's possible to load jquery in your layout before application.js using CDN (e.g. jquery-rails-cdn). You can replace rails-ujs with jquery_ujs, although rails-ujs should work (never load both).
 
-    gem 'jquery-rails'
+```ruby
+gem 'jquery-rails'
+```
 
 For rails >= 6.0, installer generator will create app/assets/javascripts/application.js, add it to assets.precompile array and add javascript_include_tag in layout, as ActiveScaffold doesn't work with webpack yet. Jquery may be loaded by packs or assets pipeline.
 
 Run the following commands, for rails 4.2
 
-    bundle install
-    rails g active_scaffold:install
-    bundle exec rake db:create
-    rails g active_scaffold:resource Model [attrs]
-    bundle exec rake db:migrate
-    
+```console
+bundle install
+rails g active_scaffold:install
+bundle exec rake db:create
+rails g active_scaffold:resource Model [attrs]
+bundle exec rake db:migrate
+```
+
 Or run the following commands, for rails >= 5
 
-    bundle install
-    rails g active_scaffold:install
-    rails db:create
-    rails g active_scaffold:resource Model [attrs]
-    rails db:migrate
-    
+```console
+bundle install
+rails g active_scaffold:install
+rails db:create
+rails g active_scaffold:resource Model [attrs]
+rails db:migrate
+```    
 
 Run the app and visit localhost:3000/<plural_model>
 
+It's recommended to call `clear_helpers` in ApplicationController, as some helpers defined by ActiveScaffold, such as active_scaffold_enum_options, options_for_association_conditions, association_klass_scoped, are usually overrided for different controllers, and it may cause issues when all helper modules are available to every controller, specially when models have associations or columns with the same name but need different code for those overrided helper methods.
+
 Threadsafe
 ----------
 

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

@@ -1,34 +1,34 @@
 jQuery(document).ready(function($) {
-/* It should not be needed, latest chrome is caching by itself
-  if (ActiveScaffold.config.conditional_get) jQuery.ajaxSettings.ifModified = true;
-  jQuery(document).on('ajax:beforeSend', function(event, xhr, settings){
-    xhr.cacheUrl = settings.url;
-  });
-  jQuery(document).on('ajax:success', function(event, data, status, xhr){
-    var etag=xhr.getResponseHeader("etag");
-    if (etag && xhr.status==304) {
-      var key = etag + xhr.cacheUrl;
-      xhr.responseText=jQuery(document).data(key);
-      var conv = jQuery(document).data('type-'+key);
-      if (conv) conv(xhr.responseText);
-    }
-  });
-  jQuery(document).ajaxComplete(function(event, xhr, settings){
-    var etag=xhr.getResponseHeader("etag");
-    if (etag && settings.ifModified && xhr.responseText) {
-      var key = etag + xhr.cacheUrl;
-      jQuery(document).data(key, xhr.responseText);
-      var contentType = xhr.getResponseHeader('Content-Type');
-      for(s in settings.contents) {
-        if (settings.contents[s].test(contentType)) {
-          var conv = settings.converters['text '+s];
-          if (typeof conv == 'function') jQuery(document).data('type-'+key, conv);
-          break;
+  /* It should not be needed, latest chrome is caching by itself
+    if (ActiveScaffold.config.conditional_get) jQuery.ajaxSettings.ifModified = true;
+    jQuery(document).on('ajax:beforeSend', function(event, xhr, settings){
+      xhr.cacheUrl = settings.url;
+    });
+    jQuery(document).on('ajax:success', function(event, data, status, xhr){
+      var etag=xhr.getResponseHeader("etag");
+      if (etag && xhr.status==304) {
+        var key = etag + xhr.cacheUrl;
+        xhr.responseText=jQuery(document).data(key);
+        var conv = jQuery(document).data('type-'+key);
+        if (conv) conv(xhr.responseText);
+      }
+    });
+    jQuery(document).ajaxComplete(function(event, xhr, settings){
+      var etag=xhr.getResponseHeader("etag");
+      if (etag && settings.ifModified && xhr.responseText) {
+        var key = etag + xhr.cacheUrl;
+        jQuery(document).data(key, xhr.responseText);
+        var contentType = xhr.getResponseHeader('Content-Type');
+        for(s in settings.contents) {
+          if (settings.contents[s].test(contentType)) {
+            var conv = settings.converters['text '+s];
+            if (typeof conv == 'function') jQuery(document).data('type-'+key, conv);
+            break;
+          }
         }
       }
-    }
-  });
-*/
+    });
+  */
   if (/1\.[2-7]\..*/.test(jQuery().jquery)) {
     var error = 'ActiveScaffold requires jquery 1.8.0 or greater, please use jquery-rails 2.1.x gem or greater';
     if (typeof console != 'undefined') console.error(error);
@@ -72,9 +72,26 @@ jQuery(document).ready(function($) {
     }
   });
   jQuery(document).on('submit', 'form.as_form:not([data-remote])', function(event) {
-    var as_form = jQuery(this).closest("form");
+    var as_form = jQuery(this).closest("form"), form_id = as_form.attr('id'), iframe, interval, doc, cookie;
     if (as_form.data('loading') == true) {
-      setTimeout("ActiveScaffold.disable_form('" + as_form.attr('id') + "')", 10);
+      setTimeout(function() { ActiveScaffold.disable_form(form_id); }, 10);
+      if (as_form.attr('target')) {
+        cookie = 'as_dl_' + new Date().getTime();
+        as_form.append($('<input>', {type: 'hidden', name: '_dl_cookie', value: cookie}));
+        iframe = jQuery('iframe[name="' + jQuery(this).attr('target') + '"]')[0];
+        interval = setInterval(function() {
+          doc = iframe.contentDocument || (iframe.contentWindow && iframe.contentWindow.document);
+          if (doc && doc.readyState !== 'loading' && (doc.location.href !== 'about:blank' || document.cookie.split(cookie+'=').length == 2)) {
+            ActiveScaffold.enable_form(form_id);
+            clearInterval(interval);
+            doc.location.replace('about:blank');
+            document.cookie = cookie + '=; path=/; expires=' + new Date().toUTCString();
+          } else if (!doc) {
+            clearInterval(interval);
+            document.cookie = cookie + '=; path=/; expires=' + new Date().toUTCString();
+          }
+        }, 1000);
+      }
     }
     return true;
   });
@@ -181,7 +198,7 @@ jQuery(document).ready(function($) {
     var td = jQuery(this), span = td.find('span.in_place_editor_field');
     if (event.type == 'mouseenter') {
       if (td.hasClass('empty') || typeof(span.data('editInPlace')) === 'undefined') td.find('span').addClass("hover");
-     }
+    }
     if (event.type == 'mouseleave') {
       if (td.hasClass('empty') || typeof(span.data('editInPlace')) === 'undefined') td.find('span').removeClass("hover");
     }
@@ -249,6 +266,7 @@ jQuery(document).ready(function($) {
     var element = jQuery(this);
     var form_element = element.prev();
     var value;
+    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 $(this).val();}).toArray();
       form_element = form_element.parent().find("input:checkbox"); // parent is needed for draggable-list, checked list may be empty
@@ -358,7 +376,7 @@ jQuery(document).ready(function($) {
     jQuery(this).parent().find('[type=submit]').click();
   }));
 
-  jQuery(document).on('turbolinks:before-visit', function() {
+  jQuery(document).on('turbolinks:before-visit turbo:before-visit', function() {
     if (history.state.active_scaffold) {
       history.replaceState({turbolinks: true, url: document.location.href}, '', document.location.href);
     }
@@ -377,13 +395,16 @@ jQuery(document).ready(function($) {
   });
 
   // call setup on document.ready if Turbolinks not enabled
-  if (typeof(Turbolinks) == 'undefined' || !Turbolinks.supported) {
+  if ((typeof(Turbolinks) == 'undefined' || !Turbolinks.supported) && typeof(Turbo) == 'undefined') {
     ActiveScaffold.setup_history_state();
     ActiveScaffold.setup(document);
   }
   if (ActiveScaffold.config.warn_changes) ActiveScaffold.setup_warn_changes();
   jQuery(document).on('as:element_updated as:element_created', function(e, action_link) {
-      ActiveScaffold.setup(e.target);
+    ActiveScaffold.setup(e.target);
+  });
+  jQuery(document).on('as:element_removed', function(e, action_link) {
+    setTimeout(ActiveScaffold.update_floating_form_footer); // delay so form is already removed
   });
   jQuery(document).on('as:action_success', 'a.as_action', function(e, action_link) {
     ActiveScaffold.setup(action_link.adapter);
@@ -395,7 +416,7 @@ jQuery(document).ready(function($) {
   });
 });
 
-jQuery(document).on('turbolinks:load', function($) {
+jQuery(document).on('turbolinks:load turbo:load', function($) {
   ActiveScaffold.setup(document);
 });
 
@@ -423,7 +444,7 @@ jQuery(document).on('turbolinks:load', function($) {
     for (var name in prop) {
       // Check if we're overwriting an existing function
       prototype[name] = typeof prop[name] == "function" &&
-        typeof _super[name] == "function" && fnTest.test(prop[name]) ?
+      typeof _super[name] == "function" && fnTest.test(prop[name]) ?
         (function(name, fn){
           return function() {
             var tmp = this._super;
@@ -477,6 +498,7 @@ var ActiveScaffold = {
     ActiveScaffold.draggable_lists('.draggable-lists', container);
     ActiveScaffold.sliders(container);
     ActiveScaffold.disable_optional_subforms(container);
+    ActiveScaffold.update_floating_form_footer(); // check other forms too, state may change
   },
   setup_history_state: function() {
     if (!jQuery('.active-scaffold').length) return;
@@ -909,25 +931,30 @@ var ActiveScaffold = {
   render_form_field: function(source, content, options) {
     if (typeof(source) == 'string') source = '#' + source;
     var source = jQuery(source);
-    var element = source.closest('.sub-form-record'), selector = '';
-    if (element.length == 0) {
-      element = source.closest('form > ol.form');
+    var element, container = source.closest('.sub-form-record'), selector = '';
+    if (container.length == 0) {
+      container = source.closest('form > ol.form');
       selector = 'li';
     }
     // find without entering new subforms
-    selector = options.is_subform ? '' : selector + ':not(.sub-form) ';
-    element = element.find(selector + '.' + options.field_class).first();
+    element = container.find(selector + ':not(.sub-form) .' + options.field_class).first();
+    if (element.length)
+      element = element.closest('dl');
+    else if (options.subform_class)
+      element = container.find(selector + '.' + options.subform_class).first();
 
     if (element.length) {
-      if (options.is_subform == false) {
-        if (typeof(options.hidden) != 'undefined') {
-          var li = element.closest('li');
-          li[options.hidden ? 'addClass' : 'removeClass'].call(li, 'hidden')
-        }
-        this.replace(element.closest('dl'), content);
-      } else {
+      var parent = element.is('li, td') ? element : element.parent('li, td');
+      if (element.is('li'))
         this.replace_html(element, content);
+      else
+        this.replace(element, content);
+      if (parent.is('li')) {
+        for (var attr in options.attrs)
+          parent.attr(attr, options.attrs[attr]);
       }
+      if (typeof(options.hidden) != 'undefined')
+        parent[options.hidden ? 'addClass' : 'removeClass'].call(parent, 'hidden')
     }
   },
 
@@ -960,23 +987,23 @@ var ActiveScaffold = {
     // test editor is open
     if (typeof(span.data('editInPlace')) === 'undefined') {
       var options = {show_buttons: true,
-                     hover_class: 'hover',
-                     element_id: 'editor_id',
-                     ajax_data_type: "script",
-                     delegate: {
-                       willCloseEditInPlace: function(span, options) {
-                         if (span.data('addEmptyOnCancel')) span.closest('td').addClass('empty');
-                         span.closest('tr').find('td.actions .loading-indicator').css('visibility','visible');
-                       },
-                       didCloseEditInPlace: function(span, options) {
-                         span.closest('tr').find('td.actions .loading-indicator').css('visibility','hidden');
-                       }
-                     },
-                     update_value: 'value'},
-          csrf_param = jQuery('meta[name=csrf-param]').first(),
-          csrf_token = jQuery('meta[name=csrf-token]').first(),
-          my_parent = span.parent(),
-          column_heading = null;
+          hover_class: 'hover',
+          element_id: 'editor_id',
+          ajax_data_type: "script",
+          delegate: {
+            willCloseEditInPlace: function(span, options) {
+              if (span.data('addEmptyOnCancel')) span.closest('td').addClass('empty');
+              span.closest('tr').find('td.actions .loading-indicator').css('visibility','visible');
+            },
+            didCloseEditInPlace: function(span, options) {
+              span.closest('tr').find('td.actions .loading-indicator').css('visibility','hidden');
+            }
+          },
+          update_value: 'value'},
+        csrf_param = jQuery('meta[name=csrf-param]').first(),
+        csrf_token = jQuery('meta[name=csrf-token]').first(),
+        my_parent = span.parent(),
+        column_heading = null;
 
       if(!(my_parent.is('td') || my_parent.is('th'))){
         my_parent = span.parents('td').eq(0);
@@ -990,8 +1017,8 @@ var ActiveScaffold = {
       }
 
       var render_url = column_heading.data('ie-render-url'),
-          mode = column_heading.data('ie-mode'),
-          record_id = span.data('ie-id') || '';
+        mode = column_heading.data('ie-mode'),
+        record_id = span.data('ie-id') || '';
 
       ActiveScaffold.read_inplace_edit_heading_attributes(column_heading, options);
 
@@ -1134,15 +1161,26 @@ var ActiveScaffold = {
     window.onbeforeunload = function() {
       if (jQuery('form.need-confirm').length) return unload_message;
     };
-    jQuery(document).on('turbolinks:before-visit', function(e) {
+    jQuery(document).on('turbolinks:before-visit turbolinks:before-visit', function(e) {
       if (jQuery('form.need-confirm').length) {
         if (!window.confirm(unload_message)) e.preventDefault();
       }
     });
+  },
+
+  update_floating_form_footer: function() {
+    jQuery('.active-scaffold form.floating-footer .form-footer').each(function () {
+      var $footer = jQuery(this), $form = $footer.closest('form.floating-footer');
+      $footer.removeClass('floating');
+      if ($form.visible(true) && !$footer.visible(true)) $footer.addClass('floating');
+    });
   }
+
 }
 
 
+jQuery(window).on('scroll resize', ActiveScaffold.update_floating_form_footer);
+
 /*
  * URL modification support. Incomplete functionality.
  */

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

@@ -1,14 +1,15 @@
 jQuery(document).ready(function() {
+  var chosen_options = ActiveScaffold.config.chosen_options || {};
   jQuery(document).on('as:element_updated as:element_created', function(event) {
-    jQuery('select.chosen', event.target).chosen();
+    jQuery('select.chosen', event.target).chosen(chosen_options);
   });
   jQuery(document).on('as:action_success', 'a.as_action', function(event, action_link) {
     if (action_link.adapter) {
-      jQuery('select.chosen', action_link.adapter).chosen();
+      jQuery('select.chosen', action_link.adapter).chosen(chosen_options);
     }
   });
-  jQuery('select.chosen').chosen();
-  jQuery(document).on('turbolinks:load', function($) {
-      jQuery('select.chosen').chosen();
+  jQuery('select.chosen').chosen(chosen_options);
+  jQuery(document).on('turbolinks:load turbo:load', function($) {
+    jQuery('select.chosen').chosen(chosen_options);
   });
 });

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

@@ -8,9 +8,23 @@
   };
 
   function loadTinyMCE() {
-    var settings = jQuery(this).data('tinymce');
-    if (settings) tinyMCE.settings = settings;
-    tinyMCE.execCommand('mceAddEditor', false, jQuery(this).attr('id'));
+    var global_settings = ActiveScaffold.config.tiny_mce_settings || {};
+    var local_settings = jQuery(this).data('tinymce');
+    var settings = {};
+    for (key in global_settings) {
+      settings[key] = global_settings[key];
+    }
+    for (key in local_settings) {
+      settings[key] = local_settings[key];
+    }
+    var id = jQuery(this).attr('id');
+    if (tinymce && tinymce.majorVersion >= 6) {
+      settings.selector = '#' + id;
+      tinymce.init(settings);
+    } else { // tinyMCE.majorVersion < 6
+      tinyMCE.settings = settings;
+      tinyMCE.execCommand('mceAddEditor', false, id);
+    }
   }
 
   jQuery(document).on('submit', 'form.as_form', function() {
@@ -28,4 +42,4 @@
       jQuery(action_link.adapter).find('textarea.mceEditor').each(loadTinyMCE);
     }
   });
-})();
+})();

data/app/assets/stylesheets/active_scaffold_layout.css

@@ -672,6 +672,17 @@ clear: both;
 .active-scaffold p.form-footer {
 clear: both;
 }
+.active-scaffold .form-footer.floating {
+position: fixed;
+bottom: 10px;
+z-index: 10;
+top: auto;
+left: auto;
+border: none;
+padding: 10px;
+background: white;
+}
+
 
 .active-scaffold a.as_cancel,
 .active-scaffold p.form-footer a {
@@ -694,7 +705,7 @@ letter-spacing: 0;
 clear: both;
 }
 
-.active-scaffold label {
+.active-scaffold label, .active-scaffold label + a.visibility-toggle {
 font-weight: normal;
 font-size: 11px;
 }
@@ -844,7 +855,7 @@ padding-left: 5px;
 .active-scaffold .form-element .sub-form.optional {
 float: none;
 }
-.active-scaffold .form-element .show-new-subform {
+.active-scaffold .form-element a.show-new-subform {
 margin-left: 5px;
 }
 

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

@@ -7,11 +7,15 @@
      multipart ||= action_config.multipart? unless local_assigns.has_key? :multipart
      columns ||= action_config.columns unless local_assigns.has_key? :columns
      persistent ||= action_config.persistent unless local_assigns.has_key? :persistent
+     unless local_assigns.has_key? :floating_footer
+       floating_footer ||= action_config.floating_footer if action_config.respond_to? :floating_footer
+     end
    else
      multipart ||= false
      columns ||= nil
      persistent ||= false
    end
+   floating_footer ||= false
    method ||= :post
    cancel_link = true if cancel_link.nil?
    submit_text ||= form_action
@@ -26,7 +30,7 @@ options = {:id => form_id,
            :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

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

@@ -9,6 +9,7 @@
     data: {loading: true},
     method: :get
   }
+  options[:class] << ' floating-footer' if active_scaffold_config.field_search.floating_footer
   
   hidden_params = url_options.except(:controller, :action, :id, :search).to_query.split(Rack::Utils::DEFAULT_SEP)
 -%>

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

@@ -52,7 +52,8 @@
     next unless in_subform?(column, parent_record, record_column)
     columns_length += 1
     show_actions = true
-    if column.association && column.form_ui.nil?
+    if !ActiveScaffold.nested_subforms && !readonly && column.association && column.form_ui.nil?
+      ActiveSupport::Deprecation.warn "Nested subforms are allowed now, set form_ui = :select for #{column.name} in controller for #{config.model.name}"
       column = column.dup unless ActiveScaffold.threadsafe
       column.form_ui = :select
     end

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

@@ -8,23 +8,34 @@
   @rendered ||= Set.new
   return if @rendered.include? column.name
   @rendered << column.name
-  renders_as = column_renders_as(column)
-  if renders_as == :subform
-    options = {:is_subform => true, :field_class => "#{column.name}-sub-form"}
+  if @form_action == :field_search
+    form_ui = column.search_ui
   else
-    options = {:is_subform => false, :field_class => "#{column.name}-input", :hidden => column.form_ui == :hidden}
-  end
-  html = if scope
-    readonly = @record.readonly? || !@record.authorized_for?(:crud_type => :update)
-    crud_type = @record.new_record? ? :create : (readonly ? :read : :update)
-    # subform.columns.to_a.include? so it doesn't check inside subgroups
-    active_scaffold_render_subform_column(column, scope, crud_type, readonly, !active_scaffold_config.subform.columns.to_a.include?(column.name), @record)
-  else
-    render_column(column, @record, renders_as, scope)
+    renders_as = column_renders_as(column)
+    form_ui = column.form_ui
   end
+  options = {field_class: "#{column.name}-input", hidden: form_ui == :hidden}
+  options[:subform_class] = "#{column.name}-sub-form" if column.association
+  options[:attrs] =
+    if renders_as == :subform
+      active_scaffold_subform_attributes(column, (column.css_class unless column.css_class.is_a?(Proc)))
+    else
+      {class: 'form-element', id: ''}
+    end
+  html =
+    if scope
+      readonly = @record.readonly? || !@record.authorized_for?(:crud_type => :update)
+      crud_type = @record.new_record? ? :create : (readonly ? :read : :update)
+      # subform.columns.to_a.include? so it doesn't check inside subgroups
+      active_scaffold_render_subform_column(column, scope, crud_type, readonly, !active_scaffold_config.subform.columns.to_a.include?(column.name), @record)
+    elsif @form_action == :field_search
+      search_attribute(column, @record)
+    else
+      render_column(column, @record, renders_as, scope)
+    end
 -%>
 
 ActiveScaffold.render_form_field('<%= source_id %>','<%= escape_javascript(html) %>', <%= options.to_json.html_safe %>);
 <%if column.update_columns && !column.update_columns.empty?%>
-  <%=  render(:partial => "render_field", :collection => column.update_columns, :locals => {:source_id => source_id, :scope => scope})%>
+<%=  render(partial: "render_field", collection: column.update_columns, locals: {source_id: source_id, scope: scope})%>
 <%end%>

data/config/locales/de.yml

@@ -47,6 +47,9 @@ de:
     deleted_model: "%{model} gelöscht"
     deleted_records: Gelöschte Records auflisten
     delimiter: Trennzeichen
+    doesnt_begin_with:
+    doesnt_contain:
+    doesnt_end_with:
     download: Herunterladen
     edit: Bearbeiten
     ends_with: Endet
@@ -138,10 +141,10 @@ de:
     yesterday: Gestern
   date:
     formats:
-      month: 
+      month: "%B"
       quarter: Quartal %{num}
-      week: 
-      year_month: 
+      week:
+      year_month: "%b %Y"
       year_quarter: Quartal %{quarter} %{year}
   time:
     formats:

data/config/locales/en.yml

@@ -47,6 +47,9 @@ en:
     deleted_model: Deleted %{model}
     deleted_records: List Deleted Records
     delimiter: Delimiter
+    doesnt_begin_with: Doesn't begin with
+    doesnt_contain: Doesn't contain
+    doesnt_end_with: Doesn't end with
     download: Download
     edit: Edit
     ends_with: Ends with