locomotive_cms 0.0.4.beta9 → 0.0.4.beta10

data/app/controllers/admin/theme_assets_controller.rb

@@ -16,7 +16,7 @@ module Admin
       @js_and_css_assets = (@assets[:javascripts] || []) + (@assets[:stylesheets] || [])
 
       if request.xhr?
-        @images = @assets[:images]
+        @images = @assets[:images] || []
         render :action => 'images', :layout => false and return
       else
         @snippets = current_site.snippets.order_by([[:name, :asc]]).all.to_a

data/app/uploaders/theme_uploader.rb

@@ -1,7 +1,11 @@
 class ThemeUploader < ::CarrierWave::Uploader::Base
 
   def store_dir
-    "sites/#{model.id}/tmp/themes"
+    if Locomotive.config.delayed_job
+      "sites/#{model.id}/tmp/themes"
+    else
+      "#{Rails.root}/tmp/themes"
+    end
   end
 
   def cache_dir

data/config/assets.yml

@@ -1,8 +1,8 @@
 embed_assets: off
 
 s3_bucket: <%= ENV['S3_BUCKET'] %>
-s3_access_key_id: <%= ENV['S3_ACCESS_KEY_ID'] %>
-s3_secret_access_key: <%= ENV['S3_SECRET_ACCESS_KEY'] %>
+s3_access_key_id: <%= ENV['S3_KEY_ID'] %>
+s3_secret_access_key: <%= ENV['S3_SECRET_KEY'] %>
 
 javascripts:
   box:

data/lib/locomotive/version.rb

@@ -1,3 +1,3 @@
 module Locomotive #:nodoc
-  VERSION = "0.0.4.beta9"
+  VERSION = "0.0.4.beta10"
 end

data/public/stylesheets/admin/application.css

@@ -27,7 +27,7 @@ div.notice p {
 
 p.no-items {
   padding: 15px 0px;
-  background: transparent url(/images/admin/list/none.png) no-repeat 0 0;
+  background: transparent url(/images/admin/list/none.png) no-repeat center 0;
   text-align: center;
   color: #9d8963 !important;
   font-size: 1.1em !important;

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: locomotive_cms
 version: !ruby/object:Gem::Version 
-  hash: -1848230059
+  hash: -1967355474
   prerelease: true
   segments: 
   - 0
   - 0
   - 4
-  - beta9
-  version: 0.0.4.beta9
+  - beta10
+  version: 0.0.4.beta10
 platform: ruby
 authors: 
 - Didier Lafforgue