active_scaffold 3.0.5 → 3.0.11

data/frontends/default/javascripts/jquery/jquery.editinplace.js

@@ -455,6 +455,7 @@ $.extend(InlineEditor.prototype, {
 			return;
 		
 		var editor = this.dom.find(':input');
+
 		var enteredText = editor.val();
 		enteredText = this.triggerDelegateCall('willCloseEditInPlace', enteredText);
 		
@@ -468,8 +469,16 @@ $.extend(InlineEditor.prototype, {
 	handleSaveEditor: function(anEvent) {
 		if (false === this.triggerDelegateCall('shouldCloseEditInPlace', true, anEvent))
 			return;
-		
-		var enteredText = this.dom.find(':input').val();
+
+    var editor = this.dom.find(':input:not(:button)');
+    var enteredText = '';
+    if (editor.length > 1) {
+      enteredText = jQuery.map(editor.not('input:checkbox:not(:checked)'), function(item, index) {
+        return $(item).val();
+      });
+    } else {
+		  enteredText = editor.val();
+    }
 		enteredText = this.triggerDelegateCall('willCloseEditInPlace', enteredText);
 		
 		if (this.isDisabledDefaultSelectChoice()
@@ -545,8 +554,16 @@ $.extend(InlineEditor.prototype, {
 	},
 	
 	handleSubmitToServer: function(enteredText) {
-		var data = this.settings.update_value + '=' + encodeURIComponent(enteredText) 
-			+ '&' + this.settings.element_id + '=' + this.dom.attr("id") 
+		var data = '';
+    if (typeof(enteredText) === 'string') {
+      data += this.settings.update_value + '=' + encodeURIComponent(enteredText) + '&';
+    } else {
+      for(var i = 0;i < enteredText.length; i++) {
+        data += this.settings.update_value + '[]=' + encodeURIComponent(enteredText[i]) + '&';
+      }
+    }
+
+    data += this.settings.element_id + '=' + this.dom.attr("id")
 			+ ((this.settings.params) ? '&' + this.settings.params : '')
 			+ '&' + this.settings.original_html + '=' + encodeURIComponent(this.originalValue) /* DEPRECATED in 2.2.0 */
 			+ '&' + this.settings.original_value + '=' + encodeURIComponent(this.originalValue);

data/frontends/default/javascripts/prototype/active_scaffold.js

@@ -45,7 +45,7 @@ document.observe("dom:loaded", function() {
   document.on('submit', 'form.as_form.as_remote_upload', function(event) {
     var as_form = event.findElement('form');
     if (as_form && as_form.readAttribute('data-loading') == 'true') {
-      setTimeout("ActiveScaffold.disable_form('" + as_form.id + "')", 10);
+      setTimeout("ActiveScaffold.disable_form('" + as_form.readAttribute('id') + "')", 10);
     }
     return true;
   });
@@ -177,10 +177,17 @@ document.observe("dom:loaded", function() {
       if (record_id) options.url = options.url.sub('__id__', record_id);
        
       if (csrf_param) options['params'] = csrf_param.readAttribute('content') + '=' + csrf_token.readAttribute('content');
+
+      if (span.up('div.active-scaffold').readAttribute('data-eid')) {
+        if (options['params'].length > 0) {
+          options['params'] += ";";
+        }
+        options['params'] += ("eid=" + span.up('div.active-scaffold').readAttribute('data-eid'));
+      }
             
       if (mode === 'clone') {
         options.nodeIdSuffix = record_id;
-        options.inplacePatternSelector = '#' + column_heading.id + ' .as_inplace_pattern';
+        options.inplacePatternSelector = '#' + column_heading.readAttribute('id') + ' .as_inplace_pattern';
         options['onFormCustomization'] = new Function('element', 'form', 'element.clonePatternField();');
       }
       
@@ -251,14 +258,14 @@ document.observe("dom:loaded", function() {
   });
   document.on('change', 'select.as_search_range_option', function(event) {
     var element = event.findElement();
-    Element[element.value == 'BETWEEN' ? 'show' : 'hide'](element.id.sub('_opt', '_between'));
+    Element[element.value == 'BETWEEN' ? 'show' : 'hide'](element.readAttribute('id').sub('_opt', '_between'));
     return true;
   });
   document.on('change', 'select.as_search_date_time_option', function(event) {
     var element = event.findElement();
-    Element[!(element.value == 'PAST' || element.value == 'FUTURE' || element.value == 'RANGE') ? 'show' : 'hide'](element.id.sub('_opt', '_numeric'));
-    Element[(element.value == 'PAST' || element.value == 'FUTURE') ? 'show' : 'hide'](element.id.sub('_opt', '_trend'));
-    Element[element.value == 'RANGE' ? 'show' : 'hide'](element.id.sub('_opt', '_range'));
+    Element[!(element.value == 'PAST' || element.value == 'FUTURE' || element.value == 'RANGE') ? 'show' : 'hide'](element.readAttribute('id').sub('_opt', '_numeric'));
+    Element[(element.value == 'PAST' || element.value == 'FUTURE') ? 'show' : 'hide'](element.readAttribute('id').sub('_opt', '_trend'));
+    Element[element.value == 'RANGE' ? 'show' : 'hide'](element.readAttribute('id').sub('_opt', '_range'));
     return true;
   });
   document.on('change', 'select.as_update_date_operator', function(event) {
@@ -268,6 +275,11 @@ document.observe("dom:loaded", function() {
     Element[element.value == 'REPLACE' ? 'hide' : 'show'](element.next('span'));
     return true;
   });
+  document.on("click", "a[data-popup]", function(event, element) {
+     if (event.stopped) return;
+     window.open($(element).href);
+     event.stop();
+   });
 });
 
 
@@ -352,7 +364,7 @@ var ActiveScaffold = {
   replace: function(element, html) {
     element = $(element)
     Element.replace(element, html);
-    element = $(element.id);
+    element = $(element.readAttribute('id'));
     return element;
   },
     
@@ -380,14 +392,14 @@ var ActiveScaffold = {
   
   disable_form: function(as_form) {
     as_form = $(as_form)
-    var loading_indicator = $(as_form.id.sub('-form', '-loading-indicator'));
+    var loading_indicator = $(as_form.readAttribute('id').sub('-form', '-loading-indicator'));
     if (loading_indicator) loading_indicator.style.visibility = 'visible';
     as_form.disable();
   },
   
   enable_form: function(as_form) {
     as_form = $(as_form)
-    var loading_indicator = $(as_form.id.sub('-form', '-loading-indicator'));
+    var loading_indicator = $(as_form.readAttribute('id').sub('-form', '-loading-indicator'));
     if (loading_indicator) loading_indicator.style.visibility = 'hidden';
     as_form.enable();
   },
@@ -396,8 +408,9 @@ var ActiveScaffold = {
     Form.focusFirstElement(form_element);
   },  
   
-  create_record_row: function(tbody, html, options) {
-    tbody = $(tbody);
+  create_record_row: function(active_scaffold_id, html, options) {
+    tbody = $(active_scaffold_id).down('tbody.records');
+
     var new_row = null;
     
     if (options.insert_at == 'top') {
@@ -432,6 +445,7 @@ var ActiveScaffold = {
       }
     }
     row.remove();
+    tbody = $(tbody);
     this.stripe(tbody);
     this.decrement_record_count(tbody.up('div.active-scaffold'));
     this.reload_if_empty(tbody, page_reload_url);
@@ -485,7 +499,7 @@ var ActiveScaffold = {
       options['callback'] = new Function('form', 'return Form.serialize(form) + ' + "'&" + options['params'] + "';");
     }
     span.removeClassName('hover');
-    span.inplace_edit = new ActiveScaffold.InPlaceEditor(span.id, options.url, options)
+    span.inplace_edit = new ActiveScaffold.InPlaceEditor(span.readAttribute('id'), options.url, options)
     span.inplace_edit.enterEditMode();
   },
   
@@ -499,6 +513,7 @@ var ActiveScaffold = {
       var element = event.element();
       toggable.toggle(); 
       element.innerHTML = (toggable.style.display == 'none') ? options.show_label : options.hide_label;
+      return false;
     });
   },
   
@@ -509,8 +524,9 @@ var ActiveScaffold = {
         element.insert(content);
       }
     } else {
-      if (current = $$('#' + element.id + ' tr.association-record')[0]) {
-        this.replace(current, content);
+      var current = $$('#' + element.readAttribute('id') + ' tr.association-record');
+      if (current[0]) {
+        this.replace(current[0], content);
       } else {
         element.insert({top: content});
       }
@@ -643,7 +659,11 @@ ActiveScaffold.ActionLink = {
   get: function(element) {
     var element = $(element);
     if (typeof(element.retrieve('action_link')) === 'undefined' && !element.hasClassName('as_adapter')) {
-      var parent = element.up();
+      var parent = element.up('.actions');
+      if (typeof(parent) === 'undefined') {
+        // maybe an column action_link
+        parent = element.up();
+      }
       if (parent && parent.nodeName.toUpperCase() == 'TD') {
         // record action
         parent = parent.up('tr.record')
@@ -662,25 +682,11 @@ ActiveScaffold.ActionLink.Abstract = Class.create({
   initialize: function(a, target, loading_indicator) {
     this.tag = $(a);
     this.url = this.tag.href;
-    this.method = 'get';
-    
-    if(this.url.match('_method=delete')){
-      this.method = 'delete';
-      // action delete is special case cause in ajax world it will be destroy
-    } else if(this.url.match('/delete')){
-      this.url = this.url.replace('/delete', '');
-      this.tag.href = this.url;
-      this.method = 'delete';
-    } else if(this.url.match('_method=post')){
-      this.method = 'post';
-    } else if(this.url.match('_method=put')){
-      this.method = 'put';
-    }
-    if (this.method != 'get') this.tag.writeAttribute('data-method', this.method);
+    this.method = this.tag.readAttribute('data-method') || 'get';
     this.target = target;
     this.loading_indicator = loading_indicator;
     this.hide_target = false;
-    this.position = this.tag.getAttribute('data-position');
+    this.position = this.tag.readAttribute('data-position');
 		
     this.tag.store('action_link', this);
   },
@@ -723,7 +729,11 @@ ActiveScaffold.ActionLink.Abstract = Class.create({
   },
 
   scaffold_id: function() {
-    return this.tag.up('div.active-scaffold').id;
+    return this.tag.up('div.active-scaffold').readAttribute('id');
+  },
+
+  scaffold: function() {
+    return this.tag.up('div.active-scaffold');
   },
   
   update_flash_messages: function(messages) {
@@ -744,13 +754,8 @@ ActiveScaffold.ActionLink.Abstract = Class.create({
 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.readAttribute('data-refresh').blank()) l.refresh_url = this.target.readAttribute('data-refresh');
+    if (this.target.hasAttribute('data-refresh') && !this.target.readAttribute('data-refresh').blank()) l.refresh_url = this.target.readAttribute('data-refresh');
     
-    if (link.hasClassName('delete')) {
-      l.url = l.url.replace(/\/delete(\?.*)?$/, '$1');
-      l.url = l.url.replace(/\/delete\/(.*)/, '/destroy/$1');
-      l.tag.href = l.url;
-    }
     if (l.position) {
       l.url = l.url.append_params({adapter: '_list_inline_adapter'});
       l.tag.href = l.url;

data/frontends/default/stylesheets/stylesheet.css

@@ -35,7 +35,7 @@ text-decoration: none;
 color: #999;
 }
 
-.active-scaffold a:hover, .active-scaffold span.hover {
+.active-scaffold a:hover, .active-scaffold div.hover {
 background-color: #ff8;
 }
 
@@ -86,7 +86,8 @@ color: #fff;
 padding: 2px 5px 4px 5px;
 }
 
-.active-scaffold-header div.actions a {
+.active-scaffold-header div.actions a,
+.active-scaffold-header div.actions {
 float: right;
 font: bold 14px arial;
 letter-spacing: -1px;
@@ -98,7 +99,25 @@ background-position: 1px 50%;
 background-repeat: no-repeat;
 }
 
-.view .active-scaffold-header div.actions a {
+.active-scaffold-header div.actions div.action_group {
+display: inline;
+float: right;
+}
+
+.active-scaffold-header div.actions div.action_group li a,
+.active-scaffold-header div.actions div.action_group li div {
+float: none;
+margin: 0;
+}
+
+.active-scaffold-header div.actions .action_group ul {
+line-height: 130%;
+top: 14px;
+}
+
+.view .active-scaffold-header div.actions a,
+.view .active-scaffold-header div.actions div,
+.view .active-scaffold-header div.actions div.action_group {
 float: left;
 }
 
@@ -118,12 +137,23 @@ opacity: 0.5;
 
 .active-scaffold-header div.actions a.new,
 .active-scaffold-header div.actions a.new_existing,
-.active-scaffold-header div.actions a.show_search {
-padding-left: 19px;
+.active-scaffold-header div.actions a.show_search,
+.active-scaffold-header div.actions a.show_config_list,
+.active-scaffold-header div.actions div.action_group div {
+margin:0;  
+padding: 1px 5px 1px 20px;
 background-position: 1px 50%;
 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 */
+}
+
+.active-scaffold-header div.actions a.show_config_list {
+  background-image: url(../../../images/active_scaffold/default/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);
@@ -166,7 +196,7 @@ background-color: #555;
 
 .active-scaffold th a, .active-scaffold th a:visited {
 color: #fff;
-padding: 2px 15px 2px 5px;
+padding: 2px 2px 2px 5px;
 }
 
 .active-scaffold th p {
@@ -183,6 +213,10 @@ color: #ff8;
 background-color: #333;
 }
 
+.active-scaffold th.sorted a {
+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;
@@ -198,6 +232,10 @@ background: #333 url(../../../images/active_scaffold/default/arrow_down.gif) rig
 background: #333 url(../../../images/active_scaffold/default/indicator-small.gif) right 50% no-repeat;
 }
 
+.active-scaffold th .mark_heading {
+margin-left: 5px;
+}
+
 /* Table :: Record Rows
    ============================= */
 
@@ -265,7 +303,7 @@ padding: 0 2px;
 }
 
 .active-scaffold tr.record td.actions a,
-.active-scaffold tr.record td.actions span {
+.active-scaffold tr.record td.actions div {
 font: bold 11px verdana, sans-serif;
 letter-spacing: -1px;
 padding: 2px;
@@ -274,42 +312,79 @@ line-height: 16px;
 white-space: nowrap;
 }
 
-.active-scaffold tr.record td.actions td.action_list {
-  position:relative;
-  text-align: left;
-  color: #0066CC;
+.active-scaffold tr.record td.actions a.disabled {
+color: #666;
+opacity: 0.5;
+}
+
+.active-scaffold .actions .action_group div:hover {
+background-color: #ff8;
 }
 
-.active-scaffold tr.record td.actions .action_list ul {
-border:medium none;
-list-style-type:none;
-margin:0;
-padding:0;
-position:absolute;
-line-height:200%;
+.active-scaffold .actions .action_group {
+position: relative;
+text-align: left;
+color: #0066CC;
+}
+
+.active-scaffold .actions .action_group ul {
+border: 2px solid #005CB8;
+list-style-type: none;
+margin: 0;
+padding: 0;
+position: absolute;
+line-height: 200%;
+display: none;
+width: 150px;
+right: 0px;
+}
+
+.active-scaffold .actions .action_group ul ul {
 display: none;
-width:100%;
-}
-
-.active-scaffold tr.record td.actions .action_list ul li {
-background:none repeat scroll 0 0 #FFF;
-border-bottom:1px solid #AFD0F5;
-border-left:1px solid #AFD0F5;
-border-right:1px solid #AFD0F5;
-color:#000000;
-display:block;
-padding-bottom:5px;
-position:relative;
-width:160px;
+position: absolute;
+top: 0;
+right: 150px;
+}
+
+.active-scaffold .actions .action_group ul li {
+background: none repeat scroll 0 0 #EEE;
+border-top: 1px dashed #222;
+display: block;
+position: relative;
+width: auto;
 z-index: 2;
 }
 
-.active-scaffold tr.record td.actions td.action_list:hover ul {
-display:block;
+.active-scaffold .actions .action_group ul li div {
+  margin: 0;
+  padding: 5px 5px 5px 25px;
+  background-position: 5px 50%;
+  background-repeat: no-repeat;
+}
+
+.active-scaffold .actions .action_group ul li a {
+  display: block;
+  color: #333;
+  margin: 0;
+  padding: 5px 5px 5px 25px;
+  background-position: 5px 50%;
+  background-repeat: no-repeat;
 }
 
+.active-scaffold .actions .action_group ul li.top {
+border-top: 0px solid #005CB8;
+}
 
+.active-scaffold .actions .action_group:hover ul ul,
+.active-scaffold .actions .action_group:hover ul ul ul {
+display: none;
+}
 
+.active-scaffold .actions .action_group:hover ul,
+.active-scaffold .actions .action_group ul li:hover > ul,
+.active-scaffold .actions .action_group ul ul li:hover ul {
+display: block;
+}
 
 /* Table :: Inline Adapter
    ============================= */
@@ -365,9 +440,9 @@ top: 0px;
 right: 0px;
 }
 
-.active-scaffold .active-scaffold .active-scaffold-header div.actions a {
+.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;
-padding: 0 2px 1px 17px;
 }
 
 .blue-theme .active-scaffold .active-scaffold-header div.actions a,

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

@@ -0,0 +1,20 @@
+<% record ||= nil
+   start_level_0_tag ||= ''
+   end_level_0_tag ||= ''%>
+<% action_links.traverse(controller, traverse_options) do |parent, link, options| -%>
+  <% if (options[:node] == :finished_traversing) -%>
+    <%= "</ul>#{(options[:level] == 0 ? "</div>#{end_level_0_tag}": '</li>')}".html_safe %>
+  <% elsif (options[:node] == :start_traversing) -%>
+	<% if options[:level] == 0 %>
+	   <%= "#{start_level_0_tag}<div class=\"action_group\"> #{content_tag(:div, as_(parent.name), :class => (parent.name.to_s).downcase)}<ul>".html_safe %>
+	<% else %>
+	   <%= "<li #{"class=\"top\"" if options[:first_action]}>#{content_tag(:div, as_(parent.name), :class => (parent.name.to_s).downcase)}<ul>".html_safe %>
+	<% 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 %>
+    <% else %>
+      <%= content_tag('li', render_group_action_link(link, url_options, options, record), options[:first_action] ? {:class => 'top'}: {}) %>
+    <% end %>
+  <% end -%>
+<% end -%>

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

@@ -9,12 +9,16 @@ options = {:onsubmit => onsubmit,
            :class => "as_form #{form_action.to_s}",
            :method => method,
            'data-loading' => true}
+cancel_options = {:class => 'as_cancel', 'data-refresh' => false}
+
+cancel_options[:remote] = true if xhr #cancel link does nt have to care about multipart forms
 if xhr && as_action_config.multipart? # file_uploads
   form_remote_upload_tag url_options.merge({:iframe => true}), options
 else
   options[:remote] = true if xhr && !as_action_config.multipart?
   form_tag url_options, options
-end -%>
+end
+-%>
 
   <h4><%= headline -%></h4>
 
@@ -22,7 +26,7 @@ end -%>
 <% if request.xhr? -%>
     <% records = @error_records || Array(@record)
        records.each do |record| %>
-       <%= error_messages_for record, :object_name => "#{record.class.model_name.human.downcase}#{record.new_record? ? '' : ": #{record.to_label}"}" %>
+       <%= active_scaffold_error_messages_for record, :object_name => "#{record.class.model_name.human.downcase}#{record.new_record? ? '' : ": #{record.to_label}"}" %>
     <% end   %>
 <% else -%>
     <%= render :partial => 'form_messages' %>
@@ -33,7 +37,7 @@ end -%>
 
   <p class="form-footer">
     <%= submit_tag as_(form_action), :class => "submit" %>
-    <%= link_to(as_(:cancel), main_path_to_return, :class => 'as_cancel', :remote => true, 'data-refresh' => false) if cancel_link %>
+    <%= link_to(as_(:cancel), main_path_to_return, cancel_options) if cancel_link %>
     <%= loading_indicator_tag(:action => form_action, :id => params[:id]) %>
   </p>
 

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

@@ -1,6 +1,8 @@
+<% form_action ||= :create
+   cancel_link = true if cancel_link.nil? %>
 <%= render :partial => "base_form", :locals => {:xhr => xhr ||= nil,
-                                                :form_action => form_action ||= :create,
+                                                :form_action => form_action,
                                                 :method => method ||= :post,
-                                                :cancel_link => cancel_link ||= true,
-                                                :headline => headline ||= active_scaffold_config.create.label(active_scaffold_config.sti_create_links ? @record.class.model_name.human(:count => 1) : nil)} %>
+                                                :cancel_link => cancel_link,
+                                                :headline => headline ||= active_scaffold_config.send(form_action).label(active_scaffold_config.sti_create_links ? @record.class.model_name.human(:count => 1) : nil)} %>
 

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

@@ -1,5 +1,6 @@
+<% cancel_link = false if cancel_link.nil? %>
 <%= render :partial => "base_form", :locals => {:xhr => xhr ||= nil,
                                                 :form_action => form_action ||= :create,
                                                 :method => method ||= :post,
-                                                :cancel_link => cancel_link ||= false,
+                                                :cancel_link => cancel_link,
                                                 :headline => headline ||= active_scaffold_config.create.label(active_scaffold_config.sti_create_links ? @record.class.model_name.human(:count => 1) : nil)} %>

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

@@ -1,6 +1,6 @@
 <% url_options = params_for(:action => :index, :escape => false, :search => nil) -%>
 <%=
-options = {:id => search_form_id,
+options = {:id => element_form_id(:action => 'search'),
            :class => "as_form search",
            :remote => true,
            :method => :get,
@@ -29,4 +29,4 @@ form_tag url_options, options %>
     <%= loading_indicator_tag(:action => :search) %>
   </p>
 </form>
-<%= javascript_tag("ActiveScaffold.focus_first_element_of_form('#{search_form_id}');") %>
+<%= javascript_tag("ActiveScaffold.focus_first_element_of_form('#{element_form_id(:action => 'search')}');") %>

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

@@ -12,11 +12,11 @@
   <% elsif column.readonly_association?
     next %>
   <% elsif renders_as == :subform and !override_form_field?(column) -%>
-  <li class="sub-form <%= active_scaffold_config_for(column.association.klass).subform.layout %>-sub-form <%= column.css_class unless column.css_class.nil? %>" id="<%= sub_form_id(:association => column.name) %>">
+  <li class="sub-form <%= active_scaffold_config_for(column.association.klass).subform.layout %>-sub-form <%= column.css_class unless column.css_class.nil? || column.css_class.is_a?(Proc) %>" id="<%= sub_form_id(:association => column.name) %>">
     <%= render :partial => form_partial_for_column(column, renders_as), :locals => { :column => column } -%>
   </li>
   <% else -%>
-  <li class="form-element <%= 'required' if column.required? %> <%= column.css_class unless column.css_class.nil? %>">
+  <li class="form-element <%= 'required' if column.required? %> <%= column.css_class unless column.css_class.nil? || column.css_class.is_a?(Proc) %>">
     <%= render :partial => form_partial_for_column(column, renders_as), :locals => { :column => column } -%>
   </li>
   <% end -%>

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

@@ -1,5 +1,5 @@
 <%= render :partial => 'messages' %>
 
 <% unless @record.nil? %>
-    <%= error_messages_for :record, :object_name => @record.class.model_name.human.downcase %>
+    <%= active_scaffold_error_messages_for :record, :object_name => @record.class.model_name.human.downcase %>
 <% end %>

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

@@ -8,7 +8,7 @@
     <% if @record.errors.count -%>
     <tr class="association-record-errors">
       <td colspan="<%= active_scaffold_config_for(@record.class).subform.columns.length + 1 %>" id="<%= element_messages_id :action => @record.class.name.underscore, :id => "#{parent_record.id}-#{index}" %>">
-        <%= error_messages_for :record, :object_name => @record.class.model_name.human.downcase %>
+        <%= active_scaffold_error_messages_for :record, :object_name => @record.class.model_name.human.downcase %>
       </td>
     </tr>
     <% end %>

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

@@ -1,22 +1,14 @@
-<% action_links ||= active_scaffold_config.action_links.member %>
 <td class="actions"><table cellpadding="0" cellspacing="0">
   <tr>
     <td class="indicator-container">
       <%= loading_indicator_tag(:action => :record, :id => record.id) %>
     </td>
-      <% level = 0 %>
-      <% action_links.traverse(controller, {:record => record}) do |parent, link, options| -%>
-        <% tag = (level == 0 ? 'td' : 'li') %>
-        <% if (options[:node] == :finished_traversing) -%>
-          <% level -= 1 %>
-          <%= "</ul></#{(level == 0 ? 'td' : 'li')}>".html_safe %>
-        <% elsif (options[:node] == :start_traversing) -%>
-          <%= "<#{tag} #{"class=\"action_list\"" if tag == 'td'}> #{content_tag('span', parent.name)}<ul>".html_safe %>
-          <% level += 1 %>
-        <% else -%>
-          <%= content_tag(tag, options[:authorized] ? render_action_link(link, url_options, record) : action_link_html(link, nil, {:class => "disabled #{link.action}#{link.html_options[:class].blank? ? '' : (' ' + link.html_options[:class])}"})) %>
-        <% end -%>
-      <% end -%>
+      <%= render :partial => 'action_group', :locals => {:action_links => action_links || active_scaffold_config.action_links.member,
+                                                         :url_options => url_options,
+                                                         :record => record,
+                                                         :traverse_options => {:for => record},
+                                                         :start_level_0_tag => '<td>',
+                                                         :end_level_0_tag => '</td>'} %>
   </tr>
 </table>
 </td>

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

@@ -1,11 +1,9 @@
-<% action_links = active_scaffold_config.action_links.collection.collect
+<% action_links = active_scaffold_config.action_links.collection
   unless action_links.empty? -%>
   <div class="actions">
-    <% new_params = params_for %>
-    <% action_links.send(nested.nil? ? :each : :reverse_each) do |link| -%>
-      <% next if skip_action_link(link) -%>
-      <%= render_action_link(link, new_params) -%>
-    <% end -%>
+    <%= render :partial => 'action_group', :locals => {:action_links => action_links,
+                                                       :url_options => params_for,
+                                                       :traverse_options => nested? ? {:reverse => true} : {}} %>
     <%= loading_indicator_tag(:action => :table) %>
   </div>
 <% end %>