From c92e4c0f9a3c2c65ee1e65b41406d4c0eff043f7 Mon Sep 17 00:00:00 2001
From: Martin Edenhofer <me@edenhofer.de>
Date: Sat, 17 Jan 2015 13:07:51 +0100
Subject: [PATCH] Improved style of error messages.

---
 .../javascripts/app/controllers/ticket_zoom.js.coffee    | 9 +++++----
 .../javascripts/app/views/generic/error/generic.jst.eco  | 4 ++--
 .../app/views/generic/error/not_found.jst.eco            | 5 ++---
 .../app/views/generic/error/unauthorized.jst.eco         | 5 ++---
 4 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/app/assets/javascripts/app/controllers/ticket_zoom.js.coffee b/app/assets/javascripts/app/controllers/ticket_zoom.js.coffee
index 2d61a9cbc..ce0a8bd97 100644
--- a/app/assets/javascripts/app/controllers/ticket_zoom.js.coffee
+++ b/app/assets/javascripts/app/controllers/ticket_zoom.js.coffee
@@ -119,10 +119,10 @@ class App.TicketZoom extends App.Controller
         # show error message
         if xhr.status is 401 || error is 'Unauthorized'
           @taskTitle = '» ' + App.i18n.translateInline('Unauthorized') + ' «'
-          @html App.view('generic/error/unauthorized')()
+          @html App.view('generic/error/unauthorized')( objectName: 'Ticket' )
         else if xhr.status is 404 || error is 'Not Found'
           @taskTitle = '» ' + App.i18n.translateInline('Not Found') + ' «'
-          @html App.view('generic/error/not_found')()
+          @html App.view('generic/error/not_found')( objectName: 'Ticket' )
         else
           @taskTitle = '» ' + App.i18n.translateInline('Error') + ' «'
           status     = xhr.status
@@ -130,8 +130,9 @@ class App.TicketZoom extends App.Controller
           if !status && !detail
             detail = 'General communication error, maybe internet is not available!'
           @html App.view('generic/error/generic')(
-            status: status
-            detail: detail
+            status:     status
+            detail:     detail
+            objectName: 'Ticket'
           )
 
         # update current task title
diff --git a/app/assets/javascripts/app/views/generic/error/generic.jst.eco b/app/assets/javascripts/app/views/generic/error/generic.jst.eco
index 2726085f4..746df4876 100644
--- a/app/assets/javascripts/app/views/generic/error/generic.jst.eco
+++ b/app/assets/javascripts/app/views/generic/error/generic.jst.eco
@@ -1,5 +1,5 @@
-<div class="main flex">
-  <h1><%- @T('Error') %></h1>
+<div class="flex fullscreenMessage">
+  <div class="error icon"></div><h2><%- @T('Opps.. I\'m sorry, something went wrong!' ) %></h2>
   <p><%- @T('Status Code') %>: <%= @status %></p>
   <p><%= @detail %></p>
 </div>
\ No newline at end of file
diff --git a/app/assets/javascripts/app/views/generic/error/not_found.jst.eco b/app/assets/javascripts/app/views/generic/error/not_found.jst.eco
index 8c2fb0c44..4353b61c7 100644
--- a/app/assets/javascripts/app/views/generic/error/not_found.jst.eco
+++ b/app/assets/javascripts/app/views/generic/error/not_found.jst.eco
@@ -1,4 +1,3 @@
-<div class="main flex">
-  <h1><%- @T('Not Found') %></h1>
-  <p><%- @T('Sorry, unable to find this ressource.') %></p>
+<div class="flex fullscreenMessage">
+  <div class="error icon"></div><h2><%- @T('Opps.. I\'m sorry, but I can\'t find this %s.', @objectName ) %></h2>
 </div>
\ No newline at end of file
diff --git a/app/assets/javascripts/app/views/generic/error/unauthorized.jst.eco b/app/assets/javascripts/app/views/generic/error/unauthorized.jst.eco
index d24fcb524..094403ee1 100644
--- a/app/assets/javascripts/app/views/generic/error/unauthorized.jst.eco
+++ b/app/assets/javascripts/app/views/generic/error/unauthorized.jst.eco
@@ -1,4 +1,3 @@
-<div class="main flex">
-  <h1><%- @T('Unauthorized') %></h1>
-  <p><%- @T('Sorry, you are not allowed to access this ressource.') %></p>
+<div class="flex fullscreenMessage">
+  <div class="error icon"></div><h2><%- @T('Opps.. I\'m sorry, but you have insufficient rights to open this %s.', @objectName ) %></h2>
 </div>
\ No newline at end of file