diff --git a/app/assets/javascripts/app/controllers/layout_ref.coffee b/app/assets/javascripts/app/controllers/layout_ref.coffee index c3d5b97b9..72e4d6724 100644 --- a/app/assets/javascripts/app/controllers/layout_ref.coffee +++ b/app/assets/javascripts/app/controllers/layout_ref.coffee @@ -2055,6 +2055,15 @@ class chatWindowRef extends Spine.Controller scrollToBottom: -> @scrollHolder.scrollTop(@scrollHolder.prop('scrollHeight')) +class AdminLoadRef extends App.ControllerContent + constructor: -> + super + @render() + + render: -> + @html App.view('layout_ref/admin_loading')() + +App.Config.set( 'layout_ref/admin_loading', AdminLoadRef, 'Routes' ) App.Config.set( 'LayoutRef', { prio: 1700, parent: '#current_user', name: 'Layout Reference', translate: true, target: '#layout_ref', role: [ 'Admin' ] }, 'NavBarRight' ) \ No newline at end of file diff --git a/app/assets/javascripts/app/controllers/ticket_zoom.coffee b/app/assets/javascripts/app/controllers/ticket_zoom.coffee index 1b2d977d6..213a9d724 100644 --- a/app/assets/javascripts/app/controllers/ticket_zoom.coffee +++ b/app/assets/javascripts/app/controllers/ticket_zoom.coffee @@ -258,23 +258,34 @@ class App.TicketZoom extends App.Controller positionPageHeaderStop: => @main.unbind('scroll', @positionPageHeaderUpdate) + @scrollHeaderPos: undefined + positionPageHeaderUpdate: => headerHeight = @scrollPageHeader.outerHeight() mainScrollHeigth = @main.prop('scrollHeight') mainHeigth = @main.height() - # if page header is possible to use, show page header - top = 0 - if mainScrollHeigth > mainHeigth + headerHeight - scroll = @main.scrollTop() - if scroll <= headerHeight - top = (scroll - headerHeight) + scroll = @main.scrollTop() # if page header is not possible to use - mainScrollHeigth to low - hide page header - else - top = -headerHeight + if not mainScrollHeigth > mainHeigth + headerHeight + @scrollPageHeader.css('transform', "translateY(#{-headerHeight}px)") - @scrollPageHeader.css('transform', "translateY(#{top}px)") + + if scroll > headerHeight + scroll = headerHeight + + if scroll is @scrollHeaderPos + return + + #marginTop: 0 .. headerHeight + @main.css('margin-top', scroll) + # translateY: 0 .. -headerHeight + @ticketZoom.css('transform', "translateY(-#{scroll}px)") + # translateY: headerHeight .. 0 + @scrollPageHeader.css('transform', "translateY(#{scroll - headerHeight}px)") + + @scrollHeaderPos = scroll render: => diff --git a/app/assets/javascripts/app/views/layout_ref/admin_loading.jst.eco b/app/assets/javascripts/app/views/layout_ref/admin_loading.jst.eco new file mode 100644 index 000000000..42f9c2da0 --- /dev/null +++ b/app/assets/javascripts/app/views/layout_ref/admin_loading.jst.eco @@ -0,0 +1,96 @@ +
+

Manage

+ + + +

Channels

+ + + +

Settings

+ + + +

System

+ + +
+ +
+
+
+

Email

+
+
+ +
+
+

Email

+ +
+
+
Collecting Email Settings..
+
+ +
+
+
\ No newline at end of file diff --git a/app/assets/javascripts/app/views/layout_ref/index.jst.eco b/app/assets/javascripts/app/views/layout_ref/index.jst.eco index 516f25930..c12b9b8d0 100644 --- a/app/assets/javascripts/app/views/layout_ref/index.jst.eco +++ b/app/assets/javascripts/app/views/layout_ref/index.jst.eco @@ -4,6 +4,7 @@