comfortable_mexican_sofa 1.1.1 → 1.1.2

data/VERSION

@@ -1 +1 @@
-1.1.1
+1.1.2

data/app/controllers/cms_admin/layouts_controller.rb

@@ -1,58 +1,58 @@
 class CmsAdmin::LayoutsController < CmsAdmin::BaseController
-  
+
   before_filter :build_cms_layout,  :only => [:new, :create]
   before_filter :load_cms_layout,   :only => [:edit, :update, :destroy]
-  
+
   def index
     return redirect_to :action => :new if @cms_site.layouts.count == 0
     @cms_layouts = @cms_site.layouts.roots
   end
-  
+
   def new
     render
   end
-  
+
   def edit
     render
   end
-  
+
   def create
     @cms_layout.save!
     flash[:notice] = 'Layout created'
-    redirect_to :action => :edit, :id => @cms_layout
+    redirect_to (params[:commit] ? {:action => :index} : {:action => :edit, :id => @cms_layout})
   rescue ActiveRecord::RecordInvalid
     flash.now[:error] = 'Failed to create layout'
     render :action => :new
   end
-  
+
   def update
     @cms_layout.update_attributes!(params[:cms_layout])
     flash[:notice] = 'Layout updated'
-    redirect_to :action => :edit, :id => @cms_layout
+    redirect_to (params[:commit] ? {:action => :index} : {:action => :edit, :id => @cms_layout})
   rescue ActiveRecord::RecordInvalid
     flash.now[:error] = 'Failed to update layout'
     render :action => :edit
   end
-  
+
   def destroy
     @cms_layout.destroy
     flash[:notice] = 'Layout deleted'
     redirect_to :action => :index
   end
-  
+
 protected
-  
+
   def build_cms_layout
     @cms_layout = @cms_site.layouts.new(params[:cms_layout])
     @cms_layout.parent ||= Cms::Layout.find_by_id(params[:parent_id])
     @cms_layout.content ||= '{{ cms:page:content:text }}'
   end
-  
+
   def load_cms_layout
     @cms_layout = @cms_site.layouts.find(params[:id])
   rescue ActiveRecord::RecordNotFound
     flash[:error] = 'Layout not found'
     redirect_to :action => :index
   end
-  
+
 end

data/app/controllers/cms_admin/pages_controller.rb

@@ -1,53 +1,53 @@
 class CmsAdmin::PagesController < CmsAdmin::BaseController
-  
+
   before_filter :check_for_layouts, :only => [:new, :edit]
   before_filter :build_cms_page,    :only => [:new, :create]
   before_filter :load_cms_page,     :only => [:edit, :update, :destroy]
   before_filter :preview_cms_page,  :only => [:create, :update]
   before_filter :build_upload_file, :only => [:new, :edit]
-  
+
   def index
     return redirect_to :action => :new if @cms_site.pages.count == 0
     @cms_pages = [@cms_site.pages.root].compact
   end
-  
+
   def new
     render
   end
-  
+
   def edit
     render
   end
-  
+
   def create
     @cms_page.save!
     flash[:notice] = 'Page saved'
-    redirect_to :action => :edit, :id => @cms_page
+    redirect_to (params[:commit] ? {:action => :index} : {:action => :edit, :id => @cms_page})
   rescue ActiveRecord::RecordInvalid
     flash.now[:error] = 'Failed to create page'
     render :action => :new
   end
-  
+
   def update
     @cms_page.save!
     flash[:notice] = 'Page updated'
-    redirect_to :action => :edit, :id => @cms_page
+    redirect_to (params[:commit] ? {:action => :index} : {:action => :edit, :id => @cms_page})
   rescue ActiveRecord::RecordInvalid
     flash.now[:error] = 'Failed to update page'
     render :action => :edit
   end
-  
+
   def destroy
     @cms_page.destroy
     flash[:notice] = 'Page deleted'
     redirect_to :action => :index
   end
-  
+
   def form_blocks
     @cms_page = @cms_site.pages.find_by_id(params[:id]) || @cms_site.pages.new
     @cms_page.layout = @cms_site.layouts.find_by_id(params[:layout_id])
   end
