comfortable_mexican_sofa 1.3.8 → 1.4.0

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

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

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

@@ -1,5 +1,5 @@
 <% content_for :right_column do %>
-  <%= render :partial => 'cms_admin/uploads/index' %>
+  <%= render :partial => 'cms_admin/files/index' %>
 <% end %>
 
 <%= form.text_field :label, :id => (@layout.new_record?? 'slugify' : nil)%>

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

@@ -6,7 +6,7 @@
     </label>
     <button></button>
   </div>
-  <%= render :partial => 'cms_admin/uploads/index' %>
+  <%= render :partial => 'cms_admin/files/index' %>
 <% end %>
 
 <%= form.text_field :label, :id => (@page.new_record?? 'slugify' : nil) %>
@@ -29,6 +29,8 @@
 
 <%= render :partial => 'form_blocks' %>
 
+<%= render :partial => 'cms_admin/categories/form', :object => form %>
+
 <%= form.simple_field nil, nil, :class => 'submit_element' do %>
   <%= form.check_box :is_published, :disable_builder => true %>
   <%= form.label_for :is_published %>

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

@@ -3,35 +3,37 @@
   has_children  = page.children.present?
   has_siblings  = page.siblings.present?
   branch_open   = (session[:cms_page_tree] || []).member?(page.id.to_s) || page.root?
+  category_view = params[:category].present?
 %>
 
 <li id='<%= dom_id(page) %>'>
   <div class='item'>
     <div class='toggle <%= 'open' if branch_open %>'>
       <%= 
-        if has_children && !page.root?
+        if !category_view && 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 %>
+      <% if !category_view && has_siblings %>
         <div class='dragger'><span><%= t('cms.views.pages.drag') %></span></div>
       <% end %>
     </div>
     <div class='action_links'>
-      <%= link_to t('.add_page'), new_cms_admin_site_page_path(@site, :parent_id => page.id) %>
+      <%= link_to t('.add_child_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 page.label, edit_cms_admin_site_page_path(@site, page) %>
+      <%= render :partial => '/cms_admin/categories/categories', :object => page %>
       <div class='sublabel'>
         <%= link_to page.url, page.full_path, :target => '_blank' %>
       </div>
     </div>
   </div>
-  <% if has_children && branch_open %>
+  <% if !category_view && has_children && branch_open %>
     <ul>
       <%= render :partial => 'index_branch', :collection => page.children %>
     </ul>

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

@@ -5,6 +5,8 @@
   <%= render :partial => 'cms_admin/sites/mirrors' %>
 <% end %>
 
+<%= render :partial => 'cms_admin/categories/index', :object => 'Cms::Page' %>
+
 <ul class='list sortable'>
   <%= render :partial => 'index_branch', :collection => @pages %>
 </ul>

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

@@ -1,11 +1,13 @@
 <% content_for :right_column do %>
-  <%= render :partial => 'cms_admin/uploads/index' %>
+  <%= render :partial => 'cms_admin/files/index' %>
 <% end %>
 
 <%= form.text_field :label, :id => (@snippet.new_record?? 'slugify' : nil) %>
 <%= form.text_field :slug, :id => 'slug', :class => 'delimiter-underscore' %>
 <%= form.text_area :content, :class => 'code' %>
 
+<%= render :partial => 'cms_admin/categories/form', :object => form %>
+
 <%= form.simple_field nil, nil, :class => 'submit_element' do %>
   <%= form.submit t(@snippet.new_record?? '.create' : '.update'), :disable_builder => true %>
 <% end %>

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

@@ -5,6 +5,8 @@
   <%= render :partial => 'cms_admin/sites/mirrors' %>
 <% end %>
 
+<%= render :partial => 'cms_admin/categories/index', :object => 'Cms::Snippet' %>
+
 <ul class='list'>
   <% @snippets.each do |snippet| %>
     <li id='cms_snippet_<%= snippet.id %>'>
@@ -16,6 +18,7 @@
         </div>
         <div class='label'>
           <%= 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) %>
           </div>

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

@@ -13,8 +13,6 @@
     <%= 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' %>
-    <%= javascript_include_tag 'comfortable_mexican_sofa/plupload/plupload.js' %>
-    <%= javascript_include_tag 'comfortable_mexican_sofa/plupload/plupload.html5.js' %>
     
   <% else %>
     
@@ -23,15 +21,13 @@
                             'comfortable_mexican_sofa/typography',
                             'comfortable_mexican_sofa/form',
                             'comfortable_mexican_sofa/content',
-                            'comfortable_mexican_sofa/widgets',
                             'comfortable_mexican_sofa/codemirror',
-                            'comfortable_mexican_sofa/jquery_ui' %>
+                            'comfortable_mexican_sofa/jquery_ui',
+                            'comfortable_mexican_sofa/widgets' %>
     <%= javascript_include_tag  'comfortable_mexican_sofa/jquery',
                                 'comfortable_mexican_sofa/jquery_ui',
                                 'comfortable_mexican_sofa/rails',
                                 'comfortable_mexican_sofa/codemirror/codemirror',
-                                'comfortable_mexican_sofa/plupload/plupload',
-                                'comfortable_mexican_sofa/plupload/plupload.html5',
                                 'comfortable_mexican_sofa/application' %>
     <%= javascript_include_tag  'comfortable_mexican_sofa/wymeditor/jquery.wymeditor.pack',
                                 'comfortable_mexican_sofa/wymeditor/jquery.wymeditor.cms' %>

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

@@ -4,6 +4,7 @@
     <li><%= active_link_to t('cms_admin.base.layouts'), cms_admin_site_layouts_path(@site) %></li>
     <li><%= active_link_to t('cms_admin.base.pages'), cms_admin_site_pages_path(@site) %></li>
     <li><%= active_link_to t('cms_admin.base.snippets'), cms_admin_site_snippets_path(@site) %></li>
+    <li><%= active_link_to t('cms_admin.base.files'), cms_admin_site_files_path(@site) %></li>
   <% end %>
   <%= cms_hook :navigation %>
 </ul>

data/comfortable_mexican_sofa.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{comfortable_mexican_sofa}
-  s.version = "1.3.8"
+  s.version = "1.4.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 = %q{2011-08-12}
+  s.date = %q{2011-08-26}
   s.description = %q{}
   s.email = %q{oleg@theworkinggroup.ca}
   s.extra_rdoc_files = [
@@ -37,6 +37,7 @@ Gem::Specification.new do |s|
     "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-bg_inset-soft_95_fef1ec_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",
@@ -47,8 +48,6 @@ Gem::Specification.new do |s|
     "app/assets/javascripts/comfortable_mexican_sofa/codemirror/codemirror.js",
     "app/assets/javascripts/comfortable_mexican_sofa/jquery.js",
     "app/assets/javascripts/comfortable_mexican_sofa/jquery_ui.js",
-    "app/assets/javascripts/comfortable_mexican_sofa/plupload/plupload.html5.js",
-    "app/assets/javascripts/comfortable_mexican_sofa/plupload/plupload.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",
@@ -99,20 +98,40 @@ Gem::Specification.new do |s|
     "app/assets/stylesheets/comfortable_mexican_sofa/widgets.css",
     "app/controllers/application_controller.rb",
     "app/controllers/cms_admin/base_controller.rb",
+    "app/controllers/cms_admin/categories_controller.rb",
+    "app/controllers/cms_admin/files_controller.rb",
     "app/controllers/cms_admin/layouts_controller.rb",
     "app/controllers/cms_admin/pages_controller.rb",
     "app/controllers/cms_admin/revisions_controller.rb",
     "app/controllers/cms_admin/sites_controller.rb",
     "app/controllers/cms_admin/snippets_controller.rb",
-    "app/controllers/cms_admin/uploads_controller.rb",
     "app/controllers/cms_content_controller.rb",
     "app/models/cms/block.rb",
+    "app/models/cms/categorization.rb",
+    "app/models/cms/category.rb",
+    "app/models/cms/file.rb",
     "app/models/cms/layout.rb",
     "app/models/cms/page.rb",
     "app/models/cms/revision.rb",
     "app/models/cms/site.rb",
     "app/models/cms/snippet.rb",
-    "app/models/cms/upload.rb",
+    "app/views/cms_admin/categories/_categories.html.erb",
+    "app/views/cms_admin/categories/_edit.html.erb",
+    "app/views/cms_admin/categories/_form.html.erb",
+    "app/views/cms_admin/categories/_index.html.erb",
+    "app/views/cms_admin/categories/_show.html.erb",
+    "app/views/cms_admin/categories/create.js.erb",
+    "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/files/_file.html.erb",
+    "app/views/cms_admin/files/_form.html.erb",
+    "app/views/cms_admin/files/_index.html.erb",
+    "app/views/cms_admin/files/create.js.erb",
+    "app/views/cms_admin/files/destroy.js.erb",
+    "app/views/cms_admin/files/edit.html.erb",
+    "app/views/cms_admin/files/index.html.erb",
+    "app/views/cms_admin/files/new.html.erb",
     "app/views/cms_admin/layouts/_form.html.erb",
     "app/views/cms_admin/layouts/_index_branch.html.erb",
     "app/views/cms_admin/layouts/edit.html.erb",
@@ -136,9 +155,6 @@ Gem::Specification.new do |s|
     "app/views/cms_admin/snippets/edit.html.erb",
     "app/views/cms_admin/snippets/index.html.erb",
     "app/views/cms_admin/snippets/new.html.erb",
-    "app/views/cms_admin/uploads/_file.html.erb",
-    "app/views/cms_admin/uploads/_index.html.erb",
-    "app/views/cms_admin/uploads/destroy.js.erb",
     "app/views/layouts/cms_admin.html.erb",
     "app/views/layouts/cms_admin/_body.html.erb",
     "app/views/layouts/cms_admin/_center.html.erb",
@@ -178,27 +194,30 @@ Gem::Specification.new do |s|
     "db/migrate/upgrades/02_upgrade_to_1_1_0.rb",
     "db/migrate/upgrades/03_upgrade_to_1_2_0.rb",
     "db/migrate/upgrades/04_upgrade_to_1_3_0.rb",
+    "db/migrate/upgrades/05_upgrade_to_1_4_0.rb",
     "db/seeds.rb",
     "doc/page_editing.png",
     "doc/sofa.png",
     "lib/comfortable_mexican_sofa.rb",
-    "lib/comfortable_mexican_sofa/acts_as_tree.rb",
     "lib/comfortable_mexican_sofa/configuration.rb",
     "lib/comfortable_mexican_sofa/controller_methods.rb",
     "lib/comfortable_mexican_sofa/engine.rb",
     "lib/comfortable_mexican_sofa/error.rb",
+    "lib/comfortable_mexican_sofa/extensions/acts_as_tree.rb",
+    "lib/comfortable_mexican_sofa/extensions/has_revisions.rb",
+    "lib/comfortable_mexican_sofa/extensions/is_categorized.rb",
+    "lib/comfortable_mexican_sofa/extensions/is_mirrored.rb",
+    "lib/comfortable_mexican_sofa/extensions/rails.rb",
     "lib/comfortable_mexican_sofa/fixtures.rb",
     "lib/comfortable_mexican_sofa/form_builder.rb",
-    "lib/comfortable_mexican_sofa/has_revisions.rb",
     "lib/comfortable_mexican_sofa/http_auth.rb",
-    "lib/comfortable_mexican_sofa/is_mirrored.rb",
-    "lib/comfortable_mexican_sofa/rails_extensions.rb",
     "lib/comfortable_mexican_sofa/tag.rb",
     "lib/comfortable_mexican_sofa/tags/asset.rb",
     "lib/comfortable_mexican_sofa/tags/field_datetime.rb",
     "lib/comfortable_mexican_sofa/tags/field_integer.rb",
     "lib/comfortable_mexican_sofa/tags/field_string.rb",
     "lib/comfortable_mexican_sofa/tags/field_text.rb",
+    "lib/comfortable_mexican_sofa/tags/file.rb",
     "lib/comfortable_mexican_sofa/tags/helper.rb",
     "lib/comfortable_mexican_sofa/tags/page_datetime.rb",
     "lib/comfortable_mexican_sofa/tags/page_integer.rb",
@@ -207,7 +226,6 @@ Gem::Specification.new do |s|
     "lib/comfortable_mexican_sofa/tags/page_text.rb",
     "lib/comfortable_mexican_sofa/tags/partial.rb",
     "lib/comfortable_mexican_sofa/tags/snippet.rb",
-    "lib/comfortable_mexican_sofa/tags/upload.rb",
     "lib/comfortable_mexican_sofa/version.rb",
     "lib/comfortable_mexican_sofa/view_hooks.rb",
     "lib/comfortable_mexican_sofa/view_methods.rb",
@@ -216,23 +234,26 @@ Gem::Specification.new do |s|
     "lib/tasks/comfortable_mexican_sofa.rake",
     "script/rails",
     "test/fixtures/cms/blocks.yml",
+    "test/fixtures/cms/categories.yml",
+    "test/fixtures/cms/categorizations.yml",
+    "test/fixtures/cms/files.yml",
     "test/fixtures/cms/layouts.yml",
     "test/fixtures/cms/pages.yml",
     "test/fixtures/cms/revisions.yml",
     "test/fixtures/cms/sites.yml",
     "test/fixtures/cms/snippets.yml",
-    "test/fixtures/cms/uploads.yml",
     "test/fixtures/files/invalid_file.gif",
     "test/fixtures/files/valid_image.jpg",
     "test/fixtures/views/_nav_hook.html.erb",
     "test/fixtures/views/_nav_hook_2.html.erb",
     "test/functional/cms_admin/base_controller_test.rb",
+    "test/functional/cms_admin/categories_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",
     "test/functional/cms_admin/revisions_controller_test.rb",
     "test/functional/cms_admin/sites_controller_test.rb",
     "test/functional/cms_admin/snippets_controller_test.rb",
-    "test/functional/cms_admin/uploads_controller_test.rb",
     "test/functional/cms_content_controller_test.rb",
     "test/integration/authentication_test.rb",
     "test/integration/fixtures_test.rb",
@@ -247,11 +268,13 @@ Gem::Specification.new do |s|
     "test/unit/form_builder_test.rb",
     "test/unit/mirrors_test.rb",
     "test/unit/models/block_test.rb",
+    "test/unit/models/categorization_test.rb",
+    "test/unit/models/category_test.rb",
+    "test/unit/models/file_test.rb",
     "test/unit/models/layout_test.rb",
     "test/unit/models/page_test.rb",
     "test/unit/models/site_test.rb",
     "test/unit/models/snippet_test.rb",
-    "test/unit/models/upload_test.rb",
     "test/unit/revisions_test.rb",
     "test/unit/tag_test.rb",
     "test/unit/tags/asset_test.rb",
@@ -259,6 +282,7 @@ Gem::Specification.new do |s|
     "test/unit/tags/field_integer_test.rb",
     "test/unit/tags/field_string_test.rb",
     "test/unit/tags/field_text_test.rb",
+    "test/unit/tags/file_test.rb",
     "test/unit/tags/helper_test.rb",
     "test/unit/tags/page_datetime_test.rb",
     "test/unit/tags/page_integer_test.rb",
@@ -267,7 +291,6 @@ Gem::Specification.new do |s|
     "test/unit/tags/page_text_test.rb",
     "test/unit/tags/partial_test.rb",
     "test/unit/tags/snippet_test.rb",
-    "test/unit/tags/upload_test.rb",
     "test/unit/view_methods_test.rb"
   ]
   s.homepage = %q{http://github.com/twg/comfortable-mexican-sofa}
@@ -279,16 +302,16 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     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<rails>, [">= 3.1.0.rc6"])
       s.add_runtime_dependency(%q<active_link_to>, [">= 1.0.0"])
       s.add_runtime_dependency(%q<paperclip>, [">= 2.3.14"])
     else
