imagine_cms 3.0.21 → 3.0.22

data/app/controllers/management/cms_controller.rb

@@ -958,41 +958,22 @@ class Management::CmsController < Management::ApplicationController # :nodoc:
       return
     end
     
-    FileUtils.rm_rf(temp_dir)
-    Dir.mkdir(temp_dir)
-    
     # create blank captions.yml if it doesn't already exist
     create_captions_file(@pg.id)
     
     original_captions = YAML.load_file(File.join(gallery_dir, 'captions.yml')).to_a
-    captions = []
-    captions << original_captions[0]
+    new_captions = [ original_captions[0] ]
+    
+    Dir.glob("#{gallery_dir}/**/*.jpg").each { |img| FileUtils.touch(img); FileUtils.mv(img, img + '.tmp') }
     
     sorted_images.each_with_index do |img, i|
-      localfile = File.join(gallery_dir, img)
-      thumbfile = File.join(gallery_dir, img.split('.')[0] + '-thumb.jpg')
-      
-      temp_localfile = File.join(temp_dir, (i + 1).to_s + '.jpg')
-      temp_thumbfile = File.join(temp_dir, (i + 1).to_s + '-thumb.jpg')
-      
-      begin ; FileUtils.cp(localfile, temp_localfile) ; rescue ; end
-      begin ; FileUtils.cp(thumbfile, temp_thumbfile) ; rescue ; end
-      
-      captions[i + 1] = original_captions[img.split('.')[0].to_i] || ''
+      FileUtils.mv(File.join(gallery_dir, "#{img.to_i}.jpg.tmp"), File.join(gallery_dir, "#{i+1}.jpg"))
+      FileUtils.mv(File.join(gallery_dir, "#{img.to_i}-thumb.jpg.tmp"), File.join(gallery_dir, "#{i+1}-thumb.jpg"))
+      FileUtils.mv(File.join(gallery_dir, 'management', "#{img.to_i}.jpg.tmp"), File.join(gallery_dir, 'management', "#{i+1}.jpg"))
+      new_captions << original_captions[img.to_i] || ''
     end
     
-    File.open(File.join(gallery_dir, 'captions.yml'), 'w') { |f| YAML.dump(captions, f) }
-    
-    images = Dir.glob("#{gallery_dir}/*.{jpg,jpeg,png,gif}")
-    temp_images = Dir.glob("#{temp_dir}/*.{jpg,jpeg,png,gif}")
-    
-    images.each { |img| File.delete(img) }
-    temp_images.each { |img| FileUtils.cp(img, File.join(gallery_dir, File.basename(img))) }
-    
-    FileUtils.rm_rf(File.join(gallery_dir, 'management'))
-    create_preview_images(:force => 1)
-    
-    FileUtils.rm_rf(temp_dir)
+    File.open(File.join(gallery_dir, 'captions.yml'), 'w') { |f| YAML.dump(new_captions, f) }
     session[:gallery_images_sorted] = nil
     
     redirect_to :action => 'gallery_management', :id => @pg, :gallery_id => params[:gallery_id]

data/app/helpers/cms_application_helper.rb

@@ -548,8 +548,8 @@ module CmsApplicationHelper
     temp.gsub!(/<#\s*tags_as_css_classes\s*#>/, page.tags_as_css_classes)
     
     # use full date/time format for created_on and updated_on
-    temp.gsub!(/<#\s*created_on\s*#>/, "#{page.created_on.getlocal.strftime('%a')} #{date_to_str(page.created_on)} #{time_to_str(page.created_on)}") if page.created_on
-    temp.gsub!(/<#\s*updated_on\s*#>/, "#{page.updated_on.getlocal.strftime('%a')} #{date_to_str(page.updated_on)} #{time_to_str(page.updated_on)}") if page.updated_on
+    temp.gsub!(/<#\s*created_on\s*#>/, "#{page.created_on.strftime('%a')} #{date_to_str(page.created_on)} #{time_to_str(page.created_on)}") if page.created_on
+    temp.gsub!(/<#\s*updated_on\s*#>/, "#{page.updated_on.strftime('%a')} #{date_to_str(page.updated_on)} #{time_to_str(page.updated_on)}") if page.updated_on
     
     # handle any custom substitutions
     temp = substitute_placeholders_custom(temp, page)

data/app/views/management/cms/_gallery_setup.html.erb

@@ -6,7 +6,7 @@
   <%- @thumbs.each_with_index do |thumb, index| -%>
   <table id="thumb_<%= File.basename(thumb, File.extname(thumb)).to_i %>" border="0" cellpadding="0" cellspacing="2" style="width: 90px; height: 90px; float: left;">
     <tr height="80">
-      <td align="center"><%= image_tag '/' + thumb %></td>
+      <td align="center"><%= image_tag "/#{thumb}?#{File.mtime(File.join(Rails.root, 'public', thumb)).to_i}" %></td>
     </tr>
   </table>
   <%- end -%>

data/app/views/management/cms/_image.html.erb

@@ -1,3 +1,6 @@
-<%= link_to_remote image_tag("/assets/content/#{path}/#{gallery_id}/management/#{image}.jpg", :size => '90x90'),
+<%-
+  thumb = "assets/content/#{path}/#{gallery_id}/management/#{image}.jpg"
+-%>
+<%= link_to_remote image_tag("/#{thumb}?#{File.mtime(File.join(Rails.root, 'public', thumb)).to_i}", :size => '90x90'),
                    :url => { :action => 'image_details', :id => id, :path => path, :gallery_id => gallery_id, :image => image.to_s + '.jpg' },
                    :update => 'gallery_window' %>

data/app/views/management/cms/_image_draggable.html.erb

@@ -1,4 +1,7 @@
-<%- image = image_draggable -%>
+<%-
+  image = image_draggable
+  thumb = "assets/content/#{path}/#{gallery_id}/management/#{image}.jpg"
+-%>
 <div id="image_<%= image %>.jpg" style="float: left; cursor: move;">
-  <%= image_tag("/assets/content/#{path}/#{gallery_id}/management/#{image}.jpg", :size => '90x90') %>
+  <%= image_tag("/#{thumb}?#{File.mtime(File.join(Rails.root, 'public', thumb)).to_i}", :size => '90x90') %>
 </div>

data/lib/imagine_cms/version.rb

@@ -1,3 +1,3 @@
 module ImagineCms
-  VERSION = "3.0.21"
+  VERSION = "3.0.22"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: imagine_cms
 version: !ruby/object:Gem::Version
-  version: 3.0.21
+  version: 3.0.22
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-24 00:00:00.000000000 Z
+date: 2013-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails