From 703ee373ce3cfadf7e3251bc559cbc83614c2576 Mon Sep 17 00:00:00 2001 From: Felix Niklas Date: Fri, 22 May 2015 09:31:42 +0200 Subject: [PATCH] add fullscreenMessage error icon --- .../javascripts/app/views/generic/error/generic.jst.eco | 5 +++-- .../javascripts/app/views/generic/error/not_found.jst.eco | 3 ++- .../javascripts/app/views/generic/error/unauthorized.jst.eco | 3 ++- app/assets/javascripts/app/views/layout_ref/error.jst.eco | 2 +- .../app/views/layout_ref/insufficient_rights.jst.eco | 3 ++- app/assets/stylesheets/svg-dimensions.css | 2 +- app/assets/stylesheets/zammad.css.scss | 3 ++- public/assets/images/icons.svg | 2 +- 8 files changed, 14 insertions(+), 9 deletions(-) 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 c07a4dc06..7811d745d 100644 --- a/app/assets/javascripts/app/views/generic/error/generic.jst.eco +++ b/app/assets/javascripts/app/views/generic/error/generic.jst.eco @@ -1,3 +1,4 @@ -
-

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

+
+ +

<%- @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 4353b61c7..6d059a1e3 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,3 +1,4 @@
-

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

+ +

<%- @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 094403ee1..47eb706f9 100644 --- a/app/assets/javascripts/app/views/generic/error/unauthorized.jst.eco +++ b/app/assets/javascripts/app/views/generic/error/unauthorized.jst.eco @@ -1,3 +1,4 @@
-

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

+ +

<%- @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/javascripts/app/views/layout_ref/error.jst.eco b/app/assets/javascripts/app/views/layout_ref/error.jst.eco index 366a97e4d..e08b39c5c 100644 --- a/app/assets/javascripts/app/views/layout_ref/error.jst.eco +++ b/app/assets/javascripts/app/views/layout_ref/error.jst.eco @@ -1,4 +1,4 @@ -
+

<%- @T('Status Code') %>: 1234. Check your internet connection...

\ No newline at end of file diff --git a/app/assets/javascripts/app/views/layout_ref/insufficient_rights.jst.eco b/app/assets/javascripts/app/views/layout_ref/insufficient_rights.jst.eco index 49d6fba85..25e7ae801 100644 --- a/app/assets/javascripts/app/views/layout_ref/insufficient_rights.jst.eco +++ b/app/assets/javascripts/app/views/layout_ref/insufficient_rights.jst.eco @@ -1,3 +1,4 @@
-

Opps.. I'm sorry, but you have insufficient rights to open this ticket.

+ +

Opps.. I'm sorry, but you have insufficient rights to open this ticket.

