comfortable_mexican_sofa 1.5.1 → 1.5.2

data/Gemfile

@@ -2,7 +2,7 @@ source 'http://rubygems.org'
 
 gem 'rails',          '>=3.0.0'
 gem 'active_link_to', '~>1.0.0'
-gem 'paperclip',      '~>2.4.2'
+gem 'paperclip',      '~>2.4.1'
 
 group :test do
   gem 'sqlite3'

data/VERSION

@@ -1 +1 @@
-1.5.1
+1.5.2

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

@@ -4,7 +4,7 @@
 = require comfortable_mexican_sofa/structure.css
 = require comfortable_mexican_sofa/form.css
 = require comfortable_mexican_sofa/content.css
-= require comfortable_mexican_sofa/widgets.css
 = require comfortable_mexican_sofa/codemirror.css
 = require comfortable_mexican_sofa/jquery_ui.css
+= require comfortable_mexican_sofa/widgets.css
 */

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

@@ -1,4 +1,7 @@
 /* -- jqueryIU ----------------------------------------------------------- */
+.ui-widget-content {
+  background: #f1f1f1;
+}
 .ui-timepicker-div .ui-widget-header{ margin-bottom: 8px; }
 .ui-timepicker-div dl{ text-align: left; }
 .ui-timepicker-div dl dt{ height: 25px; }

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

@@ -1,11 +1,12 @@
 <%= form.text_field :label %>
-<% if @file.new_record? %>
-  <%= form.file_field :file, :multiple => true %>
-<% else %>
-  <%= form.simple_field 'File', nil do %>
+<%= form.file_field :file, :multiple => @file.new_record? %>
+
+<% unless @file.new_record? %>
+  <%= form.simple_field t('.current_file'), nil do %>
     <%= link_to @file.file.url, @file.file.url, :target => '_blank' %>
   <% end %>
 <% end %>
+
 <%= form.text_area :description %>
 
 <%= render :partial => 'cms_admin/categories/form', :object => form %>

data/comfortable_mexican_sofa.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "comfortable_mexican_sofa"
-  s.version = "1.5.1"
+  s.version = "1.5.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Oleg Khabarov", "The Working Group Inc"]
@@ -317,16 +317,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.4.2"])
+      s.add_runtime_dependency(%q<paperclip>, ["~> 2.4.1"])
     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.4.2"])
+      s.add_dependency(%q<paperclip>, ["~> 2.4.1"])
     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.4.2"])
+    s.add_dependency(%q<paperclip>, ["~> 2.4.1"])
   end
 end
 

data/config/locales/en.yml

@@ -195,6 +195,7 @@ en:
       edit:
         title: Editing File
       form:
+        current_file: Current File
         create: Upload File
         update: Update File
       page_form:

data/config/locales/es.yml

@@ -195,6 +195,7 @@ es:
       edit:
         title: Editar Archivo
       form:
+        current_file: Archivo Actual
         create: Subir Archivo
         update: Actualizar Archivo
       page_form:

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: comfortable_mexican_sofa
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.5.2
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ date: 2011-09-29 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70107792060400 !ruby/object:Gem::Requirement
+  requirement: &70257515729580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70107792060400
+  version_requirements: *70257515729580
 - !ruby/object:Gem::Dependency
   name: active_link_to
-  requirement: &70107792059760 !ruby/object:Gem::Requirement
+  requirement: &70257515728680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,18 +33,18 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70107792059760
+  version_requirements: *70257515728680
 - !ruby/object:Gem::Dependency
   name: paperclip
-  requirement: &70107792058960 !ruby/object:Gem::Requirement
+  requirement: &70257515727860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.4.2
+        version: 2.4.1
   type: :runtime
   prerelease: false
-  version_requirements: *70107792058960
+  version_requirements: *70257515727860
 description: ''
 email: oleg@theworkinggroup.ca
 executables: []
@@ -355,7 +355,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4124442329296358220
+      hash: -679581346244711645
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: