diff --git a/app/assets/javascripts/app/index.coffee b/app/assets/javascripts/app/index.coffee index 490d25d12..f7316faa4 100644 --- a/app/assets/javascripts/app/index.coffee +++ b/app/assets/javascripts/app/index.coffee @@ -215,7 +215,7 @@ class App extends Spine.Controller if escalation cssClass += ' escalation' humanTime = App.PrettyDate.humanTime(time, escalation) - "" + "" # define icon helper params.Icon = (name, className = '') -> diff --git a/app/assets/javascripts/app/views/layout_ref/communication_overview.jst.eco b/app/assets/javascripts/app/views/layout_ref/communication_overview.jst.eco index 2d61ef6cd..353bacc4b 100644 --- a/app/assets/javascripts/app/views/layout_ref/communication_overview.jst.eco +++ b/app/assets/javascripts/app/views/layout_ref/communication_overview.jst.eco @@ -37,7 +37,7 @@

Welcome to Zammad! We want to entertain you and your whole family!

- Ticket# 10001 - erstellte 11.07.2014 + Ticket# 10001 - erstellte 11.07.2014
@@ -102,7 +102,7 @@ The Zammad - +
@@ -140,7 +140,7 @@ The Zammad
- +
@@ -186,7 +186,7 @@ Grüße, Peter
- +
@@ -269,7 +269,7 @@ Oliver
- + diff --git a/app/assets/javascripts/app/views/layout_ref/merge_customer_view.jst.eco b/app/assets/javascripts/app/views/layout_ref/merge_customer_view.jst.eco index 9731720d1..a9c3c080d 100644 --- a/app/assets/javascripts/app/views/layout_ref/merge_customer_view.jst.eco +++ b/app/assets/javascripts/app/views/layout_ref/merge_customer_view.jst.eco @@ -90,7 +90,7 @@
- Ticket# 10001 - created 01/12/2015 + Ticket# 10001 - created 01/12/2015
@@ -199,7 +199,7 @@
set to internal reply split
- +
@@ -373,7 +373,7 @@
set to internal split
-
+
@@ -437,7 +437,7 @@
set to internal split
-
+ @@ -797,7 +797,7 @@
Noch mehr Tickets bitte -
+
01/20/2015
diff --git a/app/assets/javascripts/app/views/layout_ref/scheduler_modal.jst.eco b/app/assets/javascripts/app/views/layout_ref/scheduler_modal.jst.eco index 4d2e2b098..c094bc98e 100644 --- a/app/assets/javascripts/app/views/layout_ref/scheduler_modal.jst.eco +++ b/app/assets/javascripts/app/views/layout_ref/scheduler_modal.jst.eco @@ -340,7 +340,7 @@ Users - 01/12/2015 + 01/12/2015 @@ -359,7 +359,7 @@ Users - 5 days 3 hours ago + 5 days 3 hours ago diff --git a/app/assets/javascripts/app/views/layout_ref/sla_modal.jst.eco b/app/assets/javascripts/app/views/layout_ref/sla_modal.jst.eco index 573f42233..096452a03 100644 --- a/app/assets/javascripts/app/views/layout_ref/sla_modal.jst.eco +++ b/app/assets/javascripts/app/views/layout_ref/sla_modal.jst.eco @@ -92,7 +92,7 @@ Users - 01/12/2015 + 01/12/2015 @@ -111,7 +111,7 @@ Users - 01/20/2015 + 01/20/2015 @@ -130,7 +130,7 @@ Users - 05/04/2015 + 05/04/2015 @@ -149,7 +149,7 @@ Users - 5 days 21 hours ago + 5 days 21 hours ago @@ -168,7 +168,7 @@ Users - 5 days 3 hours ago + 5 days 3 hours ago diff --git a/app/assets/javascripts/app/views/layout_ref/ticket_zoom.jst.eco b/app/assets/javascripts/app/views/layout_ref/ticket_zoom.jst.eco index 786d6a9b7..d28fffc76 100644 --- a/app/assets/javascripts/app/views/layout_ref/ticket_zoom.jst.eco +++ b/app/assets/javascripts/app/views/layout_ref/ticket_zoom.jst.eco @@ -57,7 +57,7 @@

Welcome to Zammad! We want to entertain you and your whole family!

- Ticket# 10001 - erstellte 11.07.2014 + Ticket# 10001 - erstellte 11.07.2014
@@ -127,7 +127,7 @@ - +
@@ -167,7 +167,7 @@
- +
@@ -216,7 +216,7 @@
- +
@@ -296,7 +296,7 @@
- + @@ -524,7 +524,7 @@
  • diff --git a/public/assets/tests/model-ui.js b/public/assets/tests/model-ui.js index 8f5a7d99d..f43e95c14 100644 --- a/public/assets/tests/model-ui.js +++ b/public/assets/tests/model-ui.js @@ -44,7 +44,7 @@ test( "model ui basic tests", function() { equal( App.viewPrint( ticket, 'state' ), 'open') equal( App.viewPrint( ticket, 'state_id' ), 'open') equal( App.viewPrint( ticket, 'not_existing' ), '-') - equal( App.viewPrint( ticket, 'updated_at' ), '') + equal( App.viewPrint( ticket, 'updated_at' ), '') equal( App.viewPrint( ticket, 'date' ), '02/07/2015') equal( App.viewPrint( ticket, 'textarea' ), '
    some new
    line
    ') @@ -55,7 +55,7 @@ test( "model ui basic tests", function() { equal( App.viewPrint( ticket, 'state' ), 'offen') equal( App.viewPrint( ticket, 'state_id' ), 'offen') equal( App.viewPrint( ticket, 'not_existing' ), '-') - equal( App.viewPrint( ticket, 'updated_at' ), '') + equal( App.viewPrint( ticket, 'updated_at' ), '') equal( App.viewPrint( ticket, 'date' ), '07.02.2015') equal( App.viewPrint( ticket, 'textarea' ), '
    some new
    line
    ')