diff --git a/app/assets/images/sprite.svg b/app/assets/images/sprite.svg index 71ccbd44e..6329f7e3f 100644 --- a/app/assets/images/sprite.svg +++ b/app/assets/images/sprite.svg @@ -1,5 +1,5 @@ - + sprite Created with Sketch (http://www.bohemiancoding.com/sketch) @@ -8,5 +8,10 @@ + + + + + \ No newline at end of file diff --git a/app/assets/javascripts/app/controllers/navigation.js.coffee b/app/assets/javascripts/app/controllers/navigation.js.coffee index 0a06528bd..ef79f1b06 100644 --- a/app/assets/javascripts/app/controllers/navigation.js.coffee +++ b/app/assets/javascripts/app/controllers/navigation.js.coffee @@ -49,30 +49,30 @@ class App.Navigation extends App.Controller # remove result if not result exists if _.isEmpty( result ) - @el.find('#global-search').parents('li').removeClass('open') + @el.find('.dropdown').removeClass('open') el.html( '' ) # remove old popovers $('.popover').remove() return - # show result list - @el.find('#global-search').parents('li').addClass('open') - # build markup html = App.view('navigation/result')( result: result ) el.html( html ) + # show result list + @el.find('.dropdown').addClass('open') + # start ticket popups - @ticketPopups('left') + @ticketPopups() # start user popups - @userPopups('left') + @userPopups() # start oorganization popups - @organizationPopups('left') + @organizationPopups() render: () -> user = App.Session.all() diff --git a/app/assets/javascripts/app/views/navigation.jst.eco b/app/assets/javascripts/app/views/navigation.jst.eco index 66c9afb87..13fd29ab6 100644 --- a/app/assets/javascripts/app/views/navigation.jst.eco +++ b/app/assets/javascripts/app/views/navigation.jst.eco @@ -1,7 +1,20 @@ -
+
 - + -
+
<% if !_.isEmpty(@user): %> -