Whitespace change to trigger buildbots after https://code.google.com/p/skia/source/detail?r=11859
git-svn-id: http://skia.googlecode.com/svn/trunk@11860 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/gm/rebaseline_server/static/loader.js b/gm/rebaseline_server/static/loader.js
index 80f84c6..efdab3b 100644
--- a/gm/rebaseline_server/static/loader.js
+++ b/gm/rebaseline_server/static/loader.js
@@ -45,7 +45,13 @@
$scope.categories = data.categories;
$scope.testData = data.testData;
$scope.sortColumn = 'test';
- $scope.showTodos = true;
+ $scope.showTodos = false;
+
+ $scope.dispositions = [
+ 'Unfiled', 'Hidden', 'Pending Approval'
+ ];
+ $scope.defaultDisposition = $scope.dispositions[0];
+ $scope.viewingDisposition = $scope.defaultDisposition;
for (var i = 0; i < $scope.testData.length; i++) {
$scope.testData[i].index = i;
@@ -113,6 +119,10 @@
$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
new file mode 100644
index 0000000..c422bd0
--- /dev/null
+++ b/gm/rebaseline_server/static/view.css
@@ -0,0 +1,6 @@
+.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 9f0158d..c8095a4 100644
--- a/gm/rebaseline_server/static/view.html
+++ b/gm/rebaseline_server/static/view.html
@@ -6,6 +6,7 @@
<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>
@@ -13,16 +14,75 @@
{{loadingMessage}}
</em>
- <div ng-hide="!categories">
+ <div ng-hide="!categories"><!-- everything: hide until data is loaded -->
+
<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>
- <table border="1">
+
+ <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">
<tr>
<th colspan="2">
Filters
@@ -80,49 +140,19 @@
</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, and displaying the first
- {{displayLimit}}: <br>
- <!-- TODO(epoger): If (displayLimit <= filteredTestData.length),
- modify this message to indicate that all results are shown. -->
+ 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>
+
(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']">
@@ -176,7 +206,8 @@
ng-click="toggleItemSelected(result.index)">
</tr>
</table>
- </div>
+ </div><!-- display of current disposition type -->
+ </div><!-- everything: hide until data is loaded -->
<!-- TODO(epoger): Can we get the base URLs (commondatastorage and
issues list) from
diff --git a/whitespace.txt b/whitespace.txt
index 397a0c8..0105682 100644
--- a/whitespace.txt
+++ b/whitespace.txt
@@ -173,3 +173,4 @@
+