comfortable_mexican_sofa 1.5.4 → 1.5.5

data/VERSION

@@ -1 +1 @@
-1.5.4
+1.5.5

data/app/assets/stylesheets/comfortable_mexican_sofa/content.css

@@ -37,14 +37,17 @@
   max-height: 500px;
   overflow-y: auto;
 }
+#cms_body #file_uploads #uploaded_files h3 {
+  margin-top: 5px;
+  font: 11px/20px Arial, sans-serif;
+  text-transform: uppercase;
+}
 #cms_body #file_uploads #uploaded_files .file {
-  position: relative;
   overflow: hidden;
-  font-size: 11px;
+  font: 11px/11px Arial, serif;
   background-color: #252525;
-  margin-top: 2px;
-  padding: 0px 3px;
-  opacity: 0.5;
+  margin-top: 1px;
+  padding: 3px 5px;
   border-radius: 2px;
   -moz-border-radius: 2px;
 }
@@ -52,22 +55,28 @@
   opacity: 0.3;
 }
 #cms_body #file_uploads #uploaded_files .file:hover {
-  opacity: 1;
+  background-color: #000;
 }
 #cms_body #file_uploads #uploaded_files .file a {
   color: #fff;
 }
+#cms_body #file_uploads #uploaded_files .file a.filename {
+  float: left;
+  width: 175px;
+  overflow: hidden;
+}
 #cms_body #file_uploads #uploaded_files .file a.delete {
-  position: absolute;
-  display: block;
-  right: 0px;
-  top: 0px;
-  height: 13px;
-  width: 13px;
-  font-weight: bold;
+  float: right;
+  margin-left: 7px;
+  background-color: #b7b7b7;
+  color: #000;
+  font: 8px/8px Arial, sans-serif;
+  padding: 1px 3px;
+  border-radius: 5px;
 }
-#cms_body #file_uploads #uploaded_files .file:hover a.delete {
-  color: #9e0b0f;
+#cms_body #file_uploads #uploaded_files .file a.delete:hover {
+  background-color: #fff;
+  color: #9E0B0F;
 }
 /* -- Categories Widget -------------------------------------------------- */
 #cms_body .categories_widget {

data/app/assets/stylesheets/comfortable_mexican_sofa/form.css

@@ -19,8 +19,6 @@
 }
 #cms_body .form_element .value {
   margin-left: 150px;
-  margin-right: -140px;
-  overflow: hidden;
 }
 #cms_body .form_element .value input[type='text'],
 #cms_body .form_element .value input[type='password'],
@@ -70,8 +68,8 @@
 #cms_body #form_blocks .files {
   overflow: hidden;
   margin-top: 5px;
-  background-color: #252525;
-  padding: 5px 5px 0px 10px;
+  background-color: #f1f1f1;
+  padding: 5px 0px 0px 5px;
   border-radius: 5px;
   color: #fff;
   min-height: 20px;
@@ -82,30 +80,30 @@
   background-color: #484848;
   border-radius: 3px;
   color: #fff;
-  height: 9px;
+  height: 11px;
   padding: 3px 5px;
   margin: 0px 5px 5px 0px;
 }
 #cms_body #form_blocks .files .file a {
   float: left;
-  color: #a3a3a3;
-  font: 9px/9px Arial, serif;
-  text-transform: uppercase;
-}
-#cms_body #form_blocks .files .file a:hover {
   color: #fff;
+  font: 11px/11px Arial, serif;
+}
+#cms_body #form_blocks .files .file:hover {
+  background-color: #000;
 }
 #cms_body #form_blocks .files .file a.delete {
   float: right;
-  margin-left: 5px;
+  margin-left: 7px;
   background-color: #b7b7b7;
   color: #000;
-  font: bold 7px/7px Arial, sans-serif;
+  font: 7px/8px Arial, sans-serif;
   padding: 1px 3px;
-  border-radius: 4px;
+  border-radius: 5px;
 }
 #cms_body #form_blocks .files .file a.delete:hover {
   background-color: #fff;
