imagine_cms 3.0.7 → 3.0.8

data/app/assets/stylesheets/cropper.css

@@ -52,7 +52,7 @@
 	position: absolute;
 	width: 100%;
 	height: 1px;
-	background: transparent url(/images/cropper/marqueeHoriz.gif) repeat-x 0 0;
+	background: transparent url(/assets/cropper/marqueeHoriz.gif) repeat-x 0 0;
 	z-index: 3;
 }
 
@@ -60,7 +60,7 @@
 	position: absolute;
 	height: 100%;
 	width: 1px;
-	background: transparent url(/images/cropper/marqueeVert.gif) repeat-y 0 0;
+	background: transparent url(/assets/cropper/marqueeVert.gif) repeat-y 0 0;
 	z-index: 3;
 }
 

data/app/controllers/management/cms_controller.rb

@@ -1238,6 +1238,7 @@ class Management::CmsController < Management::ApplicationController # :nodoc:
     original_filename = data.original_filename.strip.gsub(/[\?\s\/\:\\]+/, '-').gsub(/^-/, '').gsub(/-$/, '')
     localfile = File.join(target_dir, original_filename)
     FileUtils.cp(data.tempfile, localfile)
+    File.chmod(0644, localfile)
     
     finish_upload_status "'#{File.basename(localfile)}'"
   end
@@ -1247,8 +1248,9 @@ class Management::CmsController < Management::ApplicationController # :nodoc:
     localfile = File.join(Rails.root, 'public', 'assets', 'content', @pg.path, File.basename(params[:filename]))
     
     @filename = localfile + "?#{File.mtime(localfile).to_i}"
-    upload_to_s3(localfile, @pg, ImagineCmsConfig['amazon_s3'][Rails.env]['file_bucket'],
-                                 ImagineCmsConfig['amazon_s3']['file_prefix'])
+    bucket = ImagineCmsConfig['amazon_s3'][Rails.env]['file_bucket'] rescue nil
+    prefix = ImagineCmsConfig['amazon_s3']['file_prefix'] rescue nil
+    upload_to_s3(localfile, @pg, bucket, prefix)
     
     render :partial => 'create_file_link'
   end

data/app/helpers/cms_application_helper.rb

@@ -557,8 +557,9 @@ module CmsApplicationHelper
       begin
         val = page.send(attr.downcase.underscore)
         case val.class.to_s
-        when 'String'
-          val
+        when 'ActiveSupport::TimeWithZone'
+          val = val.utc
+          val = val.strftime("(%a) ") + val.strftime("%B ") + val.day.to_s + val.strftime(", %Y")
         when 'Time'
           val = val.strftime("(%a) ") + val.strftime("%B ") + val.day.to_s + val.strftime(", %Y")
         when 'NilClass'

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

@@ -26,7 +26,7 @@
           all_images.each { |img| images << img unless File.basename(img).include?('thumb') }
     -%>
       <div id="<%= File.basename(gallery) %>" style="float: left; width: 130px; margin: 0 20px 20px 0; text-align: center;">
-        <%= link_to_remote image_tag(File.join('content', @pg.path, File.basename(gallery), 'management', 'preview.jpg')),
+        <%= link_to_remote image_tag(File.join('/images/content', @pg.path, File.basename(gallery), 'management', 'preview.jpg')),
                            :url => { :action => 'select_gallery', :id => @pg, :gallery_id => File.basename(gallery) },
                            :update => 'select_gallery_container' %><br/>
         <strong><%= File.basename(gallery).titleize %></strong><br/>

data/lib/extensions/action_controller.rb

@@ -97,7 +97,7 @@ module ActionControllerExtensions
           'Could not find snippet "' + name + '" in the database.'
         end
       when :photo_gallery
-        gallery_dir = File.join('images', 'content', @pg.path, File.basename(name))
+        gallery_dir = File.join('assets', 'content', @pg.path, File.basename(name))
         Dir.chdir(File.join(Rails.root, 'public'))
         all_images = Dir.glob("#{gallery_dir}/*.{jpg,jpeg,png,gif}")
         Dir.chdir(Rails.root)

data/lib/imagine_cms/version.rb

@@ -1,3 +1,3 @@
 module ImagineCms
-  VERSION = "3.0.7"
+  VERSION = "3.0.8"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: imagine_cms
 version: !ruby/object:Gem::Version
-  version: 3.0.7
+  version: 3.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-27 00:00:00.000000000 Z
+date: 2013-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails