ajax_scaffold_generator 3.0.1 → 3.0.2

data/ajax_scaffold_generator.rb

@@ -38,6 +38,7 @@ end
 class AjaxScaffoldGenerator < ScaffoldGenerator
 
   def manifest
+  
     record do |m|
       
       # Check for class naming collisions.
@@ -125,7 +126,6 @@ class AjaxScaffoldGenerator < ScaffoldGenerator
                             
       m.template 'ajax_scaffold_helper.rb',
                   File.join('app/helpers',
-                            controller_class_path,
                             "ajax_scaffold_helper.rb")
 
       # Layout and stylesheet.
@@ -174,7 +174,7 @@ class AjaxScaffoldGenerator < ScaffoldGenerator
     end
 
     def scaffold_images
-      %w( indicator.gif add.gif error.gif warning.gif information.gif arrow_down.gif arrow_up.gif )
+      %w( indicator.gif indicator-small.gif add.gif error.gif warning.gif information.gif arrow_down.gif arrow_up.gif )
     end
     
     def scaffold_javascripts

data/templates/ajax_scaffold.css

@@ -91,6 +91,10 @@ display: block;
 background: #000;
 }
 
+.ajax-scaffold th.sorted {
+background: #333;
+}
+
 .ajax-scaffold th.asc a,
 .ajax-scaffold th.asc a:hover {
 background: #333 url(/images/arrow_up.gif) right 50% no-repeat;
@@ -101,6 +105,11 @@ background: #333 url(/images/arrow_up.gif) right 50% no-repeat;
 background: #333 url(/images/arrow_down.gif) right 50% no-repeat;
 }
 
+.ajax-scaffold th.loading a,
+.ajax-scaffold th.loading a:hover {
+background: #333 url(/images/indicator-small.gif) right 50% no-repeat;
+}
+
 /* Table Body Styling
    ============================= */
 

data/templates/ajax_scaffold_helper.rb

@@ -46,7 +46,8 @@ module AjaxScaffoldHelper
   end
   
   def loading_indicator_tag(options)
-    "<img src=\"/images/indicator.gif\" style=\"display: none;\" id=\"#{loading_indicator_id(options)}\" alt=\"loading indicator\" class=\"loading-indicator\" />"
+    image_filename = "indicator.gif"
+    "<img src=\"/images/#{image_filename}\" style=\"display: none;\" id=\"#{loading_indicator_id(options)}\" alt=\"loading indicator\" class=\"loading-indicator\" />"
   end  
   
   # The following are a bunch of helper methods to produce the common scaffold view id's
@@ -55,6 +56,10 @@ module AjaxScaffoldHelper
     "#{options[:scaffold_id]}-content"
   end
   
+  def scaffold_column_header_id(options)
+    "#{options[:scaffold_id]}-#{options[:column_name]}"
+  end
+  
   def scaffold_tbody_id(options)
     "#{options[:scaffold_id]}-tbody"
   end

data/templates/controller.rb

@@ -41,7 +41,7 @@ class <%= controller_class_name %>Controller < ApplicationController
     update_params :default_scaffold_id => "<%= singular_name %>", :default_sort => "id", :default_sort_direction => "asc"
     
     @sort_by = session[params[:scaffold_id]][:sort] + " " + session[params[:scaffold_id]][:sort_direction] 
-    @paginator, @<%= plural_name %> = paginate(:<%= plural_name %>, :order_by => @sort_by, :per_page => 25)
+    @paginator, @<%= plural_name %> = paginate(:<%= plural_name %>, :order_by => @sort_by, :per_page => default_per_page)
     
     render :action => "component", :layout => false
   end

data/templates/lib_ajax_scaffold_util.rb

@@ -1,5 +1,9 @@
 module AjaxScaffoldUtil
 
+  def default_per_page
+    25
+  end
+
   def clear_flashes 
     #We want to clear flashes so they don't appear on a page reload
     if request.xhr? 

data/templates/partial_column_headings.rhtml

@@ -1,11 +1,12 @@
       <%% current_sort = session[params[:scaffold_id]][:sort] %>
       <%% current_sort_direction = session[params[:scaffold_id]][:sort_direction] %>
       <%% for column in <%= model_name %>.content_columns %>
-      <th <%%= "class=\"sorted #{current_sort_direction}\"" if column.name == current_sort %>>
-        <%% sort_direction = current_sort == column.name && current_sort_direction == "asc" ? "desc" : "asc" %>
-        <%% sort_params = params.merge(:controller => '<%= controller_name %>', :action => 'component_update', :sort => column.name, :sort_direction => sort_direction, :page => 1) %>
-        <%%= link_to_remote column.human_name, 
+        <%% sort_direction = current_sort == column.name && current_sort_direction == "asc" ? "desc" : "asc" %>  
+        <%% sort_params = params.merge(:controller => '<%= controller_file_name %>', :action => 'component_update', :sort => column.name, :sort_direction => sort_direction, :page => 1) %>
+        <th id="<%%= scaffold_column_header_id(sort_params.merge(:column_name => column.name)) %>" <%%= "class=\"sorted #{current_sort_direction}\"" if column.name == current_sort %>>
+          <%%= link_to_remote column.human_name, 
                 { :url => sort_params,
+                :loading => "Element.addClassName('#{scaffold_column_header_id(sort_params.merge(:column_name => column.name))}','loading');",
                 :update => scaffold_content_id(sort_params) },
                 { :href => url_for(sort_params) } %></th>
       <%% end %>