-  
+
   def toggle_branch
     @cms_page = @cms_site.pages.find(params[:id])
     s   = (session[:cms_page_tree] ||= [])
@@ -56,7 +56,7 @@ class CmsAdmin::PagesController < CmsAdmin::BaseController
   rescue ActiveRecord::RecordNotFound
     # do nothing
   end
-  
+
   def reorder
     (params[:cms_page] || []).each_with_index do |id, index|
       if (cms_page = Cms::Page.find_by_id(id))
@@ -65,7 +65,7 @@ class CmsAdmin::PagesController < CmsAdmin::BaseController
     end
     render :nothing => true
   end
-  
+
 protected
 
   def check_for_layouts
@@ -74,17 +74,17 @@ protected
       redirect_to new_cms_admin_layout_path
     end
   end
-  
+
   def build_cms_page
     @cms_page = @cms_site.pages.new(params[:cms_page])
     @cms_page.parent ||= (@cms_site.pages.find_by_id(params[:parent_id]) || @cms_site.pages.root)
     @cms_page.layout ||= (@cms_page.parent && @cms_page.parent.layout || @cms_site.layouts.first)
   end
-  
+
   def build_upload_file
     @upload = Cms::Upload.new
   end
-  
+
   def load_cms_page
     @cms_page = @cms_site.pages.find(params[:id])
     @cms_page.attributes = params[:cms_page]
@@ -93,7 +93,7 @@ protected
     flash[:error] = 'Page not found'
     redirect_to :action => :index
   end
-  
+
   def preview_cms_page
     if params[:preview]
       layout = @cms_page.layout.app_layout.blank?? false : @cms_page.layout.app_layout

data/app/controllers/cms_admin/sites_controller.rb

@@ -1,59 +1,59 @@
 class CmsAdmin::SitesController < CmsAdmin::BaseController
-  
+
   skip_before_filter :load_admin_cms_site
-  
+
   before_filter :build_cms_site,  :only => [:new, :create]
   before_filter :load_cms_site,   :only => [:edit, :update, :destroy]
-  
+
   def index
     return redirect_to :action => :new if Cms::Site.count == 0
     @cms_sites = Cms::Site.all
   end
-  
+
   def new
     render
   end
-  
+
   def edit
     render
   end
-  
+
   def create
     @cms_site.save!
     flash[:notice] = 'Site created'
-    redirect_to :action => :edit, :id => @cms_site
+    redirect_to (params[:commit] ? {:action => :index} : {:action => :edit, :id => @cms_site})
   rescue ActiveRecord::RecordInvalid
     flash.now[:error] = 'Failed to create site'
     render :action => :new
   end
-  
+
   def update
     @cms_site.update_attributes!(params[:cms_site])
     flash[:notice] = 'Site updated'
-    redirect_to :action => :edit, :id => @cms_site
+    redirect_to (params[:commit] ? {:action => :index} : {:action => :edit, :id => @cms_site})
   rescue ActiveRecord::RecordInvalid
     flash.now[:error] = 'Failed to update site'
     render :action => :edit
   end
-  
+
   def destroy
     @cms_site.destroy
     flash[:notice] = 'Site deleted'
     redirect_to :action => :index
   end
-  
+
 protected
-  
+
   def build_cms_site
     @cms_site = Cms::Site.new(params[:cms_site])
     @cms_site.hostname ||= request.host.downcase
   end
-  
+
   def load_cms_site
     @cms_site = Cms::Site.find(params[:id])
   rescue ActiveRecord::RecordNotFound
     flash[:error] = 'Site not found'
     redirect_to :action => :index
   end
-  
+
 end

data/app/controllers/cms_admin/snippets_controller.rb

@@ -1,51 +1,51 @@
 class CmsAdmin::SnippetsController < CmsAdmin::BaseController
-  
+
   before_filter :build_cms_snippet, :only => [:new, :create]
   before_filter :load_cms_snippet,  :only => [:edit, :update, :destroy]
