active_scaffold 3.0.12 → 3.0.21

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

@@ -5,10 +5,14 @@
   <% if (options[:node] == :finished_traversing) -%>
     <%= "</ul>#{(options[:level] == 0 ? "</div>#{end_level_0_tag}": '</li>')}".html_safe %>
   <% elsif (options[:node] == :start_traversing) -%>
+        <% html_classes = []
+           html_classes << 'hover_click' if hover_via_click? %>
 	<% 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 %>
+           <% html_classes << 'action_group' %>
+	   <%= "#{start_level_0_tag}<div class=\"#{html_classes.join(' ')}\" #{"onclick=\"\"" if hover_via_click?}> #{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 %>
+           <% html_classes << 'top' if options[:first_action] %>
+	   <%= "<li #{"class=\"#{html_classes.join(' ')}\"" unless html_classes.empty?} #{"onclick=\"\"" if hover_via_click?}>#{content_tag(:div, as_(parent.name), :class => (parent.name.to_s).downcase)}<ul>".html_safe %>
 	<% end %>
   <% else -%>
     <% if options[:level] == 0 %>

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

@@ -1,21 +1,27 @@
 <% url_options ||= params_for(:action => form_action)
    xhr = request.xhr? if xhr.nil?
-   as_action_config = active_scaffold_config.send(form_action)
+   if active_scaffold_config.actions.include? form_action
+     multipart ||= active_scaffold_config.send(form_action).multipart?
+     columns ||= active_scaffold_config.send(form_action).columns
+   else
+     multipart ||= false
+     columns ||= nil
+   end
    body_partial ||= 'form' %>
 <%=
 options = {:onsubmit => onsubmit,
            :id => element_form_id(:action => form_action),
-           :multipart => as_action_config.multipart?,
+           :multipart => multipart,
            :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
+if xhr && multipart # file_uploads
   form_remote_upload_tag url_options.merge({:iframe => true}), options
 else
-  options[:remote] = true if xhr && !as_action_config.multipart?
+  options[:remote] = true if xhr && !multipart
   form_tag url_options, options
 end
 -%>
@@ -33,7 +39,7 @@ end
 <% end -%>
   </div>
 
-  <%= render :partial => body_partial, :locals => { :columns => as_action_config.columns } %>
+  <%= render :partial => body_partial, :locals => { :columns => columns, :form_action => form_action } %>
 
   <p class="form-footer">
     <%= submit_tag as_(form_action), :class => "submit" %>

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

@@ -0,0 +1,42 @@
+<% url_options ||= params_for(:action => :update)
+   xhr = request.xhr?
+   multipart ||= false
+   columns ||= nil
+%>
+<%=
+options = {:id => element_form_id(:action => :update),
+           :multipart => multipart,
+           :class => "as_form #{form_action.to_s}",
+           :method => :put,
+           'data-loading' => true}
+
+if xhr && multipart # file_uploads
+  form_remote_upload_tag url_options.merge({:iframe => true}), options
+else
+  options[:remote] = true if xhr && !multipart
+  form_tag url_options, options
+end
+-%>
+
+  <h4><%= Setting.model_name.human(:count => 2) -%></h4>
+
+  <div id="<%= element_messages_id(:action => :update) %>" class="messages-container">
+<% if request.xhr? -%>
+    <% records = @error_records || Array(@record)
+       records.each do |record| %>
+       <%= 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' %>
+<% end -%>
+  </div>
+
+  <%= render :partial => 'form', :locals => { :columns => columns, :form_action => :update } %>
+
+  <p class="form-footer">
+    <%= submit_tag as_(form_action), :class => "submit" %>
+    <%= loading_indicator_tag(:action => :update, :id => params[:id]) %>
+  </p>
+
+</form>
+<%= javascript_tag("ActiveScaffold.focus_first_element_of_form('#{element_form_id(:action => :update)}');") %>

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

@@ -14,7 +14,7 @@ form_tag url_options, options %>
     <% unless hiddens.empty?  -%>
       <li class="sub-section">
       <h5><%= as_(:optional_attributes) %></h5>
-      <ol id ="<%= sub_section_id(:sub_section => 'further_options') %>" class="form" 'style="display: none;"'>
+      <ol id ="<%= sub_section_id(:sub_section => 'further_options') %>" class="form" style="display:none;">
       <% hiddens.each do |column| -%>
         <%= render :partial => 'search_attribute', :locals => {:column => column} %>
       <% end -%>

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

@@ -1,23 +1,25 @@
 <% subsection_id ||= nil %>
-<ol class="form" <%= "id=#{subsection_id}" unless subsection_id.nil? %>  <%= 'style="display: none;"' if columns.collapsed -%>>
-  <% columns.each :for => @record do |column| %>
+<% show_unauthorized_columns = active_scaffold_config.send(form_action).show_unauthorized_columns %>
+<ol class="form" <%= "id=#{subsection_id}" unless subsection_id.nil? %> <%= "style=\"display: none;\"" if columns.collapsed %>>
+  <% columns.each :for => @record, :crud_type => (:read if show_unauthorized_columns) do |column| %>
+  <% authorized = show_unauthorized_columns ? @record.authorized_for?(:crud_type => form_action, :column => column.name) : true %>
   <% renders_as = column_renders_as(column) %>
   <% if renders_as == :subsection -%>
     <% subsection_id = sub_section_id(:sub_section => column.label) %>
   <li class="sub-section">
     <h5><%= column.label %></h5>
-    <%= render :partial => 'form', :locals => { :columns => column, :subsection_id => subsection_id} %>
+    <%= render :partial => 'form', :locals => { :columns => column, :subsection_id => subsection_id, :form_action => form_action } %>
     <%= link_to_visibility_toggle(subsection_id, {:default_visible => !column.collapsed}) -%>
   </li>
   <% 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? || 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 } -%>
