brisk-bills 0.7.0 → 0.8.1

data/vendor/plugins/active_scaffold/frontends/default/views/_form_attribute.html.erb

@@ -1,11 +1,14 @@
 <% scope ||= nil %>
-<dl class="<%= column.css_class unless column.css_class.nil? %>">
+<dl>
   <dt>
     <label for="<%= active_scaffold_input_options(column, scope)[:id] %>"><%= column.label %></label>
   </dt>
   <dd>
     <%= active_scaffold_input_for column, scope %>
-    <% if column.description -%>
+    <% if column.options.is_a?(Hash) && column.options[:update_column] -%>
+      <%= loading_indicator_tag(:action => :render_field, :id => params[:id]) %>
+    <% end -%>
+    <% if column.description.present? -%>
       <span class="description"><%= column.description %></span>
     <% end -%>
   </dd>

data/vendor/plugins/active_scaffold/frontends/default/views/_form_hidden_attribute.html.erb

@@ -1 +1,2 @@
-<%= hidden_field :record, column.name %>
+<% scope ||= nil %>
+<%= hidden_field :record, column.name, active_scaffold_input_options(column, scope) %>

data/vendor/plugins/active_scaffold/frontends/default/views/_horizontal_subform.html.erb

@@ -1,21 +1,19 @@
-<table cellpadding="0" cellspacing="0">
-  <% @record = column.association.klass.new -%>
-  <%= render :partial => 'form_association_header', :locals => {:parent_record => parent_record} %>
-
-  <tbody id="<%= sub_form_list_id(:association => column.name) %>">
-    <% associated.each_index do |index| %>
-    <% @record = associated[index] -%>
-    <% if @record.errors.count -%>
-    <tr class="association-record-errors">
-      <td colspan="<%= active_scaffold_config_for(@record.class).subform.columns.length + 1 %>">
-        <%= error_messages_for :record, :object_name => @record.class.human_name.downcase %>
-      </td>
-    </tr>
-    <% end %>
-    <tr class="association-record <%= 'association-record-new' if @record.new_record? -%> <%= 'locked' if @record.new_record? and @record == associated.last -%>">
-      <%= render :partial => 'form_association_record', :locals => {:scope => column_scope(column), :parent_record => parent_record, :column => column} %>
-    </tr>
-    <% end -%>
-  </tbody>
-</table>
-<%= render :partial => 'form_association_footer', :locals => {:parent_record => parent_record, :column => column, :associated => associated} -%>
+<table cellpadding="0" cellspacing="0">
+  <% @record = column.association.klass.new -%>
+  <%= render :partial => 'horizontal_subform_header', :locals => {:parent_record => parent_record} %>
+
+  <tbody id="<%= sub_form_list_id(:association => column.name) %>">
+    <% associated.each_index do |index| %>
+    <% @record = associated[index] -%>
+    <% 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.human_name.downcase %>
+      </td>
+    </tr>
+    <% end %>
+    <%= render :partial => 'horizontal_subform_record', :locals => {:scope => column_scope(column), :parent_record => parent_record, :column => column, :locked => @record == locked} %>
+    <% end -%>
+  </tbody>
+</table>
+<%= render :partial => 'form_association_footer', :locals => {:parent_record => parent_record, :column => column, :associated => associated} -%>

data/vendor/plugins/active_scaffold/frontends/default/views/{_form_association_header.html.erb → _horizontal_subform_header.html.erb}

@@ -4,7 +4,7 @@
     active_scaffold_config_for(@record.class).subform.columns.each :for => @record, :flatten => true do |column|
       next unless in_subform?(column, parent_record) and column_renders_as(column) != :hidden
       -%>
-      <th><%= column.label %></th>
+      <th<%= ' class="required"' if column.required? %>><label><%= column.label %></label></th>
     <% end -%>
   </tr>
-</thead>
+</thead>

data/vendor/plugins/active_scaffold/frontends/default/views/_horizontal_subform_record.html.erb