+  color: #9E0B0F;
 }
 #cms_body .form_element.field_date_time .label,
 #cms_body .form_element.field_integer .label,
@@ -143,6 +141,7 @@
   margin-top: 10px;
 }
 #cms_body .form_element.submit_element .value {
+  overflow: hidden;
   background-color: #f1f1f1;
   border-radius: 3px;
   -moz-border-radius: 3px;

data/app/controllers/cms_admin/files_controller.rb

@@ -6,7 +6,7 @@ class CmsAdmin::FilesController < CmsAdmin::BaseController
   
   def index
     return redirect_to :action => :new if @site.files.count == 0
-    @files = @site.files.includes(:categories).for_category(params[:category]).all(:order => 'cms_files.label')
+    @files = @site.files.includes(:categories).for_category(params[:category]).all(:order => 'cms_files.position')
   end
   
   def new

data/app/models/cms/file.rb

@@ -1,5 +1,7 @@
 class Cms::File < ActiveRecord::Base
   
+  IMAGE_MIMETYPES = %w(gif jpeg pjpeg png svg+xml tiff).collect{|subtype| "image/#{subtype}"}
+  
   ComfortableMexicanSofa.establish_connection(self)
     
   set_table_name :cms_files
@@ -24,7 +26,8 @@ class Cms::File < ActiveRecord::Base
   after_destroy :reload_page_cache
   
   # -- Scopes ---------------------------------------------------------------
-  default_scope order(:position)
+  scope :images,      where(:file_content_type => IMAGE_MIMETYPES)
+  scope :not_images,  where('file_content_type NOT IN (?)', IMAGE_MIMETYPES)
   
 protected
   

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

@@ -6,5 +6,5 @@
       end 
   %>
   <%= link_to file_name, file.file.url, :target => '_blank', :class => 'filename' %>
-  <%= link_to span_tag('x'), cms_admin_site_file_path(@site, file), :method => :delete, :remote => true, :class => 'delete' %>
+  <%= link_to span_tag('x'), cms_admin_site_file_path(@site, file), :method => :delete, :remote => true, :confirm => t('.are_you_sure'), :class => 'delete' %>
 </div>

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

@@ -6,8 +6,21 @@
   <% end %>
   
   <div id='uploaded_files'>
-    <% Cms::File.order('label').all.each do |file| %>
-      <%= render :partial => 'cms_admin/files/file', :object => file %>
+    <% if (images = Cms::File.images.order(:label)).present? %>
+      <div class='section images'>
+        <h3>Images</h3>
+        <% images.each do |file| %>
+          <%= render :partial => 'cms_admin/files/file', :object => file %>
+        <% end %>
+      </div>
+    <% end %>
+    <% if (images = Cms::File.not_images.order(:label)).present? %>
+      <div class='section other'>
+        <h3>Files</h3>
+        <% images.each do |file| %>
+          <%= render :partial => 'cms_admin/files/file', :object => file %>
+        <% end %>
+      </div>
     <% end %>
   </div>
 </div>

data/comfortable_mexican_sofa.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "comfortable_mexican_sofa"
-  s.version = "1.5.4"
+  s.version = "1.5.5"
 
   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-10-03"