+  <% elsif renders_as == :subform and !override_form_field?(column) and authorized -%>
+  <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) %> <%=column.name%>-sub-form" id="<%= sub_form_id(:association => column.name) %>">
+    <%=raw 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? || column.css_class.is_a?(Proc) %>">
-    <%= render :partial => form_partial_for_column(column, renders_as), :locals => { :column => column } -%>
+    <%=raw render :partial => form_partial_for_column(column, renders_as), :locals => { :column => column, :only_value => !authorized } -%>
   </li>
   <% end -%>
   <% end -%>

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

@@ -2,13 +2,18 @@
 parent_record = @record
 associated = column.singular_association? ? [parent_record.send(column.name)].compact : parent_record.send(column.name).to_a
 associated = associated.sort_by {|r| r.new_record? ? 99999999999 : r.id} unless column.association.options.has_key?(:order)
-
-associated << column.association.klass.new if column.show_blank_record? associated
+if show_blank_record = column.show_blank_record?(associated)
+  associated << if column.singular_association?
+    parent_record.send("build_#{column.name}".to_sym)
+  else
+    parent_record.send(column.name).build
+  end
+end
 subform_div_id = "#{sub_form_id({:association => column.name, :id => parent_record.id || 99999999999})}-div" 
 -%>
 <h5><%= column.label -%></h5>
 <div id ="<%= subform_div_id %>" <%= 'style="display: none;"'.html_safe if column.collapsed -%>>
-<%= render :partial => subform_partial_for_column(column), :locals => {:column => column, :parent_record => parent_record, :associated => associated} %>
+<%= render :partial => subform_partial_for_column(column), :locals => {:column => column, :parent_record => parent_record, :associated => associated, :show_blank_record => show_blank_record} %>
 </div>
 <%= link_to_visibility_toggle(subform_div_id, {:default_visible => !column.collapsed}) -%>
 <% @record = parent_record -%>

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

@@ -4,6 +4,7 @@ begin
 rescue ActiveScaffold::ControllerNotFound
   remote_controller = nil
 end
+@record = parent_record
 
 show_add_existing = column_show_add_existing(column)
 show_add_new = column_show_add_new(column, associated, @record)
@@ -17,9 +18,15 @@ add_new_url = url_for(:action => 'edit_associated', :id => parent_record.id, :as
 <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) 
+    <% if column.plural_association?
+         add_label = as_(:create_another, :model => column.association.klass.model_name.human)
+         add_class = 'as_create_another'
+       else
+         add_label = as_(:replace_with_new)
+         add_class = 'as_replace_with_new'
+       end
        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;"}) %>
+    <%= tag(:input, {:id => create_another_id, :type => 'button', :value => add_label, :href => add_new_url.html_safe, 'data-remote' => true, :class => add_class, :style=> "display: none;"}) %>
     <%= javascript_tag("ActiveScaffold.show('#{create_another_id}');") %>
     <% end -%>
 
