comfortable_mexican_sofa 1.2.8 → 1.3.0

data/app/controllers/cms_admin/uploads_controller.rb

@@ -2,27 +2,27 @@ class CmsAdmin::UploadsController < CmsAdmin::BaseController
   
   skip_before_filter :load_fixtures
   
-  before_filter :load_cms_upload, :only => :destroy
+  before_filter :load_upload, :only => :destroy
   
   def index
     render
   end
   
   def create
-    @cms_upload = @cms_site.uploads.create!(:file => params[:file])
-    render :partial => 'file', :object => @cms_upload
+    @upload = @site.uploads.create!(:file => params[:file])
+    render :partial => 'file', :object => @upload
   rescue ActiveRecord::RecordInvalid
     render :nothing => true, :status => :bad_request
   end
   
   def destroy
-    @cms_upload.destroy
+    @upload.destroy
   end
   
 protected
   
-  def load_cms_upload
-    @cms_upload = @cms_site.uploads.find(params[:id])
+  def load_upload
+    @upload = @site.uploads.find(params[:id])
   rescue ActiveRecord::RecordNotFound
     render :nothing => true
   end

data/app/controllers/cms_content_controller.rb

@@ -1,61 +1,75 @@
 class CmsContentController < ApplicationController
-  
+
   before_filter :load_cms_site
   before_filter :load_fixtures
   before_filter :load_cms_page,   :only => :render_html
   before_filter :load_cms_layout, :only => [:render_css, :render_js]
   
-  caches_page :render_css, :render_js, :if => Proc.new { |c| ComfortableMexicanSofa.config.enable_caching }
-  
   def render_html(status = 200)
     if layout = @cms_page.layout
       app_layout = layout.app_layout.blank?? false : layout.app_layout
       render :inline => @cms_page.content, :layout => app_layout, :status => status
     else
-      render :text => 'Layout Not Found', :status => 404
+      render :text => I18n.t('cms.content.layout_not_found'), :status => 404
     end
   end
-  
+
   def render_css
     render :text => @cms_layout.css, :content_type => 'text/css'
   end
-  
+
   def render_js
     render :text => @cms_layout.js, :content_type => 'text/javascript'
   end
-  
+
 protected
-  
+
   def load_fixtures
     return unless ComfortableMexicanSofa.config.enable_fixtures
     ComfortableMexicanSofa::Fixtures.import_all(@cms_site.hostname)
   end
   
   def load_cms_site
