ajax_scaffold_generator 2.1.0 → 2.2.0

data/README

@@ -1,3 +1,7 @@
+*******************************************************************************************
+** For all documentation see the project website: http://ajaxscaffold.height1percent.com **
+*******************************************************************************************
+
 Description:
     The ajax scaffold generator creates a controller to interact with a model.
     If the model does not exist, it creates the model as well. Unlike the

data/templates/controller.rb

@@ -11,6 +11,13 @@ class <%= controller_class_name %>Controller < ApplicationController
   end
 <% end -%>
 
+  def return_to_main
+    # If you have multiple scaffolds on the same view then you will want to change this to
+    # to whatever controller/action shows all the views 
+    # (ex: redirect_to :controller => 'AdminConsole', :action => 'index')
+    redirect_to :action => 'index'
+  end
+
   def list<%= suffix %>
     @<%= plural_name %> = <%= model_name %>.find :all
     render :layout => false
@@ -18,44 +25,54 @@ class <%= controller_class_name %>Controller < ApplicationController
 
   def new<%= suffix %>
     @<%= singular_name %> = <%= model_name %>.new
+
+    if request.xhr?
+      @temp_id = Time.new.to_i
+      @headers['<%= singular_name %>-id'] = @temp_id
+      @headers['Content-Type'] = 'text/html; charset=utf-8'
     
-    @temp_id = Time.new.to_i
-    @headers['<%= singular_name %>-id'] = @temp_id
-    @headers['Content-Type'] = 'text/html; charset=utf-8'
+      render :layout => false
     
-    render :layout => false
-    
-    # If you want to send an error message:
-    # render :inline => "Error text goes here", :layout => false, :status => 500
+      # If you want to send an error message:
+      # render :inline => "Error text goes here", :layout => false, :status => 500
+    end
   end
 
   def create<%= suffix %>
     @<%= singular_name %> = <%= model_name %>.new(params[:<%= singular_name %>])
     if @<%= singular_name %>.save
-      @headers['<%= singular_name %>-id'] = @<%= singular_name %>.id
-      @headers['Content-Type'] = 'text/html; charset=utf-8'
-      render :partial => '<%= singular_name %><%= suffix %>', :layout => false, :locals => { :hidden => true }
+      if request.xhr?                                                    
+        @headers['<%= singular_name %>-id'] = @<%= singular_name %>.id
+        @headers['Content-Type'] = 'text/html; charset=utf-8'
+        render :partial => '<%= singular_name %><%= suffix %>', :layout => false, :locals => { :hidden => true }
+      else
+        return_to_main
+      end
     else
-      render :partial => 'form_errors', :layout => false, :status => 500
+      render :partial => 'form_errors', :layout => false, :status => 500 if request.xhr?
+      render :action => 'new' if not request.xhr?
     end
   end
 
   def edit<%= suffix %>
     @<%= singular_name %> = <%= model_name %>.find(params[:id])
-    render :layout => false
+    render :layout => false if request.xhr?
   end
 
   def update
     @<%= singular_name %> = <%= model_name %>.find(params[:id])
     if @<%= singular_name %>.update_attributes(params[:<%= singular_name %>])
-      render :partial => '<%= singular_name %><%= suffix %>', :layout => false, :locals => { :hidden => true }
+      render :partial => '<%= singular_name %><%= suffix %>', :layout => false, :locals => { :hidden => true } if request.xhr?
+      return_to_main if not request.xhr?
     else
-      render :partial => 'form_errors', :layout => false, :status => 500
+      render :partial => 'form_errors', :layout => false, :status => 500 if request.xhr?
+      render :action => 'edit' if not request.xhr?
     end
   end
 
   def destroy<%= suffix %>
     <%= model_name %>.find(params[:id]).destroy
-    render :nothing => true
+    render :nothing => true if request.xhr?
+    return_to_main if not request.xhr?
   end
 end

data/templates/partial_item.rhtml

@@ -1,4 +1,6 @@
-<tr id="view-<%= singular_name %>-<%%= <%= singular_name %>.id %>" <%%= "style=\"display: none;\"" if hidden %>>
+<%% # The following is used when the browser doesn't have javascript enabled %>
+<%% classAttr = cycle("", "class=\"even\"") %>
+<tr <%%= classAttr %> id="view-<%= singular_name %>-<%%= <%= singular_name %>.id %>" <%%= "style=\"display: none;\"" if hidden %>>
 	<%% for column in <%= model_name %>.content_columns %>
 	<td><%%=h <%= singular_name %>.send(column.name) %>&nbsp;</td>
 	<%% end %>
@@ -6,20 +8,20 @@
  	  <div>
  	  <%%= loading_indicator_tag '<%= singular_name %>', "edit-#{<%= singular_name %>.id}" %>
    	<%%= link_to_remote "Edit", 
-   				:url => { :controller => '<%= controller_name %>', :action => 'edit', :id => <%= singular_name %> }, 
-   				:loading => "AjaxScaffold.editOnLoading(request,'<%= singular_name %>', #{<%= singular_name %>.id});",
-   				:success => "AjaxScaffold.editOnSuccess(request,'<%= singular_name %>', #{<%= singular_name %>.id});",
-   				:failure => "AjaxScaffold.editOnFailure(request,'<%= singular_name %>', #{<%= singular_name %>.id});",
-   				:complete => "AjaxScaffold.editOnComplete(request,'<%= singular_name %>', #{<%= singular_name %>.id});",
-   				:post => true; %>
+   	                    { :url => { :controller => '<%= controller_name %>', :action => 'edit', :id => <%= singular_name %> }, 
+   	                      :loading => "AjaxScaffold.editOnLoading(request,'<%= singular_name %>', #{<%= singular_name %>.id});",
+   	                      :success => "AjaxScaffold.editOnSuccess(request,'<%= singular_name %>', #{<%= singular_name %>.id});",
+   	                      :failure => "AjaxScaffold.editOnFailure(request,'<%= singular_name %>', #{<%= singular_name %>.id});",
+   	                      :post => true },
+   	                    { :href => url_for( :controller => '<%= controller_name %>', :action => 'edit', :id => <%= singular_name %> ) } %>
    	<%%= link_to_remote "Delete", 
-   				:url => { :controller => '<%= controller_name %>',:action => 'destroy', :id => <%= singular_name %> }, 
-   				:confirm => 'Are you sure?', 
-   				:loading => "AjaxScaffold.deleteOnLoading('<%= singular_name %>', #{<%= singular_name %>.id});",
-   				:success => "AjaxScaffold.deleteOnSuccess('<%= singular_name %>', #{<%= singular_name %>.id});",
-   				:failure => "AjaxScaffold.deleteOnFailure('<%= singular_name %>', #{<%= singular_name %>.id});",
-   				:complete => "AjaxScaffold.deleteOnComplete('<%= singular_name %>', #{<%= singular_name %>.id});",
-   				:post => true; %>
+   	                    { :url => { :controller => '<%= controller_name %>',:action => 'destroy', :id => <%= singular_name %> }, 
+   	                      :confirm => 'Are you sure?', 
+   	                      :loading => "AjaxScaffold.deleteOnLoading('<%= singular_name %>', #{<%= singular_name %>.id});",
+   	                      :success => "AjaxScaffold.deleteOnSuccess('<%= singular_name %>', #{<%= singular_name %>.id});",
+   	                      :failure => "AjaxScaffold.deleteOnFailure('<%= singular_name %>', #{<%= singular_name %>.id});",
+   	                      :post => true },
+   	                    { :href => url_for(:controller => '<%= controller_name %>', :action => 'destroy', :id => <%= singular_name %>) } %>
    	</div>
   </td>
-</tr>
+</tr>

data/templates/script.js