@@ -32,7 +39,7 @@ add_new_url = url_for(:action => 'edit_associated', :id => parent_record.id, :as
         <% 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;"}) %>
+        <%= tag(:input, {:id => add_existing_id, :type => 'button', :value => as_(:add_existing), :href => edit_associated_url.html_safe, 'data-remote' => true, :class=> column.plural_association? ? 'as_add_existing' : 'as_replace_existing', :style => "display: none;"}) %>
         <%= javascript_tag("ActiveScaffold.show('#{add_existing_id}');") %>
       <% end -%>
     <% end -%>

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

@@ -4,12 +4,17 @@
     <label for="<%= active_scaffold_input_options(column, scope)[:id] %>"><%= column.label %></label>
   </dt>
   <dd>
-    <%= active_scaffold_input_for column, scope %>
+    <% unless local_assigns[:only_value] %>
+    <%=raw active_scaffold_input_for column, scope %>
+    <% else %>
+    <%= get_column_value(@record, column) %>
+    <%= hidden_field :record, column.association ? column.association.primary_key_name : column.name, active_scaffold_input_options(column, scope) -%>
+    <% end %>
     <% if column.update_columns -%>
       <%= loading_indicator_tag(:action => :render_field, :id => params[:id]) %>
     <% end -%>
-    <% if column.description -%>
+    <% if column.description.present? -%>
       <span class="description"><%= column.description %></span>
     <% end -%>
   </dd>
-</dl>
+</dl>

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

@@ -1,5 +1,15 @@
 <table cellpadding="0" cellspacing="0">
-  <% @record = column.association.klass.new -%>
+  <%
+    if associated.empty?
+      @record = if column.singular_association?
+        parent_record.send("build_#{column.name}".to_sym)
+      else
+        parent_record.send(column.name).build
+      end
+    else
+      @record = associated.last
+    end
+  -%>
   <%= render :partial => 'horizontal_subform_header', :locals => {:parent_record => parent_record} %>
 
   <tbody id="<%= sub_form_list_id(:association => column.name) %>">
@@ -12,7 +22,7 @@
       </td>
     </tr>
     <% end %>
-    <%= render :partial => 'horizontal_subform_record', :locals => {:scope => column_scope(column), :parent_record => parent_record, :column => column, :locked => @record.new_record? && @record == associated.last} %>
+    <%= render :partial => 'horizontal_subform_record', :locals => {:scope => column_scope(column), :parent_record => parent_record, :column => column, :locked => show_blank_record && @record.new_record? && @record == associated.last} %>
     <% end -%>
   </tbody>
 </table>

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

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

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

@@ -1,6 +1,7 @@
-<% record_column = column 
+<%
+   record_column = column 
    readonly = (@record.readonly? or not @record.authorized_for?(:crud_type => :update))
-   crud_type = @record.new_record? ? :create : (readonly ? :read : nil) 
+   crud_type = @record.new_record? ? :create : (readonly ? :read : :update)
    show_actions = false 
    config = active_scaffold_config_for(@record.class)
    options = active_scaffold_input_options(config.columns[@record.class.primary_key], scope)
@@ -15,7 +16,7 @@
   column.form_ui ||= :select if column.association
 -%>
   <td>
-    <% unless readonly and not @record.new_record? -%>
+    <% unless readonly and not @record.new_record? or not @record.authorized_for?(:crud_type => crud_type, :column => column.name) -%>
       <%= render :partial => form_partial_for_column(column), :locals => { :column => column, :scope => scope } -%>
     <% else -%>
       <p><%= get_column_value(@record, column) -%></p>
@@ -26,7 +27,7 @@
   <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])) %>
       <% destroy_id = "#{options[:id]}-destroy" %>
-      <%= link_to as_(:remove), '#', :class => 'destroy', :id => destroy_id , :onclick => "ActiveScaffold.remove(\"#{tr_id}\"); return false;", :style=> "display: none;" %>
+      <%= 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 %>
     <% unless @record.new_record? %>

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

@@ -18,7 +18,7 @@
     <% if active_scaffold_config.list.show_search_reset && @filtered -%>
       <% search_link = ActiveScaffold::DataStructures::ActionLink.new('index', :label => :click_to_reset, :type => :member, :position => false)
       action_links = ActiveScaffold::DataStructures::ActionLinks.new
-      record = active_scaffold_config.model.new
+      record = new_model
       record.id = 0
       action_links.add(search_link)  -%>
       <%= render :partial => 'list_actions', :locals => {:record => record, :url_options => params_for(:escape => false, :search => ''), :action_links => action_links.member} %>

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

@@ -1,4 +1,4 @@
-<div id="<%= active_scaffold_id -%>" class="active-scaffold active-scaffold-<%= controller_id %> <%= "#{params[:controller]}-view" %> <%= active_scaffold_config.theme %>-theme" <%= "data-eid=#{id_from_controller(params[:eid])}" if params[:eid]%>>
+<div id="<%= active_scaffold_id -%>" class="<%= as_main_div_class %>" <%= "data-eid=#{id_from_controller(params[:eid])}" if params[:eid]%>>
   <div class="active-scaffold-header">
     <%= render :partial => 'list_header' %>
   </div>

data/frontends/default/views/_render_field.js.rjs

@@ -1,13 +1,11 @@
 column = active_scaffold_config.columns[render_field.to_sym]
-options = {:is_subform => false}
 if column_renders_as(column) == :subform
-  options[:is_subform] = true
-  field_id = sub_form_id(:association => column.name)
+  options = {:is_subform => true, :field_class => "#{column.name}-sub-form"}
 else
-  field_id = active_scaffold_input_options(column, params[:scope])[:id]
+  options = {:is_subform => false, :field_class => "#{column.name}-input"}
 end
-page.call 'ActiveScaffold.render_form_field', field_id, render(:partial => form_partial_for_column(column), :locals => { :column => column, :scope => params[:scope] }), options
-render(:partial => "render_field", :collection => column.update_columns) if column.update_columns && !column.update_columns.empty?
+page.call 'ActiveScaffold.render_form_field', source_id, render(:partial => form_partial_for_column(column), :locals => { :column => column, :scope => scope }), options
+page << render(:partial => "render_field", :collection => column.update_columns, :locals => {:source_id => source_id, :scope => scope}) if column.update_columns && !column.update_columns.empty?
 
     
 

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

@@ -6,7 +6,7 @@
     <%= active_scaffold_error_messages_for :record, :object_name => @record.class.model_name.human.downcase %>
   </div>
   <% end %>
-  <%= render :partial => 'vertical_subform_record', :locals => {:scope => column_scope(column), :parent_record => parent_record, :column => column, :locked => @record.new_record? && @record == associated.last} %>
+  <%= render :partial => 'vertical_subform_record', :locals => {:scope => column_scope(column), :parent_record => parent_record, :column => column, :locked => show_blank_record && @record.new_record? && @record == associated.last} %>
   <% end -%>
 </div>
 <%= render :partial => 'form_association_footer', :locals => {:parent_record => parent_record, :column => column, :associated => associated} -%>

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

@@ -1,7 +1,7 @@
 <%
   record_column = column
   readonly = (@record.readonly? or not @record.authorized_for?(:crud_type => :update))
-  crud_type = @record.new_record? ? :create : (readonly ? :read : nil)
+  crud_type = @record.new_record? ? :create : (readonly ? :read : :update)
   show_actions = false
   config = active_scaffold_config_for(@record.class)
   options = active_scaffold_input_options(config.columns[@record.class.primary_key], scope)
@@ -27,7 +27,7 @@
   <li 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])) %>
       <% destroy_id = "#{options[:id]}-destroy" %>
-      <%= link_to as_(:remove), '#', :class => 'destroy', :id => destroy_id , :onclick => "ActiveScaffold.remove(\"#{tr_id}\"); return false;", :style=> "display: none;" %>
+      <%= 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 %> 
     <% unless @record.new_record? %>

data/frontends/default/views/on_action_update.js.rjs

@@ -1,8 +1,10 @@
-page.call 'ActiveScaffold.replace_html', active_scaffold_messages_id, render(:partial => 'messages')
 if controller.send :successful?
+  page.call 'ActiveScaffold.replace_html', active_scaffold_messages_id, render(:partial => 'messages')
   page.call 'ActiveScaffold.update_row', element_row_id(:action => :list, :id => @record.id), render(:partial => 'list_record', :locals => {:record => @record}) if @record
   page.call 'ActiveScaffold.replace', active_scaffold_calculations_id, render(:partial => 'list_calculations') if active_scaffold_config.list.columns.any? {|c| c.calculation?}
 else