-    @cms_site = if ComfortableMexicanSofa.config.enable_multiple_sites
-      Cms::Site.find_by_hostname(request.host.downcase)
+    @cms_site ||= Cms::Site.first if Cms::Site.count == 1
+    Cms::Site.find_all_by_hostname(request.host.downcase).each do |site|
+      if site.path.blank?
+        @cms_site = site
+      elsif "#{request.fullpath}/".match /^\/#{Regexp.escape(site.path.to_s)}\//
+        @cms_site = site
+        break
+      end
+    end unless @cms_site
+    
+    if @cms_site
+      params[:cms_path].to_s.gsub!(/^#{@cms_site.path}/, '').gsub!(/^\//, '')
+      I18n.locale = @cms_site.locale
     else
-      Cms::Site.first
+      I18n.locale = I18n.default_locale
+      render :text => I18n.t('cms.content.site_not_found'), :status => 404
     end
-    render :text => 'Site Not Found', :status => 404 if !@cms_site
   end
   
+  def load_fixtures
+    return unless ComfortableMexicanSofa.config.enable_fixtures
+    ComfortableMexicanSofa::Fixtures.import_all(@cms_site.hostname)
+  end
+
   def load_cms_page
     @cms_page = @cms_site.pages.published.find_by_full_path!("/#{params[:cms_path]}")
     return redirect_to(@cms_page.target_page.full_path) if @cms_page.target_page
-    
+
   rescue ActiveRecord::RecordNotFound
     if @cms_page = @cms_site.pages.published.find_by_full_path('/404')
       render_html(404)
     else
-      render :text => 'Page Not Found', :status => 404
+      render :text => I18n.t('cms.content.page_not_found'), :status => 404
     end
   end
-  
+
   def load_cms_layout
     @cms_layout = @cms_site.layouts.find_by_slug!(params[:id])
   rescue ActiveRecord::RecordNotFound
     render :nothing => true, :status => 404
   end
-  
+
 end

data/app/models/cms/layout.rb

@@ -12,8 +12,8 @@ class Cms::Layout < ActiveRecord::Base
   
   # -- Callbacks ------------------------------------------------------------
   before_validation :assign_label
-  after_save    :clear_cache, :clear_cached_page_content
-  after_destroy :clear_cache, :clear_cached_page_content
+  after_save    :clear_cached_page_content
+  after_destroy :clear_cached_page_content
   
   # -- Validations ----------------------------------------------------------
   validates :site_id,
@@ -71,13 +71,6 @@ protected
     self.label = self.label.blank?? self.slug.try(:titleize) : self.label
   end
   
-  # After saving need to make sure that cached pages for css and js for this
-  # layout and its children are gone. Good enough to avoid using cache sweepers.
-  def clear_cache
-    FileUtils.rm File.expand_path("cms-css/#{self.slug}.css", Rails.public_path), :force => true
-    FileUtils.rm File.expand_path("cms-js/#{self.slug}.js",   Rails.public_path), :force => true
-  end
-  
   # Forcing page content reload
   def clear_cached_page_content
     self.pages.each{ |page| page.save! }

data/app/models/cms/site.rb

@@ -10,24 +10,29 @@ class Cms::Site < ActiveRecord::Base
   
   # -- Callbacks ------------------------------------------------------------
   before_validation :assign_label
+  before_save :clean_path
   
   # -- Validations ----------------------------------------------------------
   validates :label,
     :presence   => true
   validates :hostname,
     :presence   => true,
-    :uniqueness => true,
+    :uniqueness => { :scope => :path },
     :format     => { :with => /^[\w\.\-]+$/ }
     
-  # -- Class Methods --------------------------------------------------------
-  def self.options_for_select
-    Cms::Site.all.collect{|s| ["#{s.label} (#{s.hostname})", s.id]}
-  end
+  # -- Scopes ---------------------------------------------------------------
+  scope :mirrored, where(:is_mirrored => true)
   
 protected
-
+  
   def assign_label
     self.label = self.label.blank?? self.hostname : self.label
   end
   
+  def clean_path
+    self.path ||= ''
+    self.path.squeeze!('/')
+    self.path.gsub!(/\/$/, '')
+  end
+  
 end

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

@@ -2,13 +2,13 @@
   <%= render :partial => 'cms_admin/uploads/index' %>
 <% end %>
 
-<%= form.text_field :label, :label => 'Layout Name', :id => (@cms_layout.new_record?? 'slugify' : nil)%>
+<%= form.text_field :label, :id => (@layout.new_record?? 'slugify' : nil)%>
 <%= form.text_field :slug, :id => 'slug' %>
-<% if (options = Cms::Layout.options_for_select(@cms_site, @cms_layout)).present? %>
-  <%= form.select :parent_id, [['---- Select Parent Layout ----', nil]] + options %>
+<% if (options = Cms::Layout.options_for_select(@site, @layout)).present? %>
+  <%= form.select :parent_id, [["---- #{t('.select_parent_layout')} ----", nil]] + options %>
 <% end %>
 <% if (options = Cms::Layout.app_layouts_for_select).present? %>
-  <%= form.select :app_layout, [['---- Select Application Layout ----', nil]] + options %>
+  <%= form.select :app_layout, [["---- #{t('.select_app_layout')} ----", nil]] + options %>
 <% end %>
 
 <%= form.text_area :content, :class => 'code' %>
@@ -16,5 +16,5 @@
 <%= form.text_area :js, :class => 'code js' %>
 
 <%= form.simple_field nil, nil, :class => 'submit_element' do %>
-  <%= form.submit @cms_layout.new_record?? 'Create Layout' : 'Update Layout', :disable_builder => true %>
-<% end %>
+  <%= form.submit t(@layout.new_record?? '.create' : '.update'), :disable_builder => true %>
+<% end %>

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

@@ -1,23 +1,23 @@
-<% cms_layout ||= index_branch %>
+<% layout ||= index_branch %>
 
-<li id='cms_layout_<%= cms_layout.id %>'>
+<li id='cms_layout_<%= layout.id %>'>
   <div class='item'>
     <div class='icon'></div>
     <div class='action_links'>
-      <%= link_to 'Add Child Layout', new_cms_admin_layout_path(:parent_id => cms_layout.id) %>
-      <%= link_to 'Edit', edit_cms_admin_layout_path(cms_layout) %>
-      <%= link_to 'Delete', cms_admin_layout_path(cms_layout), :method => :delete, :confirm => 'Are you sure?' %>
+      <%= link_to t('.add_child_layout'), new_cms_admin_site_layout_path(@site, :parent_id => layout.id) %>
+      <%= link_to t('.edit'), edit_cms_admin_site_layout_path(@site, layout) %>
+      <%= link_to t('.delete'), cms_admin_site_layout_path(@site, layout), :method => :delete, :confirm => t('.are_you_sure') %>
     </div>
     <div class='label'>
-      <%= link_to cms_layout.label, edit_cms_admin_layout_path(cms_layout) %>
+      <%= link_to layout.label, edit_cms_admin_site_layout_path(@site, layout) %>
       <div class='sublabel'>
-        <%= link_to cms_layout.slug, edit_cms_admin_layout_path(cms_layout) %>
+        <%= link_to layout.slug, edit_cms_admin_site_layout_path(@site, layout) %>
       </div>
     </div>
   </div>
-  <% if cms_layout.children.present? %>
+  <% if layout.children.present? %>
     <ul>
-      <%= render :partial => 'index_branch', :collection => cms_layout.children %>
+      <%= render :partial => 'index_branch', :collection => layout.children %>
     </ul>
   <% end %>
-</li>
+</li>

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

@@ -1,10 +1,11 @@
-<%= link_to span_tag(pluralize(@cms_layout.revisions.count, 'revision')), cms_admin_layout_revisions_path(@cms_layout), :class => 'big button' %>
-<h1> Editing Layout </h1>
+<%= link_to span_tag(pluralize(@layout.revisions.count, t('.revision'))), cms_admin_site_layout_revisions_path(@site, @layout), :class => 'big button' %>
+
+<h1><%= t('.title')%></h1>
 
 <% content_for :right_column do %>
-  <%= render :partial => 'cms_admin/sites/mirrors', :object => @cms_layout %>
+  <%= render :partial => 'cms_admin/sites/mirrors', :object => @layout %>
 <% end %>
 
-<%= cms_form_for @cms_layout, :url => {:action => :update} do |form| %>
+<%= cms_form_for @layout, :as => :layout, :url => {:action => :update} do |form| %>
   <%= render :partial => 'form', :object => form %>
-<% end %>
+<% end %>

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

@@ -1,10 +1,10 @@
-<%= link_to span_tag('Create New Layout'), new_cms_admin_layout_path, :class => 'big button' %>
-<h1>Layouts</h1>
+<%= link_to span_tag(t('.new_link')), new_cms_admin_site_layout_path(@site), :class => 'big button' %>
+<h1><%= t('.title')%></h1>
 
 <% content_for :right_column do %>
   <%= render :partial => 'cms_admin/sites/mirrors' %>
 <% end %>
 
 <ul class='list'>
-  <%= render :partial => 'index_branch', :collection => @cms_layouts %>
+  <%= render :partial => 'index_branch', :collection => @layouts %>
 </ul>

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

@@ -1,5 +1,5 @@
-<h1> New Layout </h1>
+<h1><%= t('.title') %></h1>
 
-<%= cms_form_for @cms_layout, :url => {:action => :create} do |form| %>
+<%= cms_form_for @layout, :as => :layout, :url => {:action => :create} do |form| %>
   <%= render :partial => 'form', :object => form %>
-<% end %>
+<% end %>

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

@@ -2,27 +2,27 @@
   <div id='page_save' class='box'>
     <label>
       <input type='checkbox'/>
-      Published
+      <%= Cms::Page.human_attribute_name(:is_published) %>
     </label>
     <button></button>
   </div>
   <%= render :partial => 'cms_admin/uploads/index' %>
 <% end %>
 
-<%= form.text_field :label, :id => (@cms_page.new_record?? 'slugify' : nil) %>
+<%= form.text_field :label, :id => (@page.new_record?? 'slugify' : nil) %>
 
 <div class='page_form_extras'>
-  <% unless @cms_site.pages.count == 0 || @cms_site.pages.root == @cms_page%>
+  <% unless @site.pages.count == 0 || @site.pages.root == @page%>
     <%= form.text_field :slug, :id => 'slug' %>
   <% end %>
-  <% if (options = Cms::Layout.options_for_select(@cms_site)).present? %>
-    <%= form.select :layout_id, options, {}, 'data-page-id' => @cms_page.id.to_i, :label => 'Layout' %>
+  <% if (options = Cms::Layout.options_for_select(@site)).present? %>
+    <%= form.select :layout_id, options, {}, 'data-page-id' => @page.id.to_i, :label => 'Layout' %>
   <% end %>
-  <% if (options = Cms::Page.options_for_select(@cms_site, @cms_page)).present? %>
+  <% if (options = Cms::Page.options_for_select(@site, @page)).present? %>
     <%= form.select :parent_id, options %>
   <% end %>
-  <% if (options = Cms::Page.options_for_select(@cms_site, @cms_page, nil, 0, false)).present? %>
-    <%= form.select :target_page_id, [['---- No Redirect ----', nil]] + options, :label => 'Redirect To Page' %>
+  <% if (options = Cms::Page.options_for_select(@site, @page, nil, 0, false)).present? %>
+    <%= form.select :target_page_id, [["---- #{t('.select_target_page')} ----", nil]] + options %>
   <% end %>
   <%= cms_hook :page_form, :object => form %>
 </div>
@@ -31,7 +31,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 'Preview', :name => 'preview', :id => nil, :disable_builder => true %>
-  <%= form.submit @cms_page.new_record? ? 'Create Page' : 'Update Page', :id => 'cms_page_submit', :disable_builder => true %>
+  <%= form.label_for :is_published %>
+  <%= form.submit t('.preview'), :name => 'preview', :id => nil, :disable_builder => true %>
+  <%= form.submit t(@page.new_record?? '.create' : '.update'), :id => 'cms_page_submit', :disable_builder => true %>
 <% end %>

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

@@ -1,11 +1,10 @@
-<% block_tags = @cms_page.tags(true).select{ |t| t.is_cms_block? } %>
+<% block_tags = @page.tags(true).select{ |t| t.is_cms_block? } %>
 
 <div id='form_blocks'>
   <% if block_tags.empty? %>
     <div class='no_tags'>
-      <%= link_to @cms_page.layout.label, edit_cms_admin_layout_path(@cms_page.layout) %>
-      Layout has no content tags defined. <br/>
-      Edit the content to include a page or field tag, for example: <code>{{cms:page:content}}</code>
+      <%= link_to @page.layout.label, edit_cms_admin_site_layout_path(@site, @page.layout) %>
+      <%= t('.no_tags').html_safe %>
     </div>
   <% else %>
     <%= fields_for :blocks, nil, :builder => ComfortableMexicanSofa::FormBuilder do |cms_blocks| %>

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

@@ -1,39 +1,39 @@
 <% 
-  cms_page    ||= index_branch 
-  has_children  = cms_page.children.present?
-  has_siblings  = cms_page.siblings.present?
-  branch_open   = (session[:cms_page_tree] || []).member?(cms_page.id.to_s) || cms_page.root?
+  page        ||= index_branch 
+  has_children  = page.children.present?
+  has_siblings  = page.siblings.present?
+  branch_open   = (session[:cms_page_tree] || []).member?(page.id.to_s) || page.root?
 %>
 
-<li id='<%= dom_id(cms_page) %>'>
+<li id='<%= dom_id(page) %>'>
   <div class='item'>
     <div class='toggle <%= 'open' if branch_open %>'>
       <%= 
-        if has_children && !cms_page.root?
-          link_to span_tag('toggle'), toggle_branch_cms_admin_page_path(cms_page), :remote => true
+        if has_children && !page.root?
+          link_to span_tag(t('.toggle')), toggle_branch_cms_admin_site_page_path(@site, page), :remote => true
         end
       %>
     </div>
     <div class='icon'>
       <% if has_siblings %>
-        <div class='dragger'><span>drag</span></div>
+        <div class='dragger'><span><%= t('cms.views.pages.drag') %></span></div>
       <% end %>
     </div>
     <div class='action_links'>
-      <%= link_to 'Add Child Page', new_cms_admin_page_path(:parent_id => cms_page.id) %>
-      <%= link_to 'Edit', edit_cms_admin_page_path(cms_page) %>
-      <%= link_to 'Delete', cms_admin_page_path(cms_page), :method => :delete, :confirm => 'Are you sure?' %>
+      <%= link_to t('.add_page'), new_cms_admin_site_page_path(@site, :parent_id => page.id) %>
+      <%= link_to t('.edit'), edit_cms_admin_site_page_path(@site, page) %>
+      <%= link_to t('.delete'), cms_admin_site_page_path(@site, page), :method => :delete, :confirm => t('.are_you_sure') %>
     </div>
     <div class='label'>
-      <%= link_to cms_page.label, edit_cms_admin_page_path(cms_page) %>
+      <%= link_to page.label, edit_cms_admin_site_page_path(@site, page) %>
       <div class='sublabel'>
-        <%= link_to cms_page.url, cms_page.full_path, :target => '_blank' %>
+        <%= link_to page.url, page.full_path, :target => '_blank' %>
       </div>
     </div>
   </div>
   <% if has_children && branch_open %>
     <ul>
-      <%= render :partial => 'index_branch', :collection => cms_page.children %>
+      <%= render :partial => 'index_branch', :collection => page.children %>
     </ul>
   <% end %>
-</li>
+</li>

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

@@ -1,10 +1,11 @@
-<%= link_to span_tag(pluralize(@cms_page.revisions.count, 'revision')), cms_admin_page_revisions_path(@cms_page), :class => 'big button' %>
-<h1> Editing Page </h1>
+<%= link_to span_tag(pluralize(@page.revisions.count, t('.revision'))), cms_admin_site_page_revisions_path(@site, @page), :class => 'big button' %>
+
+<h1><%= t('.title') %></h1>
 
 <% content_for :right_column do %>
-  <%= render :partial => 'cms_admin/sites/mirrors', :object => @cms_page %>
+  <%= render :partial => 'cms_admin/sites/mirrors', :object => @page %>
 <% end %>
 
-<%= cms_form_for @cms_page, :url => {:action => :update} do |form| %>
+<%= cms_form_for @page, :as => :page, :url => {:action => :update} do |form| %>
   <%= render :partial => 'form', :object => form %>
-<% end %>
+<% end %>

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

@@ -1,10 +1,10 @@
-<%= link_to span_tag('Create New Page'), new_cms_admin_page_path, :class => 'big button' %>
-<h1>Pages</h1>
+<%= link_to span_tag(t('.new_link')), new_cms_admin_site_page_path(@site), :class => 'big button' %>
+<h1><%= t('.title')%></h1>
 
 <% content_for :right_column do %>
   <%= render :partial => 'cms_admin/sites/mirrors' %>
 <% end %>
 
 <ul class='list sortable'>
-  <%= render :partial => 'index_branch', :collection => @cms_pages %>
-</ul>
+  <%= render :partial => 'index_branch', :collection => @pages %>
+</ul>