Merge branch 'develop' of github.com:martini/zammad into develop

app/assets/javascripts/app/controllers/_application_controller.coffee

@@ -469,7 +469,9 @@ class App.Controller extends Spine.Controller
       @userTicketPopupsList.popover('destroy')
 
   anyPopoversDestroy: ->
-    $('.popover').remove()
+
+    # do not remove permanent .popover--notifications widget
+    $('.popover:not(.popover--notifications)').remove()
 
   recentView: (object, o_id) =>
     params =

app/assets/javascripts/app/controllers/navigation.coffee

@@ -49,6 +49,11 @@ class App.Navigation extends App.ControllerWidgetPermanent
       else
         @$('.bell').removeClass('show')
 
+  release: =>
+    if @notificationWidget
+      @notificationWidget.remove()
+      @notificationWidget = undefined
+
   renderMenu: =>
     items = @getItems( navbar: @Config.get( 'NavBar' ) )
 
@@ -205,6 +210,8 @@ class App.Navigation extends App.ControllerWidgetPermanent
       @emptyAndClose()
     )
 
+    if @notificationWidget
+      @notificationWidget.remove()
     @notificationWidget = new App.OnlineNotificationWidget()
     $('#app').append @notificationWidget.el
 

app/assets/javascripts/app/controllers/widget/keyboard_shortcuts.coffee

@@ -83,7 +83,7 @@ App.Config.set(
                 $('#global-search').focus()
             }
             {
-              key: 'y'
+              key: 'a'
               hotkeys: true
               description: 'Notifications'
               callback: (e) ->

app/assets/javascripts/app/controllers/widget/online_notification.coffee

@@ -44,10 +44,12 @@ class App.OnlineNotificationWidget extends App.Controller
     @bind 'auth', (user) =>
       if !user
         @counterUpdate(0)
-      else
+        return
       if !@access()
         @counterUpdate(0)
         return
+      if !@subscribeId
+        @subscribeId = App.OnlineNotification.subscribe(@updateContent)
 
     if @access()
       @subscribeId = App.OnlineNotification.subscribe(@updateContent)
@@ -69,9 +71,7 @@ class App.OnlineNotificationWidget extends App.Controller
 
   access: ->
     return false if !@Session.get()
-    return true if @isRole('Agent')
+    return true
-    return true if @isRole('Admin')
-    return false
 
   listNavigate: (e) =>
     if e.keyCode is 27 # close on esc
@@ -140,7 +140,9 @@ class App.OnlineNotificationWidget extends App.Controller
     heightPopoverSpacer     = 22
     heightPopoverHeader     = @header.outerHeight(true)
     isOverflowing           = false
+    heightPopoverContent    = 0
     @item.each (i, el) =>
+
       # accumulate height of items
       heightPopoverContent += el.clientHeight
 
@@ -206,6 +208,7 @@ class App.OnlineNotificationWidget extends App.Controller
     @show()
 
   show: =>
+    return if !@access()
     $(window).on 'keydown.notifications', @listNavigate
     @shown = true
     @el.show()
@@ -230,3 +233,6 @@ class App.OnlineNotificationWidget extends App.Controller
     id = row.data('id')
     App.OnlineNotification.destroy(id)
     @updateHeight()
+
+  remove: =>
+    @el.remove()

app/assets/javascripts/app/lib/app_init/track.coffee

@@ -15,6 +15,11 @@ class App.Track
       _instance ?= new _trackSingleton
     _instance.send()
 
+  @force: (value) ->
+    if _instance == undefined
+      _instance ?= new _trackSingleton
+    _instance.force(value)
+
   @_all: ->
     if _instance == undefined
       _instance ?= new _trackSingleton
@@ -28,6 +33,8 @@ class _trackSingleton
 #    @url     = 'http://localhost:3005/api/v1/ui'
     @url     = 'https://log.zammad.com/api/v1/ui'
 
+    @forceSending = false
+
     @log('start', 'notice', {})
 
     # start initial submit 30 sec. later to avoid ie10 cookie issues
@@ -104,9 +111,8 @@ class _trackSingleton
         return
     )
 
-  log: (facility, level, args) ->
+  log: (facility, level, args) =>
-    return if App.Config.get('developer_mode')
+    return if !@shouldSend()
-    return if !App.Config.get('ui_send_client_stats')
     info =
       time:     Math.round(new Date().getTime() / 1000)
       facility: facility
