summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorazul <azul@leap.se>2014-05-22 14:48:40 +0200
committerazul <azul@leap.se>2014-05-22 14:48:40 +0200
commit0c995deeb434237aa71e3a45f9f5a51f7c79116a (patch)
treed2988d37c9d3bdb02d9e0b36eb1bc61ca0782f1f /app
parentb9174fdc9d9bd403d9a16650bafc4715e3dbf2d4 (diff)
parentb298cea527f74f682d24defee360e0f45f47d125 (diff)
Merge pull request #162 from azul/feature/3295-custom-error-pages
Feature/3295 custom error pages
Diffstat (limited to 'app')
-rw-r--r--app/controllers/errors_controller.rb10
-rw-r--r--app/views/errors/not_found.html.haml7
-rw-r--r--app/views/errors/server_error.html.haml7
3 files changed, 24 insertions, 0 deletions
diff --git a/app/controllers/errors_controller.rb b/app/controllers/errors_controller.rb
new file mode 100644
index 0000000..6c659e6
--- /dev/null
+++ b/app/controllers/errors_controller.rb
@@ -0,0 +1,10 @@
+# We render http errors ourselves so we can customize them
+class ErrorsController < ApplicationController
+ # 404
+ def not_found
+ end
+
+ # 500
+ def server_error
+ end
+end
diff --git a/app/views/errors/not_found.html.haml b/app/views/errors/not_found.html.haml
new file mode 100644
index 0000000..75cb889
--- /dev/null
+++ b/app/views/errors/not_found.html.haml
@@ -0,0 +1,7 @@
+.hero-unit
+ %h1=t :not_found_title
+ %h2=t :not_found_subtitle
+ %p.lead=t :not_found_lead
+ %a.btn.btn-primary.btn-large{href:'/'}
+ %i.icon-home.icon-white
+ =t :home
diff --git a/app/views/errors/server_error.html.haml b/app/views/errors/server_error.html.haml
new file mode 100644
index 0000000..68baf20
--- /dev/null
+++ b/app/views/errors/server_error.html.haml
@@ -0,0 +1,7 @@
+.hero-unit
+ %h1=t :server_error_title
+ %h2=t :server_error_subtitle
+ %p.lead=t :server_error_lead
+ %a.btn.btn-primary.btn-large{href:'/'}
+ %i.icon-home.icon-white
+ =t :home