comfortable_mexican_sofa 1.0.47 → 1.0.48

data/VERSION

@@ -1 +1 @@
-1.0.47
+1.0.48

data/app/controllers/cms_admin/base_controller.rb

@@ -13,16 +13,17 @@ class CmsAdmin::BaseController < ActionController::Base
 protected
   
   def load_admin_cms_site
-    @cms_site = CmsSite.find_by_hostname!(request.host.downcase)
+    hostname = ComfortableMexicanSofa.config.override_host || request.host.downcase
+    @cms_site = CmsSite.find_by_hostname!(hostname)
   
   rescue ActiveRecord::RecordNotFound
     
     if ComfortableMexicanSofa.config.auto_manage_sites
       if CmsSite.count == 0
-        @cms_site = CmsSite.create!(:label => 'Default Site', :hostname => request.host.downcase)
+        @cms_site = CmsSite.create!(:label => 'Default Site', :hostname => hostname)
       elsif CmsSite.count == 1
         @cms_site = CmsSite.first
-        @cms_site.update_attribute(:hostname, request.host.downcase)
+        @cms_site.update_attribute(:hostname, hostname)
       end
     end
     

data/app/controllers/cms_content_controller.rb

@@ -22,7 +22,7 @@ class CmsContentController < ApplicationController
 protected
   
   def load_cms_site
-    @cms_site = CmsSite.find_by_hostname!(request.host.downcase)
+    @cms_site = CmsSite.find_by_hostname!(ComfortableMexicanSofa.config.override_host || request.host.downcase)
   rescue ActiveRecord::RecordNotFound
     render :text => 'Site Not Found', :status => 404
   end

data/app/models/cms_page.rb

@@ -63,6 +63,7 @@ class CmsPage < ActiveRecord::Base
     attributes[:cms_layout] = CmsLayout.load_from_file(site, attributes[:cms_layout])
     attributes[:parent]     = CmsPage.load_from_file(site, attributes[:parent])
     attributes[:cms_site]   = site
+    attributes[:target_page]= CmsPage.load_from_file(site, attributes[:target_page])
     new(attributes)
   rescue
     raise "Failed to load from #{file_path}"

data/app/models/cms_upload.rb

@@ -1,7 +1,7 @@
 class CmsUpload < ActiveRecord::Base
 
   # -- AR Extensions --------------------------------------------------------
-  has_attached_file :file
+  has_attached_file :file, ComfortableMexicanSofa.config.upload_file_options
   
   # -- Relationships --------------------------------------------------------
   belongs_to :cms_site

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

@@ -4,7 +4,7 @@
       <input type='checkbox'/>
       Published
     </label>
-    <a class='big button' href='#'></a>
+    <button></button>
   </div>
   <%= render :partial => 'cms_admin/uploads/index' %>
 <% end %>

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

@@ -6,6 +6,7 @@
     <%= csrf_meta_tag %>
     <%= stylesheet_link_tag :cms, :cache => ('_cms' if ComfortableMexicanSofa.config.enable_caching) %>
     <%= javascript_include_tag :cms, :cache => ('_cms' if ComfortableMexicanSofa.config.enable_caching) %>
+    <%= javascript_include_tag :tiny_mce %>
     <%= yield :head %>
     <%= cms_hook :html_head %>
   </head>

data/comfortable_mexican_sofa.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{comfortable_mexican_sofa}
-  s.version = "1.0.47"
+  s.version = "1.0.48"
 
   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-03-03}
+  s.date = %q{2011-03-22}
   s.description = %q{}
   s.email = %q{oleg@theworkinggroup.ca}
   s.extra_rdoc_files = [

data/config/initializers/comfortable_mexican_sofa.rb

@@ -32,6 +32,18 @@ ComfortableMexicanSofa.configure do |config|
   # to an environment with read-only filesystem (like Heroku) turn this setting off.
   #   config.enable_caching = true
   
+  # File uploads use Paperclip and can support filesystem or s3 uploads.  Override
+  # the upload method and appropriate settings based on Paperclip.  For S3 see:
+  # http://rdoc.info/gems/paperclip/2.3.8/Paperclip/Storage/S3, and for 
+  # filesystem see: http://rdoc.info/gems/paperclip/2.3.8/Paperclip/Storage/S3
+  #   config.upload_file_options = {:storage => :filesystem}
+  
+  # Override the host used to look up the active CmsSite.  If you are not
+  # planning on using the site features, I recommend you set this override to
+  # limit unexpected "Site not found" errors when you try to hit app01.example.com
+  # instead of www.example.com.
+  #   config.override_host = "www.example.com"
+  
 end
 
 # Default credentials for ComfortableMexicanSofa::HttpAuth

data/lib/comfortable_mexican_sofa/configuration.rb

@@ -27,6 +27,12 @@ class ComfortableMexicanSofa::Configuration
   # Caching for css/js. For admin layout and ones for cms content. Enabled by default.
   attr_accessor :enable_caching
   
+  # Upload settings
+  attr_accessor :upload_file_options
+  
+  # Override the hostname when looking up which site to use
+  attr_accessor :override_host
+  
   # Configuration defaults
   def initialize
     @cms_title            = 'ComfortableMexicanSofa MicroCMS'
@@ -37,6 +43,8 @@ class ComfortableMexicanSofa::Configuration
     @auto_manage_sites    = true
     @disable_irb          = true
     @enable_caching       = true
+    @upload_file_options  = {}
+    @override_host        = nil
   end
   
-end
+end

data/lib/comfortable_mexican_sofa/view_methods.rb

@@ -44,13 +44,16 @@ ActionView::Helpers::AssetTagHelper.register_javascript_expansion :cms => [
   'comfortable_mexican_sofa/jquery',
   'comfortable_mexican_sofa/jquery-ui/jquery-ui',
   'comfortable_mexican_sofa/rails',
-  'comfortable_mexican_sofa/tiny_mce/tiny_mce',
-  'comfortable_mexican_sofa/tiny_mce/jquery.tinymce',
   'comfortable_mexican_sofa/plupload/plupload.min',
   'comfortable_mexican_sofa/plupload/plupload.html5.min',
   'comfortable_mexican_sofa/codemirror/codemirror.js',
   'comfortable_mexican_sofa/cms'
 ]
+ActionView::Helpers::AssetTagHelper.register_javascript_expansion :tiny_mce => [
+  'comfortable_mexican_sofa/tiny_mce/tiny_mce',
+  'comfortable_mexican_sofa/tiny_mce/jquery.tinymce'
+]
+
 ActionView::Helpers::AssetTagHelper.register_stylesheet_expansion :cms => [
   'comfortable_mexican_sofa/reset',
   'comfortable_mexican_sofa/structure',

data/lib/tasks/comfortable_mexican_sofa.rake

@@ -238,7 +238,8 @@ namespace :comfortable_mexican_sofa do
         end
         if should_write
           
-          attributes = page.attributes.slice('label', 'slug', 'full_path')
+          attributes = page.attributes.slice('label', 'slug', 'full_path', 'is_published')
+          attributes['targe_page']            = page.target_page.full_path if page.target_page
           attributes['parent']                = page.parent.full_path if page.parent
           attributes['cms_layout']            = page.cms_layout.slug
           attributes['cms_blocks_attributes'] = page.cms_blocks_attributes.collect{|b| b.delete(:id) && b.stringify_keys}
@@ -280,4 +281,4 @@ namespace :comfortable_mexican_sofa do
     task :all => [:layouts, :pages, :snippets]
     
   end
-end
+end

data/public/javascripts/comfortable_mexican_sofa/cms.js

@@ -145,15 +145,15 @@ $.CMS = function(){
     
     enable_page_save_widget : function(){
       $('#page_save input').attr('checked', $('input#cms_page_is_published').is(':checked'));
-      $('#page_save a').html($('input#cms_page_submit').val());
+      $('#page_save button').html($('input#cms_page_submit').val());
       
-      $('#page_save a').bind('click', function(){
+      $('#page_save input').bind('click', function(){
         $('input#cms_page_is_published').attr('checked', $(this).is(':checked'));
       })
       $('input#cms_page_is_published').bind('click', function(){
-        $('#page_save a').attr('checked', $(this).is(':checked'));
+        $('#page_save input').attr('checked', $(this).is(':checked'));
       })
-      $('#page_save a').bind('click', function(){
+      $('#page_save button').bind('click', function(){
         $('input#cms_page_submit').click();
       })
     },

data/public/stylesheets/comfortable_mexican_sofa/structure.css

@@ -80,6 +80,7 @@ html, body {
 
 /* -- Buttons ------------------------------------------------------------ */
 a.button,
+button,
 input[type='button'], 
 input[type='submit'], 
 input[type='reset'], 
@@ -100,6 +101,7 @@ table.formatted td.action_links a {
   text-shadow: #f5f5f5 1px 1px;
 }
 a.button:hover,
+button:hover,
 input[type='button']:hover, 
 input[type='submit']:hover, 
 input[type='reset']:hover, 
@@ -112,6 +114,7 @@ table.formatted td.action_links a:hover {
   border-color: #484848;
 }
 a.button.big,
+button,
 input[type='button'], 
 input[type='submit'], 
 input[type='reset'], 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 0
-  - 47
-  version: 1.0.47
+  - 48
+  version: 1.0.48
 platform: ruby
 authors: 
 - Oleg Khabarov
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-03 00:00:00 -05:00
+date: 2011-03-22 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -384,7 +384,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 4181913889619670678
+      hash: -3244962332587742397
       segments: 
       - 0
       version: "0"