+  s.date = "2011-10-04"
   s.description = ""
   s.email = "oleg@theworkinggroup.ca"
   s.extra_rdoc_files = [

data/config/locales/en.yml

@@ -200,6 +200,8 @@ en:
         update: Update File
       page_form:
         are_you_sure: Are you sure?
+      file:
+        are_you_sure: Are you sure?
         
     categories:
       index:

data/config/locales/es.yml

@@ -200,6 +200,8 @@ es:
         update: Actualizar Archivo
       page_form:
         are_you_sure: ¿Estás seguro?
+      file:
+        are_you_sure: ¿Estás seguro?
           
     categories:
       index:

data/config/routes.rb

@@ -6,13 +6,13 @@ Rails.application.routes.draw do
       resources :pages do
         get  :form_blocks,    :on => :member
         get  :toggle_branch,  :on => :member
-        post :reorder,        :on => :collection
+        put :reorder,        :on => :collection
         resources :revisions, :only => [:index, :show, :revert] do
           put :revert, :on => :member
         end
       end
       resources :files do
-        post :reorder, :on => :collection
+        put :reorder, :on => :collection
       end
       resources :layouts do
         post :reorder, :on => :collection
@@ -21,7 +21,7 @@ Rails.application.routes.draw do
         end
       end
       resources :snippets do
-        post :reorder, :on => :collection
+        put :reorder, :on => :collection
         resources :revisions, :only => [:index, :show, :revert] do
           put :revert, :on => :member
         end

data/test/functional/cms_admin/files_controller_test.rb

@@ -173,7 +173,7 @@ class CmsAdmin::FilesControllerTest < ActionController::TestCase
     assert_equal 0, file_one.position
     assert_equal 1, file_two.position
 
-    post :reorder, :site_id => cms_sites(:default), :cms_file => [file_two.id, file_one.id]
+    put :reorder, :site_id => cms_sites(:default), :cms_file => [file_two.id, file_one.id]
     assert_response :success
     file_one.reload
     file_two.reload

data/test/functional/cms_admin/layouts_controller_test.rb

@@ -111,7 +111,7 @@ class CmsAdmin::LayoutsControllerTest < ActionController::TestCase
     assert_equal 0, layout_one.position
     assert_equal 1, layout_two.position
 
-    post :reorder, :site_id => cms_sites(:default), :cms_layout => [layout_two.id, layout_one.id]
+    put :reorder, :site_id => cms_sites(:default), :cms_layout => [layout_two.id, layout_one.id]
     assert_response :success
     layout_one.reload
     layout_two.reload

data/test/functional/cms_admin/pages_controller_test.rb

@@ -406,7 +406,7 @@ class CmsAdmin::PagesControllerTest < ActionController::TestCase
     assert_equal 0, page_one.position
     assert_equal 1, page_two.position
 
-    post :reorder, :site_id => cms_sites(:default), :cms_page => [page_two.id, page_one.id]
+    put :reorder, :site_id => cms_sites(:default), :cms_page => [page_two.id, page_one.id]
     assert_response :success
     page_one.reload
     page_two.reload

data/test/unit/models/file_test.rb

@@ -31,4 +31,20 @@ class CmsFileTest < ActiveSupport::TestCase
       cms_sites(:default).files.create(:file => '')
     end
   end
+  
+  def test_image_mimetypes
+    assert_equal %w(image/gif image/jpeg image/pjpeg image/png image/svg+xml image/tiff),
+      Cms::File::IMAGE_MIMETYPES
+  end
+  
+  def test_images_scope
+    file = cms_files(:default)
+    assert_equal 'image/jpeg', file.file_content_type
+    assert_equal 1, Cms::File.images.count
+    assert_equal 0, Cms::File.not_images.count
+    
+    file.update_attribute(:file_content_type, 'application/pdf')
+    assert_equal 0, Cms::File.images.count
+    assert_equal 1, Cms::File.not_images.count
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: comfortable_mexican_sofa
 version: !ruby/object:Gem::Version
-  version: 1.5.4
+  version: 1.5.5
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-03 00:00:00.000000000Z
+date: 2011-10-04 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70223424480860 !ruby/object:Gem::Requirement
+  requirement: &70349048422300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70223424480860
+  version_requirements: *70349048422300
 - !ruby/object:Gem::Dependency
   name: active_link_to
-  requirement: &70223424480280 !ruby/object:Gem::Requirement
+  requirement: &70349048421660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70223424480280
+  version_requirements: *70349048421660
 - !ruby/object:Gem::Dependency
   name: paperclip
-  requirement: &70223424479600 !ruby/object:Gem::Requirement
+  requirement: &70349048421060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,7 +44,7 @@ dependencies:
         version: 2.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *70223424479600
+  version_requirements: *70349048421060
 description: ''
 email: oleg@theworkinggroup.ca
 executables: []
@@ -358,7 +358,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1060939018448966854
+      hash: 3379896773245428729
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: