active_scaffold_vho 3.0.31 → 3.1.0

data/{frontends/default → app/assets}/javascripts/jquery/jquery.editinplace.js

@@ -259,7 +259,7 @@ $.extend(InlineEditor.prototype, {
 		var buttons_html  = (this.settings.show_buttons) ? this.settings.save_button + ' ' + this.settings.cancel_button : '';
 		var editorElement = this.createEditorElement(); // needs to happen before anything is replaced
 		/* insert the new in place form after the element they click, then empty out the original element */
-		this.dom.html('<form class="inplace_form" data-as_load="form" style="display: inline; margin: 0; padding: 0;"></form>')
+		this.dom.html('<form class="inplace_form" style="display: inline; margin: 0; padding: 0;"></form>')
 			.find('form')
 				.append(editorElement)
 				.append(buttons_html);

data/{lib/active_scaffold/bridges/tiny_mce/public → app/assets}/javascripts/jquery/tiny_mce_bridge.js

@@ -1,18 +1,19 @@
-$(document).on('as:form_loaded', 'form.as_form, form.inplace_form', function(event) {
+$('form.as_form').live('as:form_loaded', function(event) {
     var as_form = $(this).closest("form");
     as_form.find('textarea.as_mceEditor').each(function(index, elem) {
       tinyMCE.execCommand('mceAddControl', false, $(elem).attr('id'));
     });
     return true;
   });
-$(document).on('as:form_submit', 'form.as_form, form.inplace_form', function(event) {
+$('form.as_form').live('as:form_submit', function(event) {
     var as_form = $(this).closest("form");
     if (as_form.has('textarea.as_mceEditor').length > 0) {
       tinyMCE.triggerSave();
     }
     return true;
   });
-$(document).on('as:form_unloaded', 'form.as_form, form.inplace_form', function(event) {
+
+$('form.as_form').live('as:form_unloaded', function(event) {
     var as_form = $(this).closest("form");
     as_form.find('textarea.as_mceEditor').each(function(index, elem) {
       tinyMCE.execCommand('mceRemoveControl', false, $(elem).attr('id'));

data/{frontends/default → app/assets}/javascripts/prototype/active_scaffold.js

@@ -209,51 +209,34 @@ document.observe("dom:loaded", function() {
     }
     return true;
   });
-  document.on('ajax:before', 'div.active-scaffold-footer .pagination a', function(event) {
+  document.on('ajax:before', 'a.as_paginate', function(event) {
     var as_paginate = event.findElement();
-    var loading_indicator = as_paginate.up(1).down('img.loading-indicator');
+    var loading_indicator = as_paginate.up().down('img.loading-indicator');
     var history_controller_id = as_paginate.readAttribute('data-page-history');
     
     if (history_controller_id) addActiveScaffoldPageToHistory(as_paginate.readAttribute('href'), history_controller_id);
-    if (loading_indicator == null) {
-      var table_loading_indicator = as_paginate.up('div.active-scaffold').down('div.actions').down('img.loading-indicator');
-      loading_indicator = table_loading_indicator.cloneNode(true);
-      loading_indicator.id = null;
-      as_paginate.up(1).insert({top: loading_indicator});
-    }
-    loading_indicator.style.visibility = 'visible';
+    if (loading_indicator) loading_indicator.style.visibility = 'visible';
     return true;
   });
-  document.on('ajax:failure', 'div.active-scaffold-footer .pagination a', function(event) {
+  document.on('ajax:failure', 'a.as_paginate', function(event) {
     var as_scaffold = event.findElement('.active-scaffold');
     ActiveScaffold.report_500_response(as_scaffold);
     return true;
   });
-  document.on('ajax:complete', 'div.active-scaffold-footer .pagination a', function(event) {
+  document.on('ajax:complete', 'a.as_paginate', function(event) {
     var as_paginate = event.findElement();
     var loading_indicator = as_paginate.up().down('img.loading-indicator');
     
     if(loading_indicator) loading_indicator.style.visibility = 'hidden';  
     return true;
   });
-  document.on('ajax:before', 'a.as_add_existing', function(event) {
+  document.on('ajax:before', 'input[type=button].as_add_existing', function(event) {
     var button = event.findElement();
-    var selected_id = button.previous().getValue();
-    if (selected_id) {
-      var url =  button.readAttribute('href').sub('--ID--', selected_id);
-      event.memo.url = url;
-      return true;
-    } else {
-      return false;
-    }
-  });
-  document.on('click', 'a.as_destroy_existing', function(event) {
-    var associated_record = event.findElement('tr.association-record');
-    ActiveScaffold.delete_subform_record(associated_record);
-    event.stop();
-    return false;
+    var url =  button.readAttribute('href').sub('--ID--', button.previous().getValue());
+    event.memo.url = url;
+    return true;
   });
-  document.on('change', 'input.update_form, textarea.update_form, select.update_form', function(event) {
+  document.on('change', 'input.update_form, select.update_form', function(event) {
     var element = event.findElement();
     var as_form = element.up('form.as_form');
     var params = null;
@@ -331,45 +314,17 @@ document.observe("dom:loaded", function() {
       ActiveScaffold.focus_first_element_of_form(as_form);
       return true;
   });
-  document.on('as:form_element_loaded', 'li.horizontal-sub-form', function(event, element) {
-      element.select('a.as_associated_form_link').each(function(element) {
-        ActiveScaffold.show(element);
-        //Show select Box for add_existing as well
-        if(element.hasClassName('as_add_existing')) {
-          ActiveScaffold.show(element.previous());
-        }
-      });
-      return true;
-  });
-  document.on('as:list_row_loaded', 'tr.inline-adapter-autoopen', function(event, element) {
-    var actionlink_controllers = event.element().readAttribute('data-actionlink-controllers');
-    if(actionlink_controllers) {
-      actionlink_controllers = actionlink_controllers.split('::');
-      element.previous('tr').select('a.index').each(function(action_link) {
-        for (var i = 0; i < actionlink_controllers.length; i++) {
-          if (actionlink_controllers[i] === action_link.readAttribute('data-controller')) {
-            var as_action_link = ActiveScaffold.ActionLink.get(action_link);
-            if (as_action_link) {
-              as_action_link.set_opened();  
-            }
-          }
-        }
-      });
-    }
-    return true;
-  });
   document.on('ajax:before', 'form.as_form', function(event) {
     var as_form = event.findElement('form');
-    as_form.fire('as:form_submit');
+    element.fire('as:form_submit');
     return true;
   });
   document.on('submit', 'form.as_form[data-remote!="true"]', function(event) {
     var as_form = event.findElement('form');
-    as_form.fire('as:form_submit');
+    element.fire('as:form_submit');
     return true;
   });
   ActiveScaffold.trigger_load_events($$('[data-as_load]'));
-  ActiveScaffold.load_embedded_conrollers();
 });
 
 
@@ -451,26 +406,17 @@ var ActiveScaffold = {
     new_row.highlight();
   },
   
-  replace: function(element, html, disable_event_trigger) {
+  replace: function(element, html) {
     element = $(element);
     var elements = element.select('[data-as_load]');
-    var new_element = null;
     elements.unshift(element);
-    if((typeof(disable_event_trigger) != 'boolean') || disable_event_trigger === false) {
-      ActiveScaffold.trigger_unload_events(elements);
-    }
-    if (html.startsWith('<tr')) {
-        new_element = new Element('tbody').update(html);
-    } else {
-        new_element = new Element('div').update(html);
-    }
+    ActiveScaffold.trigger_unload_events(elements);
+    var new_element = new Element('div').update(html);
     new_element = new_element.firstDescendant();
     Element.replace(element, new_element);
     elements = new_element.select('[data-as_load]');
     elements.unshift(new_element);
-    if((typeof(disable_event_trigger) != 'boolean') || disable_event_trigger === false) {
-      ActiveScaffold.trigger_load_events(elements);
-    }
+    ActiveScaffold.trigger_load_events(elements);
     return new_element;
   },
     
@@ -525,7 +471,7 @@ var ActiveScaffold = {
       tbody.insert({top: html});
       new_row = tbody.firstDescendant();
     } else if (options.insert_at == 'bottom') {
-      var last_row = tbody.childElements().reverse().detect(function(node) {return node.hasClassName('record') || node.hasClassName('inline-adapter')});
+      var last_row = tbody.childElements().reverse().detect(function(node) { return node.hasClassName('record') || node.hasClassName('inline-adapter')});
       if (last_row) {
         last_row.insert({after: html});
       } else {
@@ -564,8 +510,7 @@ var ActiveScaffold = {
     if (errors.hasClassName('association-record-errors')) {
       this.replace_html(errors, '');
     }
-    record.down('input.associated_action').value('delete');
-    this.hide(record);
+    this.remove(record);
   },
 
   report_500_response: function(active_scaffold_id) {
@@ -661,7 +606,7 @@ var ActiveScaffold = {
     if (element) {
       if (options.is_subform == false) {
         ActiveScaffold.trigger_unload_events(new Array(element.up('li.form-element')));
-        element = this.replace(element.up('dl'), content);
+        this.replace(element.up('dl'), content);
         ActiveScaffold.trigger_load_events(new Array(element.up('li.form-element')));
       } else {
         this.replace_html(element, content);
@@ -687,7 +632,7 @@ var ActiveScaffold = {
     var mark_checkboxes = $$('#' + element.readAttribute('id') + ' > tr.record td.marked-column input[type="checkbox"]');
     mark_checkboxes.each(function(item) {
      if(options.checked === true) {
-       item.writeAttribute({checked: 'checked'});
+       item.writeAttribute({ checked: 'checked' });
      } else {
        item.removeAttribute('checked');
      }
@@ -696,7 +641,7 @@ var ActiveScaffold = {
     if(options.include_mark_all === true) {
       var mark_all_checkbox = element.previous('thead').down('th.marked-column_heading span input[type="checkbox"]');
       if(options.checked === true) {
-        mark_all_checkbox.writeAttribute({checked: 'checked'}); 
+        mark_all_checkbox.writeAttribute({ checked: 'checked' }); 
       } else {
         mark_all_checkbox.removeAttribute('checked');
       }
@@ -734,13 +679,6 @@ var ActiveScaffold = {
        break;
       }
     });
-  },
-
-  load_embedded_conrollers: function(){
-    $$('a.as_link_to_component').each(function(element) {
-      var div_element = element.up('div.active-scaffold-component');
-      new Ajax.Updater(div_element, element.readAttribute('href').append_params({embedded: true}), {method: 'get', evalScripts: true});
-    });
   }
 
 }
@@ -831,11 +769,9 @@ ActiveScaffold.Actions.Abstract = Class.create({
     this.target = $(target);
     this.loading_indicator = $(loading_indicator);
     this.options = options;
-    var _this = this;
     this.links = links.collect(function(link) {
-      var my_link = _this.instantiate_link(link);
-      return my_link;
-    });
+      return this.instantiate_link(link);
+    }.bind(this));
   },
 
   instantiate_link: function(link) {
@@ -938,25 +874,6 @@ ActiveScaffold.ActionLink.Abstract = Class.create({
     this.adapter = element;
     this.adapter.addClassName('as_adapter');
     this.adapter.store('action_link', this);
-  },
-
-  wrap_with_adapter_html: function(content, should_refresh_data) {
-    // players_view class missing
-    var id_string = null;
-    var close_label = this.scaffold().readAttribute('data-closelabel');
-    var controller = this.scaffold().readAttribute('data-controller');
-
-    if (this.tag.readAttribute('data-controller')) {
-        controller = this.tag.readAttribute('data-controller');
-    }
-
-    if(this.target.hasClassName('before-header')) {
-        id_string = this.target.readAttribute('id').replace('search', 'nested');
-    } else {
-        id_string = this.target.readAttribute('id').replace('list', 'nested');
-    }
-
-    return '<tr class="inline-adapter" id="' + id_string + '"><td colspan="99" class="inline-adapter-cell"><div class="' + this.action + '-view ' + controller +  '-view view"><a class="inline-adapter-close as_cancel" title="' + close_label + '" data-remote="true" data-refresh="' + should_refresh_data + '" href="">' + close_label +'</a>' + content + '</div></td></tr>'
   }
 });
 
@@ -967,10 +884,10 @@ ActiveScaffold.Actions.Record = Class.create(ActiveScaffold.Actions.Abstract, {
   instantiate_link: function(link) {
     var l = new ActiveScaffold.ActionLink.Record(link, this.target, this.loading_indicator);
     if (this.target.hasAttribute('data-refresh') && !this.target.readAttribute('data-refresh').blank()) l.refresh_url = this.target.readAttribute('data-refresh');
-
-    if (l.position && l.tag.hasAttribute('data-action') && l.tag.readAttribute('data-action') == "index") {
-        l.url = l.url.append_params({embedded: true});
-        l.tag.href = l.url;
+    
+    if (l.position) {
+      l.url = l.url.append_params({adapter: '_list_inline_adapter'});
+      l.tag.href = l.url;
     }
     l.set = this;
     return l;
@@ -989,7 +906,6 @@ ActiveScaffold.ActionLink.Record = Class.create(ActiveScaffold.ActionLink.Abstra
   },
 
   insert: function(content) {
-    var should_refresh_data = (typeof(this.refresh_ur)== 'undefined');
     this.close_previous_adapter();
 
     if (this.position == 'replace') {
@@ -998,19 +914,18 @@ ActiveScaffold.ActionLink.Record = Class.create(ActiveScaffold.ActionLink.Abstra
     }
 
     if (this.position == 'after') {
-      this.target.insert({after:this.wrap_with_adapter_html(content, should_refresh_data)});
+      this.target.insert({after:content});
       ActiveScaffold.trigger_load_events(this.target.next().select('[data-as_load]'));
       this.set_adapter(this.target.next());
     }
     else if (this.position == 'before') {
-      this.target.insert({before:this.wrap_with_adapter_html(content, should_refresh_data)});
+      this.target.insert({before:content});
       ActiveScaffold.trigger_load_events(this.target.previous().select('[data-as_load]'));
       this.set_adapter(this.target.previous());
     }
     else {
       return false;
     }
-    this.update_flash_messages();
     this.adapter.down('td').down().highlight();
   },
 
@@ -1036,14 +951,11 @@ ActiveScaffold.ActionLink.Record = Class.create(ActiveScaffold.ActionLink.Abstra
   },
 
   set_opened: function() {
-    var should_refresh_data = (typeof(this.refresh_ur)== 'undefined');
     if (this.position == 'after') {
-      var new_adapter = ActiveScaffold.replace(this.target.next(), this.wrap_with_adapter_html(this.target.next().childElements().first().innerHTML, should_refresh_data), true);
-      this.set_adapter(new_adapter);
+      this.set_adapter(this.target.next());
     }
     else if (this.position == 'before') {
-      var new_adapter = ActiveScaffold.replace(this.target.previous(), this.wrap_with_adapter_html(this.target.previous().childElements().first().innerHTML, should_refresh_data), true);
-      this.set_adapter(new_adapter);
+      this.set_adapter(this.target.previous());
     }
     this.disable();
   }
@@ -1055,7 +967,10 @@ ActiveScaffold.ActionLink.Record = Class.create(ActiveScaffold.ActionLink.Abstra
 ActiveScaffold.Actions.Table = Class.create(ActiveScaffold.Actions.Abstract, {
   instantiate_link: function(link) {
     var l = new ActiveScaffold.ActionLink.Table(link, this.target, this.loading_indicator);
-    
+    if (l.position) {
+      l.url = l.url.append_params({adapter: '_list_inline_adapter'});
+      l.tag.href = l.url;
+    }
     return l;
   }
 });
@@ -1063,14 +978,13 @@ ActiveScaffold.Actions.Table = Class.create(ActiveScaffold.Actions.Abstract, {
 ActiveScaffold.ActionLink.Table = Class.create(ActiveScaffold.ActionLink.Abstract, {
   insert: function(content) {
     if (this.position == 'top') {
-      this.target.insert({top:this.wrap_with_adapter_html(content, false)});
+      this.target.insert({top:content});
       ActiveScaffold.trigger_load_events(this.target.immediateDescendants().first().select('[data-as_load]'));
       this.set_adapter(this.target.immediateDescendants().first());
     }
     else {
       throw 'Unknown position "' + this.position + '"'
     }
-    this.update_flash_messages();
     this.adapter.down('td').down().highlight();
   }
 });

data/{frontends/default/stylesheets/stylesheet.css → app/assets/stylesheets/active_scaffold.css.erb}

@@ -171,20 +171,21 @@ background-repeat: no-repeat;
 }
 
 .active-scaffold-header div.actions div.action_group div {
-  background-image: url(../../../images/active_scaffold/default/gears.png); /* default icon for actions or override with css */
+  background-image: url(<%= asset_path 'gears.png' %>); /* default icon for actions or override with css */
 }
 
 .active-scaffold-header div.actions a.show_config_list {
-  background-image: url(../../../images/active_scaffold/default/config.png);
+  background-image: url(<%= asset_path 'config.png' %>);
 }
 
 .active-scaffold-header div.actions a.new,
 .active-scaffold-header div.actions a.new_existing {
-background-image: url(../../../images/active_scaffold/default/add.gif);
+background-image: url(<%= asset_path 'add.gif' %>);
 }
 
 .active-scaffold-header div.actions a.show_search {
-background-image: url(../../../images/active_scaffold/default/magnifier.png);
+
+background-image: url(<%= asset_path 'magnifier.png' %>);
 }
 
 .blue-theme .active-scaffold-header div.actions a:hover {
@@ -243,17 +244,17 @@ padding-right: 18px;
 
 .active-scaffold th.asc a,
 .active-scaffold th.asc a:hover {
-background: #333 url(../../../images/active_scaffold/default/arrow_up.gif) right 50% no-repeat;
+background: #333 url(<%= asset_path 'arrow_up.gif' %>) right 50% no-repeat;
 }
 
 .active-scaffold th.desc a,
 .active-scaffold th.desc a:hover {
-background: #333 url(../../../images/active_scaffold/default/arrow_down.gif) right 50% no-repeat;
+background: #333 url(<%= asset_path 'arrow_down.gif' %>) right 50% no-repeat;
 }
 
 .active-scaffold th.loading a,
 .active-scaffold th.loading a:hover {
-background: #333 url(../../../images/active_scaffold/default/indicator-small.gif) right 50% no-repeat;
+background: #333 url(<%= asset_path 'indicator-small.gif' %>) right 50% no-repeat;
 }
 
 .active-scaffold th .mark_heading {
@@ -432,7 +433,7 @@ float: right;
 text-indent: -4000px;
 width: 16px;
 height: 17px;
-background: url(../../../images/active_scaffold/default/close.gif) 0 0 no-repeat;
+background: url(<%= asset_path 'close.gif' %>) 0 0 no-repeat;
 }
 
 /* Nested
@@ -528,11 +529,10 @@ background-color: #005CB8;
 color: #ccc;
 }
 
-.active-scaffold-footer .pagination {
-text-align: right;
+.active-scaffold-footer .active-scaffold-pagination {
+float: right;
 white-space: nowrap;
 margin-right: 5px;
-font: bold 12px arial, sans-serif;
 }
 
 .blue-theme .active-scaffold-footer .active-scaffold-records {
@@ -543,7 +543,8 @@ margin-left: 5px;
 text-decoration: none;
 letter-spacing: 0;
 padding: 0 2px;
-margin: 0;
+margin: 0 -2px;
+font: bold 12px arial, sans-serif;
 }
 
 .blue-theme .active-scaffold-footer a,
@@ -561,9 +562,9 @@ padding-left: 5px;
 border-left: solid 1px #ccc;
 }
 
-.active-scaffold-footer .prev {
-margin-right: 3px;
-padding-right: 3px;
+.active-scaffold-footer .previous {
+margin-right: 0;
+padding-right: 5px;
 border-right: solid 1px #ccc;
 }
 
@@ -776,7 +777,7 @@ padding: 6px 0;
 }
 
 .active-scaffold li.form-element dd {
-float: none;
+float: left;
 }
 
 .active-scaffold li.form-element dd input[type="checkbox"] {
@@ -954,7 +955,7 @@ height: 16px;
 padding: 0;
 width: 16px;
 text-indent: -4000px;
-background: url(../../../images/active_scaffold/default/cross.png) 0 0 no-repeat;
+background: url(<%= asset_path 'cross.png' %>) 0 0 no-repeat;
 }
 
 .active-scaffold .sub-form .locked a.destroy {
@@ -993,17 +994,18 @@ font-size: 100%;
 }
 
 .active-scaffold-found {
+  float:left;
 }
 
 .as_touch a.inline-adapter-close {
 width: 25px;
 height: 27px;
-background: url(../../../images/active_scaffold/default/close_touch.png) 0 0 no-repeat;
+background: url(<%= asset_path 'close_touch.png' %>) 0 0 no-repeat;
 }
 
-.as_touch .active-scaffold-footer .pagination, .as_touch .active-scaffold-footer .pagination a {
-    font-size: 20px;
-    padding: 3px 10px;
+.as_touch .as_paginate {
+font-size: 20px;
+padding: 3px 10px;
 }
 
 .as_touch .active-scaffold-header div.actions a {
@@ -1072,4 +1074,4 @@ padding: 5px 2px 5px 5px;
 
 .as_touch tr.record td {
 padding: 5px 10px;
-}
+}

data/app/assets/stylesheets/jquery-ui-timepicker-addon.css

@@ -0,0 +1,6 @@
+.ui-timepicker-div .ui-widget-header { margin-bottom: 8px; }
+.ui-timepicker-div dl { text-align: left; }
+.ui-timepicker-div dl dt { height: 25px; }
+.ui-timepicker-div dl dd { margin: -25px 10px 10px 65px; }
+.ui-timepicker-div td { font-size: 90%; }
+.ui-tpicker-grid-label { background: none; border: none; margin: 0; padding: 0; }

data/frontends/default/views/_action_group.html.erb

@@ -16,7 +16,7 @@
 	<% end %>
   <% else -%>
     <% if options[:level] == 0 %>
-      <%= "#{start_level_0_tag}#{h(render_group_action_link(link, url_options, options, record))}#{end_level_0_tag}".html_safe %>
+      <%= "#{start_level_0_tag}#{render_group_action_link(link, url_options, options, record)}#{end_level_0_tag}".html_safe %>
     <% else %>
       <%= content_tag('li', render_group_action_link(link, url_options, options, record), options[:first_action] ? {:class => 'top'}: {}) %>
     <% end %>

data/frontends/default/views/_base_form.html.erb

@@ -54,4 +54,4 @@ end
     <%= loading_indicator_tag(:action => form_action, :id => params[:id]) %>
   </p>
 
-</form>
+</form>

data/frontends/default/views/_form_association_footer.html.erb

@@ -10,15 +10,17 @@ show_add_new = column_show_add_new(column, associated, @record)
 
 return unless show_add_new or show_add_existing
 
-edit_associated_url = url_for(:action => 'edit_associated', :id => parent_record.id, :association => column.name, :associated_id => '--ID--', :escape => false, :eid => params[:eid], :parent_controller => params[:parent_controller], :parent_id => params[:parent_id]).html_safe if show_add_existing
-add_new_url = url_for(:action => 'edit_associated', :id => parent_record.id, :association => column.name, :escape => false, :eid => params[:eid], :parent_controller => params[:parent_controller], :parent_id => params[:parent_id]).html_safe if show_add_new
+edit_associated_url = url_for(:action => 'edit_associated', :id => parent_record.id, :association => column.name, :associated_id => '--ID--', :escape => false, :eid => params[:eid], :parent_controller => params[:parent_controller], :parent_id => params[:parent_id]) if show_add_existing
+add_new_url = url_for(:action => 'edit_associated', :id => parent_record.id, :association => column.name, :escape => false, :eid => params[:eid], :parent_controller => params[:parent_controller], :parent_id => params[:parent_id]) if show_add_new
 
 -%>
 <div class="footer-wrapper">
   <div class="footer">
     <% if show_add_new -%>
-    <% add_label = column.plural_association? ? as_(:create_another, :model => column.association.klass.model_name.human) : as_(:replace_with_new) %>
-    <%= link_to add_label, add_new_url, :class => 'as_associated_form_link', :remote => true, :style=> "display: none;" %>
+    <% add_label = column.plural_association? ? as_(:create_another, :model => column.association.klass.model_name.human) : as_(:replace_with_new) 
+       create_another_id = "#{sub_form_id(:association => column.name)}-create-another" %>
+    <%= tag(:input, {:id => create_another_id, :type => 'button', :value => add_label, :href => add_new_url.html_safe, 'data-remote' => true, :style=> "display: none;"}) %>
+    <%= javascript_tag("ActiveScaffold.show('#{create_another_id}');") %>
     <% end -%>
 
     <%= '|' if show_add_new and show_add_existing %>
@@ -27,9 +29,11 @@ add_new_url = url_for(:action => 'edit_associated', :id => parent_record.id, :as
       <% if remote_controller and remote_controller.respond_to? :uses_record_select? and remote_controller.uses_record_select? -%>
         <%= link_to_record_select as_(:add_existing), remote_controller.controller_path, :onselect => "ActiveScaffold.record_select_onselect(#{edit_associated_url.to_json}, #{active_scaffold_id.to_json}, id);" -%>
       <% else -%>
-        <% select_options = options_for_select(options_for_association(column.association))%>
-        <%= select_tag 'associated_id', '<option value="">'.html_safe + as_(:_select_) + '</option>'.html_safe + select_options, :id => nil, :style => "display: none;" %>
-        <%= link_to as_(:add_existing), edit_associated_url, :remote => true, :class => 'as_associated_form_link as_add_existing', :style => "display: none;" %>
+        <% select_options = options_for_select(options_for_association(column.association)) 
+           add_existing_id = "#{sub_form_id(:association => column.name)}-add-existing" %>
+        <%= select_tag 'associated_id', '<option value="">'.html_safe + as_(:_select_) + '</option>'.html_safe + select_options %>
+        <%= tag(:input, {:id => add_existing_id, :type => 'button', :value => as_(:add_existing), :href => edit_associated_url.html_safe, 'data-remote' => true, :class=> 'as_add_existing', :style => "display: none;"}) %>
+        <%= javascript_tag("ActiveScaffold.show('#{add_existing_id}');") %>
       <% end -%>
     <% end -%>
   </div>

data/frontends/default/views/_horizontal_subform_record.html.erb

@@ -5,7 +5,6 @@
    config = active_scaffold_config_for(@record.class)
    options = active_scaffold_input_options(config.columns[@record.class.primary_key], scope)
    tr_id = "association-#{options[:id]}"
-   associated_action = @record.new_record? ? :create_or_empty : :update
 %>
 <tr id="<%= tr_id %>" class="association-record <%= 'association-record-new' if @record.new_record? -%> <%= 'locked' if locked -%>">
 <% config.subform.columns.each :for => @record.class, :crud_type => crud_type, :flatten => true do |column| %>
@@ -26,16 +25,13 @@
 <% if show_actions -%>
   <td class="actions">
     <% if record_column.plural_association? and (@record.authorized_for?(:crud_type => :delete) or not [:destroy, :delete_all].include?(record_column.association.options[:dependent])) %>
-      <% link_classes = ['destroy', 'as_destroy_existing']
-         link_classes << 'as_associated_form_link' if !locked %>
-      <%= link_to as_(:remove), '#', :class => link_classes.join(' '), :style=> "display: none;" %>
+      <% destroy_id = "#{options[:id]}-destroy" %>
+      <%= link_to as_(:remove), '#', :class => 'destroy', :id => destroy_id , :onclick => "ActiveScaffold.delete_subform_record(\"#{tr_id}\"); return false;", :style=> "display: none;" %>
+      <%= javascript_tag("ActiveScaffold.show('#{destroy_id}');") if !locked %>
     <% end %>
-  </td>
-<% end -%>
-  <td>
     <% unless @record.new_record? %>
-    <input type="hidden" name="<%= options[:name] -%>" id="<%= options[:id] -%>" value="<%= @record.id -%>" />
+      <input type="hidden" name="<%= options[:name] -%>" id="<%= options[:id] -%>" value="<%= @record.id -%>" />
     <% end -%>
-    <input type="hidden" name="<%= scope ? "record#{scope}[associated_action]" : "record[associated_action]" -%>" class="associated_action" value="<%= associated_action -%>" />
   </td>
+<% end -%>
 </tr>

data/frontends/default/views/_list.html.erb

@@ -8,7 +8,7 @@
   <%= render :partial => 'list_messages', :locals => {:columns => columns} %>
   <tbody class="records" id="<%= active_scaffold_tbody_id %>">
     <% if !@records.empty? -%>
-      <%= render :partial => 'list_record', :collection => @records, :locals => { :hidden => false, :columns => columns, :action_links => active_scaffold_config.action_links.member} %>
+      <%= render :partial => 'list_record', :collection => @page.items, :locals => { :hidden => false, :columns => columns, :action_links => active_scaffold_config.action_links.member} %>
     <% end -%>
     <% if columns.any? {|c| c.calculation?} -%>
       <%= render :partial => 'list_calculations', :locals => {:columns => columns} %>
@@ -16,4 +16,3 @@
   </tbody>
 </table>
 <%= render :partial => 'list_pagination' %>
-<% save_current_page_num %>

data/frontends/default/views/_list_inline_adapter.html.erb

@@ -0,0 +1,10 @@
+<%# nested_id, allows us to remove a nested scaffold programmatically %>
+<tr class="inline-adapter" id="<%= element_row_id :action => :nested %>">
+  <td colspan="99" class="inline-adapter-cell">
+    <div class="<%= "#{params[:action]}-view" if params[:action] %> <%= "#{params[:associations] ? params[:associations] : params[:controller]}-view" %> view">
+      <%= link_to(as_(:close), '', :class => 'inline-adapter-close as_cancel', :remote => true, :title => as_(:close), 'data-refresh' => (action_name == 'index' ? true : false)) -%>
+      <%= payload -%>
+    </div>
+  </td>
+</tr>
+<%= javascript_tag("var action_link = ActiveScaffold.ActionLink.get('#{element_row_id(:action => :nested)}'); if (action_link) action_link.update_flash_messages('#{escape_javascript(render(:partial => 'messages').strip)}');") %>

data/frontends/default/views/_list_messages.html.erb

@@ -11,7 +11,7 @@
       <p class="filtered-message" <%= ' style="display:none;" '.html_safe unless @filtered %>>
         <%= @filtered.is_a?(Array) ? render(:partial => 'human_conditions', :locals => {:columns => @filtered}) : as_(active_scaffold_config.list.filtered_message) %>
       </p>
-      <p id="<%= empty_message_id %>" class="empty-message" <%= ' style="display:none;" '.html_safe unless @records.empty? %>>
+      <p id="<%= empty_message_id %>" class="empty-message" <%= ' style="display:none;" '.html_safe unless @page.items.empty? %>>
         <%= as_(active_scaffold_config.list.no_entries_message) %>
       </p>
     </td>
@@ -23,7 +23,7 @@
       action_links.add(search_link)  -%>
       <%= render :partial => 'list_actions', :locals => {:record => record, :url_options => params_for(:escape => false, :search => ''), :action_links => action_links.member} %>
     <% else %>
-      <td class='actions'><%= '<p class="empty-message">&nbsp;</p>'.html_safe if @records.empty? %></td>
+      <td class='actions'><%= '<p class="empty-message">&nbsp;</p>'.html_safe if @page.items.empty? %></td>
     <% end -%>
 
   </tr>