From 72c1ac9454e47b4de045cf90eb014f36391bb0ee Mon Sep 17 00:00:00 2001
From: did <didier@nocoffee.fr>
Date: Fri, 8 Jul 2011 15:03:48 +0200
Subject: [PATCH] solve minor bugs

---
 lib/locomotive/middlewares/cache.rb      | 2 +-
 lib/locomotive/version.rb                | 2 +-
 lib/tasks/locomotive.rake                | 8 ++++++++
 public/javascripts/admin/application.js  | 2 +-
 public/stylesheets/admin/application.css | 4 ++--
 5 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/lib/locomotive/middlewares/cache.rb b/lib/locomotive/middlewares/cache.rb
index b82e197c..3104ea95 100644
--- a/lib/locomotive/middlewares/cache.rb
+++ b/lib/locomotive/middlewares/cache.rb
@@ -7,7 +7,7 @@ module Locomotive
       def initialize(app, opts = {}, &block)
         url_format = Locomotive::Dragonfly.app.configuration[:url_format]
 
-        base_format = url_format.split('/:').first
+        base_format = url_format.split('/:').first rescue '/images/dynamic'
 
         @regexp = %r{^#{base_format}/}
         @app = app
diff --git a/lib/locomotive/version.rb b/lib/locomotive/version.rb
index 80fca816..b901c601 100644
--- a/lib/locomotive/version.rb
+++ b/lib/locomotive/version.rb
@@ -1,3 +1,3 @@
 module Locomotive #:nodoc
-  VERSION = "1.0.0.beta.4"
+  VERSION = "1.0.0.rc1"
 end
diff --git a/lib/tasks/locomotive.rake b/lib/tasks/locomotive.rake
index bf4224ab..b7af19af 100644
--- a/lib/tasks/locomotive.rake
+++ b/lib/tasks/locomotive.rake
@@ -55,6 +55,14 @@ namespace :locomotive do
       end
     end
 
+    desc "Index page is sometimes after the 404 error page. Fix this"
+    task :place_index_before_404 => :environment do
+      Site.all.each do |site|
+        site.pages.root.first.update_attribute :position, 0
+        site.pages.not_found.first.update_attribute :position, 1
+      end
+    end
+
     desc 'Remove asset collections and convert them into content types'
     task :remove_asset_collections => :environment do
       puts "Processing #{AssetCollection.count} asset collection(s)..."
diff --git a/public/javascripts/admin/application.js b/public/javascripts/admin/application.js
index ff77696a..cba0d9d0 100644
--- a/public/javascripts/admin/application.js
+++ b/public/javascripts/admin/application.js
@@ -127,7 +127,7 @@ $(document).ready(function() {
     var link    = $('#sites-picker-link');
     var picker  = $('#sites-picker');
 
-    if (picker.empty()) return;
+    if (picker.size() == 0) return;
 
     var left    = link.position().left + link.parent().position().left - (picker.width() - link.width());
     picker.css('left', left);
diff --git a/public/stylesheets/admin/application.css b/public/stylesheets/admin/application.css
index 49a7447f..0aba3695 100644
--- a/public/stylesheets/admin/application.css
+++ b/public/stylesheets/admin/application.css
@@ -190,12 +190,12 @@ ul.theme-assets li.hidden strong a { font-style: italic; color: #8B8D9A; font-we
 
 #pages-list li.hidden strong a { font-style: italic; font-weight: normal; }
 
-#pages-list ul.folder li.templatized strong a {
+#pages-list ul.folder li.templatized > strong a {
   padding-right: 24px;
   background: transparent url(/images/admin/list/icons/template.png) no-repeat right 3px;
 }
 
-#pages-list ul.folder li.redirect strong a {
+#pages-list ul.folder li.redirect > strong a {
   padding-right: 24px;
   background: transparent url(/images/admin/list/icons/redirect.png) no-repeat right 2px;
 }