active_scaffold 3.5.4 → 3.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e0a92ddd6c1b3401de801feb8488ec0e4a74d02eb91a7be59a9b28fe723c26f4
-  data.tar.gz: 832e014bbebf915d82c126ef5d552cf8f241461ca780dced5ec9df59771ae711
+  metadata.gz: 0c98847307a3be61b8137eba789a6e1779c2c9dccc9190b8c4d50428d6dffd33
+  data.tar.gz: f82b68052234f72ac8bc715eb88f7aabaed422e8ef8b929b63244e9d3cf5500d
 SHA512:
-  metadata.gz: 597fc2f0187a6c59e0f52f7a9a187ef85810f716334ee32fd37c362a21201c7b39111c39f8a5b29e9f4b38eb9702991e1a269e05062442f5157a2a0a9de1a815
-  data.tar.gz: dfad5b57b1bb177eaa1c8cc829a06fe85e1f4463605336fa5d67c1e3ad12c65cb285c15dbfcf2de04e9e0191c4fb172868dd2130f20a8a69b609fcf6790695d0
+  metadata.gz: a60af5b75baee4785e3ad1bc3353a59db2e2677aa14f82eabac52dd5d732486185731e1f2e66cb35f3bf3ebac14322ea3038bdca39c497bd163a600566d13198
+  data.tar.gz: 59bddf1ef940582d370591bd4003408505733abd2c45f7cac115f3033d8925266f92339c1deb6aae2c484a73ebe27e137d6b518b3199064fea187f5726f35ba4

data/{CHANGELOG → CHANGELOG.rdoc}

@@ -1,3 +1,74 @@
+- Fix i18n at ruby 3.0.0
+- Add list helper for bitfield column, so it display labels of selected checkboxes in list
+- Support rails 6.0
+
+= 3.6.0.rc2
+- Fix subform crud in subform subgroup when controller is embedded
+- Fix sorting for mongoid models, broken in 3.6.0.rc1
+- Improve add_new option, allow to change subform columns (with helper override calling super and add columns to locals argument)
+- Support add_new option for record_select or radio form_ui
+- Support add_new option for polymorphic associations (add_new may be array with class names to allow add new, or true to allow add new for any model)
+- Support description for columns displayed as subform
+- Don't mess with history if current page is not using activescaffold when is loaded
+- Fix changing sort_by per request when threadsafe is enabled
+
+= 3.6.0.rc1
+- Cleanup: deprecate ActiveScaffold.set_defaults for ActiveScaffold.defaults, rename some setters
+- Fix adding new action links on request with threadsafety enabled
+- Fix iterating in config.columns with threadsafety enabled
+- Fix changing pagination enabled/disabled with threadsafety enabled
+- Allow create action in has_many through singular association
+- Display no options in radio form_ui when no option is available, so column can be refreshed with update_columns
+- Add as_main_div_data to override data attributes on main div
+- Add loading indicator to embedded scaffolds, display error if fails
+- Fix race condition in threadsafe mode with delayed setup
+- Add ActiveScaffold::Config::Core.after_config_callbacks, so custom methods or procs can be added to be called after active_scaffold config block (used by bitfields bridge)
+- Display loading indicator at bottom on auto pagination
+- List rendering speed up
+- Remove font family from CSS, it was preventing from changing it easily in body
+- Fix search for mongoid models in with threadsafety enabled
+- Keep nested params after calling render_field for column in subform
+- Fix nested for controllers without list action (for example, for nested create on singular assocations)
+- Fix delayed setup issues with threads
+- Fix render_field under nested list for polymorphic association
+- Add foreign_type column to constrained columns in nested list for polymorphic association
+- Add return_to to action links on nested list for singular associations, so forms would return to list
+- Case insensitive search with PostGIS adapter
+- Use clear_storage with around_action and ensure, so empty hash is removed from session storage when exception is raised too
+- Delete search from session when search is reset
+- Add cache_column_counts method to get counts with one query for associations which are not preloaded, query per column is overridable with count_query_for_column
+- ActiveStorage support with bridge
+- Add list_row_attributes helper so more HTML attributes can be added to tr.record in list, overriding the helper
+- Support column!=value param for not equal condition (column!= means column is not null)
+- Don't force to use join for column's includes when sorting by method
+- Add support for range conditions in url params for numeric (integer, decimal, float, bigint) columns too
+- Support include_blank option in :radio form_ui
+- Add add_new option for :select form_ui in singular associations, in column.options, it adds link to toggle between select and subform
+- Fix subform crud in subform subgroup, when form is on nested scaffold, when record on first subform is persisted
+- Add association_join_text setting to column, so it can be changed for one column only
+- Use Arel.sql with sorting.clause before passing to reorder method
+
+= 3.6.0.pre
+- Added threadsafety as tech preview, enabled with ActiveScaffold.threadsafe! in initializer.
+- Added active_scaffold_config.build_action_columns method to easily create action columns for custom form actions.
+- Replaced each(options) with each_column(options) in ActionColumns
+- Replaced collect_visible(options, &proc) with visible_columns(options).map(&proc) in ActionColumns
+- Replaced names with visible_columns_names in ActionColumns
+- Replaced names_without_auth_check with to_a in ActionColumns
+- Support rails 5.2, drop support for 4.0 and 4.1
+- Require ruby 2.3.1, drop support for 2.0, 2.1 and 2.2.
+- Fix has_one/belongs_to nested for polymorphic associations, leave rails to build conditions from {assoc_name: record} hash
+- Cast blank into nil for null string columns in conditions_from_params
+- Support multipart with iframe in process_action_link_action default response
+- Fix hidding and showing columns based on permissions with update_columns on subforms
+- Fix subform crud in subform subgroup, when form is on nested scaffold
+- Fix JS when rails-ujs is used instead of jquery_ujs (rails >= 5.1)
+- Display flash messages only inside create form, when conf.list.always_show_create is enabled, instead of displaying twice (in form and above list).
+- Fix default autocomplete value for password form_ui, new-password has to be used because off is ignored by browsers in password fields now
+
+= 3.5.5
+- Fix creating new records, when using cancan and allowing access based on id (fixes #617)
+
 = 3.5.4
 - Fix chosen form_ui for plural associations
 - Eager load with includes in association options query, if includes has a hash with own association key, see #612
@@ -54,6 +125,7 @@
 - fix display of association in list when association_limit is nil
 - fix conversion of i18n date and datetime value, some abbr day and month may be equal in some languages
 - fix hidden form_ui for collection associations (has_many, habtm)
+- Drop rails 3.2.x and ruby 1.9 support
 
 = 3.4.43
 - Fix human conditions for date and datetime columns, not using date picker

data/README.md

@@ -1,6 +1,7 @@
+
 Overview
 ========
-[![Build status](https://travis-ci.org/activescaffold/active_scaffold.svg?branch=master)](https://travis-ci.org/activescaffold/active_scaffold)
+[![Build status](https://travis-ci.com/activescaffold/active_scaffold.svg?branch=master)](https://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)
@@ -8,10 +9,12 @@ 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.0.5 and < 5.2 is supported, ruby >= 2.1 supported, although it should work with ruby >= 2.0.0, it's too old and not tested. Ruby < 2.0.0 won't work.
+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.
 
 Branch Details
 --------------
+3-6-stable supports rails >= 4.2.x and ruby >= 2.3.0
+3-5-stable supports rails >= 4.0.x and ruby >= 2.0.0  
 3-4-stable supports rails >= 3.2.x and ruby >= 1.9.3  
 3-3-stable supports rails >= 3.2.x and ruby >= 1.8  
 rails-3.2 supports Rails 3.1 & 3.2, and is the current source of the 3.2.x line of gems.
@@ -24,28 +27,37 @@ Added to Gemfile
 
     gem 'active_scaffold'
 
-For rails >= 5.1, add
+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'
 
-Run the following commands
+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 User name:string
+    rails g active_scaffold:resource Model [attrs]
     bundle exec rake db:migrate
     
-Commands for Rails 5
+Or run the following commands, for rails >= 5
 
     bundle install
     rails g active_scaffold:install
     rails db:create
-    rails g active_scaffold:resource User name:string
+    rails g active_scaffold:resource Model [attrs]
     rails db:migrate
     
 
-Run the app and visit localhost:3000/users
+Run the app and visit localhost:3000/<plural_model>
+
+Threadsafe
+----------
+
+Threadsafe can be enabled calling ActiveScaffold.threadsafe! in an initializer.
+ It should be enabled on app start and it can't be disabled. Threadsafety is a
+ new feature and not well tested yet.  
 
 Configuration
 -------------

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

@@ -32,7 +32,6 @@
     require_asset "prototype/active_scaffold"
     require_asset "prototype/dhtml_history"
     require_asset "prototype/form_enhancements"
-    require_asset "prototype/rico_corner"
   end
 %>
 ActiveScaffold.config = <%= ActiveScaffold.js_config.to_json %>;

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

@@ -61,6 +61,11 @@ jQuery(document).ready(function($) {
     if (e.keyCode == 13) e.preventDefault();
   });
   jQuery(document).on('ajax:error', 'form.as_form', function(event, xhr, status, error) {
+    if (event.detail && !xhr) {
+      error = event.detail[0];
+      status = event.detail[1];
+      xhr = event.detail[2];
+    }
     var as_div = jQuery(this).closest("div.active-scaffold");
     if (as_div.length) {
       ActiveScaffold.report_500_response(as_div, xhr);
@@ -86,6 +91,7 @@ jQuery(document).ready(function($) {
     return true;
   });
   jQuery(document).on('ajax:success', 'a.as_action', function(event, response) {
+    if (event.detail && !response) response = event.detail[0];
     var action_link = ActiveScaffold.ActionLink.get(jQuery(this));
     if (action_link) {
       if (action_link.position) {
@@ -105,6 +111,11 @@ jQuery(document).ready(function($) {
     return true;
   });
   jQuery(document).on('ajax:error', 'a.as_action', function(event, xhr, status, error) {
+    if (event.detail && !xhr) {
+      error = event.detail[0];
+      status = event.detail[1];
+      xhr = event.detail[2];
+    }
     var action_link = ActiveScaffold.ActionLink.get(jQuery(this));
     if (action_link) {
       ActiveScaffold.report_500_response(action_link.scaffold_id(), xhr);
@@ -139,6 +150,11 @@ jQuery(document).ready(function($) {
     return true;
   });
   jQuery(document).on('ajax:error', 'a.as_cancel', function(event, xhr, status, error) {
+    if (event.detail && !xhr) {
+      error = event.detail[0];
+      status = event.detail[1];
+      xhr = event.detail[2];
+    }
     var action_link = ActiveScaffold.find_action_link(jQuery(this));
     if (action_link) {
       ActiveScaffold.report_500_response(action_link.scaffold_id(), xhr);
@@ -151,6 +167,11 @@ jQuery(document).ready(function($) {
     return true;
   });
   jQuery(document).on('ajax:error', 'a.as_sort', function(event, xhr, status, error) {
+    if (event.detail && !xhr) {
+      error = event.detail[0];
+      status = event.detail[1];
+      xhr = event.detail[2];
+    }
     var as_scaffold = jQuery(this).closest('.active-scaffold');
     ActiveScaffold.report_500_response(as_scaffold, xhr);
     jQuery(this).closest('th').removeClass('loading');
@@ -179,6 +200,11 @@ jQuery(document).ready(function($) {
     return true;
   });
   jQuery(document).on('ajax:error', 'a.as_paginate', function(event, xhr, status, error) {
+    if (event.detail && !xhr) {
+      error = event.detail[0];
+      status = event.detail[1];
+      xhr = event.detail[2];
+    }
     var as_scaffold = jQuery(this).closest('.active-scaffold');
     ActiveScaffold.report_500_response(as_scaffold, xhr);
     return true;
@@ -297,6 +323,37 @@ jQuery(document).ready(function($) {
     if (jQuery(this).prop('checked')) color_field.val('');
   });
 
+  jQuery(document).on('click', '.hide-new-subform, .show-new-subform', function(e) {
+    var $this = jQuery(this), line = $this.closest('.form-element'),
+      subform = line.find('#' + $this.data('subform-id')), radio = false, hide, select;
+    if ($this.is('[type=radio]')) {
+      radio = true;
+      hide = $this.is('.hide-new-subform');
+    } else {
+      e.preventDefault();
+      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').andSelf();
+    }
+    if (hide) {
+      subform.hide().find("input:enabled,select:enabled,textarea:enabled").prop('disabled', true);
+      if (select) select.show().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);
+      subform.show().find("input:disabled,select:disabled,textarea:disabled").prop('disabled', false);
+      if (radio) $this.prop('disabled', true);
+      else {
+        $this.data('select-text', $this.html());
+        $this.html($this.data('subform-text'));
+      }
+    }
+  });
+
   jQuery(document).on('turbolinks:before-visit', function() {
     if (history.state.active_scaffold) {
       history.replaceState({turbolinks: true, url: document.location.href}, '', document.location.href);
@@ -454,8 +511,10 @@ var ActiveScaffold = {
     ActiveScaffold.auto_paginate(container);
     ActiveScaffold.draggable_lists('.draggable-lists', container);
     ActiveScaffold.sliders(container);
+    ActiveScaffold.disable_optional_subforms(container);
   },
   setup_history_state: function() {
+    if (!jQuery('.active-scaffold').length) return;
     var data = {}, current_search_item = jQuery('.active-scaffold .filtered-message[data-search]');
     if (current_search_item.length) {
       // store user settings enabled, update state with current page, search and sorting
@@ -479,7 +538,9 @@ var ActiveScaffold = {
   auto_paginate: function(element) {
     var paginate_link = jQuery('.active-scaffold-pagination.auto-paginate a:first', element);
     if (paginate_link.length) {
-      jQuery('.active-scaffold-pagination.auto-paginate', element).hide();
+      var pagination = paginate_link.closest('.auto-paginate');
+      pagination.find('.as_paginate').hide();
+      pagination.find('.loading-indicator').css({visibility: 'visible'});
       ActiveScaffold.auto_load_page(paginate_link.attr('href'), {auto_pagination: true});
     }
   },
@@ -489,6 +550,30 @@ var ActiveScaffold = {
   enable_js_form_buttons: function(element) {
     jQuery('.as-js-button', element).show();
   },
+  disable_optional_subforms: function(element) {
+    jQuery('.sub-form.optional', element).each(function () {
+      var $this = jQuery(this), toggle = $this.find('>.visibility-toggle');
+      if (toggle.length) {
+        var hide = toggle.text() == toggle.data('show');
+        $this.find('> [id] > .sub-form-record > .associated-record dl:first').each(function (i) {
+          var parent = jQuery(this).parent(), div_id = toggle.data('toggable') + i;
+          parent.children().wrapAll('<div id="' + div_id + '">');
+          if (hide) parent.find('> div').hide();
+          parent.prepend(toggle.clone().data('toggable', div_id));
+        });
+        toggle.remove();
+      }
+      if ($this.is(':visible')) {
+        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')) {
+          select = line.find('#' + toggle.data('select-id'));
+          if (select.hasClass('recordselect') || select.is('.no-options')) select = select.next(':hidden').andSelf();
+          select.hide().prop('disabled', true);
+        }
+      } else $this.find("input:enabled,select:enabled,textarea:enabled").prop('disabled', true);
+    });
+  },
   sliders: function(element) {
     jQuery('.as-slider', element).each(function() {
       var opts = $(this).data('slider');
@@ -499,8 +584,13 @@ var ActiveScaffold = {
   load_embedded: function(element) {
     jQuery('.active-scaffold-component .load-embedded', element).each(function(index, item) {
       item = jQuery(item);
-      item.closest('.active-scaffold-component').load(item.attr('href'), function() {
-        jQuery(this).trigger('as:element_updated');
+      var indicator = item.closest('.active-scaffold-component').find('.loading-indicator');
+      indicator.css({visibility: 'visible'});
+      item.closest('.active-scaffold-component').load(item.attr('href'), function(response, status, xhr) {
+        if (status == 'error') {
+          indicator.css({visibility: 'hidden'});
+          indicator.after($('<p>').html(item.data('error-msg')).addClass("error-message message server-error"));
+        } else jQuery(this).trigger('as:element_updated');
       });
     });
   },
@@ -653,7 +743,7 @@ var ActiveScaffold = {
 
   disable_form: function(as_form, skip_loading_indicator) {
     if (typeof(as_form) == 'string') as_form = '#' + as_form;
-    as_form = jQuery(as_form)
+    as_form = jQuery(as_form);
     var loading_indicator = jQuery('#' + as_form.attr('id').replace(/-form$/, '-loading-indicator'));
     if (!skip_loading_indicator && loading_indicator) loading_indicator.css('visibility','visible');
     jQuery('input[type=submit]', as_form).attr('disabled', 'disabled');
@@ -1023,6 +1113,7 @@ var ActiveScaffold = {
       url: url,
       data: params,
       type: 'post',
+      dataType: 'script',
       beforeSend: function(xhr, settings) {
         element.nextAll('img.loading-indicator').css('visibility','visible');
         /* force to blur and save previous last_focus, because disable_form will trigger
@@ -1311,8 +1402,8 @@ ActiveScaffold.ActionLink.Record = ActiveScaffold.ActionLink.Abstract.extend({
         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, response) {
-          ActiveScaffold.update_row(target, response.responseText);
+        jQuery.get(this.refresh_url, function(e, status, xhr) {
+          ActiveScaffold.update_row(target, xhr.responseText);
         });
       }
     }
@@ -1373,7 +1464,7 @@ ActiveScaffold.ActionLink.Table = ActiveScaffold.ActionLink.Abstract.extend({
     else {
       throw 'Unknown position "' + this.position + '"'
     }
-    ActiveScaffold.highlight(this.adapter.find('td').first().children());
+    ActiveScaffold.highlight(this.adapter.find('td').first().children().not('script'));
     ActiveScaffold.focus_first_element_of_form(this.adapter);
   }
 });

data/app/assets/stylesheets/active_scaffold_colors.scss

@@ -278,7 +278,7 @@ color: $msg_filtered_color;
 color: $msg_color;
 }
 
-.active-scaffold .error-message {
+.active-scaffold .error-message, .active-scaffold-component .error-message {
 border-color: $msg_error_border_color;
 background-color: $msg_error_bg;
 }

data/app/assets/stylesheets/active_scaffold_layout.css

@@ -58,13 +58,15 @@ position: relative;
 .active-scaffold-header h2 {
 padding: 2px 0px;
 margin: 0;
-font: bold 160% arial, sans-serif;
+font-weight: bold;
+font-size: 160%;
 }
 
 .active-scaffold div.actions a,
 .active-scaffold div.actions {
 float: right;
-font: bold 14px arial;
+font-weight: bold;
+font-size: 14px;
 letter-spacing: -1px;
 text-decoration: none;
 padding: 1px 2px;
@@ -150,7 +152,8 @@ text-align: left;
 .active-scaffold th a,
 .active-scaffold th p,
 .active-scaffold .show-view th {
-font: bold 11px arial, sans-serif;
+font-weight: bold;
+font-size: 11px;
 }
 .active-scaffold th a,
 .active-scaffold th p {
@@ -192,7 +195,6 @@ display: none;
 padding: 5px 4px;
 }
 .active-scaffold tr.record td {
-font-family: Verdana, sans-serif;
 font-size: 11px;
 border: solid 1px;
 border-width: 0 0 1px 1px;
@@ -251,7 +253,8 @@ padding: 0 2px;
 
 .active-scaffold tr.record td.actions a,
 .active-scaffold tr.record td.actions div {
-font: bold 11px verdana, sans-serif;
+font-weight: bold;
+font-size: 11px;
 letter-spacing: -1px;
 padding: 2px;
 margin: 0 2px;
@@ -378,7 +381,8 @@ right: 0px;
 
 .active-scaffold .active-scaffold .active-scaffold-header div.actions a,
 .active-scaffold .active-scaffold .active-scaffold-header div.actions div {
-font: bold 11px verdana, sans-serif;
+font-weight: bold;
+font-size: 11px;
 }
 
 .active-scaffold .active-scaffold .view {
@@ -413,13 +417,15 @@ font-size: 11px;
 
 .active-scaffold-calculations td {
 border-top: 2px solid;
-font: bold 12px arial, sans-serif;
+font-weight: bold;
+font-size: 12px;
 }
 
 .active-scaffold .active-scaffold-footer {
 padding: 3px 0px 2px 0px;
 border-bottom: none;
-font: bold 12px arial, sans-serif;
+font-weight: bold;
+font-size: 12px;
 }
 .active-scaffold .active-scaffold-footer > br {
 clear: both;
@@ -430,13 +436,17 @@ float: right;
 white-space: nowrap;
 margin-right: 5px;
 }
+.active-scaffold-footer .active-scaffold-pagination.auto-paginate {
+float: left;
+}
 
 .active-scaffold-footer a {
 text-decoration: none;
 letter-spacing: 0;
 padding: 0 2px;
 margin: 0 -2px;
-font: bold 12px arial, sans-serif;
+font-weight: bold;
+font-size: 12px;
 }
 
 .active-scaffold-footer .next {
@@ -467,7 +477,7 @@ text-align: center;
 position: relative;
 }
 
-.active-scaffold .message {
+.active-scaffold .message, .active-scaffold-component .message {
 font-size: 11px;
 font-weight: bold;
 padding: 5px 20px 5px 5px;
@@ -493,15 +503,16 @@ position: absolute;
 right: 10px;
 top: 4px;
 padding: 0;
-font: bold 11px verdana, sans-serif;
+font-weight: bold;
+font-size: 11px;
 letter-spacing: -1px;
 }
 
-.active-scaffold .messages-container .message {
+.active-scaffold .messages-container .message, .active-scaffold-component .message {
 margin: 0;
 }
 
-.active-scaffold .error-message {
+.active-scaffold .error-message, .active-scaffold-component .error-message {
 border-left: solid 5px;
 }
 
@@ -529,7 +540,6 @@ padding: 2px 5px;
 font-size: 11px;
 margin: 0;
 letter-spacing: 0;
-font-family: Verdana;
 }
 
 .active-scaffold .errorExplanation ul {
@@ -541,12 +551,12 @@ list-style: disc;
 .active-scaffold .errorExplanation p {
 font-size: 11px;
 padding: 2px 5px;
-font-family: Verdana;
 margin: 0;
 }
 
 .active-scaffold .errorExplanation ul li {
-font: bold 11px verdana;
+font-weight: bold;
+font-size: 11px;
 letter-spacing: -1px;
 margin: 0;
 padding: 0;
@@ -590,13 +600,15 @@ clear: both;
 width: 12em;
 float: left;
 clear: left;
-font: normal 11px verdana, sans-serif;
+font-weight: normal;
+font-size: 11px;
 line-height: 16px;
 }
 
 .active-scaffold .show-view dd {
 float: left;
-font: bold 14px arial;
+font-weight: bold;
+font-size: 14px;
 padding-left: 5px;
 margin-bottom: 5px;
 }
@@ -611,7 +623,6 @@ margin: 0;
 .active-scaffold .submit {
 font-weight: bold;
 font-size: 14px;
-font-family: Arial, sans-serif;
 letter-spacing: 0;
 margin: 0;
 margin-top: 5px;
@@ -631,7 +642,8 @@ padding: 2px;
 margin: 0;
 text-transform: none;
 letter-spacing: -1px;
-font: bold 16px arial;
+font-weight: bold;
+font-size: 16px;
 }
 
 .active-scaffold h5 {
@@ -663,7 +675,8 @@ clear: both;
 
 .active-scaffold a.as_cancel,
 .active-scaffold p.form-footer a {
-font: bold 14px arial, sans-serif;
+font-weight: bold;
+font-size: 14px;
 letter-spacing: 0;
 }
 
@@ -682,7 +695,8 @@ clear: both;
 }
 
 .active-scaffold label {
-font: normal 11px verdana, sans-serif;
+font-weight: normal;
+font-size: 11px;
 }
 
 .active-scaffold li.form-element dt {
@@ -717,12 +731,12 @@ font-weight: bold;
 
 .active-scaffold label.example {
 font-size: 11px;
-font-family: arial;
 }
 
 .active-scaffold input.text-input,
 .active-scaffold select {
-font: bold 16px arial;
+font-weight: bold;
+font-size: 16px;
 letter-spacing: -1px;
 border: solid 1px;
 }
@@ -746,7 +760,6 @@ padding: 1px;
 
 
 .active-scaffold textarea {
-font-family: Arial, sans-serif;
 font-size: 12px;
 padding: 1px;
 border: solid 1px;
@@ -828,6 +841,12 @@ clear: left;
 padding: 5px 0;
 padding-left: 5px;
 }
+.active-scaffold .form-element .sub-form.optional {
+float: none;
+}
+.active-scaffold .form-element .show-new-subform {
+margin-left: 5px;
+}
 
 .active-scaffold .sub-form h5 {
 margin-left: -5px;
@@ -840,7 +859,8 @@ background: none;
 }
 
 .active-scaffold .sub-form table th {
-font: normal 10px verdana, sans-serif;
+font-weight: normal;
+font-size: 10px;
 padding: 0 5px 0 1px;
 background: none;
 }
@@ -891,13 +911,15 @@ display: none;
 }
 
 .active-scaffold .sub-form .association-record a {
-font: bold 12px arial;
+font-weight: bold;
+font-size: 12px;
 }
 
 .active-scaffold .sub-form input.text-input,
 .active-scaffold .sub-form select {
 letter-spacing: 0;
-font: bold 12px arial;
+font-weight: bold;
+font-size: 12px;
 }
 
 .active-scaffold .sub-form .footer-wrapper {
@@ -983,7 +1005,8 @@ padding: 4px 0px;
 
 .as_touch .active-scaffold div.actions a,
 .as_touch .active-scaffold div.actions div {
-  font: bold 14px arial;
+font-weight: bold;
+font-size: 14px;
 }
 
 .as_touch .active-scaffold div.actions {