-      s.add_dependency(%q<rails>, [">= 3.0.0"])
+      s.add_dependency(%q<rails>, [">= 3.1.0.rc6"])
       s.add_dependency(%q<active_link_to>, [">= 1.0.0"])
       s.add_dependency(%q<paperclip>, [">= 2.3.14"])
     end
   else
-    s.add_dependency(%q<rails>, [">= 3.0.0"])
+    s.add_dependency(%q<rails>, [">= 3.1.0.rc6"])
     s.add_dependency(%q<active_link_to>, [">= 1.0.0"])
     s.add_dependency(%q<paperclip>, [">= 2.3.14"])
   end

data/config/database.yml

@@ -4,7 +4,7 @@ development:
   adapter: sqlite3
   database: db/development.sqlite3
   pool: 5
-  timeout: 5000
+  timeout: 10000
 
 # Warning: The database defined as "test" will be erased and
 # re-generated from your development database when you run "rake".
@@ -13,10 +13,4 @@ test:
   adapter: sqlite3
   database: db/test.sqlite3
   pool: 5
-  timeout: 5000
-
-production:
-  adapter: sqlite3
-  database: db/production.sqlite3
-  pool: 5
-  timeout: 5000
+  timeout: 10000

data/config/locales/en.yml

@@ -75,7 +75,13 @@ en:
       record_not_found: Record Not Found
       not_found: Revision Not Found
       