+  flash[:error] = active_scaffold_error_messages_for(@record, :object_name => "#{@record.class.model_name.human.downcase}#{@record.new_record? ? '' : ": #{@record.to_label}"}", :header_message => '', :message => "#{@record.class.model_name.human.downcase}#{@record.new_record? ? '' : ": #{@record.to_label}"}", :container_tag => nil, :list_type => :br)
+  page.call 'ActiveScaffold.replace_html', active_scaffold_messages_id, render(:partial => 'messages')
   page.call 'ActiveScaffold.scroll_to', active_scaffold_messages_id
 end
 

data/frontends/default/views/on_mark_all.js.rjs

@@ -0,0 +1,12 @@
+options = {:checked => mark_all,
+           :include_mark_all => true}
+page << "ActiveScaffold.mark_records('#{active_scaffold_tbody_id}', #{options.to_json});"
+if active_scaffold_config.model.marked.length>0 then
+  if active_scaffold_config.model.marked.length < @page.pager.count then
+    page.call 'ActiveScaffold.replace_html', active_scaffold_messages_id, active_scaffold_config.model.marked.length.to_s + " records marked. Press <a href=\""+url_for(:action=>"mark_all",:mark_target=>"scope")+"\">here</a> to select all #{@page.pager.count} records.".html_safe
+  else
+    page.call 'ActiveScaffold.replace_html', active_scaffold_messages_id, "All #{@page.pager.count} records marked"
+  end
+else
+  page.call 'ActiveScaffold.replace_html', active_scaffold_messages_id, ""
+end

data/frontends/default/views/on_update.js.rjs

@@ -15,7 +15,7 @@ if controller.send :successful?
       end
     end
     #page.call 'ActiveScaffold.replace', active_scaffold_calculations_id, render(:partial => 'list_calculations') if active_scaffold_config.list.columns.any? {|c| c.calculation?}
-  elsif (active_scaffold_config.update.refresh_list)
+  elsif update_refresh_list?
     page.call 'ActiveScaffold.replace_html', active_scaffold_content_id, render(:partial => 'list', :layout => false)
   else
     updated_row = render :partial => 'list_record', :locals => {:record => @record}

data/frontends/default/views/render_field.js.rjs

@@ -0,0 +1 @@
+page << render(:partial => "render_field", :collection => columns, :locals => {:source_id => source_id, :scope => scope})

data/frontends/default/views/update_column.js.rjs

@@ -1,6 +1,6 @@
 column_span_id ||= element_cell_id(:id => @record.id.to_s, :action => 'update_column', :name => params[:column])
 unless controller.send :successful?
-  page.call 'alert', @record.errors.full_messages(active_scaffold_config).join("\n")
+  page.call 'alert', @record.errors.full_messages.join("\n")
   @record.reload
 end
 column = active_scaffold_config.columns[params[:column]]

data/lib/active_scaffold.rb

@@ -66,13 +66,17 @@ module ActiveScaffold
     base.module_eval do
       # TODO: these should be in actions/core
       before_filter :handle_user_settings
+      before_filter :check_input_device
     end
+
+    base.helper_method :touch_device?
+    base.helper_method :hover_via_click?
   end
 
   def self.set_defaults(&block)
     ActiveScaffold::Config::Core.configure &block
   end
-
+  
   def active_scaffold_config
     self.class.active_scaffold_config
   end
@@ -81,8 +85,7 @@ module ActiveScaffold
     self.class.active_scaffold_config_for(klass)
   end
 
-  def active_scaffold_session_storage
-    id = params[:eid] || params[:controller]
+  def active_scaffold_session_storage(id = (params[:eid] || params[:controller]))
     session_index = "as:#{id}"
     session[session_index] ||= {}
     session[session_index]
@@ -100,14 +103,46 @@ module ActiveScaffold
     end
   end
 
+  def check_input_device
+    if request.env["HTTP_USER_AGENT"] && request.env["HTTP_USER_AGENT"][/(iPhone|iPod|iPad)/i]
+      session[:input_device_type] = 'TOUCH'
+      session[:hover_supported] = false
+    else
+      session[:input_device_type] = 'MOUSE'
+      session[:hover_supported] = true
+    end if session[:input_device_type].nil?
+   end
+
+  def touch_device?
+    session[:input_device_type] == 'TOUCH'
+  end
+
+  def hover_via_click?
+    session[:hover_supported] == false
+  end
+  
   def self.js_framework=(framework)
     @@js_framework = framework
   end
-
+  
   def self.js_framework
     @@js_framework ||= :prototype
   end
 
+  # exclude bridges you do not need
+  # name of bridge subdir should be used to exclude it
+  # eg
+  #   ActiveScaffold.exclude_bridges = [:cancan, :ancestry]
+  #   if you are using Activescaffold as a gem add to initializer
+  #   if you are using Activescaffold as a plugin add to active_scaffold_env.rb
+  def self.exclude_bridges=(bridges)
+    @@exclude_bridges = bridges
+  end
+
+  def self.exclude_bridges
+    @@exclude_bridges ||= []
+  end
+
   def self.root
     File.dirname(__FILE__) + "/.."
   end
@@ -201,10 +236,10 @@ module ActiveScaffold
         column.set_link(Proc.new {|col| link_for_association(col)})
       end
     end
-
-    def link_for_association(column, options = {})
+    
+    def active_scaffold_controller_for_column(column, options = {})
       begin
-        controller = if column.polymorphic_association?
+        if column.polymorphic_association?
           :polymorph
         elsif options.include?(:controller)
           "#{options[:controller].to_s.camelize}Controller".constantize
@@ -212,28 +247,32 @@ module ActiveScaffold
           active_scaffold_controller_for(column.association.klass)
         end
       rescue ActiveScaffold::ControllerNotFound
-        controller = nil
+        nil        
       end
-
+    end
+    
+    def link_for_association(column, options = {})
+      controller = active_scaffold_controller_for_column(column, options)
+      
       unless controller.nil?
         options.reverse_merge! :label => column.label, :position => :after, :type => :member, :controller => (controller == :polymorph ? controller : controller.controller_path), :column => column
         options[:parameters] ||= {}
         options[:parameters].reverse_merge! :parent_scaffold => controller_path, :association => column.association.name
         if column.plural_association?
           # note: we can't create nested scaffolds on :through associations because there's no reverse association.
-
+          
           ActiveScaffold::DataStructures::ActionLink.new('index', options) #unless column.through_association?
         else
-          actions = [:create, :update, :show]
+          actions = [:create, :update, :show] 
           actions = controller.active_scaffold_config.actions unless controller == :polymorph
           column.actions_for_association_links.delete :new unless actions.include? :create
           column.actions_for_association_links.delete :edit unless actions.include? :update
           column.actions_for_association_links.delete :show unless actions.include? :show
           ActiveScaffold::DataStructures::ActionLink.new(:none, options.merge({:crud_type => nil, :html_options => {:class => column.name}}))
-        end
+        end 
       end
     end
-
+    
     def link_for_association_as_scope(scope, options = {})
       options.reverse_merge! :label => scope, :position => :after, :type => :member, :controller => controller_path
       options[:parameters] ||= {}
@@ -297,13 +336,12 @@ module ActiveScaffold
     end
 
     # Tries to find a controller for the given ActiveRecord model.
-    # Searches in the namespace of the current controller for singular
-    # and plural versions of the conventional "#{model}Controller"
-    # syntax.  You may override this method to customize the search
-    # routine.
+    # Searches in the namespace of the current controller for singular and plural versions of the conventional "#{model}Controller" syntax.
+    # You may override this method to customize the search routine.
     def active_scaffold_controller_for(klass)
       controller_namespace = self.to_s.split('::')[0...-1].join('::') + '::'
       error_message = []
+      klass = klass.to_s.singularize.camelize.constantize unless klass.is_a? Class
       [controller_namespace, ''].each do |namespace|
         ["#{klass.to_s.underscore.pluralize}", "#{klass.to_s.underscore.pluralize.singularize}"].each do |controller_name|
           begin
@@ -338,10 +376,11 @@ require 'active_scaffold_env'
 ## But at least rescue the action in production
 ##
 
-if defined?(ACTIVE_SCAFFOLD_PLUGIN)
-  ActiveScaffoldAssets.copy_to_public(ActiveScaffold.root, {:clean_up_destination => true})
-else
-  Rails::Application.initializer("active_scaffold.install_assets") do
+Rails::Application.initializer("active_scaffold.install_assets") do
+  begin
     ActiveScaffoldAssets.copy_to_public(ActiveScaffold.root, {:clean_up_destination => true})
+  rescue
+    raise $! unless Rails.env == 'production'
   end
 end
+