comfortable_mexican_sofa 1.3.1 → 1.3.2

data/app/controllers/cms_admin/sites_controller.rb

@@ -22,7 +22,7 @@ class CmsAdmin::SitesController < CmsAdmin::BaseController
   def create
     @site.save!
     flash[:notice] = I18n.t('cms.sites.created')
-    redirect_to :action => :edit, :id => @site
+    redirect_to cms_admin_site_layouts_path(@site)
   rescue ActiveRecord::RecordInvalid
     flash.now[:error] = I18n.t('cms.sites.creation_failure')
     render :action => :new

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

@@ -24,7 +24,8 @@
                             'comfortable_mexican_sofa/form',
                             'comfortable_mexican_sofa/content',
                             'comfortable_mexican_sofa/widgets',
-                            'comfortable_mexican_sofa/codemirror' %>
+                            'comfortable_mexican_sofa/codemirror',
+                            'comfortable_mexican_sofa/jquery_ui' %>
     <%= javascript_include_tag  'comfortable_mexican_sofa/jquery',
                                 'comfortable_mexican_sofa/jquery_ui',
                                 'comfortable_mexican_sofa/rails',

data/comfortable_mexican_sofa.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{comfortable_mexican_sofa}
-  s.version = "1.3.1"
+  s.version = "1.3.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-07-08}
+  s.date = %q{2011-07-10}
   s.description = %q{}
   s.email = %q{oleg@theworkinggroup.ca}
   s.extra_rdoc_files = [
@@ -29,6 +29,19 @@ Gem::Specification.new do |s|
     "app/assets/images/comfortable_mexican_sofa/icon_move.gif",
     "app/assets/images/comfortable_mexican_sofa/icon_regular.gif",
     "app/assets/images/comfortable_mexican_sofa/icon_snippet.gif",
+    "app/assets/images/comfortable_mexican_sofa/jquery_ui/ui-bg_flat_0_aaaaaa_40x100.png",
+    "app/assets/images/comfortable_mexican_sofa/jquery_ui/ui-bg_flat_75_ffffff_40x100.png",
+    "app/assets/images/comfortable_mexican_sofa/jquery_ui/ui-bg_glass_55_fbf9ee_1x400.png",
+    "app/assets/images/comfortable_mexican_sofa/jquery_ui/ui-bg_glass_65_ffffff_1x400.png",
+    "app/assets/images/comfortable_mexican_sofa/jquery_ui/ui-bg_glass_75_dadada_1x400.png",
+    "app/assets/images/comfortable_mexican_sofa/jquery_ui/ui-bg_glass_75_e6e6e6_1x400.png",
+    "app/assets/images/comfortable_mexican_sofa/jquery_ui/ui-bg_glass_95_fef1ec_1x400.png",
+    "app/assets/images/comfortable_mexican_sofa/jquery_ui/ui-bg_highlight-soft_75_cccccc_1x100.png",
+    "app/assets/images/comfortable_mexican_sofa/jquery_ui/ui-icons_222222_256x240.png",
+    "app/assets/images/comfortable_mexican_sofa/jquery_ui/ui-icons_2e83ff_256x240.png",
+    "app/assets/images/comfortable_mexican_sofa/jquery_ui/ui-icons_454545_256x240.png",
+    "app/assets/images/comfortable_mexican_sofa/jquery_ui/ui-icons_888888_256x240.png",
+    "app/assets/images/comfortable_mexican_sofa/jquery_ui/ui-icons_cd0a0a_256x240.png",
     "app/assets/images/comfortable_mexican_sofa/wym_icons.png",
     "app/assets/javascripts/comfortable_mexican_sofa/application.js",
     "app/assets/javascripts/comfortable_mexican_sofa/codemirror/codemirror.js",
@@ -79,6 +92,7 @@ Gem::Specification.new do |s|
     "app/assets/stylesheets/comfortable_mexican_sofa/codemirror.css",
     "app/assets/stylesheets/comfortable_mexican_sofa/content.css",
     "app/assets/stylesheets/comfortable_mexican_sofa/form.css",
+    "app/assets/stylesheets/comfortable_mexican_sofa/jquery_ui.css",
     "app/assets/stylesheets/comfortable_mexican_sofa/reset.css",
     "app/assets/stylesheets/comfortable_mexican_sofa/structure.css",
     "app/assets/stylesheets/comfortable_mexican_sofa/typography.css",
@@ -200,10 +214,6 @@ Gem::Specification.new do |s|
     "lib/generators/README",
     "lib/generators/cms_generator.rb",
     "lib/tasks/comfortable_mexican_sofa.rake",
-    "public/422.html",
-    "public/500.html",
-    "public/favicon.ico",
-    "public/robots.txt",
     "script/rails",
     "test/fixtures/cms/blocks.yml",
     "test/fixtures/cms/layouts.yml",

data/config/initializers/comfortable_mexican_sofa.rb

@@ -47,7 +47,7 @@ ComfortableMexicanSofa.configure do |config|
   
   # Admin interface will respect the locale of the site being managed. However you can
   # force it to English by setting this to `:en`
-  #   cofig.admin_locale = nil
+  #   config.admin_locale = nil
   
 end
 

data/db/migrate/upgrades/04_upgrade_to_1_3_0.rb

@@ -2,12 +2,12 @@ class UpgradeTo130 < ActiveRecord::Migration
   def self.up
     add_column :cms_sites, :is_mirrored, :boolean, :null => false, :default => false
     add_column :cms_sites, :path, :string
-    add_column :cms_sites, :locale, :string, :null_false, :default => 'en'
-    add_index :cms_sites, :is_mirrored
+    add_column :cms_sites, :locale, :string, :null => false, :default => 'en'
+    add_index :cms_sites, :is_mirrored 
     
-    add_column :cms_layouts,  :is_shared, :null => false, :default => false
-    add_column :cms_pages,    :is_shared, :null => false, :default => false
-    add_column :cms_snippets, :is_shared, :null => false, :default => false
+    add_column :cms_layouts,  :is_shared, :boolean, :null => false, :default => false
+    add_column :cms_pages,    :is_shared, :boolean, :null => false, :default => false
+    add_column :cms_snippets, :is_shared, :boolean, :null => false, :default => false
   end
 
   def self.down

data/lib/generators/cms_generator.rb

@@ -32,6 +32,8 @@ class CmsGenerator < Rails::Generators::Base
       '/assets/comfortable_mexican_sofa/', '/images/comfortable_mexican_sofa/'
     gsub_file 'public/stylesheets/comfortable_mexican_sofa/widgets.css',
       '/assets/comfortable_mexican_sofa/', '/images/comfortable_mexican_sofa/'
+    gsub_file 'public/stylesheets/comfortable_mexican_sofa/jquery_ui.css',
+      '/assets/comfortable_mexican_sofa/', '/images/comfortable_mexican_sofa/'
   end
   
   def generate_cms_seeds

data/test/functional/cms_admin/sites_controller_test.rb

@@ -49,7 +49,7 @@ class CmsAdmin::SitesControllerTest < ActionController::TestCase
       }
       assert_response :redirect
       site = Cms::Site.last
-      assert_redirected_to :action => :edit, :id => site
+      assert_redirected_to cms_admin_site_layouts_path(site)
       assert_equal 'Site created', flash[:notice]
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: comfortable_mexican_sofa
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -10,12 +10,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-07-08 00:00:00.000000000 -04:00
+date: 2011-07-10 00:00:00.000000000 -04:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70140585880800 !ruby/object:Gem::Requirement
+  requirement: &70107226381460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -23,10 +23,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70140585880800
+  version_requirements: *70107226381460
 - !ruby/object:Gem::Dependency
   name: active_link_to
-  requirement: &70140585880320 !ruby/object:Gem::Requirement
+  requirement: &70107226380760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -34,10 +34,10 @@ dependencies:
         version: 0.0.8
   type: :runtime
   prerelease: false
-  version_requirements: *70140585880320
+  version_requirements: *70107226380760
 - !ruby/object:Gem::Dependency
   name: paperclip
-  requirement: &70140585875980 !ruby/object:Gem::Requirement
+  requirement: &70107226380140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -45,7 +45,7 @@ dependencies:
         version: 2.3.14
   type: :runtime
   prerelease: false
-  version_requirements: *70140585875980
+  version_requirements: *70107226380140
 description: ''
 email: oleg@theworkinggroup.ca
 executables: []
@@ -66,6 +66,19 @@ files:
 - app/assets/images/comfortable_mexican_sofa/icon_move.gif
 - app/assets/images/comfortable_mexican_sofa/icon_regular.gif
 - app/assets/images/comfortable_mexican_sofa/icon_snippet.gif
