diff --git a/app/controllers/pageflow/application_controller.rb b/app/controllers/pageflow/application_controller.rb
index 33b893cbf9..400ca25efa 100644
--- a/app/controllers/pageflow/application_controller.rb
+++ b/app/controllers/pageflow/application_controller.rb
@@ -21,8 +21,14 @@ class ApplicationController < ActionController::Base
rescue_from ActiveRecord::RecordNotFound do
respond_to do |format|
- format.html { render :file => Rails.root.join('public/404.html'), :status => :not_found }
- format.any(:json, :css) { head :not_found }
+ format.html do
+ begin
+ render file: Rails.public_path.join('pageflow', 'error_pages', '404.html'), status: :not_found
+ rescue ActionView::MissingTemplate
+ head :not_found
+ end
+ end
+ format.any { head :not_found }
end
end
diff --git a/app/controllers/pageflow/entries_controller.rb b/app/controllers/pageflow/entries_controller.rb
index eec03b8865..96f37abb5b 100644
--- a/app/controllers/pageflow/entries_controller.rb
+++ b/app/controllers/pageflow/entries_controller.rb
@@ -41,9 +41,6 @@ def show
@entry = DraftEntry.find(params[:id])
authorize!(:show, @entry.to_model)
end
- format.any do
- render(:file => 'public/pageflow/404.html', :status => :not_found)
- end
end
end
diff --git a/lib/generators/pageflow/error_pages/error_pages_generator.rb b/lib/generators/pageflow/error_pages/error_pages_generator.rb
new file mode 100644
index 0000000000..6a97e4d178
--- /dev/null
+++ b/lib/generators/pageflow/error_pages/error_pages_generator.rb
@@ -0,0 +1,27 @@
+require 'rails/generators'
+
+module Pageflow
+ module Generators
+ class ErrorPagesGenerator < Rails::Generators::Base
+ desc 'Generate error pages.'
+
+ source_root File.expand_path('../templates', __FILE__)
+
+ def create_not_found
+ copy_file '404.html', 'public/pageflow/error_pages/404.html'
+ end
+
+ def copy_fonts
+ directory 'fonts', 'public/pageflow/error_pages/fonts'
+ end
+
+ def copy_stylesheets
+ directory 'stylesheets', 'public/pageflow/error_pages/stylesheets'
+ end
+
+ def copy_images
+ directory 'images', 'public/pageflow/error_pages/images'
+ end
+ end
+ end
+end
diff --git a/lib/generators/pageflow/error_pages/templates/404.html b/lib/generators/pageflow/error_pages/templates/404.html
new file mode 100644
index 0000000000..eac9f38384
--- /dev/null
+++ b/lib/generators/pageflow/error_pages/templates/404.html
@@ -0,0 +1,15 @@
+
+
+
+
+ Not Found (404)
+
+
+
+
+
+
Not Found
+
The page you've requested cannot be found.
+
-
Beitrag nicht gefunden
-
Die Seite wurde entweder verschoben oder es befindet sich ein Tippfehler in der URL.
-
-
Interner Fehler
-
Das hätte nicht passieren dürfen: Es ist ein Fehler aufgetreten. Wir wurden darüber bereits automatisch informiert und geloben Besserung.
-