diff options
| author |  epoger@google.com <epoger@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-10-18 18:36:25 +0000 |
|---|---|---|
| committer | epoger@google.com <epoger@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-10-18 18:36:25 +0000 |
| commit | cce4e09a5c4730443fcab33e487ff534216e03cb (patch) | |
| tree | a52e66bad7c8d60ec41adc3a19ea6c3d1d4706db /gm/rebaseline_server | |
| parent | 94041c6d8b1050a034fef70d38bc2da93f59fc4a (diff) | |
Revert r11860, which was supposed to just be a whitespace change (argh)
(SkipBuildbotRuns)
Review URL: https://codereview.chromium.org/29603002
git-svn-id: http://skia.googlecode.com/svn/trunk@11861 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'gm/rebaseline_server')
| -rw-r--r-- | gm/rebaseline_server/static/loader.js | 12 | ||||
| -rw-r--r-- | gm/rebaseline_server/static/view.css | 6 | ||||
| -rw-r--r-- | gm/rebaseline_server/static/view.html | 117 |
3 files changed, 44 insertions, 91 deletions
diff --git a/gm/rebaseline_server/static/loader.js b/gm/rebaseline_server/static/loader.js index efdab3b460..80f84c6a3a 100644 --- a/gm/rebaseline_server/static/loader.js +++ b/gm/rebaseline_server/static/loader.js @@ -45,13 +45,7 @@ Loader.controller( $scope.categories = data.categories; $scope.testData = data.testData; $scope.sortColumn = 'test'; - $scope.showTodos = false; - - $scope.dispositions = [ - 'Unfiled', 'Hidden', 'Pending Approval' - ]; - $scope.defaultDisposition = $scope.dispositions[0]; - $scope.viewingDisposition = $scope.defaultDisposition; + $scope.showTodos = true; for (var i = 0; i < $scope.testData.length; i++) { $scope.testData[i].index = i; @@ -119,10 +113,6 @@ Loader.controller( $scope.areUpdatesPending = true; } - $scope.setViewingDisposition = function(disposition) { - $scope.viewingDisposition = disposition; - } - $scope.localTimeString = function(secondsPastEpoch) { var d = new Date(secondsPastEpoch * 1000); return d.toString(); diff --git a/gm/rebaseline_server/static/view.css b/gm/rebaseline_server/static/view.css deleted file mode 100644 index c422bd003f..0000000000 --- a/gm/rebaseline_server/static/view.css +++ /dev/null @@ -1,6 +0,0 @@ -.disposition-tab-true { - background-color: #ccccff; -} -.disposition-tab-false { - background-color: #8888ff; -} diff --git a/gm/rebaseline_server/static/view.html b/gm/rebaseline_server/static/view.html index c8095a4d9f..9f0158d579 100644 --- a/gm/rebaseline_server/static/view.html +++ b/gm/rebaseline_server/static/view.html @@ -6,7 +6,6 @@ <title ng-bind="windowTitle"></title> <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.1.5/angular.js"></script> <script src="loader.js"></script> - <link rel="stylesheet" href="view.css"> </head> <body> @@ -14,75 +13,16 @@ {{loadingMessage}} </em> - <div ng-hide="!categories"><!-- everything: hide until data is loaded --> - + <div ng-hide="!categories"> <div ng-hide="!(header.isEditable && header.isExported)" style="background-color:#ffbb00"> WARNING! These results are editable and exported, so any user who can connect to this server over the network can modify them. </div> - - <div style="background-color:#bbffbb"><!-- TODOs --> - <p> - TODO(epoger): - <input type="checkbox" name="showTodosCheckbox" value="true" - ng-checked="showTodos == true" - ng-click="showTodos = !showTodos"> - show - <ul ng-hide="!showTodos"> - <li> - Implement editing of results (we have added the --editable - flag to the server, but it's not fully implemented yet). - <div ng-hide="!header.isEditable"> - Currently selected items are: {{selectedItems}} - </div> - </li><li> - If server was run with --reload flag, automatically check for - new results and tell the user when new results are available - (the user can reload the page if he wants to see them). - </li><li> - Add ability to filter builder and test names - (using a free-form text field, with partial string match) - </li><li> - Add more columns, such as pixel diffs, notes/bugs, - ignoreFailure boolean - </li><li> - Improve the column sorting, as per - <a href="http://jsfiddle.net/vojtajina/js64b/14/"> - http://jsfiddle.net/vojtajina/js64b/14/ - </a> - </li><li> - Right now, if you change which column is used to - sort the data, the column widths may fluctuate based on the - longest string <i>currently visible</i> within the top {{displayLimit}} - results. Can we fix the column widths to be wide enough to hold - any result, even the currently hidden results? - </li> - </ul> - </div><!-- TODOs --> - <div ng-hide="!(header.timeUpdated)"> Results current as of {{localTimeString(header.timeUpdated)}} </div> - - <div style="font-size:20px"><!-- tabs --> - <div ng-repeat="disposition in dispositions" - style="display:inline-block"> - <div class="disposition-tab-{{disposition == viewingDisposition}}" - style="display:inline-block" - ng-click="setViewingDisposition(disposition)"> - {{disposition}} - </div> - <div style="display:inline-block"> - - </div> - </div> - </div><!-- tabs --> - - <div class="disposition-tab-true"><!-- display of current disposition type --> - - <br> - <table ng-hide="viewingDisposition != defaultDisposition" border="1"> + <table border="1"> <tr> <th colspan="2"> Filters @@ -140,19 +80,49 @@ </tr> </table> + <p> + TODO(epoger): + <input type="checkbox" name="showTodosCheckbox" value="true" + ng-checked="showTodos == true" + ng-click="showTodos = !showTodos"> + show + <ul ng-hide="!showTodos"> + <li> + Implement editing of results (we have added the --editable + flag to the server, but it's not fully implemented yet). + <div ng-hide="!header.isEditable"> + Currently selected items are: {{selectedItems}} + </div> + </li><li> + If server was run with --reload flag, automatically check for + new results and tell the user when new results are available + (the user can reload the page if he wants to see them). + </li><li> + Add ability to filter builder and test names + (using a free-form text field, with partial string match) + </li><li> + Add more columns, such as pixel diffs, notes/bugs, + ignoreFailure boolean + </li><li> + Improve the column sorting, as per + <a href="http://jsfiddle.net/vojtajina/js64b/14/"> + http://jsfiddle.net/vojtajina/js64b/14/ + </a> + </li><li> + Right now, if you change which column is used to + sort the data, the column widths may fluctuate based on the + longest string <i>currently visible</i> within the top {{displayLimit}} + results. Can we fix the column widths to be wide enough to hold + any result, even the currently hidden results? + </li> + </ul> <p> - Found {{filteredTestData.length}} matches; - <span ng-hide="filteredTestData.length <= limitedTestData.length"> - displaying the first {{limitedTestData.length}} - </span> - <span ng-hide="filteredTestData.length > limitedTestData.length"> - displaying them all - </span> - <br> - + Found {{filteredTestData.length}} matches, and displaying the first + {{displayLimit}}: <br> + <!-- TODO(epoger): If (displayLimit <= filteredTestData.length), + modify this message to indicate that all results are shown. --> (click on the column header radio buttons to re-sort by that column) <br> - <table border="1"> <tr> <th ng-repeat="categoryName in ['resultType', 'builder', 'test', 'config']"> @@ -206,8 +176,7 @@ ng-click="toggleItemSelected(result.index)"> </tr> </table> - </div><!-- display of current disposition type --> - </div><!-- everything: hide until data is loaded --> + </div> <!-- TODO(epoger): Can we get the base URLs (commondatastorage and issues list) from |