From a86dd6ddf18adf54cbbcc0d39e4c5175a2a90b83 Mon Sep 17 00:00:00 2001 From: Felix Niklas Date: Wed, 10 Jun 2015 12:49:57 +0200 Subject: [PATCH] fix task error icon --- .../javascripts/app/controllers/ticket_zoom.js.coffee | 6 +++--- .../javascripts/app/views/generic/error/generic.jst.eco | 2 +- .../javascripts/app/views/generic/error/not_found.jst.eco | 2 +- .../app/views/generic/error/unauthorized.jst.eco | 2 +- app/assets/stylesheets/zammad.css.scss | 7 +++++++ 5 files changed, 13 insertions(+), 6 deletions(-) diff --git a/app/assets/javascripts/app/controllers/ticket_zoom.js.coffee b/app/assets/javascripts/app/controllers/ticket_zoom.js.coffee index 78c9c4614..02b78ed68 100644 --- a/app/assets/javascripts/app/controllers/ticket_zoom.js.coffee +++ b/app/assets/javascripts/app/controllers/ticket_zoom.js.coffee @@ -168,15 +168,15 @@ class App.TicketZoom extends App.Controller # show error message if status is 401 || statusText is 'Unauthorized' @taskHead = '» ' + App.i18n.translateInline('Unauthorized') + ' «' - @taskIconClass = 'error' + @taskIconClass = 'diagonal-cross' @html App.view('generic/error/unauthorized')( objectName: 'Ticket' ) else if status is 404 || statusText is 'Not Found' @taskHead = '» ' + App.i18n.translateInline('Not Found') + ' «' - @taskIconClass = 'error' + @taskIconClass = 'diagonal-cross' @html App.view('generic/error/not_found')( objectName: 'Ticket' ) else @taskHead = '» ' + App.i18n.translateInline('Error') + ' «' - @taskIconClass = 'error' + @taskIconClass = 'diagonal-cross' if !detail detail = 'General communication error, maybe internet is not available!' 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 3ee886f7f..4ce46e3f0 100644 --- a/app/assets/javascripts/app/views/generic/error/generic.jst.eco +++ b/app/assets/javascripts/app/views/generic/error/generic.jst.eco @@ -1,4 +1,4 @@
- +

<%- @T('Status Code') %>: <%= @status %>. <%= @detail %>

\ 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 712731661..19f720785 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,4 @@
- +

<%- @T('Opps.. I\'m sorry, but I can\'t find this %s.', @objectName ) %>

\ 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 bfb0c9e21..3ad3a7033 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,4 @@
- +

<%- @T('Opps.. I\'m sorry, but you have insufficient rights to open this %s.', @objectName ) %>

\ No newline at end of file diff --git a/app/assets/stylesheets/zammad.css.scss b/app/assets/stylesheets/zammad.css.scss index 0d1fe26a3..226cdeb19 100644 --- a/app/assets/stylesheets/zammad.css.scss +++ b/app/assets/stylesheets/zammad.css.scss @@ -1808,6 +1808,7 @@ footer { align-items: center; justify-content: center; position: relative; + width: 16px; } .nav-tab-icon .icon { @@ -1816,6 +1817,12 @@ footer { fill: #808080; } + .nav-tab-icon .icon-diagonal-cross { + fill: #F35910; + width: 12px; + height: 12px; + } + .nav-tab-icon .modified-inner-circle { position: absolute; left: 0;