@@ -116,8 +122,7 @@ class _trackSingleton
     @data.push info
 
   send: (async = true) =>
-    return if App.Config.get('developer_mode')
+    return if !@shouldSend()
-    return if !App.Config.get('ui_send_client_stats')
     return if _.isEmpty @data
     newData = _.clone(@data)
     @data = []
@@ -155,6 +160,15 @@ class _trackSingleton
           @data.push item
     )
 
+  force: (value = true) ->
+    @forceSending = value
+
+  shouldSend: ->
+    return true if @forceSending
+    return false if App.Config.get('developer_mode')
+    return false if !App.Config.get('ui_send_client_stats')
+    true
+
   _all: ->
     @data
 

app/views/mailer/password_change/en.html.erb

@@ -2,7 +2,7 @@ Your <%= c 'product_name' %> password has been changed
 
 <p>Hi <%= d 'user.firstname' %>,</p>
 <br>
-<p>the password for your <%= c 'product_name' %> account <b><%= d 'user.login' %></b> has been changed recently.</p>
+<p>The password for your <%= c 'product_name' %> account <b><%= d 'user.login' %></b> has been changed recently.</p>
 <br>
 <p>This activity is not known to you? If not, contact your system administrator.</p>
 <br>

app/views/mailer/password_reset/en.html.erb

@@ -10,6 +10,6 @@ Reset your <%= c 'product_name' %> password
 <br>
 <p>This link takes you to a page where you can change your password.</p>
 <br>
-<p>If you don't want to reset your password, please ignore this message. Your password will not be reset.</p>
+<p>If you don't want to reset your password, please ignore this message. Your password will not be reseted.</p>
 <br>
 <p>Your <%= c 'product_name' %> Team</p>

app/views/mailer/signup/en.html.erb

@@ -2,7 +2,7 @@ Confirm your <%= c 'product_name' %> account, <%= d 'user.firstname' %> <%= d 'u
 
 <p>Hi <%= d 'user.firstname' %>,</p>
 <br>
-<p>confirm your email address to complete your <%= c 'product_name' %> account. It's easy, just click the link below.</p>
+<p>Confirm your email address to complete your <%= c 'product_name' %> account. It's easy, just click the link below.</p>
 <br>
 <p><a href="<%= c 'http_type' %>://<%= c 'fqdn' %>/#email_verify/<%= d 'token.name' %>"><%= c 'http_type' %>://<%= c 'fqdn' %>/#email_verify/<%= d 'token.name' %></a></p>
 <br>

app/views/mailer/test_ticket/en.html.erb

@@ -2,7 +2,7 @@ Test Ticket!
 
 <p>Dear <%= d 'agent.firstname' %>,</p>
 <br>
-<p>this is a <b>Test Ticket</b>. I'm a customer and I need some help! :)</p>
+<p>This is a <b>test ticket</b>. I'm a customer and I need some help! :)</p>
 <br>
 <p><%= d 'customer.fullname' %></p>
 <br>

app/views/mailer/ticket_create/en.html.erb

@@ -2,7 +2,7 @@ New Ticket (<%= d 'ticket.title' %>)
 
 <p>Hi <%= d 'recipient.firstname' %>,</p>
 <br>
-<p>a new Ticket (<%= d 'ticket.title' %>) has been created by "<b><%= d 'ticket.updated_by.longname' %></b>".</p>
+<p>A new ticket (<%= d 'ticket.title' %>) has been created by "<b><%= d 'ticket.updated_by.longname' %></b>".</p>
 <br>
 <p>
 <%= t 'Group' %>: <%= d 'ticket.group.name' %><br>

app/views/mailer/ticket_escalation/en.html.erb

@@ -2,7 +2,7 @@ Ticket is escalated (<%= d 'ticket.title' %>)
 
 <p>Hi <%= d 'recipient.firstname' %>,</p>
 <br>
-<p>Ticket (<%= d 'ticket.title' %>) from "<b><%= d 'ticket.customer.longname' %></b>" is escalated since "<%= d 'ticket.escalation_time' %>"!</p>
+<p>A ticket (<%= d 'ticket.title' %>) from "<b><%= d 'ticket.customer.longname' %></b>" is escalated since "<%= d 'ticket.escalation_time' %>"!</p>
 <br>
 <% if @objects[:article] %>
   <p>