-  
+
   def index
     return redirect_to :action => :new if @cms_site.snippets.count == 0
     @cms_snippets = @cms_site.snippets.all(:order => 'label')
   end
-  
+
   def new
     render
   end
-  
+
   def edit
     render
   end
-  
+
   def create
     @cms_snippet.save!
     flash[:notice] = 'Snippet created'
-    redirect_to :action => :edit, :id => @cms_snippet
+    redirect_to (params[:commit] ? {:action => :index} : {:action => :edit, :id => @cms_snippet})
   rescue ActiveRecord::RecordInvalid
     flash.now[:error] = 'Failed to create snippet'
     render :action => :new
   end
-  
+
   def update
     @cms_snippet.update_attributes!(params[:cms_snippet])
     flash[:notice] = 'Snippet updated'
-    redirect_to :action => :edit, :id => @cms_snippet
+    redirect_to (params[:commit] ? {:action => :index} : {:action => :edit, :id => @cms_snippet})
   rescue ActiveRecord::RecordInvalid
     flash.now[:error] = 'Failed to update snippet'
     render :action => :edit
   end
-  
+
   def destroy
     @cms_snippet.destroy
     flash[:notice] = 'Snippet deleted'
     redirect_to :action => :index
   end
-  
+
 protected
-  
+
   def build_cms_snippet
     @cms_snippet = @cms_site.snippets.new(params[:cms_snippet])
   end
-  
+
   def load_cms_snippet
     @cms_snippet = @cms_site.snippets.find(params[:id])
   rescue ActiveRecord::RecordNotFound

data/app/views/cms_admin/layouts/_form.html.erb

@@ -14,3 +14,8 @@
 <%= form.text_area :content, :class => 'code' %>
 <%= form.text_area :css, :class => 'code_css' %>
 <%= form.text_area :js, :class => 'code_js' %>
+
+<%= form.simple_field nil, nil, :class => 'submit_element' do %>
+  <%= form.submit 'and continue', :id => nil, :name => 'save', :disable_builder => true %>
+  <%= form.submit @cms_layout.new_record?? 'Create Layout' : 'Update Layout', :disable_builder => true %>
+<% end %>

data/app/views/cms_admin/layouts/edit.html.erb

@@ -2,5 +2,4 @@
 
 <%= cms_form_for @cms_layout, :url => {:action => :update} do |form| %>
   <%= render :partial => 'form', :object => form %>
-  <%= form.submit 'Update Layout' %>
 <% end %>

data/app/views/cms_admin/layouts/new.html.erb

@@ -2,5 +2,4 @@
 
 <%= cms_form_for @cms_layout, :url => {:action => :create} do |form| %>
   <%= render :partial => 'form', :object => form %>
-  <%= form.submit 'Create Layout' %>
 <% end %>

data/app/views/cms_admin/pages/_form.html.erb

@@ -32,6 +32,7 @@
 <%= form.simple_field nil, nil, :class => 'submit_element' do %>
   <%= form.check_box :is_published, :disable_builder => true %>
   <%= form.label_for :is_published, :label => 'Published' %>
-  <%= form.submit @cms_page.new_record?? 'Create Page' : 'Update Page', :disable_builder => true %>
-  <%= form.submit 'Preview', :name => 'preview', :id => 'cms_page_preview', :disable_builder => true %>
+  <%= form.submit 'Preview', :name => 'preview', :id => nil, :disable_builder => true %>
+  <%= form.submit 'and continue', :id => nil, :name => 'save', :disable_builder => true %>
+  <%= form.submit @cms_page.new_record? ? 'Create Page' : 'Update Page', :disable_builder => true %>
 <% end %>

data/app/views/cms_admin/sites/_form.html.erb

@@ -1,2 +1,7 @@
 <%= form.text_field :label %>
-<%= form.text_field :hostname %>
+<%= form.text_field :hostname %>
+
+<%= form.simple_field nil, nil, :class => 'submit_element' do %>
+  <%= form.submit 'and continue', :id => nil, :name => 'save', :disable_builder => true %>
+  <%= form.submit @cms_site.new_record?? 'Create Site' : 'Update Site', :disable_builder => true %>
+<% end %>