data/templates/partial_item.rhtml

@@ -1,6 +1,6 @@
 <%% # The following is used when the browser doesn't have javascript enabled %>
 <%% classAttr = cycle("", "class=\"even\"") %>
-<%% @options = params.merge(:controller => '<%= controller_name %>', :action => "view", :id => <%= singular_name %>.id) %>
+<%% @options = params.merge(:controller => '<%= controller_file_name %>', :action => "view", :id => <%= singular_name %>.id) %>
 
 <tr <%%= classAttr %> id="<%%= element_row_id(@options) %>" <%%= "style=\"display: none;\"" if hidden %>>
 	<%% for column in <%= model_name %>.content_columns %>

data/templates/partial_new_edit.rhtml

@@ -5,9 +5,9 @@
 <tr id="<%%= element_row_id(@options) %>" class="<%%= @options[:action] %>" <%%= "style=\"display:none;\"" if request.xhr? %>>
   <td id="<%%= element_cell_id(@options) %>" colspan="<%%= num_columns %>">
   
-    <%%= form_remote_tag :url => @options.merge(:controller => '<%= controller_name %>'), 
+    <%%= form_remote_tag :url => @options.merge(:controller => '<%= controller_file_name %>'), 
     			:loading => "Element.show('#{loading_indicator_id(@options)}');",
-    			:html => { :href => url_for(@options.merge(:controller => '<%= controller_name %>')),
+    			:html => { :href => url_for(@options.merge(:controller => '<%= controller_file_name %>')),
                      :id => element_form_id(@options) } %>
       
       <%%= hidden_field_tag "scaffold_id", @options[:scaffold_id] %>
@@ -30,7 +30,7 @@
       	  <%% on_cancel += "AjaxScaffold.displayMessageIfEmpty('#{scaffold_tbody_id(@options)}','#{empty_message_id(@options)}');" if @options[:action] == "create" %>
       	<%% end %>
       	<%%= link_to_function "Cancel", on_cancel,
-	                      :href => url_for(:controller => '<%= controller_name %>', :action => 'return_to_main') %>           
+	                      :href => url_for(:controller => '<%= controller_file_name %>', :action => 'return_to_main') %>           
       	<%%= loading_indicator_tag @options %>
     	</p>
     <%%= end_form_tag %>

data/templates/partial_pagination_links.rhtml

@@ -1,14 +1,16 @@
-   <%% pagination_params = params.merge(:controller => '<%= controller_name %>', :action => 'component_update') %>
+   <%% pagination_params = params.merge(:controller => '<%= controller_file_name %>', :action => 'component_update') %>
+   <%% indicator_params = { :controller => '<%= controller_file_name %>', :action => 'pagination' } %>
+   <%%= loading_indicator_tag indicator_params %>
    <%%= link_to_remote('Previous', 
            { :url => pagination_params.merge(:page => paginator.current.previous),
+           :loading => "Element.show('#{loading_indicator_id(indicator_params)}');",
            :update => scaffold_content_id(pagination_params) },
            { :href => url_for(pagination_params.merge(:page => paginator.current.previous)),
            :class => "previous"}) if @paginator.current.previous %>
-   <span class="page-numbers">
-    <%%= pagination_ajax_links @paginator, pagination_params %>
-   </span>
+   <%%= pagination_ajax_links @paginator, pagination_params %>
    <%%= link_to_remote('Next', 
            { :url => pagination_params.merge(:page => paginator.current.next),
+           :loading => "Element.show('#{loading_indicator_id(indicator_params)}');",
            :update => scaffold_content_id(pagination_params) },
            { :href => url_for(pagination_params.merge(:page => paginator.current.next)),
            :class => "next"}) if @paginator.current.next %>

data/templates/view_component.rhtml

@@ -4,7 +4,7 @@
 <%% end %>
     <div class="ajax-scaffold-header">
       <div class="actions">  
-        <%% new_params = params.merge(:controller => '<%= controller_name %>', :action => 'new') %>
+        <%% new_params = params.merge(:controller => '<%= controller_file_name %>', :action => 'new') %>
         <%%= loading_indicator_tag(new_params) %>
         <%%= link_to_remote "Create New",
           { :url => new_params,

data/templates/view_list.rhtml

@@ -1 +1 @@
-<%%= render_component :controller => '<%= controller_name %>', :action => 'component', :params => params %>
+<%%= render_component :controller => '<%= controller_file_path %>', :action => 'component', :params => params %>

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: ajax_scaffold_generator
 version: !ruby/object:Gem::Version 
-  version: 3.0.1
-date: 2006-04-12 00:00:00 -04:00
+  version: 3.0.2
+date: 2006-04-13 00:00:00 -04:00
 summary: Ajax scaffold generator is a rails generator for ajaxified scaffolds
 require_paths: 
   - lib
@@ -52,6 +52,7 @@ files:
   - templates/layout.rhtml
   - templates/information.gif
   - templates/indicator.gif
+  - templates/indicator-small.gif
   - templates/helper.rb
   - templates/functional_test.rb
   - templates/form_scaffolding.rhtml