@@ -0,0 +1,31 @@
+<% record_column = column -%>
+<% readonly = (@record.readonly? or not @record.authorized_for?(:crud_type => :update)) -%>
+<% crud_type = @record.new_record? ? :create : (readonly ? :read : :update) -%>
+<% show_actions = false -%>
+<% config = active_scaffold_config_for(@record.class) -%>
+<tr 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| %>
+<%
+  next unless in_subform?(column, parent_record)
+  show_actions = true
+  column = column.clone
+  column.form_ui ||= :select if column.association
+-%>
+  <td>
+    <% unless readonly and not @record.new_record? -%>
+      <%= render :partial => form_partial_for_column(column), :locals => { :column => column, :scope => scope } -%>
+    <% else -%>
+      <p><%= get_column_value(@record, column) -%></p>
+    <% end -%>
+  </td>
+<% end -%>
+<% if show_actions -%>
+  <td class="actions">
+    <%= link_to_function as_(:remove), '$(this).up(".association-record").remove()', { :class => "destroy" } if record_column.plural_association? and (@record.authorized_for?(:crud_type => :delete) or not [:destroy, :delete_all].include?(record_column.association.options[:dependent])) %>
+    <% unless @record.new_record? %>
+    <% options = active_scaffold_input_options(config.columns[@record.class.primary_key], scope) -%>
+    <input type="hidden" name="<%= options[:name] -%>" id="<%= options[:id] -%>" value="<%= @record.id -%>" />
+    <% end -%>
+  </td>
+<% end -%>
+</tr>

data/vendor/plugins/active_scaffold/frontends/default/views/_list.html.erb

@@ -6,32 +6,18 @@
   </thead>
   <tbody class="messages">
     <tr>
-      <td colspan="<%= active_scaffold_config.list.columns.length + 1 -%>" class="messages-container">
-        <div id="<%= active_scaffold_messages_id -%>">
-          <%= render :partial => 'messages' %>
-        </div>
-        <p class="filtered-message" <%= ' style="display:none;" ' unless @filtered %>>
-          <%= as_(active_scaffold_config.list.filtered_message) %>
-        </p>
-        <p id="<%= empty_message_id %>" class="empty-message" <%= ' style="display:none;" ' unless @page.items.empty? %>>
-          <%= as_(active_scaffold_config.list.no_entries_message) %>
-        </p>
+      <td colspan="<%= active_scaffold_config.list.columns.length + (active_scaffold_config.list.mark_records ? 2 : 1) -%>" class="messages-container">
+        <%= render :partial => 'list_messages' %>
       </td>
     </tr>
   </tbody>
   <tbody class="records" id="<%= active_scaffold_tbody_id %>">
     <% if !@records.empty? -%>
-      <%= render :partial => 'list_record', :collection => @page.items, :locals => { :hidden => false, :dont_show_calculations => true } %>
+      <%= render :partial => 'list_record', :collection => @page.items, :locals => { :hidden => false } %>
     <% end -%>
     <% if active_scaffold_config.list.columns.any? {|c| c.calculation?} -%>
       <%= render :partial => 'list_calculations' %>
     <% end -%>
   </tbody>
 </table>
-<div class="active-scaffold-footer">
-  <div class="active-scaffold-found"><span class="active-scaffold-records"><%= @page.pager.count -%></span> <%=as_(:found, :count => @page.pager.count) %></div>
-  <div class="active-scaffold-pagination">
-    <%= render :partial => 'list_pagination_links', :locals => { :current_page => @page } unless @page.pager.number_of_pages < 2 %>
-  </div>
-  <br clear="both" /><%# a hack for the Rico Corner problem %>
-</div>
+<%= render :partial => 'list_pagination' %>

data/vendor/plugins/active_scaffold/frontends/default/views/_list_actions.html.erb

@@ -1,13 +1,26 @@
-<table cellpadding="0" cellspacing="0">
+<td class="actions"><table cellpadding="0" cellspacing="0">
   <tr>
     <td class="indicator-container">
       <%= loading_indicator_tag(:action => :record, :id => record.id) %>
     </td>
-    <% active_scaffold_config.action_links.each :record do |link| -%>
-      <% next if controller.respond_to? link.security_method and !controller.send(link.security_method) -%>
+    <% active_scaffold_config.action_links.each :member do |link| -%>
+      <% next if skip_action_link(link) -%>
       <td>
-        <%= record.authorized_for?(:action => link.crud_type) ? render_action_link(link, url_options) : "<a class='disabled'>#{link.label}</a>" -%>
+        <%= record.authorized_for?(:crud_type => link.crud_type, :action => link.action) ? render_action_link(link, url_options, record) : "<a class='disabled #{link.action}'>#{link.label}</a>".html_safe -%>
       </td>
     <% end -%>
   </tr>
-</table>
+</table>
+
+<% target_id = element_row_id(:action => :list, :id => record.id) -%>
+<script type="text/javascript">
+//<![CDATA[
+new ActiveScaffold.Actions.Record(
+  $$('#<%= target_id -%> a.action'),
+  $('<%= target_id -%>'),
+  $('<%= loading_indicator_id(:action => :record, :id => record.id) -%>'),
+  {refresh_url: '<%= url_for params_for(:action => :row, :id => record.id, :_method => :get, :escape => true) -%>'}
+);
+//]]>
+</script>
+</td>

data/vendor/plugins/active_scaffold/frontends/default/views/_list_calculations.html.erb

@@ -1,16 +1,9 @@
 <% display_class = ( @records.kind_of?(Array) ? @records.first : @records ) -%>
 <tr id="<%= active_scaffold_calculations_id %>" class="active-scaffold-calculations">
   <% active_scaffold_config.list.columns.each do |column| -%>
-    <td>
+    <td id="<%= active_scaffold_calculations_id(column) if column.calculation? %>">
       <% if column.calculation? -%>
-        <%
-        calculation = column_calculation(column)
-
-        override_formatter = "render_#{column.name}_#{column.calculate}"
-        calculation = self.method(override_formatter).call(calculation) if respond_to? override_formatter
-
-        -%>
-        <%= calculation.to_s %>
+        <%= render_column_calculation(column) %>
       <% else -%>
         &nbsp;
       <% end -%>

data/vendor/plugins/active_scaffold/frontends/default/views/_list_column_headings.html.erb

@@ -4,15 +4,15 @@ sorting_stages = ['reset', 'ASC', 'DESC']
 default_sorting = active_scaffold_config.list.sorting
 default_sorting_stages = ['ASC', 'DESC']
 -%>
+  <%= content_tag :th, mark_record(marked_records.length >= @page.pager.count), :class => 'mark_record_column' if active_scaffold_config.list.mark_records %>
 <% active_scaffold_config.list.columns.each do |column| -%>
   <%
   stages = default_sorting.sorts_on?(column) ? default_sorting_stages : sorting_stages
   column_sort_direction = stages.after(sorting.direction_of(column)) || 'ASC'
-  sort_params = params_for(:action => :update_table, :page => 1,
-                           :sort => column.name, :sort_direction => column_sort_direction)
+  sort_params = params_for(:page => 1, :sort => column.name, :sort_direction => column_sort_direction)
   column_header_id = active_scaffold_column_header_id(column)
   -%>
-  <th id="<%= column_header_id %>" <%= "class=\"sorted #{sorting.direction_of(column).downcase}\"" if sorting.sorts_on? column %>>
+  <th id="<%= column_header_id %>" class="<%= column.css_class unless column.css_class.nil? %> <%= "sorted #{sorting.direction_of(column).downcase}" if sorting.sorts_on? column %>" title="<%= h column.description %>">
   <% if column.sortable? -%>
     <% href = url_for(sort_params) -%>
     <%= link_to_remote column.label,
@@ -20,12 +20,12 @@ default_sorting_stages = ['ASC', 'DESC']
         :before => "addActiveScaffoldPageToHistory('#{href}', '#{controller_id}')",
         :loading => "Element.addClassName('#{column_header_id}','loading');",
         :failure => "ActiveScaffold.report_500_response('#{active_scaffold_id}')",
-        :update => active_scaffold_content_id,
         :method => :get },
       { :href => href } %>
    <% else -%>
      <p><%= column.label %></p>
    <% end -%>
+   <%= inplace_edit_control(column) -%>
  </th>
 <% end -%>
 <th class="actions">

data/vendor/plugins/active_scaffold/frontends/default/views/_list_header.html.erb

@@ -1,14 +1,14 @@
-<% if active_scaffold_config.action_links.any? { |link| link.type == :table } -%>
+<% if active_scaffold_config.action_links.any? { |link| link.type == :collection } -%>
   <div class="actions">
-    <% new_params = params_for(:action => :table) %>
-    <% active_scaffold_config.action_links.each :table do |link| -%>
-      <% next if controller.respond_to? link.security_method and !controller.send(link.security_method) -%>
+    <% new_params = params_for(:action => :index) %>
+    <% active_scaffold_config.action_links.each :collection do |link| -%>
+      <% next if skip_action_link(link) -%>
 	  <% next if link.action == 'new' && params[:nested].nil? && active_scaffold_config.list.always_show_create %>
 	  <% next if link.action == 'show_search' && active_scaffold_config.list.always_show_search %>
       <%= render_action_link(link, new_params) -%>
     <% end -%>
 
-    <%= loading_indicator_tag(:action => :table) %>
+    <%= loading_indicator_tag(:action => :index) %>
   </div>
 <% end %>
-<h2><%= active_scaffold_config.list.user.label %></h2>
+<h2><%= active_scaffold_config.list.user.label %></h2>

data/vendor/plugins/active_scaffold/frontends/default/views/_list_inline_adapter.html.erb

@@ -1,5 +1,6 @@
 <%= update_page_tag { |page| page.replace_html active_scaffold_messages_id, :partial => 'messages' } %>
-<tr class="inline-adapter">
+<%# 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">
       <a href="" class="inline-adapter-close" title="<%= as_(:close) %>"><%= as_(:close) %></a>

data/vendor/plugins/active_scaffold/frontends/default/views/_list_messages.html.erb

@@ -0,0 +1,20 @@
+        <div id="<%= active_scaffold_messages_id -%>">
+          <%= render :partial => 'messages' %>
+        </div>
+        <p class="filtered-message" <%= ' style="display:none;" '.html_safe unless @filtered %>>
+          <%= as_(active_scaffold_config.list.filtered_message) %>
+          <% if active_scaffold_config.list.show_search_reset -%>
+          <% href = url_for(params_for(:action => :index, :escape => false, :search => '')) -%>
+          <%= link_to_remote as_(:click_to_reset),
+                { :url => href,
+                  :method => :get,
+                  :before => "addActiveScaffoldPageToHistory('#{href}', '#{params[:controller]}')",
+                  :after => "$('#{loading_indicator_id(:action => :index)}').style.visibility = 'visible';",
+                  :complete => "$('#{loading_indicator_id(:action => :index)}').style.visibility = 'hidden';",
+                  :failure => "ActiveScaffold.report_500_response('#{active_scaffold_id}')"
+                }, :href => href %>
+          <% end -%>
+        </p>
+        <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>

data/vendor/plugins/active_scaffold/frontends/default/views/_list_pagination.html.erb

@@ -0,0 +1,11 @@
+<% if active_scaffold_config.list.pagination -%>
+<div class="active-scaffold-footer">
+<% unless @page.pager.infinite? -%>
+  <div class="active-scaffold-found"><span class="active-scaffold-records"><%= @page.pager.count -%></span> <%=as_(:found, :count => @page.pager.count) %></div>
+<% end -%>
+  <div class="active-scaffold-pagination">
+    <%= render :partial => 'list_pagination_links', :locals => { :current_page => @page } if @page.pager.infinite? || @page.pager.number_of_pages > 1 %>
+  </div>
+  <br clear="both" /><%# a hack for the Rico Corner problem %>
+</div>
+<% end -%>

data/vendor/plugins/active_scaffold/frontends/default/views/_list_pagination_links.html.erb

@@ -1,5 +1,5 @@
 <% unless current_page.nil? -%>
-  <% pagination_params = params_for(:action => 'update_table') -%>
+  <% pagination_params = params_for -%>
   <% indicator_params = pagination_params.merge(:action => 'pagination') -%>
   <% previous_url = url_for(pagination_params.merge(:page => current_page.number - 1)) -%>
   <% next_url = url_for(pagination_params.merge(:page => current_page.number + 1)) -%>
@@ -12,19 +12,17 @@
           :before => "addActiveScaffoldPageToHistory('#{previous_url}', '#{controller_id}');",
           :complete => "$('#{loading_indicator_id(:action => :pagination)}').style.visibility = 'hidden';",
           :failure => "ActiveScaffold.report_500_response('#{active_scaffold_id}')",
-          :update => active_scaffold_content_id,
           :method => :get },
         { :href => previous_url,
           :class => "previous"}) if current_page.prev? %>