@@ -228,6 +228,7 @@ var AjaxScaffold = {
   }, 
   newOnSuccess: function(request, type) {
     var createForm = request.responseText;
+    
     var id = this.getId(request,type);
     
     new Insertion.Top(this.getTableBodyElement(type), createForm);
@@ -240,14 +241,8 @@ var AjaxScaffold = {
     TableBodyUtil.highlight(createElement,this.getTableBodyElement(type));
     Form.focusFirstElement(this.getFormElement('create',type,id));
   }, 
-  newOnComplete: function(request, type) {
-  
-  },
-  getNewIndicator: function(type) {
-    return $(type + "-new-loading-indicator");
-  },
 
-  
+
   createOnLoading: function(request,type,id) {
     Element.show(this.getIndicator('create',type,id));
   }, 
@@ -330,7 +325,8 @@ var AjaxScaffold = {
     Element.hide(viewElement); 
     Element.hide(this.getIndicator('edit',type,id));
     Element.show(editElement);
-    new Effect.Highlight(editElement);
+    
+    new TableEffect.Highlight(editElement);
     Form.focusFirstElement(formElement);
   },
   
@@ -358,7 +354,7 @@ var AjaxScaffold = {
     new Insertion.Bottom(this.getTableBodyElement(type), view);
     var viewElement = this.getViewElement(type,id);
     new TableRow.MoveBefore(editElement, viewElement);
-     
+    
     Element.remove(editElement); 
     Element.show(viewElement);
     
@@ -388,7 +384,9 @@ var AjaxScaffold = {
   
 
   
-
+  getNewIndicator: function(type) {
+    return $(type + "-new-loading-indicator");
+  },
   getIndicator: function(scope, type,id) {
     return $(type + '-' + scope + '-' + id + "-loading-indicator");
   },

data/templates/style.css

@@ -1,33 +1,39 @@
-.list-wrapper form,
-.list-wrapper table,
-.list-wrapper p,
-.list-wrapper div,
-.list-wrapper fieldset {
+.ajax-scaffold-wrapper form,
+.ajax-scaffold-wrapper table,
+.ajax-scaffold-wrapper p,
+.ajax-scaffold-wrapper div,
+.ajax-scaffold-wrapper fieldset,
+.ajax-scaffold form,
+.ajax-scaffold table,
+.ajax-scaffold p,
+.ajax-scaffold div,
+.ajax-scaffold fieldset {
 margin: 0;
 padding: 0;
 }
 
-table.list a {
+.ajax-scaffold a {
 color: #0066CC;
+text-decoration: none;
 }
 
-.list-wrapper {
+.ajax-scaffold-wrapper {
 margin: 5px 0;
 }
 
-table.list {
+.ajax-scaffold {
 width: 100%;
 }
 
 /* Header Styling
    ======================== */
 
-.list-header {
+.ajax-scaffold-header {
 position: relative;
 background: #005CB8;
 }
 
-.list-header div.actions a {
+.ajax-scaffold-header div.actions a {
 color: #fff;
 background: url(/images/add.gif) 1px 50% no-repeat;
 font-size: 13px;
@@ -37,11 +43,11 @@ text-decoration: none;
 padding: 1px 2px 1px 19px;
 }
 
-.list-header div.actions a:hover {
+.ajax-scaffold-header div.actions a:hover {
 background: #378CDF url(/images/add.gif) 1px 50% no-repeat;
 }
 
-.list-header h2 {
+.ajax-scaffold-header h2 {
 color: #fff;
 padding: 3px 5px;
 margin: 0;
@@ -50,7 +56,7 @@ font-weight: normal;
 font-family: Verdana, sans-serif;
 }
 
-.list-header .actions {
+.ajax-scaffold-header .actions {
 position: absolute;
 right: 5px;
 bottom: 2px;
@@ -59,12 +65,11 @@ bottom: 2px;
 /* Table Column Headers
    ============================= */
 
-
-table.list tr.header {
+.ajax-scaffold tr.header {
 background: #C5DBF7;
 }
 
-table.list th {
+.ajax-scaffold th {
 font-size: 11px;
 padding: 2px;
 color: #fff;
@@ -78,7 +83,7 @@ padding-left: 5px;
 /* Table Body Styling
    ============================= */
 
-table.list td {
+.ajax-scaffold td {
 padding: 5px 4px;
 border-bottom: solid 1px #C5DBF7;
 color: #333;
@@ -87,23 +92,20 @@ font-size: 11px;
 background-color: #E6F2FF;
 }
 
-table.list tr.even td {
+.ajax-scaffold tr.even td {
 background-color: #fff;
 }
 
-
-table.list .edit td,
-table.list .create td {
+.ajax-scaffold .edit td,
+.ajax-scaffold .create td {
 padding: 0;
 padding: 4px;
 }
 
-table.list td.action {
-padding: 0;
-padding-right: 2px;
-}
+/* Table Actions (Edit, Delete) Styling
+   ============================= */
 
-table.list td a {
+.ajax-scaffold td a {
 font-family: Verdana, sans-serif;
 font-size: 11px;
 font-weight: bold;
@@ -112,40 +114,51 @@ padding: 2px;
 line-height: 18px;
 }
 
-table.list td a:hover {
+/* The following fixes some very weird 
+     layout issue in IE where the edit link
+     is too close to the delete link after 
+     the introduction of the taconite JS library
+.ajax-scaffold .actions a {
+display: block;
+float: right;
+padding: 0 2px;
+margin-left: 3px;
+}
+ */
+
+.ajax-scaffold td a:hover {
 background: #ff8;
 }
 
-table.list .edit td,
-table.list .create td {
+.ajax-scaffold .edit td,
+.ajax-scaffold .create td {
 background: #DAFFCD;
 }
 
-table.list .edit td,
-table.list .create td {
+.ajax-scaffold .edit td,
+.ajax-scaffold .create td {
 border-top: solid 2px #fff;
 border-bottom: solid 2px #fff;
 }
 
-table.list .actions div {
+.ajax-scaffold .actions div {
 width: 95px;
-right: 0;
 text-align: right;
 float: right;
 padding-right: 2px;
 }
 
-/* List Footer Styling 
+/* ajax-scaffold Footer Styling 
    ========================== */
 
-.list-wrapper .list-footer {
+.ajax-scaffold-wrapper .ajax-scaffold-footer {
 text-align: right;
 background: #005CB8;
 padding: 2px 0;
 border-bottom: none;
 }
 
-table.list tfoot a {
+.ajax-scaffold tfoot a {
 color: #fff;
 font-size: 12px;
 font-weight: bold;
@@ -153,20 +166,20 @@ letter-spacing: 0;
 font-family: Arial, sans-serif;
 }
 
-table.list tfoot a:hover {
+.ajax-scaffold tfoot a:hover {
 color: #0066CC;
 }
 
 /* Messages 
    ========================= */
 
-table.list .empty-message td {
+.ajax-scaffold .empty-message td {
 background: #e8e8e8;
 text-align: center;
 color: #666;
 }
 
-table.list .error-message td {
+.ajax-scaffold .error-message td {
 border-bottom: solid 1px #fff;
 background: #f66;
 color: #333;
@@ -174,30 +187,35 @@ font-size: 11px;
 font-weight: bold;
 }
 
-table.list .error-message p {
+.ajax-scaffold .error-message p {
 padding-left: 19px;
 background: url(/images/error.gif) 0 0 no-repeat;
 }
 
-table.list .error-message td.actions {
+.ajax-scaffold .error-message td.actions {
 background: #f66;
 text-align: right;
 }
 
-table.list .error-message td.actions a {
+.ajax-scaffold .error-message td.actions a {
 color: #333;
 }
 
 /* Error Styling 
    ========================== */
 
-table.list #errorExplanation {
+.ajax-scaffold #errorExplanation {
 background: #fcc;
 margin: 2px 7px;
 border: solid 1px #f66;
+float: left;
+}
+
+.ajax-scaffold fieldset {
+clear: both;
 }
 
-table.list #errorExplanation h2 {
+.ajax-scaffold #errorExplanation h2 {
 padding: 2px 5px 3px 20px;
 color: #333;
 font-size: 11px;
@@ -207,51 +225,49 @@ font-family: Verdana;
 background: #f66 url(/images/error.gif) 2px 1px no-repeat;
 }
 
-table.list #errorExplanation ul {
+.ajax-scaffold #errorExplanation ul {
 margin: 0;
 padding: 2px 2px 4px 25px;
 }
 
-table.list #errorExplanation p {
+.ajax-scaffold #errorExplanation p {
 font-size: 11px;
 padding: 2px 5px;
 font-family: Verdana;
 margin: 0;
 }
 
-table.list #errorExplanation ul li {
+.ajax-scaffold #errorExplanation ul li {
 font-size: 11px;
 margin: 0;
 font-family: Verdana;
 padding: 0;
 }
 
-table.list .fieldWithErrors input {
+.ajax-scaffold .fieldWithErrors input {
 border: solid 1px #f00;
 }
 
 /* Loading Indicators
    ============================== */
 
-.list-wrapper .loading-indicator {
+.ajax-scaffold-wrapper .loading-indicator {
 vertical-align: bottom;
 margin: 0;
 }
 
-.list-wrapper .list-header .loading-indicator,
-.list-wrapper .edit .loading-indicator,
-.list-wrapper .create .loading-indicator {
+.ajax-scaffold-wrapper .ajax-scaffold-header .loading-indicator,
+.ajax-scaffold-wrapper .edit .loading-indicator,
+.ajax-scaffold-wrapper .create .loading-indicator {
 vertical-align: bottom;
 margin-bottom: 3px;
 }
 
-
-
-
 /* Form Styling 
    ============================== */
    
-.list-wrapper .submit {
+.ajax-scaffold-wrapper .submit,
+.ajax-scaffold .submit {
 font-weight: bold;
 font-size: 14px;
 font-family: Arial, sans-serif;
@@ -260,55 +276,58 @@ margin: 0;
 margin-top: 5px;
 }
 
-.list-wrapper fieldset {
+.ajax-scaffold-wrapper fieldset,
+.ajax-scaffold fieldset {
 border: none;
 }
 
-table.list label.required{
+.ajax-scaffold label.required{
 font-weight: bold;
 }
 
-table.list label.example {
+.ajax-scaffold label.example {
 font-size: 11px;
 font-family: arial;
 color: #888;
 }
 
-table.list h4 {
+.ajax-scaffold h4 {
 padding: 2px;
 margin: 0;
+font-weight: bold;
+text-transform: none;
 color: #1F7F00;
 font-size: 16px;
 letter-spacing: -1px;
 font-family: Georgia, Arial, sans-serif;
 }
 
-table.list .edit a,
-table.list .create a {
+.ajax-scaffold .edit a,
+.ajax-scaffold .create a {
 font-size: 14px;
 font-weight: bold;
 font-family: Arial, sans-serif;
 letter-spacing: 0;
 }
 
-table.list p {
+.ajax-scaffold p {
 clear: both;
 }
 
-table.list div.row {
+.ajax-scaffold div.row {
 clear: both;
 float: none;
 padding: 2px;
 margin-left: 5px;
 }
 
-table.list div.form-element {
+.ajax-scaffold div.form-element {
 float: left;
 margin-right: 10px;
 margin-bottom: 2px;
 }
 
-table.list label {
+.ajax-scaffold label {
 display: block;
 font-family: Verdana, sans-serif;
 color: #555;
@@ -316,20 +335,20 @@ font-size: 11px;
 padding-bottom: 1px;
 }
 
-table.list input,
-table.list select {
+.ajax-scaffold input,
+.ajax-scaffold select {
 font-size: 16px;
 font-weight: bold;
 font-family: Arial, sans-serif;
 letter-spacing: -1px;
 }
 
-table.list .form-element input {
+.ajax-scaffold .form-element input {
 padding: 1px;
 border: solid 1px #1F7F00;
 }
 
-table.list textarea {
+.ajax-scaffold textarea {
 height: 65px;
 font-family: Arial, sans-serif;
 font-size: 12px;
@@ -340,6 +359,6 @@ border: solid 1px #1F7F00;
 /* IE hacks
    ==================================== */
    
-* html .list-header {
+* html .ajax-scaffold-header {
 height: 1%;
 }   

data/templates/view_edit.rhtml

@@ -1,22 +1,36 @@
-<tr id="<%%= "edit-<%= singular_name %>-#{@<%= singular_name %>.id}" %>" class="edit" style="display: none;">
-	<td colspan="<%%= num_columns %>">
-		<%%= form_remote_tag :url => { :controller => '<%= controller_name %>', :action => 'update', :id => @<%= singular_name %> },
-  		:loading => "AjaxScaffold.updateOnLoading(request,'<%= singular_name %>',#{@<%= singular_name %>.id});", 
-			:success => "AjaxScaffold.updateOnSuccess(request,'<%= singular_name %>',#{@<%= singular_name %>.id});", 
-			:failure => "AjaxScaffold.updateOnFailure(request,'<%= singular_name %>',#{@<%= singular_name %>.id});", 
-			:complete => "AjaxScaffold.updateOnComplete(request,'<%= singular_name %>',#{@<%= singular_name %>.id});", 
-			:html => { :id => "edit-<%= singular_name %>-#{@<%= singular_name %>.id}-form" } %>
-  	<h4>Edit <%= Inflector.titleize(singular_name) %></h4>
-  	
-  	<div id="<%%= "update-<%= singular_name %>-#{@<%= singular_name %>.id}-errors" %>" style="display: none;" ></div>
-  	
-  	<%%= render :partial => 'form' %>
-  	
-  	<p>
-  		<%%= submit_tag "Update", :class => "submit" %>
-  		<%%= link_to_function "Cancel", "AjaxScaffold.updateOnCancel('<%= singular_name %>',#{@<%= singular_name %>.id});" %>
-  		<%%= loading_indicator_tag '<%= singular_name %>', "update-#{@<%= singular_name %>.id}" %>
-  	</p>
-  	<%%= end_form_tag %>
-	</td>
-</tr>
+<%% if not request.xhr? %>
+<table class="ajax-scaffold" cellpadding="0" cellspacing="0">
+  <tbody>
+<%% end %>
+<tr id="<%%= "edit-<%= singular_name %>-#{@<%= singular_name %>.id}" %>" class="edit" <%%= "style=\"display: none;\"" if request.xhr? %> >
+	<td colspan="<%%= num_columns %>">
+		<%%= form_remote_tag :url => { :controller => '<%= controller_name %>', :action => 'update', :id => @<%= singular_name %> },
+  		                   :loading => "AjaxScaffold.updateOnLoading(request,'<%= singular_name %>',#{@<%= singular_name %>.id});", 
+		                     :success => "AjaxScaffold.updateOnSuccess(request,'<%= singular_name %>',#{@<%= singular_name %>.id});", 
+		                     :failure => "AjaxScaffold.updateOnFailure(request,'<%= singular_name %>',#{@<%= singular_name %>.id});", 
+		                     :html => { :action => url_for(:controller => '<%= controller_name %>', :action => 'update', :id => @<%= singular_name %>),
+		                                :id => "edit-<%= singular_name %>-#{@<%= singular_name %>.id}-form" } %>
+  	  <h4>Edit <%= Inflector.titleize(singular_name) %></h4>
+  	
+      <%% # Its actually okay to leave both of these elements (ex: form_errors will only generate HTML when in fallback mode) %>
+      <%% if request.xhr? %>
+        <div id="<%%= "update-<%= singular_name %>-#{@<%= singular_name %>.id}-errors" %>" style="display: none;" ></div>
+      <%% else %>
+        <%%= render :partial => 'form_errors' %>
+      <%% end %>
+
+  	  <%%= render :partial => 'form' %>
+  	
+  	  <p>
+  	  	<%%= submit_tag "Update", :class => "submit" %>
+  	  	<%%= link_to_function "Cancel", "AjaxScaffold.updateOnCancel('<%= singular_name %>',#{@<%= singular_name %>.id});",
+	                              :href => url_for(:controller => '<%= controller_name %>', :action => 'return_to_main') %>
+  	  	<%%= loading_indicator_tag '<%= singular_name %>', "update-#{@<%= singular_name %>.id}" %>
+  	  </p>
+  	<%%= end_form_tag %>
+	</td>
+</tr>
+<%% if not request.xhr? %>
+  </tbody>
+</table>
+<%% end %>

data/templates/view_list.rhtml

@@ -1,21 +1,21 @@
-<div id="<%= singular_name %>-list-wrapper" class="list-wrapper">
-<div id="<%= singular_name %>-list-header" class="list-header">
+<div id="<%= singular_name %>-list-wrapper" class="ajax-scaffold-wrapper">
+<div id="<%= singular_name %>-list-header" class="ajax-scaffold-header">
 <h2><%= Inflector.titleize(plural_name) %></h2>
 
 <div class="actions">  
   <%%= loading_indicator_tag '<%= singular_name %>', "new" %>
   <%%= link_to_remote "Create New",
-      :url => { :controller => '<%= controller_name %>', :action => 'new' }, 
-			:loading => "AjaxScaffold.newOnLoading(request,'<%= singular_name %>');",
-			:success => "AjaxScaffold.newOnSuccess(request,'<%= singular_name %>');",
-			:failure => "AjaxScaffold.newOnFailure(request,'<%= singular_name %>');",
-			:complete => "AjaxScaffold.newOnComplete(request,'<%= singular_name %>');",
-			:class => "create" %> 
+         { :url => { :controller => '<%= controller_name %>', :action => 'new' }, 
+           :loading => "AjaxScaffold.newOnLoading(request,'<%= singular_name %>');",
+			     :success => "AjaxScaffold.newOnSuccess(request,'<%= singular_name %>');",
+			     :failure => "AjaxScaffold.newOnFailure(request,'<%= singular_name %>');" },
+         { :href => url_for(:controller => '<%= controller_name %>', :action => 'new'), 
+			     :class => "create" } %> 
 			 
 </div>
 
 </div>
-<table id="<%= singular_name %>-list" class="list" cellpadding="0" cellspacing="0">
+<table id="<%= singular_name %>-list" class="ajax-scaffold" cellpadding="0" cellspacing="0">
   <thead>  
 	  <tr class="header">
 	  	<%% for column in <%= model_name %>.content_columns %>
@@ -40,11 +40,12 @@
   <tbody id="<%= singular_name %>-list-body">
     <%% if !@<%= plural_name %>.empty? %>
   	  <%%= render :partial => '<%= singular_name %>', :collection => @<%= plural_name %>, :locals => { :hidden => false } %>
-  	<%% end %>
-    <!-- Do not remove the following TR, it is needed to load up the even row color when enableHighlighting is turned on -->
+  	<%% else %>
+    <%% # Do not remove the following TR, it is needed to load up the even row color when enableHighlighting is turned on and the list is empty %>
     <tr class="even ignore" style="display: none;">
       <td colspan="<%%= num_columns %>"></td>
     </tr>
+    <%% end %>
   </tbody>
 </table>
 </div>
@@ -55,4 +56,4 @@ TableBodyUtil.enableHighlighting(AjaxScaffold.getTableBodyElement('<%= singular_
 TableBodyUtil.paintStripes(AjaxScaffold.getTableBodyElement('<%= singular_name %>'));
 <%% end %>
 Rico.Corner.round('<%= singular_name %>-list-wrapper', {color: '#005CB8', bgColor: '#fff', compact: true});
-</script>
+</script>

data/templates/view_new.rhtml

@@ -1,23 +1,33 @@
-<tr id="create-<%= singular_name %>-<%%= @temp_id %>" class="create" style="display: none;">
-  <td colspan="<%%= num_columns %>">
-    <%%= form_remote_tag :url => { :controller => '<%= controller_name %>', :action => 'create' }, 
-    			:loading => "AjaxScaffold.createOnLoading(request,'<%= singular_name %>',#{@temp_id});",
-    			:success => "AjaxScaffold.createOnSuccess(request,'<%= singular_name %>',#{@temp_id});",
-    			:complete => "AjaxScaffold.createOnComplete(request,'<%= singular_name %>',#{@temp_id});",
-    			:failure => "AjaxScaffold.createOnFailure(request,'<%= singular_name %>',#{@temp_id});",
-    			:html => { :id => "create-<%= singular_name %>-#{@temp_id}-form" } %>
-      
-      <h4>New <%= Inflector.titleize(singular_name) %></h4>
-      
-      <div id="<%%= "create-<%= singular_name %>-#{@temp_id}-errors" %>" style="display: none;" ></div>
-      
-      <%%= render :partial => 'form' %>
-      
-      <p>
-      	<%%= submit_tag "Create", :class => "submit" %>
-      	<%%= link_to_function "Cancel", "AjaxScaffold.createOnCancel('<%= singular_name %>',#{@temp_id});" %>
-      	<%%= loading_indicator_tag '<%= singular_name %>', "create-#{@temp_id}" %>
-    	</p>
-    <%%= end_form_tag %>
-  </td>
-</tr>
+<%% if not request.xhr? %>
+<table class="ajax-scaffold" cellpadding="0" cellspacing="0">
+  <tbody>
+<%% end %>
+<tr id="create-<%= singular_name %>-<%%= @temp_id %>" class="create" <%%= "style=\"display: none;\"" if request.xhr? %>>
+  <td colspan="<%%= num_columns %>">
+    <%%= form_remote_tag :url => { :controller => '<%= controller_name %>', :action => 'create' }, 
+    			:loading => "AjaxScaffold.createOnLoading(request,'<%= singular_name %>',#{@temp_id});",
+    			:success => "AjaxScaffold.createOnSuccess(request,'<%= singular_name %>',#{@temp_id});",
+    			:failure => "AjaxScaffold.createOnFailure(request,'<%= singular_name %>',#{@temp_id});",
+    			:html => { :action => url_for(:controller => '<%= controller_name %>', :action => 'create'),
+                     :id => "create-<%= singular_name %>-#{@temp_id}-form" } %>
+      
+      <h4>New <%= Inflector.titleize(singular_name) %></h4>
+      
+      <%% # Its actually okay to leave both of these elements (ex: form_errors will only generate HTML when in fallback mode) %>
+      <%% if request.xhr? %>
+        <div id="<%%= "create-<%= singular_name %>-#{@temp_id}-errors" %>" style="display: none;" ></div>
+      <%% else %>
+        <%%= render :partial => 'form_errors' %>
+      <%% end %>
+            
+      <%%= render :partial => 'form' %>
+      
+      <p>
+      	<%%= submit_tag "Create", :class => "submit" %>
+      	<%%= link_to_function "Cancel", "AjaxScaffold.createOnCancel('<%= singular_name %>',#{@temp_id});",
+	                      :href => url_for(:controller => '<%= controller_name %>', :action => 'return_to_main') %>
+      	<%%= loading_indicator_tag '<%= singular_name %>', "create-#{@temp_id}" %>
+    	</p>
+    <%%= end_form_tag %>
+  </td>
+</tr>

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: ajax_scaffold_generator
 version: !ruby/object:Gem::Version 
-  version: 2.1.0
-date: 2006-02-23 00:00:00 -05:00
+  version: 2.2.0
+date: 2006-03-03 00:00:00 -05:00
 summary: Ajax scaffold generator is a rails generator for ajaxified scaffolds
 require_paths: 
   - lib