github-migration/engine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

solve minor bugs

Browse Source
This commit is contained in:
did 2011-07-08 15:03:48 +02:00
parent c426b83871
commit 72c1ac9454
5 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/locomotive/middlewares/cache.rb
View File

@ -7,7 +7,7 @@ module Locomotive
def initialize(app, opts = {}, &block) def initialize(app, opts = {}, &block)
url_format = Locomotive::Dragonfly.app.configuration[:url_format] 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}/} @regexp = %r{^#{base_format}/}
@app = app @app = app

2
lib/locomotive/version.rb
View File

@ -1,3 +1,3 @@
module Locomotive #:nodoc module Locomotive #:nodoc
VERSION = "1.0.0.beta.4" VERSION = "1.0.0.rc1"
end end

8
lib/tasks/locomotive.rake
View File

@ -55,6 +55,14 @@ namespace :locomotive do
end end
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' desc 'Remove asset collections and convert them into content types'
task :remove_asset_collections => :environment do task :remove_asset_collections => :environment do
puts "Processing #{AssetCollection.count} asset collection(s)..." puts "Processing #{AssetCollection.count} asset collection(s)..."

2
public/javascripts/admin/application.js
View File

@ -127,7 +127,7 @@ $(document).ready(function() {
var link = $('#sites-picker-link'); var link = $('#sites-picker-link');
var picker = $('#sites-picker'); 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()); var left = link.position().left + link.parent().position().left - (picker.width() - link.width());
picker.css('left', left); picker.css('left', left);

4
public/stylesheets/admin/application.css
View File

@ -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 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; padding-right: 24px;
background: transparent url(/images/admin/list/icons/template.png) no-repeat right 3px; 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; padding-right: 24px;
background: transparent url(/images/admin/list/icons/redirect.png) no-repeat right 2px; background: transparent url(/images/admin/list/icons/redirect.png) no-repeat right 2px;
} }