Changeset 909

Show
Ignore:
Timestamp:
11/08/07 09:13:46 (1 year ago)
Author:
wyca..@gmail.com
Message:

Fixes parts and smooths out merb generator a bit

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/app_generators/merb/merb_generator.rb

    r826 r909  
    2727      m.file_copy_each %w( application.rb exceptions.rb ), "app/controllers" 
    2828      m.file_copy_each %w( global_helper.rb ), "app/helpers" 
    29       m.file_copy_each %w( application.erb ), "app/mailers/views/layout" 
     29      m.file_copy_each %w( application.html.erb ), "app/parts/views/layout"       
     30      m.file_copy_each %w( application.html.erb application.text.erb ), "app/mailers/views/layout" 
    3031      m.file_copy_each %w( application.html.erb ), "app/views/layout" 
    3132      m.file_copy_each %w( internal_server_error.html.erb not_found.html.erb not_acceptable.html.erb ), "app/views/exceptions" 
    …… 
    8788      app/helpers 
    8889      app/mailers/helpers 
    89       app/mailers/views 
    9090      app/mailers/views/layout 
    91       app/parts 
     91      app/parts/helpers 
     92      app/parts/views/layout 
    9293      app/views/layout 
    9394      app/views/exceptions 

  • trunk/lib/merb/mail_controller.rb

    r815 r909  
    6767  class MailController < AbstractController 
    6868    
    69     self._template_root = File.expand_path(self._template_root / "../app/mailers/views") 
     69    self._template_root = File.expand_path(self._template_root / "../mailers/views") 
    7070    class_inheritable_accessor :_mailer_klass 
    7171    self._mailer_klass  = Merb::Mailer 

  • trunk/lib/merb/mixins/render.rb

    r907 r909  
    373373      def glob_template(path, opts = {}) 
    374374        the_template = "#{path}.#{@_template_format}" 
    375         Merb::AbstractController._globs[the_template] || (@_merb_unmatchd = (the_template + ".*"); nil) 
     375        Merb::AbstractController._globs[the_template] || (@_merb_unmatched = (the_template + ".*"); nil) 
    376376      end 
    377377