comfortable_mexican_sofa 1.5.11 → 1.6.0

data/app/views/cms_admin/files/create.js.erb

@@ -1,3 +1,3 @@
-$('#uploaded_files').prepend(
+$('.uploaded_files').prepend(
   '<%= escape_javascript(render :partial => "file", :object => @file ) %>'
 );

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

@@ -3,7 +3,7 @@
 <% end %>
 
 <%= form.text_field :label, :id => (@layout.new_record?? 'slugify' : nil)%>
-<%= form.text_field :slug, :id => 'slug' %>
+<%= form.text_field :identifier, :id => 'slug' %>
 <% if (options = Cms::Layout.options_for_select(@site, @layout)).present? %>
   <%= form.select :parent_id, [["---- #{t('.select_parent_layout')} ----", nil]] + options %>
 <% end %>

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

@@ -15,7 +15,7 @@
     <div class='label'>
       <%= link_to layout.label, edit_cms_admin_site_layout_path(@site, layout) %>
       <div class='sublabel'>
-        <%= link_to layout.slug, edit_cms_admin_site_layout_path(@site, layout) %>
+        <%= link_to layout.identifier, edit_cms_admin_site_layout_path(@site, layout) %>
       </div>
     </div>
   </div>

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

@@ -1,4 +1,4 @@
-<% block_tags = @page.tags(true).select{ |t| t.is_cms_block? }.uniq_by{|t| t.label} %>
+<% block_tags = @page.tags(true).select{ |t| t.is_cms_block? }.uniq_by{|t| t.identifier} %>
 
 <div id='form_blocks'>
   <% if block_tags.empty? %>

data/app/views/cms_admin/revisions/show.html.erb

@@ -1,5 +1,5 @@
 <h1> <%= t('.title') %> <%= @record.class.to_s.demodulize %></h1>
-<h2> <%= @record.is_a?(Cms::Page) ? "#{t('.full_path')}: #{@record.full_path}" : "#{t('.slug')}: #{@record.slug}" %> </h2>
+<h2> <%= @record.is_a?(Cms::Page) ? "#{t('.full_path')}: #{@record.full_path}" : "#{t('.slug')}: #{@record.identifier}" %> </h2>
 
 <% content_for :right_column do %>
   <h2><%= pluralize(@record.revisions.count, t('.revision')) %></h2>

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

@@ -1,4 +1,5 @@
-<%= form.text_field :label %>
+<%= form.text_field :label, :id => (@site.new_record?? 'slugify' : nil) %>
+<%= form.text_field :identifier, :id => 'slug' %>
 <%= form.text_field :hostname %>
 <%= form.text_field :path %>
 <%= form.select :locale, ComfortableMexicanSofa.config.locales.to_a.collect{|l| [l[1], l[0]]} %>

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

@@ -3,7 +3,7 @@
 <% end %>
 
 <%= form.text_field :label, :id => (@snippet.new_record?? 'slugify' : nil) %>
-<%= form.text_field :slug, :id => 'slug', :class => 'delimiter-underscore' %>
+<%= form.text_field :identifier, :id => 'slug', :class => 'delimiter-underscore' %>
 <%= form.text_area :content, :class => 'code' %>
 
 <%= render :partial => 'cms_admin/categories/form', :object => form %>

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

@@ -24,7 +24,7 @@
           <%= link_to snippet.label, edit_cms_admin_site_snippet_path(@site, snippet) %>
           <%= render :partial => '/cms_admin/categories/categories', :object => snippet %>
           <div class='sublabel'>
-            <%= link_to snippet.slug, edit_cms_admin_site_snippet_path(@site, snippet) %>
+            <%= link_to snippet.identifier, edit_cms_admin_site_snippet_path(@site, snippet) %>
           </div>
         </div>
       </div>

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

@@ -5,14 +5,12 @@
   
   <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' : '/javascripts' %>/comfortable_mexican_sofa"/>
+  <meta name="cms-site-id" content="<%= @site.try(:id) %>"/>
   
   <% if ComfortableMexicanSofa.asset_pipeline_enabled? %>
     
     <%= stylesheet_link_tag 'comfortable_mexican_sofa/application' %>
     <%= javascript_include_tag 'comfortable_mexican_sofa/application' %>
-    <%= javascript_include_tag 'comfortable_mexican_sofa/wymeditor/jquery.wymeditor.pack.js' %>
-    <%= javascript_include_tag 'comfortable_mexican_sofa/wymeditor/jquery.wymeditor.cms.js' %>
     
   <% else %>
     
@@ -21,6 +19,8 @@
                             'comfortable_mexican_sofa/typography',
                             'comfortable_mexican_sofa/form',
                             'comfortable_mexican_sofa/content',
+                            'comfortable_mexican_sofa/files',
+                            'comfortable_mexican_sofa/elrte',
                             'comfortable_mexican_sofa/codemirror',
                             'comfortable_mexican_sofa/jquery_ui',
                             'comfortable_mexican_sofa/widgets' %>
@@ -29,10 +29,11 @@
                                 'comfortable_mexican_sofa/jquery_ui_timepicker',
                                 'comfortable_mexican_sofa/rails',
                                 'comfortable_mexican_sofa/codemirror/codemirror',
+                                'comfortable_mexican_sofa/elrte/elrte',
+                                'comfortable_mexican_sofa/elrte/elrte.codemirror',
+                                'comfortable_mexican_sofa/elrte/elrte.sofa_image',
+                                'comfortable_mexican_sofa/elrte/elrte.sofa_link',
                                 'comfortable_mexican_sofa/application' %>
-    <%= javascript_include_tag  'comfortable_mexican_sofa/wymeditor/jquery.wymeditor.pack',
-                                'comfortable_mexican_sofa/wymeditor/jquery.wymeditor.cms',
-                                'comfortable_mexican_sofa/wymeditor/jquery.wymeditor.embed' %>
                                 
   <% end %>
   

data/comfortable_mexican_sofa.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "comfortable_mexican_sofa"
-  s.version = "1.5.11"
+  s.version = "1.6.0"
 
   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 = "2011-11-17"
+  s.date = "2011-12-15"
   s.description = ""
   s.email = "oleg@theworkinggroup.ca"
   s.extra_rdoc_files = [
@@ -25,6 +25,31 @@ Gem::Specification.new do |s|
     "VERSION",
     "app/assets/images/comfortable_mexican_sofa/arrow_bottom.gif",
     "app/assets/images/comfortable_mexican_sofa/arrow_right.gif",
+    "app/assets/images/comfortable_mexican_sofa/checkerboard.gif",
+    "app/assets/images/comfortable_mexican_sofa/elrte/elrte-toolbar.png",
+    "app/assets/images/comfortable_mexican_sofa/elrte/google-maps.png",
+    "app/assets/images/comfortable_mexican_sofa/elrte/iframe.png",
+    "app/assets/images/comfortable_mexican_sofa/elrte/media-director.png",
+    "app/assets/images/comfortable_mexican_sofa/elrte/media-flash.png",
+    "app/assets/images/comfortable_mexican_sofa/elrte/media-quicktime.png",
+    "app/assets/images/comfortable_mexican_sofa/elrte/media-realaudio.png",
+    "app/assets/images/comfortable_mexican_sofa/elrte/media-rutube.png",
+    "app/assets/images/comfortable_mexican_sofa/elrte/media-vimeo.png",
+    "app/assets/images/comfortable_mexican_sofa/elrte/media-winmedia.png",
+    "app/assets/images/comfortable_mexican_sofa/elrte/media-youtube.png",
+    "app/assets/images/comfortable_mexican_sofa/elrte/outline-div.png",
+    "app/assets/images/comfortable_mexican_sofa/elrte/outline-p.png",
+    "app/assets/images/comfortable_mexican_sofa/elrte/pagebreak.gif",
+    "app/assets/images/comfortable_mexican_sofa/elrte/pixel.gif",
+    "app/assets/images/comfortable_mexican_sofa/elrte/smileys/evilgrin.png",
+    "app/assets/images/comfortable_mexican_sofa/elrte/smileys/grin.png",
+    "app/assets/images/comfortable_mexican_sofa/elrte/smileys/happy.png",
+    "app/assets/images/comfortable_mexican_sofa/elrte/smileys/smile.png",
+    "app/assets/images/comfortable_mexican_sofa/elrte/smileys/surprised.png",
+    "app/assets/images/comfortable_mexican_sofa/elrte/smileys/tongue.png",
+    "app/assets/images/comfortable_mexican_sofa/elrte/smileys/unhappy.png",
+    "app/assets/images/comfortable_mexican_sofa/elrte/smileys/waii.png",
+    "app/assets/images/comfortable_mexican_sofa/elrte/smileys/wink.png",
     "app/assets/images/comfortable_mexican_sofa/icon_layout.gif",
     "app/assets/images/comfortable_mexican_sofa/icon_move.gif",
     "app/assets/images/comfortable_mexican_sofa/icon_regular.gif",
@@ -43,55 +68,23 @@ Gem::Specification.new do |s|
     "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/images/comfortable_mexican_sofa/x.png",
     "app/assets/javascripts/comfortable_mexican_sofa/application.js",
     "app/assets/javascripts/comfortable_mexican_sofa/codemirror/codemirror.js",
+    "app/assets/javascripts/comfortable_mexican_sofa/elrte/elrte.codemirror.js",
+    "app/assets/javascripts/comfortable_mexican_sofa/elrte/elrte.js",
+    "app/assets/javascripts/comfortable_mexican_sofa/elrte/elrte.sofa_image.js",
+    "app/assets/javascripts/comfortable_mexican_sofa/elrte/elrte.sofa_link.js",
     "app/assets/javascripts/comfortable_mexican_sofa/jquery.js",
     "app/assets/javascripts/comfortable_mexican_sofa/jquery_ui.js",
     "app/assets/javascripts/comfortable_mexican_sofa/jquery_ui_timepicker.js",
     "app/assets/javascripts/comfortable_mexican_sofa/rails.js",
-    "app/assets/javascripts/comfortable_mexican_sofa/wymeditor/iframe/default/lbl-blockquote.png",
-    "app/assets/javascripts/comfortable_mexican_sofa/wymeditor/iframe/default/lbl-h1.png",
-    "app/assets/javascripts/comfortable_mexican_sofa/wymeditor/iframe/default/lbl-h2.png",
-    "app/assets/javascripts/comfortable_mexican_sofa/wymeditor/iframe/default/lbl-h3.png",
-    "app/assets/javascripts/comfortable_mexican_sofa/wymeditor/iframe/default/lbl-h4.png",
-    "app/assets/javascripts/comfortable_mexican_sofa/wymeditor/iframe/default/lbl-h5.png",
-    "app/assets/javascripts/comfortable_mexican_sofa/wymeditor/iframe/default/lbl-h6.png",
-    "app/assets/javascripts/comfortable_mexican_sofa/wymeditor/iframe/default/lbl-p.png",
-    "app/assets/javascripts/comfortable_mexican_sofa/wymeditor/iframe/default/lbl-pre.png",
-    "app/assets/javascripts/comfortable_mexican_sofa/wymeditor/iframe/default/wymiframe.css",
-    "app/assets/javascripts/comfortable_mexican_sofa/wymeditor/iframe/default/wymiframe.html",
-    "app/assets/javascripts/comfortable_mexican_sofa/wymeditor/jquery.wymeditor.cms.js",
-    "app/assets/javascripts/comfortable_mexican_sofa/wymeditor/jquery.wymeditor.embed.js",
-    "app/assets/javascripts/comfortable_mexican_sofa/wymeditor/jquery.wymeditor.pack.js",
-    "app/assets/javascripts/comfortable_mexican_sofa/wymeditor/lang/bg.js",
-    "app/assets/javascripts/comfortable_mexican_sofa/wymeditor/lang/ca.js",
-    "app/assets/javascripts/comfortable_mexican_sofa/wymeditor/lang/cs.js",
-    "app/assets/javascripts/comfortable_mexican_sofa/wymeditor/lang/cy.js",
-    "app/assets/javascripts/comfortable_mexican_sofa/wymeditor/lang/de.js",
-    "app/assets/javascripts/comfortable_mexican_sofa/wymeditor/lang/en.js",
-    "app/assets/javascripts/comfortable_mexican_sofa/wymeditor/lang/es.js",
-    "app/assets/javascripts/comfortable_mexican_sofa/wymeditor/lang/fa.js",
-    "app/assets/javascripts/comfortable_mexican_sofa/wymeditor/lang/fi.js",
-    "app/assets/javascripts/comfortable_mexican_sofa/wymeditor/lang/fr.js",
-    "app/assets/javascripts/comfortable_mexican_sofa/wymeditor/lang/gl.js",
-    "app/assets/javascripts/comfortable_mexican_sofa/wymeditor/lang/he.js",
-    "app/assets/javascripts/comfortable_mexican_sofa/wymeditor/lang/hr.js",
-    "app/assets/javascripts/comfortable_mexican_sofa/wymeditor/lang/hu.js",
-    "app/assets/javascripts/comfortable_mexican_sofa/wymeditor/lang/it.js",
-    "app/assets/javascripts/comfortable_mexican_sofa/wymeditor/lang/nb.js",
-    "app/assets/javascripts/comfortable_mexican_sofa/wymeditor/lang/nl.js",
-    "app/assets/javascripts/comfortable_mexican_sofa/wymeditor/lang/nn.js",
-    "app/assets/javascripts/comfortable_mexican_sofa/wymeditor/lang/pl.js",
-    "app/assets/javascripts/comfortable_mexican_sofa/wymeditor/lang/pt-br.js",
-    "app/assets/javascripts/comfortable_mexican_sofa/wymeditor/lang/pt.js",
-    "app/assets/javascripts/comfortable_mexican_sofa/wymeditor/lang/ru.js",
-    "app/assets/javascripts/comfortable_mexican_sofa/wymeditor/lang/sv.js",
-    "app/assets/javascripts/comfortable_mexican_sofa/wymeditor/lang/tr.js",
-    "app/assets/javascripts/comfortable_mexican_sofa/wymeditor/lang/zh_cn.js",
     "app/assets/stylesheets/comfortable_mexican_sofa/application.css",
     "app/assets/stylesheets/comfortable_mexican_sofa/codemirror.css",
     "app/assets/stylesheets/comfortable_mexican_sofa/content.css",
+    "app/assets/stylesheets/comfortable_mexican_sofa/dialogs.css",
+    "app/assets/stylesheets/comfortable_mexican_sofa/elrte.css",
+    "app/assets/stylesheets/comfortable_mexican_sofa/files.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",
@@ -101,6 +94,7 @@ Gem::Specification.new do |s|
     "app/controllers/application_controller.rb",
     "app/controllers/cms_admin/base_controller.rb",
     "app/controllers/cms_admin/categories_controller.rb",
+    "app/controllers/cms_admin/dialogs_controller.rb",
     "app/controllers/cms_admin/files_controller.rb",
     "app/controllers/cms_admin/layouts_controller.rb",
     "app/controllers/cms_admin/pages_controller.rb",
@@ -126,6 +120,8 @@ Gem::Specification.new do |s|
     "app/views/cms_admin/categories/destroy.js.erb",
     "app/views/cms_admin/categories/edit.js.erb",
     "app/views/cms_admin/categories/update.js.erb",
+    "app/views/cms_admin/dialogs/image.html.erb",
+    "app/views/cms_admin/dialogs/link.html.erb",
     "app/views/cms_admin/files/_file.html.erb",
     "app/views/cms_admin/files/_form.html.erb",
     "app/views/cms_admin/files/_index.html.erb",
@@ -199,6 +195,7 @@ Gem::Specification.new do |s|
     "db/migrate/upgrades/04_upgrade_to_1_3_0.rb",
     "db/migrate/upgrades/05_upgrade_to_1_4_0.rb",
     "db/migrate/upgrades/06_upgrade_to_1_5_0.rb",
+    "db/migrate/upgrades/07_upgrade_to_1_6_0.rb",
     "db/seeds.rb",
     "doc/preview.png",
     "doc/sofa.png",
@@ -251,6 +248,7 @@ Gem::Specification.new do |s|
     "test/fixtures/cms/revisions.yml",
     "test/fixtures/cms/sites.yml",
     "test/fixtures/cms/snippets.yml",
+    "test/fixtures/files/data.zip",
     "test/fixtures/files/document.pdf",
     "test/fixtures/files/image.gif",
     "test/fixtures/files/image.jpg",
@@ -260,6 +258,7 @@ Gem::Specification.new do |s|
     "test/fixtures/views/render_test/render_layout.html.erb",
     "test/functional/cms_admin/base_controller_test.rb",
     "test/functional/cms_admin/categories_controller_test.rb",
+    "test/functional/cms_admin/dialogs_controller_test.rb",
     "test/functional/cms_admin/files_controller_test.rb",
     "test/functional/cms_admin/layouts_controller_test.rb",
     "test/functional/cms_admin/pages_controller_test.rb",
@@ -267,8 +266,8 @@ Gem::Specification.new do |s|
     "test/functional/cms_admin/sites_controller_test.rb",
     "test/functional/cms_admin/snippets_controller_test.rb",
     "test/functional/cms_content_controller_test.rb",
-    "test/gemfiles/Gemfile.rails-3.0.10",
-    "test/gemfiles/Gemfile.rails-3.1.1",
+    "test/gemfiles/Gemfile.rails-3.0",
+    "test/gemfiles/Gemfile.rails-3.1",
     "test/integration/authentication_test.rb",
     "test/integration/fixtures_test.rb",
     "test/integration/mirrors_test.rb",
@@ -321,16 +320,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>, ["~> 1.0.0"])
-      s.add_runtime_dependency(%q<paperclip>, ["~> 2.3.0"])
+      s.add_runtime_dependency(%q<paperclip>, [">= 2.3.0"])
     else
       s.add_dependency(%q<rails>, [">= 3.0.0"])
       s.add_dependency(%q<active_link_to>, ["~> 1.0.0"])
-      s.add_dependency(%q<paperclip>, ["~> 2.3.0"])
+      s.add_dependency(%q<paperclip>, [">= 2.3.0"])
     end
   else
     s.add_dependency(%q<rails>, [">= 3.0.0"])
     s.add_dependency(%q<active_link_to>, ["~> 1.0.0"])
-    s.add_dependency(%q<paperclip>, ["~> 2.3.0"])
+    s.add_dependency(%q<paperclip>, [">= 2.3.0"])
   end
 end
 

data/config/initializers/paperclip.rb

@@ -1,28 +1,3 @@
 Paperclip.options[:command_path] = case Rails.env
   when 'development', 'test' then '/usr/local/bin'
-end
-
-if Rails.env.test?
-  class Paperclip::Attachment
-    def self.default_options 
-      @default_options = {
-        :url                    => "/system/:attachment/:id/:style/:filename",
-        :path                   => ":rails_root/public:url",
-        :styles                 => {},
-        :only_process           => [],
-        :processors             => [:thumbnail],
-        :convert_options        => {},
-        :source_file_options    => {},
-        :default_url            => "/:attachment/:style/missing.png",
-        :default_style          => :original,
-        :storage                => :filesystem,
-        :use_timestamp          => false,
-        :whiny                  => Paperclip.options[:whiny] || Paperclip.options[:whiny_thumbnails],
-        :use_default_time_zone  => true,
-        :hash_digest            => "SHA1",
-        :hash_data              => ":class/:attachment/:id/:style/:updated_at",
-        :preserve_files         => false
-      }
-    end
-  end
 end

data/config/locales/en.yml

@@ -216,4 +216,10 @@ en:
         save: Save
       form:
         label: Categories
+        
+    dialogs:
+      image:
+        insert: Insert Image
+      link:
+        create: Create Link
       

data/config/locales/es.yml

@@ -216,3 +216,9 @@ es:
         save: Guardar
       form:
         label: Categorias
+        
+    dialogs:
+      image:
+        insert: Insertar Imagen
+      link:
+        create: Create Link

data/config/routes.rb

@@ -27,12 +27,13 @@ Rails.application.routes.draw do
         end
       end
       resources :categories
+      get 'dialog/:type' => 'dialogs#show', :as => 'dialog'
     end
   end unless ComfortableMexicanSofa.config.admin_route_prefix.blank?
   
   scope :controller => :cms_content do
-    get 'cms-css/:site_id/:layout_slug' => :render_css,  :as => 'cms_css'
-    get 'cms-js/:site_id/:layout_slug'  => :render_js,   :as => 'cms_js'
+    get 'cms-css/:site_id/:identifier' => :render_css,  :as => 'cms_css'
+    get 'cms-js/:site_id/:identifier'  => :render_js,   :as => 'cms_js'
     get '/' => :render_html,  :as => 'cms_html',  :path => "(*cms_path)"
   end
   

data/db/migrate/01_create_cms.rb

@@ -3,8 +3,9 @@ class CreateCms < ActiveRecord::Migration
   def self.up
     # -- Sites --------------------------------------------------------------
     create_table :cms_sites do |t|
-      t.string :label
-      t.string :hostname
+      t.string :label,        :null => false
+      t.string :identifier,   :null => false
+      t.string :hostname,     :null => false
       t.string :path
       t.string :locale,       :null => false, :default => 'en'
       t.boolean :is_mirrored, :null => false, :default => false
@@ -14,30 +15,30 @@ class CreateCms < ActiveRecord::Migration
     
     # -- Layouts ------------------------------------------------------------
     create_table :cms_layouts do |t|
-      t.integer :site_id
+      t.integer :site_id,     :null => false
       t.integer :parent_id
       t.string  :app_layout
-      t.string  :label
-      t.string  :slug
+      t.string  :label,       :null => false
+      t.string  :identifier,  :null => false
       t.text    :content
       t.text    :css
       t.text    :js
-      t.integer :position,  :null => false, :default => 0
-      t.boolean :is_shared, :null => false, :default => false
+      t.integer :position,    :null => false, :default => 0
+      t.boolean :is_shared,   :null => false, :default => false
       t.timestamps
     end
     add_index :cms_layouts, [:parent_id, :position]
-    add_index :cms_layouts, [:site_id, :slug], :unique => true
+    add_index :cms_layouts, [:site_id, :identifier], :unique => true
     
     # -- Pages --------------------------------------------------------------
     create_table :cms_pages do |t|
-      t.integer :site_id
+      t.integer :site_id,         :null => false
       t.integer :layout_id
       t.integer :parent_id
       t.integer :target_page_id
-      t.string  :label
+      t.string  :label,           :null => false
       t.string  :slug
-      t.string  :full_path
+      t.string  :full_path,       :null => false
       t.text    :content
       t.integer :position,        :null => false, :default => 0
       t.integer :children_count,  :null => false, :default => 0
@@ -50,36 +51,36 @@ class CreateCms < ActiveRecord::Migration
     
     # -- Page Blocks --------------------------------------------------------
     create_table :cms_blocks do |t|
-      t.integer   :page_id
-      t.string    :label
+      t.integer   :page_id,     :null => false
+      t.string    :identifier,  :null => false
       t.text      :content
       t.timestamps
     end
-    add_index :cms_blocks, [:page_id, :label]
+    add_index :cms_blocks, [:page_id, :identifier]
     
     # -- Snippets -----------------------------------------------------------
     create_table :cms_snippets do |t|
-      t.integer :site_id
-      t.string  :label
-      t.string  :slug
+      t.integer :site_id,     :null => false
+      t.string  :label,       :null => false
+      t.string  :identifier,  :null => false
       t.text    :content
-      t.integer :position,  :null => false, :default => 0
-      t.boolean :is_shared, :null => false, :default => false
+      t.integer :position,    :null => false, :default => 0
+      t.boolean :is_shared,   :null => false, :default => false
       t.timestamps
     end
-    add_index :cms_snippets, [:site_id, :slug], :unique => true
+    add_index :cms_snippets, [:site_id, :identifier], :unique => true
     add_index :cms_snippets, [:site_id, :position]
     
     # -- Files --------------------------------------------------------------
     create_table :cms_files do |t|
-      t.integer :site_id
+      t.integer :site_id,           :null => false
       t.integer :block_id
-      t.string  :label
-      t.string  :file_file_name
-      t.string  :file_content_type
-      t.integer :file_file_size
-      t.string  :description, :limit => 2048
-      t.integer :position,    :null => false, :default => 0
+      t.string  :label,             :null => false
+      t.string  :file_file_name,    :null => false
+      t.string  :file_content_type, :null => false
+      t.integer :file_file_size,    :null => false
+      t.string  :description,       :limit => 2048
+      t.integer :position,          :null => false, :default => 0
       t.timestamps
     end
     add_index :cms_files, [:site_id, :label]
@@ -89,8 +90,8 @@ class CreateCms < ActiveRecord::Migration
     
     # -- Revisions -----------------------------------------------------------
     create_table :cms_revisions, :force => true do |t|
-      t.string    :record_type
-      t.integer   :record_id
+      t.string    :record_type, :null => false
+      t.integer   :record_id,   :null => false
       t.text      :data
       t.datetime  :created_at
     end
@@ -98,15 +99,16 @@ class CreateCms < ActiveRecord::Migration
     
     # -- Categories ---------------------------------------------------------
     create_table :cms_categories, :force => true do |t|
-      t.string :label
-      t.string :categorized_type
+      t.string :site_id,          :null => false
+      t.string :label,            :null => false
+      t.string :categorized_type, :null => false
     end
-    add_index :cms_categories, [:categorized_type, :label], :unique => true
+    add_index :cms_categories, [:site_id, :categorized_type, :label], :unique => true
     
     create_table :cms_categorizations, :force => true do |t|
-      t.integer :category_id
-      t.string  :categorized_type
-      t.integer :categorized_id
+      t.integer :category_id,       :null => false
+      t.string  :categorized_type,  :null => false
+      t.integer :categorized_id,    :null => false
     end
     add_index :cms_categorizations, [:category_id, :categorized_type, :categorized_id], :unique => true,
       :name => 'index_cms_categorizations_on_cat_id_and_catd_type_and_catd_id'