\ No newline at end of file diff --git a/app/assets/stylesheets/svg-dimensions.css b/app/assets/stylesheets/svg-dimensions.css index 3096e86b5..c3e9aa81e 100644 --- a/app/assets/stylesheets/svg-dimensions.css +++ b/app/assets/stylesheets/svg-dimensions.css @@ -1 +1 @@ -.icon-arrow-down { width: 13px; height: 7px; } .icon-arrow-left { width: 7px; height: 13px; } .icon-arrow-right { width: 7px; height: 13px; } .icon-arrow-up { width: 13px; height: 7px; } .icon-clock { width: 16px; height: 16px; } .icon-close { width: 13px; height: 13px; } .icon-cloud { width: 16px; height: 16px; } .icon-cog { width: 20px; height: 20px; } .icon-dashboard { width: 24px; height: 24px; } .icon-diagonal-cross { width: 13px; height: 13px; } .icon-email { width: 17px; height: 17px; } .icon-facebook { width: 17px; height: 17px; } .icon-group { width: 24px; height: 24px; } .icon-important { width: 16px; height: 16px; } .icon-in-process { width: 64px; height: 64px; } .icon-list { width: 16px; height: 16px; } .icon-lock-open { width: 16px; height: 16px; } .icon-lock { width: 16px; height: 16px; } .icon-logo { width: 42px; height: 36px; } .icon-long-arrow-right { width: 11px; height: 11px; } .icon-magnifier { width: 15px; height: 15px; } .icon-marker { width: 17px; height: 19px; } .icon-message { width: 24px; height: 24px; } .icon-mood-bad { width: 60px; height: 59px; } .icon-mood-good { width: 60px; height: 59px; } .icon-mood-ok { width: 60px; height: 59px; } .icon-mood-super-bad { width: 60px; height: 59px; } .icon-mood-supergood { width: 60px; height: 59px; } .icon-note { width: 17px; height: 16px; } .icon-one-ticket { width: 48px; height: 10px; } .icon-organization { width: 16px; height: 16px; } .icon-outbound-calls { width: 17px; height: 17px; } .icon-overviews { width: 24px; height: 24px; } .icon-package { width: 16px; height: 16px; } .icon-pen { width: 16px; height: 16px; } .icon-person { width: 24px; height: 24px; } .icon-phone { width: 17px; height: 17px; } .icon-plus { width: 20px; height: 20px; } .icon-priority-modified-inner-circle { width: 16px; height: 16px; } .icon-priority-modified-outer-circle { width: 16px; height: 16px; } .icon-priority { width: 16px; height: 16px; } .icon-received-calls { width: 17px; height: 17px; } .icon-reopening { width: 68px; height: 47px; } .icon-reply-all { width: 16px; height: 16px; } .icon-reply { width: 16px; height: 16px; } .icon-signout { width: 15px; height: 19px; } .icon-split { width: 16px; height: 16px; } .icon-stopwatch { width: 77px; height: 83px; } .icon-switchView { width: 19px; height: 18px; } .icon-team { width: 16px; height: 16px; } .icon-templates { width: 24px; height: 24px; } .icon-tools { width: 24px; height: 24px; } .icon-total-tickets { width: 48px; height: 83px; } .icon-twitter { width: 17px; height: 17px; } .icon-user { width: 16px; height: 16px; } \ No newline at end of file +.icon-arrow-down { width: 13px; height: 7px; } .icon-arrow-left { width: 7px; height: 13px; } .icon-arrow-right { width: 7px; height: 13px; } .icon-arrow-up { width: 13px; height: 7px; } .icon-clock { width: 16px; height: 16px; } .icon-close { width: 13px; height: 13px; } .icon-cloud { width: 16px; height: 16px; } .icon-cog { width: 20px; height: 20px; } .icon-dashboard { width: 24px; height: 24px; } .icon-diagonal-cross { width: 13px; height: 13px; } .icon-email { width: 17px; height: 17px; } .icon-facebook { width: 17px; height: 17px; } .icon-group { width: 24px; height: 24px; } .icon-important { width: 16px; height: 16px; } .icon-in-process { width: 64px; height: 64px; } .icon-list { width: 16px; height: 16px; } .icon-lock-open { width: 16px; height: 16px; } .icon-lock { width: 16px; height: 16px; } .icon-logo { width: 42px; height: 36px; } .icon-long-arrow-right { width: 11px; height: 11px; } .icon-magnifier { width: 15px; height: 15px; } .icon-mail { width: 17px; height: 17px; } .icon-marker { width: 17px; height: 19px; } .icon-message { width: 24px; height: 24px; } .icon-mood-bad { width: 60px; height: 59px; } .icon-mood-good { width: 60px; height: 59px; } .icon-mood-happy { width: 60px; height: 59px; } .icon-mood-ok { width: 60px; height: 59px; } .icon-mood-super-bad { width: 60px; height: 59px; } .icon-mood-super-happy { width: 60px; height: 59px; } .icon-mood-supergood { width: 60px; height: 59px; } .icon-note { width: 17px; height: 16px; } .icon-one-ticket { width: 48px; height: 10px; } .icon-organization { width: 16px; height: 16px; } .icon-outbound-calls { width: 17px; height: 17px; } .icon-overviews { width: 24px; height: 24px; } .icon-package { width: 16px; height: 16px; } .icon-pen { width: 16px; height: 16px; } .icon-person { width: 24px; height: 24px; } .icon-phone { width: 17px; height: 17px; } .icon-plus { width: 20px; height: 20px; } .icon-priority-modified-inner-circle { width: 16px; height: 16px; } .icon-priority-modified-outer-circle { width: 16px; height: 16px; } .icon-priority { width: 16px; height: 16px; } .icon-received-calls { width: 17px; height: 17px; } .icon-reopening { width: 68px; height: 47px; } .icon-reply-all { width: 16px; height: 16px; } .icon-reply { width: 16px; height: 16px; } .icon-signout { width: 15px; height: 19px; } .icon-split { width: 16px; height: 16px; } .icon-stopwatch { width: 77px; height: 83px; } .icon-switchView { width: 19px; height: 18px; } .icon-team { width: 16px; height: 16px; } .icon-templates { width: 24px; height: 24px; } .icon-tools { width: 24px; height: 24px; } .icon-total-tickets { width: 48px; height: 83px; } .icon-twitter { width: 17px; height: 17px; } .icon-user { width: 16px; height: 16px; } \ No newline at end of file diff --git a/app/assets/stylesheets/zammad.css.scss b/app/assets/stylesheets/zammad.css.scss index 78b40803a..4cb2825c5 100644 --- a/app/assets/stylesheets/zammad.css.scss +++ b/app/assets/stylesheets/zammad.css.scss @@ -867,9 +867,10 @@ textarea, display: flex; align-items: center; justify-content: center; + flex: 1; .icon { - margin: -5px 14px 0 0; + margin-right: 14px; fill: #F35910; } diff --git a/public/assets/images/icons.svg b/public/assets/images/icons.svg index 3d7f8b0c2..d1bb9b8c8 100644 --- a/public/assets/images/icons.svg +++ b/public/assets/images/icons.svg @@ -1 +1 @@ -arrow-downarrow-leftarrow-rightarrow-upclockclosecloudcogdashboarddiagonal-crossemailfacebookgroupimportantin-processlistlock-openlocklong-arrow-rightmagnifiermarkermessagemood-badmood-goodmood-okmood-super-badmood-supergoodnoteone-ticketorganizationoutbound-callsoverviewspackagepenpersonphonepluspriority-modified-inner-circlepriority-modified-outer-circlepriorityreceived-callsreopeningreply-allreplysignoutsplitstopwatchswitchViewteamtemplatestoolstotal-ticketstwitteruser \ No newline at end of file +arrow-downarrow-leftarrow-rightarrow-upclockclosecloudcogdashboarddiagonal-crossemailfacebookgroupimportantin-processlistlock-openlocklong-arrow-rightmagnifiermailmarkermessagemood-badmood-goodmood-happymood-okmood-super-badmood-super-happymood-supergoodnoteone-ticketorganizationoutbound-callsoverviewspackagepenpersonphonepluspriority-modified-inner-circlepriority-modified-outer-circlepriorityreceived-callsreopeningreply-allreplysignoutsplitstopwatchswitchViewteamtemplatestoolstotal-ticketstwitteruser \ No newline at end of file