-    uploads:
+    files:
+      created: Files uploaded
+      creation_failure: Failed to upload files
+      updated: File updated
+      update_failure: Failed to update file
+      deleted: File deleted
+      not_found: File not found
       
     content:
       site_not_found: Site Not Found
@@ -89,6 +95,7 @@ en:
       layouts: Layouts
       pages: Pages
       snippets: Snippets
+      files: Files
       
     sites:
       index:
@@ -174,7 +181,33 @@ en:
         slug: Slug
         update: Update to this Revision
       
-    uploads:
+    files:
       index:
+        title: Files
+        new_link: Upload New File
+        edit: Edit
+        delete: Delete
+        are_you_sure: Are you sure?
         button: Upload Files
+      new:
+        title: New File
+      edit:
+        title: Editing File
+      form:
+        create: Upload File
+        update: Update File
+        
+    categories:
+      index:
+        label: Categories
+        edit: Edit
+        done: Done
+        all: All
+        add: Add
+      show:
+        are_you_sure: Are you sure?
+      edit:
+        save: Save
+      form:
+        label: Categories
       

data/config/locales/es.yml

@@ -75,7 +75,13 @@ es:
       record_not_found: Registro no encontrado
       not_found: Revisión no encontrada
 
-    uploads:
+    files:
+      created: Files uploaded
+      creation_failure: Failed to upload files
+      updated: File updated
+      update_failure: Failed to update file
+      deleted: File deleted
+      not_found: File not found
 
     content:
       site_not_found: Sitio no encontrado
@@ -89,7 +95,8 @@ es:
       layouts: Diseños
       pages: Páginas
       snippets: Fragmentos
-
+      files: Files
+      
     sites:
       index:
         title: Listado de Sitios
@@ -165,7 +172,7 @@ es:
       form:
         create: Crear Fragmento
         update: Actualizar Fragmento
-
+        
     revisions:
       show:
         title: Revisiones de
@@ -173,7 +180,33 @@ es:
         full_path: Ruta completa
         slug: Identificador
         update: Actualizar a esta versión
-
-    uploads:
+        
+    files:
       index:
+        title: Files
+        new_link: Upload New File
+        edit: Edit
+        delete: Delete
+        are_you_sure: Are you sure?
         button: Cargar Archivos
+      new:
+        title: New File
+      edit:
+        title: Editing File
+      form:
+        create: Upload File
+        update: Update File
+          
+    categories:
+      index:
+        label: Categories
+        edit: Edit
+        done: Done
+        all: All
+        add: Add
+      show:
+        are_you_sure: Are you sure?
+      edit:
+        save: Save
+      form:
+        label: Categories