-  <%= pagination_ajax_links current_page, pagination_params %>
+  <%= pagination_ajax_links current_page, pagination_params, active_scaffold_config.list.page_links_window %>
   <%= link_to_remote(as_(:next),
         { :url => pagination_params.merge(:page => current_page.number + 1),
           :after => "$('#{loading_indicator_id(:action => :pagination)}').style.visibility = 'visible';",
           :before => "addActiveScaffoldPageToHistory('#{next_url}', '#{controller_id}');",
           :complete => "$('#{loading_indicator_id(:action => :pagination)}').style.visibility = 'hidden';",
           :failure => "ActiveScaffold.report_500_response('#{active_scaffold_id}')",
-          :update => active_scaffold_content_id,
           :method => :get },
         { :href => next_url,
           :class => "next"}) if current_page.next? %>
-<% end -%>
+<% end -%>

data/vendor/plugins/active_scaffold/frontends/default/views/_list_record.html.erb

@@ -1,35 +1,11 @@
 <%
 record = list_record if list_record # compat with render :partial :collection
-dont_show_calculations ||= false
 tr_class = cycle("", "even-record")
 tr_class += " #{list_row_class(record)}" if respond_to? :list_row_class
 url_options = params_for(:action => :list, :id => record.id)
 -%>
 
 <tr class="record <%= tr_class %>" id="<%= element_row_id(:action => :list, :id => record.id) %>">
-  <% active_scaffold_config.list.columns.each do |column| %>
-    <% column_value = get_column_value(record, column) -%>
-
-    <td class="<%= column_class(column, column_value) %>" >
-      <%= render_list_column(column_value, column, record) %>
-    </td>
-  <% end -%>
-  <% if active_scaffold_config.action_links.any? {|link| link.type == :record } -%>
-  <td class="actions">
-    <%= render :partial => 'list_actions', :locals => {:record => record, :url_options => url_options} %>
-  </td>
-  <% end -%>
+  <%= render :partial => 'list_record_columns', :locals => {:record => record} %>
+  <%= render :partial => 'list_actions', :locals => {:record => record, :url_options => url_options} if active_scaffold_config.action_links.any? {|link| link.type == :member } %>
 </tr>
-
-<% target_id = element_row_id(:action => :list, :id => record.id) -%>
-<script type="text/javascript">
-actions = new ActiveScaffold.Actions.Record(
-  $$('#<%= target_id -%> a.action'),
-  $('<%= target_id -%>'),
-  $('<%= loading_indicator_id(:action => :record, :id => record.id) -%>'),
-  {refresh_url: '<%= url_for params_for(:action => :row, :id => record.id, :_method => :get, :escape => false) -%>'}
-);
-  <%= update_page do |page|
-        page.replace active_scaffold_calculations_id, :partial => 'list_calculations'
-      end if not dont_show_calculations and active_scaffold_config.list.columns.any? {|c| c.calculation?} %>
-</script>

data/vendor/plugins/active_scaffold/frontends/default/views/_list_record_columns.html.erb

@@ -0,0 +1,9 @@
+  <%= content_tag :td, mark_record(marked_records.include?(record.id.to_s), :id => record.id), :class => 'mark_record_column' if active_scaffold_config.list.mark_records %>
+<% active_scaffold_config.list.columns.each do |column| %>
+  <% authorized = record.authorized_for?(:crud_type => :read, :column => column.name) -%>
+  <% column_value = authorized ? get_column_value(record, column) : active_scaffold_config.list.empty_field_text -%>
+
+  <td class="<%= column_class(column, column_value) %>" >
+    <%= authorized ? render_list_column(column_value, column, record) : column_value %>
+  </td>
+<% end -%>

data/vendor/plugins/active_scaffold/frontends/default/views/_nested.html.erb

@@ -1,4 +1,3 @@
-<h4>&nbsp;</h4>
 <%
   # TODO: shouldn't this logic happen in the controller action instead of the template?
   # Actually, maybe we should make render :active_scaffold work in the controller, and not even have a _nested.rhtml?
@@ -14,18 +13,10 @@
       association = column.association
 
       # determine what constraints we need
-      if column.through_association?
-        @constraints = {
-          association.source_reflection.reverse => {
-            association.through_reflection.reverse => parent_id
-          }
-        }
-      else
-        @constraints = { association.reverse => parent_id }
-      end
+      @constraints = { association.reverse => parent_id }
 
       # generate the customized label
-      @label = as_(:nested_for_model, :nested_model => active_scaffold_config_for(association.klass).label, :parent_model => format_value(@record.to_label))
+      @label = as_(:nested_for_model, :nested_model => active_scaffold_config_for(association.klass).list.label, :parent_model => format_value(@record.to_label))
 
       begin
         controller = active_scaffold_controller_for(association.klass)
@@ -36,7 +27,7 @@
           :constraints => @constraints,
           :conditions => association.options[:conditions],
           :label => h(@label),
-          :params => {:nested => true, :parent_column => column_name, :parent_model => association.active_record}
+          :params => {:nested => true, :parent_column => column_name, :parent_model => association.active_record.name, :format => 'html'}
         )
       end
     end

data/vendor/plugins/active_scaffold/frontends/default/views/_render_fields.js.rjs

@@ -0,0 +1,11 @@
+render_fields.each do |column_name|
+  column = active_scaffold_config.columns[column_name.to_sym]
+  if column_renders_as(column) == :subform
+    field_id = sub_form_id(:association => column.name)
+    page[field_id].replace_html :partial => form_partial_for_column(column), :locals => { :column => column, :scope => params[:scope] }
+  else
+    field_id = active_scaffold_input_options(column, params[:scope])[:id]
+    page[field_id].up('dl').replace :partial => form_partial_for_column(column), :locals => { :column => column, :scope => params[:scope] }
+  end
+  page << render(:partial => 'render_fields.js', :object => Array(column.update_column)) if column.update_column
+end

data/vendor/plugins/active_scaffold/frontends/default/views/_search.html.erb

@@ -1,21 +1,27 @@
-<% href = url_for(params_for(:action => :update_table, :escape => false).delete_if{|k,v| k == 'search'}) -%>
+<% live_search = active_scaffold_config.search.live? -%>
+<% href = url_for(params_for(:action => :index, :escape => false).delete_if{|k,v| k == 'search'}) -%>
 <%= form_remote_tag :url => href,
                     :method => :get,
                     :before => "addActiveScaffoldPageToHistory('#{href}', '#{params[:controller]}')",
-                    :after => "$('#{loading_indicator_id(:action => :search, :id => params[:id])}').style.visibility = 'visible'; Form.disable('#{search_form_id}');",
-                    :complete => "$('#{loading_indicator_id(:action => :search, :id => params[:id])}').style.visibility = 'hidden'; Form.enable('#{search_form_id}');",
+                    :after => "$('#{loading_indicator_id(:action => :search, :id => params[:id])}').style.visibility = 'visible';#{"Form.disable('#{search_form_id}');" unless live_search }",
+                    :complete => "$('#{loading_indicator_id(:action => :search, :id => params[:id])}').style.visibility = 'hidden';#{"Form.enable('#{search_form_id}');" unless live_search }",
                     :failure => "ActiveScaffold.report_500_response('#{active_scaffold_id}')",
-                    :update => active_scaffold_content_id,
-                    :html => { :href => href, :id => search_form_id, :class => 'search', :method => :get } %>
-  <input type="text" name="search" size="50" value="<%= params[:search] -%>" class="text-input" id="<%= search_input_id %>" autocompleted="off" />
-  <%= submit_tag as_(:search), :class => "submit" %>
-  <a href="javascript:void(0)" class="cancel" onclick="f = this.up('form'); f.reset(); f.onsubmit();"><%= as_(:reset) -%></a>
+                    :html => { :action => href, :id => search_form_id, :class => 'search', :method => :get } %>
+  <%= text_field_tag :search, search_params, :class => 'text-input', :id => search_input_id, :size => 50, :autocompleted => :off %>
+  <%= submit_tag as_(:search), :class => "submit" unless live_search %>
+  <%= link_to_remote as_(:reset), {:url => href, :with => "'search='", :method => :get,
+        :failure => "ActiveScaffold.report_500_response('#{active_scaffold_id}')"}, :class => 'cancel' %>
   <%= loading_indicator_tag(:action => :search) %>
 </form>
 
 <script type="text/javascript">
 //<![CDATA[
-  new TextFieldWithExample('<%= search_input_id %>', '<%= as_(:search_terms) %>');
-  Form.focusFirstElement('<%= search_form_id -%>');
+  new TextFieldWithExample('<%= search_input_id %>', '<%= as_(live_search ? :live_search : :search_terms) %>', {focus: true});
+<% if live_search -%>
+  new Form.Element.DelayedObserver('<%= search_input_id %>', 0.5, function(element, value) {
+    if (!$(element.id)) return false; // because the element may have been destroyed
+    $(element).up('form').onsubmit();
+  });
+<% end -%>
 //]]>
-</script>
+</script>