comfortable_mexican_sofa 1.3.2 → 1.3.3

data/Gemfile

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

data/README.md

@@ -1,11 +1,12 @@
 # ComfortableMexicanSofa (CMS Engine) [![Build Status](https://secure.travis-ci.org/twg/comfortable-mexican-sofa.png)](http://travis-ci.org/twg/comfortable-mexican-sofa)
 
-ComfortableMexicanSofa is a powerful CMS Engine for your Rails 3 applications. Unlike other CMS solutions ComfortableMexicanSofa compliments your application, it doesn't force you to extend it to implement custom functionality.
+ComfortableMexicanSofa is a powerful CMS Engine for your Rails 3 applications.
 
 Features
 --------
-* Powerful page templating capability
 * Simple integration with Rails 3.0 and 3.1 apps
+* Build your application in Rails, not in CMS
+* Powerful page templating capability
 * Multiple Sites from a single installation
 * Multilingual
 * Fixtures for initial content population
@@ -46,6 +47,8 @@ After creating a Site, you need to make a Layout. Layout is the template of your
 
 Once you have a layout, you may start creating pages and populating content. It's that easy.
 
+For more information please [see Wiki pages](https://github.com/twg/comfortable-mexican-sofa/wiki).
+
 ![Sofa's Page Edit View](https://github.com/twg/comfortable-mexican-sofa/raw/master/doc/page_editing.png)
 
 CMS Tags Overview
@@ -94,10 +97,6 @@ Here's a number of tag variations:
     {{ cms:partial:path/to/partial }}     # same as <%= render :partial => 'path/to/partial' %>
     {{ cms:partial:path/to/partial:a:b }} # same as <%= render :partial => 'path/to/partial',
                                           #   :locals => { :param_1 => 'a', :param_1 => 'b' } %>
-
-Multiple Sites
---------------
-Sofa is able to manage multiple sites from the same application. For instance: 'site-a.example.com' and 'site-b.example.com' will have distinct set of layouts, pages, snippets, etc. To enable multi-site functionality make sure you have this setting in the initializer: `config.enable_multiple_sites = true`.
     
 Integrating CMS with your app
 -----------------------------

data/VERSION

@@ -1 +1 @@
-1.3.2
+1.3.3

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

@@ -151,7 +151,7 @@ $.CMS = function(){
         unique_names:     true,
         multipart:        true,
         multipart_params: { authenticity_token: auth_token, format: 'js' },
-        url:              '/' + admin_path_prefix + '/uploads'
+        url:              $('#file_uploads').data('path')
       });
       uploader.init();
       uploader.bind('FilesAdded', function(up, files) {

data/app/views/cms_admin/uploads/_index.html.erb

@@ -1,4 +1,4 @@
-<div id='file_uploads' class='box'>
+<div id='file_uploads' class='box' data-path='<%= cms_admin_site_uploads_path(@site) %>'>
   <div class='actions'>
     <a id='uploader_button' href='#' class='big button'><%= t('.button') %></a>
   </div>

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

@@ -5,7 +5,7 @@
   
   <meta name="cms-admin-path" content="<%= ComfortableMexicanSofa.config.admin_route_prefix %>" />
   <meta name="cms-locale" content="<%= I18n.locale %>" />
-  <meta name="cms-js-assets-base-path" content="<%= ComfortableMexicanSofa.asset_pipeline_enabled?? '/assets' : '/public/javascripts' %>/comfortable_mexican_sofa"/>
+  <meta name="cms-js-assets-base-path" content="<%= ComfortableMexicanSofa.asset_pipeline_enabled?? '/assets' : '/javascripts' %>/comfortable_mexican_sofa"/>
   
   <% if ComfortableMexicanSofa.asset_pipeline_enabled? %>
     
@@ -40,4 +40,4 @@
   
   <%= yield :head %>
   <%= cms_hook :html_head %>
-</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.3.2"
+  s.version = "1.3.3"
 
   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-07-10}
+  s.date = %q{2011-07-21}
   s.description = %q{}
   s.email = %q{oleg@theworkinggroup.ca}
   s.extra_rdoc_files = [
@@ -280,16 +280,16 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<rails>, [">= 3.0.0"])
-      s.add_runtime_dependency(%q<active_link_to>, [">= 0.0.8"])
+      s.add_runtime_dependency(%q<active_link_to>, [">= 0.0.10"])
       s.add_runtime_dependency(%q<paperclip>, [">= 2.3.14"])
     else
       s.add_dependency(%q<rails>, [">= 3.0.0"])
-      s.add_dependency(%q<active_link_to>, [">= 0.0.8"])
+      s.add_dependency(%q<active_link_to>, [">= 0.0.10"])
       s.add_dependency(%q<paperclip>, [">= 2.3.14"])
     end
   else
     s.add_dependency(%q<rails>, [">= 3.0.0"])
-    s.add_dependency(%q<active_link_to>, [">= 0.0.8"])
+    s.add_dependency(%q<active_link_to>, [">= 0.0.10"])
     s.add_dependency(%q<paperclip>, [">= 2.3.14"])
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: comfortable_mexican_sofa
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.3.3
   prerelease: 
 platform: ruby
 authors:
@@ -10,12 +10,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-07-10 00:00:00.000000000 -04:00
+date: 2011-07-21 00:00:00.000000000 -04:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70107226381460 !ruby/object:Gem::Requirement
+  requirement: &70165032140020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -23,21 +23,21 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70107226381460
+  version_requirements: *70165032140020
 - !ruby/object:Gem::Dependency
   name: active_link_to
-  requirement: &70107226380760 !ruby/object:Gem::Requirement
+  requirement: &70165032132520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.0.8
+        version: 0.0.10
   type: :runtime
   prerelease: false
-  version_requirements: *70107226380760
+  version_requirements: *70165032132520
 - !ruby/object:Gem::Dependency
   name: paperclip
-  requirement: &70107226380140 !ruby/object:Gem::Requirement
+  requirement: &70165032128560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -45,7 +45,7 @@ dependencies:
         version: 2.3.14
   type: :runtime
   prerelease: false
-  version_requirements: *70107226380140
+  version_requirements: *70165032128560
 description: ''
 email: oleg@theworkinggroup.ca
 executables: []
@@ -321,7 +321,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1116101950145069320
+      hash: 2149008651056251806
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: