dry_crud 1.2.5 → 1.2.6

data/README.rdoc

@@ -20,16 +20,16 @@ To integrate DRY CRUD into your code, only a few additions are required:
 * To use standard formatting, tables and forms throughout your application, add <tt>helper :standard</tt> to your +ApplicationController+ and benefit everywhere from these little helper methods. 
 * Add a <tt>:label</tt> method to your models for a human-friendly representation.
 
-Version 1.2.0 is built for Rails 3. If you need a version for Rails 2.3, please get version 0.6.0 of the gem or go to the rails-2.3 branch on Github.
+Version 1.0.0 and higher are built for Rails 3. If you need a version for Rails 2.3, please get version 0.6.0 of the gem or go to the rails-2.3 branch on Github.
 
 == Overview
 
-In most Rails applications, you have some models that require basic CRUD (create, read, update, delete) functionality. There are various possibilities like Rails scaffolding, {Active Scaffold}[http://activescaffold.com/] or {Dry Scaffold}[http://github.com/grimen/dry_scaffold]. Still, various parts in your application remain duplicated. While you might pull up common methods into a common superclass controller, most views still contain very similar code.
+In most Rails applications, you have some models that require basic CRUD (create, read, update, delete) functionality. There are various possibilities like Rails scaffolding, {Inherited Resources}[https://github.com/josevalim/inherited_resources] or {Dry Scaffold}[http://github.com/grimen/dry_scaffold]. Still, various parts in your application remain duplicated. While you might pull up common methods into a common superclass controller, most views still contain very similar code.
 
 Enter DRY CRUD.
 
 <b>
-The main idea of DRY CRUD is to concentrate basic functionality of your application, like CRUD actions, uniform formatting, forms and tables into specifically extendable units. DRY CRUD generates various foundation classes that you may freely adapt to your application's needs. For each model, you may transparently customize arbitrary parts or just fallback to the general behavior. This applies not only for controllers, but also for view templates and helpers.
+The main idea of DRY CRUD is to concentrate basic functionality of your application, like CRUD actions, uniform formatting, forms and tables into specifically extendable units. DRY CRUD generates various foundation classes that you may freely adapt to your application's needs. For each model, you may transparently customize arbitrary parts or just fallback to the general behavior. This applies not only for controllers, but also for view templates and helpers. There is no black box your code depends on. You lay the foundation that fits your application best.
 </b>
 
 A core element of DRY CRUD is the +RenderInheritable+ module. This gives you inheritable views and partials. In the default case, a template is searched in the current controller's view folder. If it is not found there, the template with the same name in the view folder of the superclass controller is used. This lookup path might be customized as well. RenderInheritable is also available as a stand-alone gem at http://github.com/codez/render_inheritable.
@@ -85,7 +85,7 @@ In <tt>app/views/list/index.html.erb</tt>, add the following line for the pagina
 
 And we are done again. All our controllers inheriting from +ListController+, including above +PeopleController+, now have paginated index views. Because our customization for the people table is in the separate <tt>_list</tt> partial, no further modifications are required. 
 If the current page should be remembered while viewing or editing an entry, just add :page to the remembered_params in <tt>ListController::Memory</tt>:
-  
+
   controller.remember_params = [:q, :sort, :sort_dir, :page]
 
 
@@ -125,11 +125,19 @@ In <tt>app/controllers/people_controller.rb</tt>:
   
   def delete_picture
     if !perform_delete_picture(@entry.picture)
-      flash[:alert] = 'Could not delete picture' 
+      flash.alert = 'Could not delete picture' 
       false
     end
   end
 
+Beside these "action" callbacks, there is also a set of "before render" callbacks that are called whenever a certain view is rendered. They are available for the +index+, +show+, +new+, +edit+ and +form+ (= +new+ and +edit+) views. These callbacks are not only called for the corresponding action, but, for example, also when the +new+ view is going to be rendered from an unsuccessfull +create+ action. Say you need to prepare additional variables whenever the form is rendered:
+
+In <tt>app/controllers/people_controller.rb</tt>:
+  before_render_form :set_hometowns
+  
+  def set_hometowns
+    @hometowns = City.where(:country => @entry.country)
+  end
 
 === Standard Tables and Forms
 
@@ -170,9 +178,9 @@ Of course, custom input fields may be defined as well:
   <% end %>
 
 Even +belongs_to+ associations are automatically rendered with a select field. By default, all entries from the associated model are used as options. To customize this, either define an instance variable with the same name as the association in your controller, or pass a <tt>:list</tt> option:
-  <%= f.belongs_to_field :hometown, :list => City.where('country = ?', @person.country) %>
+  <%= f.belongs_to_field :hometown, :list => City.where(:country => @person.country) %>
 
-Yes, it's bad practice to use finder logic in your views! Define the variable <tt>@hometowns</tt> in your controller instead, and you do not even have to specify the <tt>:list</tt> option.
+Yes, it's bad practice to use finder logic in your views! Define the variable <tt>@hometowns</tt> in your controller instead (as shown in the example above), and you do not even have to specify the <tt>:list</tt> option.
 
 == Generated Files
 
@@ -235,6 +243,8 @@ views/shared/_labeled.html.erb:: Partial to define the layout for an arbitrary c
 
 views/layouts/crud.html.erb:: An example layout showing how to use the @title and +flash+. Most probably you want to merge this with your application.html.erb or adapt the main CRUD templates, so you wont need this file.
 
+views/layouts/_menu.html.erb:: An empty file to put your menu items into. Included from +list.html.erb+.
+
 public/stylesheets/crud.css:: A simple CSS with all the classes and ids used in the CRUD code. 
 
 

data/Rakefile

@@ -25,6 +25,16 @@ task :test => ['test:app:init'] do
   end
 end
 
+require 'rcov/rcovtask'
+Rcov::RcovTask.new do |test| 
+    test.libs << "test/test_app/test"
+    test.test_files = Dir[ "test/test_app/test/**/*_test.rb" ]
+    test.rcov_opts = ['--text-report',
+                      '-i', '"test\/test_app\/app\/.*"',
+                      '-x', '"\/Library\/Ruby\/.*"']
+    test.verbose = true
+end
+
 namespace :test do
   namespace :app do
     task :environment do
@@ -51,9 +61,12 @@ namespace :test do
     desc "Initializes the test application with a couple of classes"
     task :init => :generate_crud do
       FileUtils.cp_r(File.join(File.dirname(__FILE__), 'test', 'templates', '.'), TEST_APP_ROOT)
-      FileUtils.rm_f(File.join(TEST_APP_ROOT, 'app', 'views', 'layouts', 'crud.html.erb'))
+      FileUtils.rm_f(File.join(TEST_APP_ROOT, 'public', 'index.html'))
+      FileUtils.mv(File.join(TEST_APP_ROOT, 'app', 'views', 'layouts', 'crud.html.erb'),
+                   File.join(TEST_APP_ROOT, 'app', 'views', 'layouts', 'application.html.erb'), 
+                   :force => true)
       FileUtils.cd(TEST_APP_ROOT) do
-        sh "rake db:migrate db:seed db:test:prepare"
+        sh "rake db:migrate db:seed db:test:prepare RAILS_ENV=development"
       end
     end
   end

data/VERSION

@@ -1 +1 @@
-1.2.5
+1.2.6

data/lib/generators/dry_crud/templates/INSTALL

@@ -8,6 +8,6 @@ required:
  * To use standard formatting, tables and forms throughout your
    application, add 'helper :standard' to your ApplicationController and 
    benefit everywhere from these little helper methods. 
- * Add a :label method to your models for a human-friendly representation.
+ * Add a #label method to your models for a human-friendly representation.
 
 Enjoy dry_crud and stay DRY!

data/lib/generators/dry_crud/templates/app/controllers/crud_controller.rb

@@ -20,7 +20,8 @@ class CrudController < ListController
   # Defines before and after callback hooks for create, update, save and destroy.
   define_model_callbacks :create, :update, :save, :destroy
   
-  # Defines before callbacks for the render actions.
+  # Defines before callbacks for the render actions. A virtual callback
+  # unifiying render_new and render_edit, called render_form, is defined further down.
   define_model_callbacks :render_show, 
                          :render_new, 
                          :render_edit, 
@@ -49,26 +50,27 @@ class CrudController < ListController
   #   GET /entries/new
   #   GET /entries/new.xml
   def new
+    @entry.attributes = params[model_identifier]
     respond_with @entry
   end
-  
-  # Display a form to edit an exisiting entry of this model.
-  #   GET /entries/1/edit
-  def edit
-    render_with_callback :edit
-  end
-  
+
   # Create a new entry of this model from the passed params.
   #   POST /entries
   #   POST /entries.xml
   def create
+    @entry.attributes = params[model_identifier]
     created = with_callbacks(:create) { save_entry } 
     
     respond_processed(created, 'created', 'new') do |format|
-      format.html { redirect_to_show }
-      format.xml  { render :xml => @entry, :status => :created, :location => @entry }
+      format.xml  { render :xml => @entry, :status => :created, :location => @entry } if created
     end
   end
+    
+  # Display a form to edit an exisiting entry of this model.
+  #   GET /entries/1/edit
+  def edit
+    render_with_callback 'edit'
+  end
   
   # Update an existing entry of this model from the passed params.
   #   PUT /entries/1
@@ -77,10 +79,7 @@ class CrudController < ListController
     @entry.attributes = params[model_identifier]
     updated = with_callbacks(:update) { save_entry }
     
-    respond_processed(updated, 'updated', 'edit') do |format|
-      format.html { redirect_to_show }
-      format.xml  { head :ok }
-    end
+    respond_processed(updated, 'updated', 'edit')
   end
   
   # Destroy an existing entry of this model.
@@ -88,27 +87,37 @@ class CrudController < ListController
   #   DELETE /entries/1.xml
   def destroy
     destroyed = with_callbacks(:destroy) { @entry.destroy }
-    
-    respond_processed(destroyed, 'destroyed', 'show') do |format|
-      format.html { redirect_to_index }
-      format.xml  { head :ok }
+
+    respond_processed(destroyed, 'destroyed') do |format|
+      format.html do 
+        if destroyed
+          redirect_to_index
+        else
+          flash.alert = @entry.errors.full_messages.join('<br/>').html_safe
+          request.env["HTTP_REFERER"].present? ? redirect_to(:back) : redirect_to_show
+        end
+      end
     end
   end
   
   protected 
   
   #############  CUSTOMIZABLE HELPER METHODS  ##############################
-
   
   # Convenience method to respond to various formats if the performed
-  # action may succeed or fail. In case of failure, a standard response
-  # is given and the failed_action template is rendered. In case of success,
-  # the flash[:notice] is set and control is passed to the given block.
-  def respond_processed(success, operation, failed_action)
+  # action may succeed or fail. It is possible to pass a block and respond
+  # in custom ways for certain cases. If no response is performed in the 
+  # given block, the default responses in this method are executed.
+  def respond_processed(success, operation, failed_action = 'show')
     respond_to do |format|
+      flash.notice = "#{full_entry_label} was successfully #{operation}." if success
+      yield format if block_given?
+      return if performed?
+      
+      # fallback responders if nothing was performed in the block
       if success
-        flash[:notice] = "#{full_entry_label} was successfully #{operation}."
-        yield format
+        format.html { redirect_to_show }
+        format.xml  { head :ok }
       else 
         format.html { render_with_callback failed_action }
         format.xml  { render :xml => @entry.errors, :status => :unprocessable_entity }
@@ -116,9 +125,9 @@ class CrudController < ListController
     end
   end
   
-  # Creates a new model entry from the given params.
+  # Creates a new model entry.
   def build_entry
-    @entry = model_class.new(params[model_identifier])
+    @entry = model_class.new
   end
   
   # Sets an existing model entry from the given id.
@@ -159,6 +168,11 @@ class CrudController < ListController
       @model_identifier ||= model_class.name.underscore.to_sym
     end
 
+    # Convenience callback to apply a callback on both form actions (new and edit).
+    def before_render_form(*methods)
+      before_render_new *methods
+      before_render_edit *methods
+    end
   end
   
 end

data/lib/generators/dry_crud/templates/app/controllers/list_controller.rb

@@ -53,7 +53,6 @@ class ListController < ApplicationController
     end
   end
   
-  
   # Helper method to run before_render callbacks and render the action.
   # If a callback renders or redirects, the action is not rendered.
   def render_with_callback(action)
@@ -115,7 +114,7 @@ class ListController < ApplicationController
   
   # Sort functionality for the index table.
   # Extracted into an own module for convenience.
-  module Sorting
+  module Sort
     # Adds a :sort_mappings class attribute.
     def self.included(controller)
       # Define a map of (virtual) attributes to SQL order expressions.
@@ -160,7 +159,7 @@ class ListController < ApplicationController
     end
   end
   
-  include Sorting
+  include Sort
   
   # Remembers certain params of the index action in order to return
   # to the same list after an entry was viewed or edited.

data/lib/generators/dry_crud/templates/app/helpers/crud_helper.rb

@@ -2,6 +2,14 @@
 # attributes for the current model to be used in tables and forms. This helper
 # is included in CrudController.
 module CrudHelper
+
+  # Renders a generic form for the current entry with :default_attrs or the 
+  # given attribute array, using the StandardFormBuilder.
+  # If a block is given, a custom form may be rendered and attrs is ignored.
+  def crud_form(attrs = nil, options = {}, &block)
+    attrs = default_attrs - [:created_at, :updated_at] unless attrs
+    standard_form(@entry, attrs, &block)
+  end
   
   # Create a table of the @entries variable with the default or 
   # the passed attributes in its columns.
@@ -11,27 +19,38 @@ module CrudHelper
     else      
       attrs = default_attrs if attrs.blank?
       list_table(*attrs) do |t| 
-         add_list_actions(t)
+         add_table_actions(t)
       end
     end
   end
   
   # Adds a set of standard action link column (show, edit, destroy) to the given table.
-  def add_list_actions(table)
-    table.col('', :class => 'center') { |e| link_action_show(e) }
-    table.col('', :class => 'center') { |e| link_action_edit(e) }
-    table.col('', :class => 'center') { |e| link_action_destroy(e) }
+  def add_table_actions(table)
+    action_col(table) { |e| link_table_action_show(e) }
+    action_col(table) { |e| link_table_action_edit(e) }
+    action_col(table) { |e| link_table_action_destroy(e) }
   end
   
-  # Renders a generic form for the current entry with :default_attrs or the 
-  # given attribute array, using the StandardFormBuilder.
-  # If a block is given, a custom form may be rendered and attrs is ignored.
-  def crud_form(attrs = nil, options = {}, &block)
-    unless attrs
-      attrs = default_attrs
-      [:created_at, :updated_at].each {|a| attrs.delete(a) }
-    end		
-    standard_form(@entry, attrs, &block)
+  def link_table_action_show(record)
+    link_table_action('show', record)
+  end
+  
+  def link_table_action_edit(record)
+    link_table_action('edit', edit_polymorphic_path(record))  
+  end
+  
+  def link_table_action_destroy(record)
+    link_table_action('delete', record, 
+                      :confirm => StandardHelper::CONFIRM_DELETE_MESSAGE, 
+                      :method => :delete)  
+  end
+  
+  def link_table_action(image, url, html_options = {})
+  	link_to(action_icon(image), url, html_options) 
+  end
+  
+  def action_col(table, &block)
+  	table.col('', :class => 'center', &block)
   end
   
 end

data/lib/generators/dry_crud/templates/app/helpers/list_helper.rb

@@ -18,8 +18,7 @@ module ListHelper
   # These are all defined attributes except certain special ones like 'id' or 'position'.
   def default_attrs	
     attrs = model_class.column_names.collect(&:to_sym)
-    [:id, :position].each {|a| attrs.delete(a) }
-    attrs
+    attrs - [:id, :position, :password]
   end
     
 end

data/lib/generators/dry_crud/templates/app/helpers/standard_form_builder.rb

@@ -6,6 +6,7 @@
 class StandardFormBuilder < ActionView::Helpers::FormBuilder
   
   BLANK_SELECT_LABEL = 'Please select'
+  REQUIRED_MARK    = '<span class="required">*</span>'.html_safe
   
   attr_reader :template 
   
@@ -35,6 +36,8 @@ class StandardFormBuilder < ActionView::Helpers::FormBuilder
       text_area(attr, html_options)
     elsif belongs_to_association?(attr, type)
       belongs_to_field(attr, html_options)
+    elsif attr.to_s.include?('password')
+      password_field(attr, html_options)
     else
       custom_field_method = :"#{type}_field"
       if respond_to?(custom_field_method)
@@ -50,6 +53,11 @@ class StandardFormBuilder < ActionView::Helpers::FormBuilder
     super(attr, {:size => 30}.merge(html_options))
   end
   
+  # Render a standard password field.
+  def password_field(attr, html_options = {})
+    super(attr, {:size => 30}.merge(html_options))
+  end
+  
   # Render a standard text area.
   def text_area(attr, html_options = {})
     super(attr, {:rows => 5, :cols => 30}.merge(html_options))
@@ -99,12 +107,17 @@ class StandardFormBuilder < ActionView::Helpers::FormBuilder
   def belongs_to_field(attr, html_options = {})
     list = association_entries(attr, html_options)
     if list.present?
-      collection_select(attr, list, :id, :label, { :prompt => BLANK_SELECT_LABEL }, html_options)
+      collection_select(attr, list, :id, :label, select_options(attr), html_options)
     else
       '(none available)'
     end
   end
   
+  # Renders a marker if the given attr has to be present.
+  def required_mark(attr)
+    REQUIRED_MARK if required?(attr)
+  end
+  
   # Render a label for the given attribute with the passed field html section.
   def labeled(attr, field_html = nil, &block)
     template.labeled(label(attr), field_html, &block)
@@ -114,7 +127,7 @@ class StandardFormBuilder < ActionView::Helpers::FormBuilder
   # input field. E.g. labeled_boolean_field(:checked, {:class => 'bold'})
   def method_missing(name, *args)
     if field_method = labeled_field_method?(name)
-      labeled(args.first, send(field_method, *args))
+      labeled(args.first, send(field_method, *args) + required_mark(args.first))
     else     
       super(name, *args)
     end
@@ -129,7 +142,7 @@ class StandardFormBuilder < ActionView::Helpers::FormBuilder
   # Returns true if attr is a non-polymorphic belongs_to association,
   # for which an input field may be automatically rendered.
   def belongs_to_association?(attr, type)
-    if type == :integer || type == nil
+    if type == :integer || type.nil?
       assoc = association(@object, attr, :belongs_to)
       assoc.present? && assoc.options[:polymorphic].nil?
     else
@@ -153,6 +166,22 @@ class StandardFormBuilder < ActionView::Helpers::FormBuilder
     list
   end
   
+  # Returns true if the given attribute must be present.
+  def required?(attr)
+    attr = attr.to_s
+    attr, attr_id = attr.end_with?('_id') ? [attr[0..-4], attr] : [attr, "#{attr}_id"]
+    validators = @object.class.validators_on(attr) + 
+                 @object.class.validators_on(attr_id)
+    validators.any? {|v| v.kind == :presence }
+  end
+  
+  # Depending if the given attribute must be present, return
+  # only an initial selection prompt or a blank option, respectively.
+  def select_options(attr)
+    required?(attr) ? { :prompt => BLANK_SELECT_LABEL } : 
+                      { :include_blank => StandardHelper::NO_ENTRY }
+  end
+  
   private
   
   def labeled_field_method?(name)

data/lib/generators/dry_crud/templates/app/helpers/standard_helper.rb

@@ -4,6 +4,7 @@
 module StandardHelper
   
   NO_LIST_ENTRIES_MESSAGE = "No entries found"
+  NO_ENTRY                = '(none)'
   CONFIRM_DELETE_MESSAGE  = 'Do you really want to delete this entry?'
   
   FLOAT_FORMAT = "%.2f"
@@ -20,7 +21,7 @@ module StandardHelper
     case value
       when Fixnum then number_with_delimiter(value)
       when Float  then FLOAT_FORMAT % value
-      when Date	  then value.to_s
+      when Date   then value.to_s
       when Time   then value.strftime(TIME_FORMAT)   
       when true   then 'yes'
       when false  then 'no'
@@ -52,7 +53,8 @@ module StandardHelper
   # Renders an arbitrary content with the given label. Used for uniform presentation.
   def labeled(label, content = nil, &block)
     content = capture(&block) if block_given?
-    render(:partial => 'shared/labeled', :locals => { :label => label, :content => content}) 
+    render(:partial => 'shared/labeled', 
+           :locals => { :label => label, :content => content}) 
   end
   
   # Transform the given text into a form as used by labels or table headers.
@@ -66,17 +68,15 @@ module StandardHelper
   
   # Renders a list of attributes with label and value for a given object. 
   # Optionally surrounded with a div.
-  def render_attrs(obj, attrs, div = true)
-    html = attrs.collect do |a| 
+  def render_attrs(obj, *attrs)
+    attrs.collect do |a| 
       labeled_attr(obj, a)
     end.join("\n").html_safe
-    
-    div ? content_tag(:div, html, :class => 'attributes') : html
   end
   
   # Renders the formatted content of the given attribute with a label.
   def labeled_attr(obj, attr)
-  	labeled(captionize(attr, obj.class), format_attr(obj, attr))
+    labeled(captionize(attr, obj.class), format_attr(obj, attr))
   end
   
   # Renders a table for the given entries. One column is rendered for each attribute passed. 
@@ -99,8 +99,8 @@ module StandardHelper
   # If a block is given, custom input fields may be rendered and attrs is ignored.
   def standard_form(object, attrs = [], options = {}, &block)
     form_for(object, {:builder => StandardFormBuilder}.merge(options)) do |form|
-      content = ""
-      content << render(:partial => 'shared/error_messages', :locals => {:errors => object.errors})
+      content = render(:partial => 'shared/error_messages', 
+                       :locals => {:errors => object.errors})
       
       content << if block_given? 
         capture(form, &block) 
@@ -108,14 +108,22 @@ module StandardHelper
         form.labeled_input_fields(*attrs)
       end
       
-      content << labeled(nil, form.submit("Save"))
+      content << labeled(nil, form.submit("Save") + cancel_link(object))
       content.html_safe
     end
   end
   
+  def cancel_link(object)
+    link_to("Cancel", polymorphic_path(object), :class => 'cancel')
+  end
+  
   # Alternate table row
-  def tr_alt(&block)
-    content_tag(:tr, :class => cycle("even", "odd", :name => "row_class"), &block)
+  def tr_alt(cycle_name = 'row_class', &block)
+    content_tag(:tr, :class => cycle("even", "odd", :name => cycle_name), &block)
+  end
+  
+  def clear
+    content_tag(:div, '', :class => 'clear')
   end
  
   
@@ -123,33 +131,43 @@ module StandardHelper
   
   # Standard link action to the show page of a given record.
   def link_action_show(record)
-    link_action 'Show', record
+    link_action 'Show', 'show', record
   end
   
   # Standard link action to the edit page of a given record.
   def link_action_edit(record)
-    link_action 'Edit', edit_polymorphic_path(record)
+    link_action 'Edit', 'edit', edit_polymorphic_path(record)
   end
   
   # Standard link action to the destroy action of a given record.
   def link_action_destroy(record)
-    link_action 'Delete', record, :confirm => CONFIRM_DELETE_MESSAGE, :method => :delete
+    link_action 'Delete', 'delete', record, 
+                :confirm => CONFIRM_DELETE_MESSAGE, 
+                :method => :delete
   end
   
   # Standard link action to the list page.
   def link_action_index(url_options = {:action => 'index', :returning => true})
-    link_action 'List', url_options
+    link_action 'List', 'list', url_options
   end
   
   # Standard link action to the new page.
   def link_action_add(url_options = {:action => 'new'})
-    link_action 'Add', url_options
+    link_action 'Add', 'add', url_options
   end
   
   # A generic helper method to create action links.
   # These link could be styled to look like buttons, for example.
-  def link_action(label, options = {}, html_options = {})
-    link_to("[#{label}]", options, {:class => 'action'}.merge(html_options))
+  def link_action(label, icon = nil, url = {}, html_options = {})
+    link_to(icon ? action_icon(icon, label) : label, 
+            url, 
+            {:class => 'action'}.merge(html_options))
+  end
+  
+  def action_icon(icon, label = nil)
+    html = image_tag("actions/#{icon}.png", :size => '16x16') 
+    html << ' ' << label if label
+    html
   end
   
   protected
@@ -161,7 +179,7 @@ module StandardHelper
     if assoc_val = obj.send(assoc.name)
       link_to_unless(no_assoc_link?(assoc, assoc_val), assoc_val.label, assoc_val)
     else
-      '(none)'
+      NO_ENTRY
     end
   end
   

data/lib/generators/dry_crud/templates/app/views/crud/_attrs.html.erb

@@ -1 +1 @@
-<%= render_attrs @entry, default_attrs %>
+<%= render_attrs @entry, *default_attrs %>

data/lib/generators/dry_crud/templates/app/views/crud/edit.html.erb

@@ -1,7 +1,7 @@
 <% @title ||= "Edit #{full_entry_label}" -%>
 
-<%= render :partial => 'form' %>
+<% content_for(:actions, render(:partial => 'actions_edit')) %>
 
-<br/>
+<%= clear %>
 
-<%= render :partial => 'actions_edit' %>
+<%= render :partial => 'form' %>

data/lib/generators/dry_crud/templates/app/views/crud/new.html.erb

@@ -1,7 +1,7 @@
 <% @title ||= "New #{models_label.singularize}" -%>
 
-<%= render :partial => 'form' %>
+<% content_for(:actions, link_action_index) %>
 
-<br/>
+<%= clear %>
 
-<%= link_action_index %>
+<%= render :partial => 'form' %>

data/lib/generators/dry_crud/templates/app/views/crud/show.html.erb

@@ -1,7 +1,9 @@
 <% @title ||= full_entry_label -%>
 
+<% content_for(:actions, render(:partial => 'actions_show')) %>
+
+<%= clear %>
+
 <%= render :partial => 'attrs' %>
 
-<br/>
 
-<%= render :partial => 'actions_show' %>