app/views/mailer/ticket_escalation_warning/en.html.erb

@@ -2,7 +2,7 @@ Ticket will escalated (<%= d 'ticket.title' %>)
 
 <p>Hi <%= d 'recipient.firstname' %>,</p>
 <br>
-<p>Ticket (<%= d 'ticket.title' %>) from "<b><%= d 'ticket.customer.longname' %></b>" will escalated at "<%= d 'ticket.escalation_time' %>"!</p>
+<p>a ticket (<%= d 'ticket.title' %>) from "<b><%= d 'ticket.customer.longname' %></b>" will escalate at "<%= d 'ticket.escalation_time' %>"!</p>
 <br>
 <% if @objects[:article] %>
   <p>

app/views/mailer/ticket_reminder_reached/en.html.erb

@@ -2,7 +2,7 @@ Reminder reached (<%= d 'ticket.title' %>)
 
 <p>Hi <%= d 'recipient.firstname' %>,</p>
 <br>
-<p>ticket needs attachen, reminder reached for Ticket (<%= d 'ticket.title' %>) with customer "<b><%= d 'ticket.customer.longname' %></b>".</p>
+<p>Ticket needs attention, reminder reached for ticket (<%= d 'ticket.title' %>) with customer "<b><%= d 'ticket.customer.longname' %></b>".</p>
 <br>
 <% if @objects[:article] %>
   <p>

app/views/mailer/user_device/en.html.erb

@@ -2,10 +2,10 @@
 
 <p>Hi <%= d 'user.firstname' %>,</p>
 <br>
-<p>it looks like you signed into your <%= c 'product_name' %> account using a new device on "<%= d 'user_device.created_at' %>":</p>
+<p>It looks like you signed into your <%= c 'product_name' %> account using a new device on "<%= d 'user_device.created_at' %>":</p>
 <br>
 <p>
-Your Location: <%= d 'user_device.location' %><br>
+Your location: <%= d 'user_device.location' %><br>
 Your IP: <%= d 'user_device.ip' %><br
 </p>
 <br>

test/browser/keyboard_shortcuts_test.rb

@@ -35,6 +35,21 @@ class KeyboardShortcutsTest < TestCase
       timeout: 2,
     )
 
+    # show notifications
+    shortcut(key: 'a')
+    watch_for(
+      css:     '.js-notificationsContainer .js-header',
+      value:   'Notification',
+      timeout: 10,
+    )
+
+    shortcut(key: 'a')
+    watch_for_disappear(
+      css:     '.js-notificationsContainer .js-header',
+      value:   'Notification',
+      timeout: 2,
+    )
+
     # go to overviews
     shortcut(key: 'o')
     watch_for(
@@ -172,7 +187,7 @@ class KeyboardShortcutsTest < TestCase
       },
     )
     sleep 5