data/app/views/cms_admin/sites/edit.html.erb

@@ -2,5 +2,4 @@
 
 <%= cms_form_for @cms_site, :url => {:action => :update} do |form| %>
   <%= render :partial => 'form', :object => form %>
-  <%= form.submit 'Update Site' %>
 <% end %>

data/app/views/cms_admin/sites/new.html.erb

@@ -2,5 +2,4 @@
 
 <%= cms_form_for @cms_site, :url => {:action => :create} do |form| %>
   <%= render :partial => 'form', :object => form %>
-  <%= form.submit 'Create Site' %>
 <% end %>

data/app/views/cms_admin/snippets/_form.html.erb

@@ -4,4 +4,9 @@
 
 <%= form.text_field :label, :id => (@cms_snippet.new_record?? 'slugify' : nil) %>
 <%= form.text_field :slug, :id => 'slug', :class => 'delimiter-underscore' %>
-<%= form.text_area :content, :class => 'code' %>
+<%= form.text_area :content, :class => 'code' %>
+
+<%= form.simple_field nil, nil, :class => 'submit_element' do %>
+  <%= form.submit 'and continue', :id => nil, :name => 'save', :disable_builder => true %>
+  <%= form.submit @cms_snippet.new_record?? 'Create Snippet' : 'Update Snippet', :disable_builder => true %>
+<% end %>

data/app/views/cms_admin/snippets/edit.html.erb

@@ -2,5 +2,4 @@
 
 <%= cms_form_for @cms_snippet, :url => {:action => :update} do |form| %>
   <%= render :partial => 'form', :object => form %>
-  <%= form.submit 'Update Snippet' %>
 <% end %>

data/app/views/cms_admin/snippets/new.html.erb

@@ -2,5 +2,4 @@
 
 <%= cms_form_for @cms_snippet, :url => {:action => :create} do |form| %>
   <%= render :partial => 'form', :object => form %>
-  <%= form.submit 'Create Snippet' %>
 <% end %>

data/comfortable_mexican_sofa.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{comfortable_mexican_sofa}
-  s.version = "1.1.1"
+  s.version = "1.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Oleg Khabarov", "The Working Group Inc"]
-  s.date = %q{2011-05-02}
+  s.date = %q{2011-05-05}
   s.description = %q{}
   s.email = %q{oleg@theworkinggroup.ca}
   s.extra_rdoc_files = [
@@ -225,6 +225,7 @@ Gem::Specification.new do |s|
     "test/integration/authentication_test.rb",
     "test/integration/fixtures_test.rb",
     "test/integration/render_cms_test.rb",
+    "test/integration/routing_extensions_test.rb",
     "test/integration/sites_test.rb",
     "test/integration/view_hooks_test.rb",
     "test/test_helper.rb",
@@ -265,6 +266,7 @@ Gem::Specification.new do |s|
     "test/integration/authentication_test.rb",
     "test/integration/fixtures_test.rb",
     "test/integration/render_cms_test.rb",
+    "test/integration/routing_extensions_test.rb",
     "test/integration/sites_test.rb",
     "test/integration/view_hooks_test.rb",
     "test/test_helper.rb",

data/config/initializers/comfortable_mexican_sofa.rb

@@ -10,6 +10,11 @@ ComfortableMexicanSofa.configure do |config|
   # You can change 'cms-admin' to 'admin', for example.
   #   config.admin_route_prefix = 'cms-admin'
   
+  # By default Cms content is served directly from the root. Change this setting
+  # if you wish to restrict all content to a section of your site.
+  # To have root page served from http://yourhost/content/ set config below to 'content'
+  #   config.content_route_prefix = ''
+  
   # Path: /cms-admin redirects to /cms-admin/pages but you can change it
   # You don't need to change it when changing admin_route_prefix
   #   config.admin_route_redirect = '/cms-admin/pages'