comfortable_mexican_sofa 1.2.8 → 1.3.0

data/Gemfile

@@ -1,7 +1,7 @@
 source 'http://rubygems.org'
 
 gem 'rails',          '>=3.0.0'
-gem 'active_link_to', '>=0.0.7'
+gem 'active_link_to', '>=0.0.0'
 gem 'paperclip',      '>=2.3.11'
 
 group :development do

data/README.md

@@ -12,7 +12,7 @@ Add gem definition to your Gemfile:
 Then from the Rails project's root run:
     
     bundle install
-    rails g cms
+    rails generate cms
     rake db:migrate
     
 When upgrading to a newer version just run `rails g cms` and replace files when prompted. You may also need to run `rake db:migrate` again.

data/VERSION

@@ -1 +1 @@
-1.2.8
+1.3.0

data/app/assets/javascripts/comfortable_mexican_sofa/application.js

@@ -24,9 +24,9 @@ $.CMS = function(){
   return {
 
     enable_sortable_list: function(){
-      $('ul.sortable, ul.sortable ul').sortable({
-        handle: 'div.dragger',
-        axis: 'y',
+      $('.sortable, ul.sortable ul').sortable({
+        handle: '.dragger',
+        axis:   'y',
         update: function(){
           $.post(current_path + '/reorder', '_method=put&'+$(this).sortable('serialize'));
         }

data/app/assets/javascripts/comfortable_mexican_sofa/wymeditor/jquery.wymeditor.cms.js

@@ -2,7 +2,7 @@
 var cms_wym_options = {
   
   initSkin:         false,
-  lang:             'en',
+  lang:             $('meta[name="cms-locale"]').attr('content'),
   
   updateSelector:    'form',
   updateEvent:       'submit',

data/app/assets/stylesheets/comfortable_mexican_sofa/structure.css

@@ -14,7 +14,7 @@ html, body {
   position: relative;
   margin: 0px 250px 0px 175px;
   min-height: 100%;
-  background-color: #D8D8D8;
+  background-color: #e6e6e6;
 }
 .center_column .center_column_content {
   padding: 25px;

data/app/controllers/cms_admin/base_controller.rb

@@ -1,43 +1,40 @@
 class CmsAdmin::BaseController < ApplicationController
-  
+
   protect_from_forgery
-  
+
   # Authentication module must have #authenticate method
   include ComfortableMexicanSofa.config.authentication.to_s.constantize
-  
+
   before_filter :authenticate,
-                :load_admin_cms_site,
-                :load_fixtures
+                :load_admin_site,
+                :load_fixtures,
+                :except => :jump
   
   layout 'cms_admin'
   
+  def jump
+    path = ComfortableMexicanSofa.config.admin_route_redirect
+    return redirect_to(path) unless path.blank?
+    load_admin_site
+    redirect_to cms_admin_site_pages_path(@site) if @site
+  end
+  
 protected
   
-  def load_admin_cms_site
-    hostname = request.host.downcase
-    @cms_site = Cms::Site.find_by_hostname!(hostname)
-    
-  rescue ActiveRecord::RecordNotFound
-    unless ComfortableMexicanSofa.config.enable_multiple_sites
-      if Cms::Site.count == 0
-        @cms_site = Cms::Site.create!(:label => 'Default Site', :hostname => hostname)
-      else
-        @cms_site = Cms::Site.first
-        @cms_site.update_attribute(:hostname, hostname)
-      end
-    end
-    
-    unless @cms_site
-      flash[:error] = 'No Site defined for this hostname. Create it now.'
-      return redirect_to(cms_admin_sites_path)
+  def load_admin_site
+    unless (@site = Cms::Site.find_by_id(params[:site_id]) || Cms::Site.first)
+      I18n.locale = ComfortableMexicanSofa.config.admin_locale || I18n.default_locale
+      flash[:error] = I18n.t('cms.base.site_not_found')
+      return redirect_to(new_cms_admin_site_path)
     end
+    I18n.locale = ComfortableMexicanSofa.config.admin_locale || @site.locale
   end
-  
+
   def load_fixtures
     return unless ComfortableMexicanSofa.config.enable_fixtures
-    ComfortableMexicanSofa::Fixtures.import_all(@cms_site.hostname)
+    ComfortableMexicanSofa::Fixtures.import_all(@site.hostname)
     if %w(cms_admin/layouts cms_admin/pages cms_admin/snippets).member?(params[:controller])
-      flash.now[:error] = 'CMS Fixtures are enabled. All changes done here will be discarded.'
+      flash.now[:error] = I18n.t('cms.base.fixtures_enabled')
     end
   end
 end

data/app/controllers/cms_admin/layouts_controller.rb

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

data/app/controllers/cms_admin/pages_controller.rb

@@ -7,8 +7,8 @@ class CmsAdmin::PagesController < CmsAdmin::BaseController
   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
+    return redirect_to :action => :new if @site.pages.count == 0
+    @pages = [@site.pages.root].compact
   end
 
   def new
@@ -20,45 +20,45 @@ class CmsAdmin::PagesController < CmsAdmin::BaseController
   end
 
   def create
-    @cms_page.save!
-    flash[:notice] = 'Page saved'
-    redirect_to :action => :edit, :id => @cms_page
+    @page.save!
+    flash[:notice] = I18n.t('cms.pages.created')
+    redirect_to :action => :edit, :id => @page
   rescue ActiveRecord::RecordInvalid
-    flash.now[:error] = 'Failed to create page'
+    flash.now[:error] = I18n.t('cms.pages.creation_failure')
     render :action => :new
   end
 
   def update
-    @cms_page.save!
-    flash[:notice] = 'Page updated'
-    redirect_to :action => :edit, :id => @cms_page
+    @page.save!
+    flash[:notice] = I18n.t('cms.pages.updated')
+    redirect_to :action => :edit, :id => @page
   rescue ActiveRecord::RecordInvalid
-    flash.now[:error] = 'Failed to update page'
+    flash.now[:error] = I18n.t('cms.pages.update_failure')
     render :action => :edit
   end
 
   def destroy
-    @cms_page.destroy
-    flash[:notice] = 'Page deleted'
+    @page.destroy
+    flash[:notice] = I18n.t('cms.pages.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])
+    @page = @site.pages.find_by_id(params[:id]) || @site.pages.new
+    @page.layout = @site.layouts.find_by_id(params[:layout_id])
   end
 
   def toggle_branch
-    @cms_page = @cms_site.pages.find(params[:id])
+    @page = @site.pages.find(params[:id])
     s   = (session[:cms_page_tree] ||= [])
-    id  = @cms_page.id.to_s
+    id  = @page.id.to_s
     s.member?(id) ? s.delete(id) : s << id
   rescue ActiveRecord::RecordNotFound
     # do nothing
   end
 
   def reorder
-    (params[:cms_page] || []).each_with_index do |id, index|
+    (params[:page] || []).each_with_index do |id, index|
       if (cms_page = Cms::Page.find_by_id(id))
         cms_page.update_attribute(:position, index)
       end
@@ -69,16 +69,16 @@ class CmsAdmin::PagesController < CmsAdmin::BaseController
 protected
 
   def check_for_layouts
-    if @cms_site.layouts.count == 0
-      flash[:error] = 'No Layouts found. Please create one.'
-      redirect_to new_cms_admin_layout_path
+    if @site.layouts.count == 0
+      flash[:error] = I18n.t('cms.pages.layout_not_found')
+      redirect_to new_cms_admin_site_layout_path(@site)
     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)
+    @page = @site.pages.new(params[:page])
+    @page.parent ||= (@site.pages.find_by_id(params[:parent_id]) || @site.pages.root)
+    @page.layout ||= (@page.parent && @page.parent.layout || @site.layouts.first)
   end
 
   def build_upload_file
@@ -86,18 +86,18 @@ protected
   end
 
   def load_cms_page
-    @cms_page = @cms_site.pages.find(params[:id])
-    @cms_page.attributes = params[:cms_page]
-    @cms_page.layout ||= (@cms_page.parent && @cms_page.parent.layout || @cms_site.layouts.first)
+    @page = @site.pages.find(params[:id])
+    @page.attributes = params[:page]
+    @page.layout ||= (@page.parent && @page.parent.layout || @site.layouts.first)
   rescue ActiveRecord::RecordNotFound
-    flash[:error] = 'Page not found'
+    flash[:error] = I18n.t('cms.pages.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
-      render :inline => @cms_page.content(true), :layout => layout
+      layout = @page.layout.app_layout.blank?? false : @page.layout.app_layout
+      render :inline => @page.content(true), :layout => layout
     end
   end
 end

data/app/controllers/cms_admin/revisions_controller.rb

@@ -20,7 +20,7 @@ class CmsAdmin::RevisionsController < CmsAdmin::BaseController
   
   def revert
     @record.restore_from_revision(@revision)
-    flash[:notice] = 'Content Reverted'
+    flash[:notice] = I18n.t('cms.revisions.reverted')
     redirect_to_record
   end
   
@@ -35,22 +35,22 @@ protected
       Cms::Snippet.find(params[:snippet_id])
     end
   rescue ActiveRecord::RecordNotFound
-    flash[:error] = 'Record Not Found'
+    flash[:error] = I18n.t('cms.revisions.record_not_found')
     redirect_to cms_admin_path
   end
   
   def load_revision
     @revision = @record.revisions.find(params[:id])
   rescue ActiveRecord::RecordNotFound
-    flash[:error] = 'Revision Not Found'
+    flash[:error] = I18n.t('cms.revisions.not_found')
     redirect_to_record
   end
   
   def redirect_to_record
     redirect_to case @record
-      when Cms::Layout  then edit_cms_admin_layout_path(@record)
-      when Cms::Page    then edit_cms_admin_page_path(@record)
-      when Cms::Snippet then edit_cms_admin_snippet_path(@record)
+      when Cms::Layout  then edit_cms_admin_site_layout_path(@site, @record)
+      when Cms::Page    then edit_cms_admin_site_page_path(@site, @record)
+      when Cms::Snippet then edit_cms_admin_site_snippet_path(@site, @record)
     end
   end
   

data/app/controllers/cms_admin/sites_controller.rb

@@ -1,14 +1,14 @@
 class CmsAdmin::SitesController < CmsAdmin::BaseController
 
-  skip_before_filter  :load_admin_cms_site,
+  skip_before_filter  :load_admin_site,
                       :load_fixtures
 
-  before_filter :build_cms_site,  :only => [:new, :create]
-  before_filter :load_cms_site,   :only => [:edit, :update, :destroy]
+  before_filter :build_site,  :only => [:new, :create]
+  before_filter :load_site,   :only => [:edit, :update, :destroy]
 
   def index
     return redirect_to :action => :new if Cms::Site.count == 0
-    @cms_sites = Cms::Site.all
+    @sites = Cms::Site.all
   end
 
   def new
@@ -20,40 +20,41 @@ class CmsAdmin::SitesController < CmsAdmin::BaseController
   end
 
   def create
-    @cms_site.save!
-    flash[:notice] = 'Site created'
-    redirect_to :action => :edit, :id => @cms_site
+    @site.save!
+    flash[:notice] = I18n.t('cms.sites.created')
+    redirect_to :action => :edit, :id => @site
   rescue ActiveRecord::RecordInvalid
-    flash.now[:error] = 'Failed to create site'
+    flash.now[:error] = I18n.t('cms.sites.creation_failure')
     render :action => :new
   end
 
   def update
-    @cms_site.update_attributes!(params[:cms_site])
-    flash[:notice] = 'Site updated'
-    redirect_to :action => :edit, :id => @cms_site
+    @site.update_attributes!(params[:site])
+    flash[:notice] = I18n.t('cms.sites.updated')
+    redirect_to :action => :edit, :id => @site
   rescue ActiveRecord::RecordInvalid
-    flash.now[:error] = 'Failed to update site'
+    flash.now[:error] = I18n.t('cms.sites.update_failure')
     render :action => :edit
   end
 
   def destroy
-    @cms_site.destroy
-    flash[:notice] = 'Site deleted'
+    @site.destroy
+    flash[:notice] = I18n.t('cms.sites.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
+  def build_site
+    @site = Cms::Site.new(params[:site])
+    @site.hostname ||= request.host.downcase
   end
 
-  def load_cms_site
-    @cms_site = Cms::Site.find(params[:id])
+  def load_site
+    @site = Cms::Site.find(params[:id])
+    I18n.locale = ComfortableMexicanSofa.config.admin_locale || @site.locale
   rescue ActiveRecord::RecordNotFound
-    flash[:error] = 'Site not found'
+    flash[:error] = I18n.t('cms.sites.not_found')
     redirect_to :action => :index
   end
 

data/app/controllers/cms_admin/snippets_controller.rb

@@ -1,11 +1,11 @@
 class CmsAdmin::SnippetsController < CmsAdmin::BaseController
 
-  before_filter :build_cms_snippet, :only => [:new, :create]
-  before_filter :load_cms_snippet,  :only => [:edit, :update, :destroy]
+  before_filter :build_snippet, :only => [:new, :create]
+  before_filter :load_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')
+    return redirect_to :action => :new if @site.snippets.count == 0
+    @snippets = @site.snippets.all(:order => 'label')
   end
 
   def new
@@ -17,40 +17,39 @@ class CmsAdmin::SnippetsController < CmsAdmin::BaseController
   end
 
   def create
-    # raise @cms_snippet.to_yaml
-    @cms_snippet.save!
-    flash[:notice] = 'Snippet created'
-    redirect_to :action => :edit, :id => @cms_snippet
+    @snippet.save!
+    flash[:notice] = I18n.t('cms.snippets.created')
+    redirect_to :action => :edit, :id => @snippet
   rescue ActiveRecord::RecordInvalid
-    flash.now[:error] = 'Failed to create snippet'
+    flash.now[:error] = I18n.t('cms.snippets.creation_failure')
     render :action => :new
   end
 
   def update
-    @cms_snippet.update_attributes!(params[:cms_snippet])
-    flash[:notice] = 'Snippet updated'
-    redirect_to :action => :edit, :id => @cms_snippet
+    @snippet.update_attributes!(params[:snippet])
+    flash[:notice] = I18n.t('cms.snippets.updated')
+    redirect_to :action => :edit, :id => @snippet
   rescue ActiveRecord::RecordInvalid
-    flash.now[:error] = 'Failed to update snippet'
+    flash.now[:error] = I18n.t('cms.snippets.update_failure')
     render :action => :edit
   end
 
   def destroy
-    @cms_snippet.destroy
-    flash[:notice] = 'Snippet deleted'
+    @snippet.destroy
+    flash[:notice] = I18n.t('cms.snippets.deleted')
     redirect_to :action => :index
   end
 
 protected
 
-  def build_cms_snippet
-    @cms_snippet = @cms_site.snippets.new(params[:cms_snippet])
+  def build_snippet
+    @snippet = @site.snippets.new(params[:snippet])
   end
 
-  def load_cms_snippet
-    @cms_snippet = @cms_site.snippets.find(params[:id])
+  def load_snippet
+    @snippet = @site.snippets.find(params[:id])
   rescue ActiveRecord::RecordNotFound
-    flash[:error] = 'Snippet not found'
+    flash[:error] = I18n.t('cms.snippets.not_found')
     redirect_to :action => :index
   end
 end