From 27ff22758958c26759187b7f4060fad1ed4b62b7 Mon Sep 17 00:00:00 2001 From: humper Date: Wed, 6 Aug 2014 12:39:59 -0700 Subject: make the action buttons for rebaseline server stick to the top of the window as you scroll NOTRY=true BUG=skia:1912 R=stephana@google.com, epoger@google.com Author: humper@google.com Review URL: https://codereview.chromium.org/446933002 --- gm/rebaseline_server/static/live-loader.js | 4 ++ gm/rebaseline_server/static/live-view.html | 3 ++ gm/rebaseline_server/static/loader.js | 4 ++ gm/rebaseline_server/static/utils.js | 12 +++++ gm/rebaseline_server/static/view.css | 20 ++++++++ gm/rebaseline_server/static/view.html | 77 +++++++++++++++--------------- 6 files changed, 81 insertions(+), 39 deletions(-) create mode 100644 gm/rebaseline_server/static/utils.js (limited to 'gm') diff --git a/gm/rebaseline_server/static/live-loader.js b/gm/rebaseline_server/static/live-loader.js index 418e9cc708..f171ff0fe9 100644 --- a/gm/rebaseline_server/static/live-loader.js +++ b/gm/rebaseline_server/static/live-loader.js @@ -296,6 +296,10 @@ Loader.controller( $scope.updateResults(); $scope.loadingMessage = ""; $scope.windowTitle = "Current GM Results"; + + $timeout( function() { + make_results_header_sticky(); + }); } } ).error( diff --git a/gm/rebaseline_server/static/live-view.html b/gm/rebaseline_server/static/live-view.html index 9e22ed4998..b19008cec9 100644 --- a/gm/rebaseline_server/static/live-view.html +++ b/gm/rebaseline_server/static/live-view.html @@ -4,9 +4,12 @@ + + + diff --git a/gm/rebaseline_server/static/loader.js b/gm/rebaseline_server/static/loader.js index 19bc2378a0..1ec7305dc6 100644 --- a/gm/rebaseline_server/static/loader.js +++ b/gm/rebaseline_server/static/loader.js @@ -291,6 +291,10 @@ Loader.controller( $scope.updateResults(); $scope.loadingMessage = ""; $scope.windowTitle = "Current GM Results"; + + $timeout( function() { + make_results_header_sticky(); + }); } } ).error( diff --git a/gm/rebaseline_server/static/utils.js b/gm/rebaseline_server/static/utils.js new file mode 100644 index 0000000000..e846b90bd6 --- /dev/null +++ b/gm/rebaseline_server/static/utils.js @@ -0,0 +1,12 @@ +function make_results_header_sticky( ) { + element = $(".results-header-actions"); + var pos = element.position(); + $(window).scroll( function() { + var windowPos = $(window).scrollTop(); + if (windowPos > pos.top) { + element.addClass("sticky"); + } else { + element.removeClass("sticky"); + } + }); +} diff --git a/gm/rebaseline_server/static/view.css b/gm/rebaseline_server/static/view.css index 0e8641246d..ee9be3293b 100644 --- a/gm/rebaseline_server/static/view.css +++ b/gm/rebaseline_server/static/view.css @@ -68,3 +68,23 @@ .image-link { text-decoration: none; } + +.results-header { + overflow: hidden; + padding: 10px; + background-color: #ccccff; +} + +.results-header-actions { + float: right; +} + +.sticky { + position: fixed; + top: 2px; + box-shadow: -2px 2px 5px 0 rgba(0,0,0,.45); + background: white; + right: 2px; + padding: 10px; + border: 2px solid #222; +} diff --git a/gm/rebaseline_server/static/view.html b/gm/rebaseline_server/static/view.html index 0e964d1e98..bafa3f2f3f 100644 --- a/gm/rebaseline_server/static/view.html +++ b/gm/rebaseline_server/static/view.html @@ -4,9 +4,11 @@ + + @@ -195,46 +197,43 @@

+

+
+ all tests shown: + + + +
+ +
+
+
+ Found {{filteredImagePairs.length}} matches; + + displaying the first {{limitedImagePairs.length}}. + + + displaying them all. + + + Rendered in {{(renderEndTime - renderStartTime).toFixed(0)}} ms. + +
+ (click on the column header radio buttons to re-sort by that column) +
+
+
- - - - - -
- Found {{filteredImagePairs.length}} matches; - - displaying the first {{limitedImagePairs.length}}. - - - displaying them all. - - - Rendered in {{(renderEndTime - renderStartTime).toFixed(0)}} ms. - -
- (click on the column header radio buttons to re-sort by that column) - 		-
- all tests shown: - - - -
-
- -
-
-- cgit v1.2.3