-    shortcut(key: 'y')
+    shortcut(key: 'a')
     watch_for(
       css:     '.js-notificationsContainer',
       value:   'Test Ticket for Shortcuts II',
@@ -183,7 +198,7 @@ class KeyboardShortcutsTest < TestCase
     watch_for(
       css:     '.active.content',
       value:   ticket2[:number],
-      timeout: 2,
+      timeout: 3,
     )
 
     shortcut(key: 'e')

test/browser_test_helper.rb

@@ -139,6 +139,9 @@ class TestCase < Test::Unit::TestCase
       instance.get(params[:url])
     end
 
+    # submit logs anyway
+    instance.execute_script('App.Track.force()')
+
     element = instance.find_elements(css: '#login input[name="username"]')[0]
     if !element
 
@@ -363,7 +366,6 @@ class TestCase < Test::Unit::TestCase
         #if element
         #  instance.mouse.move_to(element)
         #end
-        sleep 0.2
         element.click
       rescue => e
         sleep 0.5
@@ -374,15 +376,14 @@ class TestCase < Test::Unit::TestCase
         #if element
         #  instance.mouse.move_to(element)
         #end
-        sleep 0.2
         element.click
       end
 
     else
-      sleep 1
+      sleep 0.5
       instance.find_elements(partial_link_text: params[:text])[0].click
     end
-    sleep 0.4 if !params[:fast]
+    sleep 0.2 if !params[:fast]
     sleep params[:wait] if params[:wait]
   end
 
@@ -517,7 +518,7 @@ class TestCase < Test::Unit::TestCase
       instance.execute_script("$('#{params[:css]}').blur()")
     end
 
-    sleep 0.5
+    sleep 0.2
   end
 
 =begin
@@ -543,11 +544,11 @@ class TestCase < Test::Unit::TestCase
       element = instance.find_elements(css: "#{params[:css]}.js-shadow + .js-input")[0]
       element.click
       element.clear
-      sleep 1
+      sleep 0.5
       element.send_keys(params[:value])
-      sleep 0.5
+      sleep 0.2
       element.send_keys(:enter)
-      sleep 0.5
+      sleep 0.2
       return
     end
 
@@ -573,7 +574,7 @@ class TestCase < Test::Unit::TestCase
       dropdown.select_by(:text, params[:value])
       #puts "select2 - #{params.inspect}"
     end
-    sleep 0.8
+    sleep 0.5
   end
 
 =begin
@@ -668,9 +669,9 @@ class TestCase < Test::Unit::TestCase
     end
     instance.action.send_keys(params[:value]).perform
     if params[:slow]
-      sleep 2
+      sleep 1.5
     else
-      sleep 0.3
+      sleep 0.2
     end
   end
 
@@ -757,7 +758,7 @@ class TestCase < Test::Unit::TestCase
     elsif !params[:should_not_match]
       raise "not matching '#{params[:value]}' in content '#{text}' but should!"
     end
-    sleep 0.8
+    sleep 0.2
     match
   end
 
@@ -1215,7 +1216,7 @@ wait untill text in selector disabppears
 
             # accept task close warning
             if instance.find_elements(css: '.modal button.js-submit')[0]
-              sleep 0.5
+              sleep 0.4
               instance.find_elements(css: '.modal button.js-submit')[0].click
             end
           end
@@ -1284,16 +1285,16 @@ wait untill text in selector disabppears
 
     # workaround, sometimes focus is not triggered
     element.send_keys(params[:customer])
-    sleep 3.5
+    sleep 2.5
 
     # check if pulldown is open, it's not working stable via selenium
     #instance.execute_script("$('#{params[:css]} .js-recipientDropdown').addClass('open')")
     #sleep 0.5
     element.send_keys(:arrow_down)
-    sleep 0.3
+    sleep 0.2
     element.send_keys(:enter)
     #instance.find_elements(css: params[:css] + ' .recipientList-entry.js-user.is-active')[0].click
-    sleep 0.6
+    sleep 0.4
     assert(true, 'ticket_customer_select')
   end
 
@@ -1545,7 +1546,7 @@ wait untill text in selector disabppears
       screenshot(browser: instance, comment: 'ticket_create_failed')
       raise 'no ticket create screen found!'
     end
-    sleep 1
+    sleep 0.4
 
     if data[:group]
       if data[:group] == '-NONE-'
@@ -1613,16 +1614,16 @@ wait untill text in selector disabppears
 
       # workaround, sometimes focus is not triggered
       element.send_keys(data[:customer])
-      sleep 3.5
+      sleep 2.5
 
       # check if pulldown is open, it's not working stable via selenium
       #instance.execute_script("$('.active .newTicket .js-recipientDropdown').addClass('open')")
       #sleep 0.5
       element.send_keys(:arrow_down)
-      sleep 0.3
+      sleep 0.2
       element.send_keys(:enter)
       #instance.find_elements(css: '.active .newTicket .recipientList-entry.js-user.is-active')[0].click
-      sleep 0.6
+      sleep 0.4
     end
 
     if data[:attachment]
@@ -1742,16 +1743,16 @@ wait untill text in selector disabppears
 
       # workaround, sometimes focus is not triggered
       element.send_keys(data[:customer])
-      sleep 3.5
+      sleep 2.5
 
       # check if pulldown is open, it's not working stable via selenium
       #instance.execute_script("$('.modal .user_autocompletion .js-recipientDropdown').addClass('open')")
       #sleep 0.5
       element.send_keys(:arrow_down)
-      sleep 0.6
+      sleep 0.4
       element.send_keys(:enter)
       #instance.find_elements(css: '.modal .user_autocompletion .recipientList-entry.js-user.is-active')[0].click
-      sleep 0.3
+      sleep 0.2
 
       click(browser: instance, css: '.modal .js-submit')