+- app/assets/images/comfortable_mexican_sofa/jquery_ui/ui-bg_flat_0_aaaaaa_40x100.png
+- app/assets/images/comfortable_mexican_sofa/jquery_ui/ui-bg_flat_75_ffffff_40x100.png
+- app/assets/images/comfortable_mexican_sofa/jquery_ui/ui-bg_glass_55_fbf9ee_1x400.png
+- app/assets/images/comfortable_mexican_sofa/jquery_ui/ui-bg_glass_65_ffffff_1x400.png
+- app/assets/images/comfortable_mexican_sofa/jquery_ui/ui-bg_glass_75_dadada_1x400.png
+- app/assets/images/comfortable_mexican_sofa/jquery_ui/ui-bg_glass_75_e6e6e6_1x400.png
+- app/assets/images/comfortable_mexican_sofa/jquery_ui/ui-bg_glass_95_fef1ec_1x400.png
+- app/assets/images/comfortable_mexican_sofa/jquery_ui/ui-bg_highlight-soft_75_cccccc_1x100.png
+- app/assets/images/comfortable_mexican_sofa/jquery_ui/ui-icons_222222_256x240.png
+- app/assets/images/comfortable_mexican_sofa/jquery_ui/ui-icons_2e83ff_256x240.png
+- app/assets/images/comfortable_mexican_sofa/jquery_ui/ui-icons_454545_256x240.png
+- app/assets/images/comfortable_mexican_sofa/jquery_ui/ui-icons_888888_256x240.png
+- app/assets/images/comfortable_mexican_sofa/jquery_ui/ui-icons_cd0a0a_256x240.png
 - app/assets/images/comfortable_mexican_sofa/wym_icons.png
 - app/assets/javascripts/comfortable_mexican_sofa/application.js
 - app/assets/javascripts/comfortable_mexican_sofa/codemirror/codemirror.js
@@ -116,6 +129,7 @@ files:
 - app/assets/stylesheets/comfortable_mexican_sofa/codemirror.css
 - app/assets/stylesheets/comfortable_mexican_sofa/content.css
 - app/assets/stylesheets/comfortable_mexican_sofa/form.css
+- app/assets/stylesheets/comfortable_mexican_sofa/jquery_ui.css
 - app/assets/stylesheets/comfortable_mexican_sofa/reset.css
 - app/assets/stylesheets/comfortable_mexican_sofa/structure.css
 - app/assets/stylesheets/comfortable_mexican_sofa/typography.css
@@ -237,10 +251,6 @@ files:
 - lib/generators/README
 - lib/generators/cms_generator.rb
 - lib/tasks/comfortable_mexican_sofa.rake
-- public/422.html
-- public/500.html
-- public/favicon.ico
-- public/robots.txt
 - script/rails
 - test/fixtures/cms/blocks.yml
 - test/fixtures/cms/layouts.yml
@@ -311,7 +321,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4527735035333233913
+      hash: 1116101950145069320
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/public/422.html

@@ -1,26 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <title>The change you wanted was rejected (422)</title>
-  <style type="text/css">
-    body { background-color: #fff; color: #666; text-align: center; font-family: arial, sans-serif; }
-    div.dialog {
-      width: 25em;
-      padding: 0 4em;
-      margin: 4em auto 0 auto;
-      border: 1px solid #ccc;
-      border-right-color: #999;
-      border-bottom-color: #999;
-    }
-    h1 { font-size: 100%; color: #f00; line-height: 1.5em; }
-  </style>
-</head>
-
-<body>
-  <!-- This file lives in public/422.html -->
-  <div class="dialog">
-    <h1>The change you wanted was rejected.</h1>
-    <p>Maybe you tried to change something you didn't have access to.</p>
-  </div>
-</body>
-</html>

data/public/500.html

@@ -1,26 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <title>We're sorry, but something went wrong (500)</title>
-  <style type="text/css">
-    body { background-color: #fff; color: #666; text-align: center; font-family: arial, sans-serif; }
-    div.dialog {
-      width: 25em;
-      padding: 0 4em;
-      margin: 4em auto 0 auto;
-      border: 1px solid #ccc;
-      border-right-color: #999;
-      border-bottom-color: #999;
-    }
-    h1 { font-size: 100%; color: #f00; line-height: 1.5em; }
-  </style>
-</head>
-
-<body>
-  <!-- This file lives in public/500.html -->
-  <div class="dialog">
-    <h1>We're sorry, but something went wrong.</h1>
-    <p>We've been notified about this issue and we'll take a look at it shortly.</p>
-  </div>
-</body>
-</html>

data/public/robots.txt

@@ -1,5 +0,0 @@
-# See http://www.robotstxt.org/wc/norobots.html for documentation on how to use the robots.txt file
-#
-# To ban all spiders from the entire site uncomment the next two lines:
-# User-Agent: *
-# Disallow: /