| OLD | NEW |
| 1 <!DOCTYPE html> | 1 <!DOCTYPE html> |
| 2 | 2 |
| 3 <html ng-app="Loader"> | 3 <html ng-app="Loader" ng-controller="Loader.Controller"> |
| 4 | 4 |
| 5 <head> | 5 <head> |
| 6 <title>Current GM Results</title> | 6 <title ng-bind="windowTitle"></title> |
| 7 <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.1.5/angular.js"
></script> | 7 <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.1.5/angular.js"
></script> |
| 8 <script src="loader.js"></script> | 8 <script src="loader.js"></script> |
| 9 </head> | 9 </head> |
| 10 | 10 |
| 11 <body> | 11 <body> |
| 12 <div ng-controller="Loader.Controller"> | |
| 13 | |
| 14 <!-- TODO(epoger): Add some indication of how old the | |
| 15 expected/actual data is --> | |
| 16 | |
| 17 <em> | 12 <em> |
| 18 {{loadingMessage}} | 13 {{loadingMessage}} |
| 19 </em> | 14 </em> |
| 20 | 15 |
| 21 <div ng-hide="!categories"> | 16 <div ng-hide="!categories"> |
| 22 <div ng-hide="!(header.isEditable && header.isExported)" | 17 <div ng-hide="!(header.isEditable && header.isExported)" |
| 23 style="background-color:#ffbb00"> | 18 style="background-color:#ffbb00"> |
| 24 WARNING! These results are editable and exported, so any user | 19 WARNING! These results are editable and exported, so any user |
| 25 who can connect to this server over the network can modify them. | 20 who can connect to this server over the network can modify them. |
| 26 </div> | 21 </div> |
| 22 <div ng-hide="!(header.timeUpdated)"> |
| 23 Results current as of {{localTimeString(header.timeUpdated)}} |
| 24 </div> |
| 27 <table border="1"> | 25 <table border="1"> |
| 28 <tr> | 26 <tr> |
| 29 <th colspan="2"> | 27 <th colspan="2"> |
| 30 Filters | 28 Filters |
| 31 </th> | 29 </th> |
| 32 <th> | 30 <th> |
| 33 Settings | 31 Settings |
| 34 </th> | 32 </th> |
| 35 </tr> | 33 </tr> |
| 36 <tr valign="top"> | 34 <tr valign="top"> |
| (...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 76 ng-click="updateResults()" | 74 ng-click="updateResults()" |
| 77 ng-disabled="!areUpdatesPending"> | 75 ng-disabled="!areUpdatesPending"> |
| 78 Update Results | 76 Update Results |
| 79 </button> | 77 </button> |
| 80 </td></tr> | 78 </td></tr> |
| 81 </tr></table></td> | 79 </tr></table></td> |
| 82 </tr> | 80 </tr> |
| 83 </table> | 81 </table> |
| 84 | 82 |
| 85 <p> | 83 <p> |
| 86 TODO(epoger): Add ability to filter builder and test names | 84 TODO(epoger): |
| 87 (using a free-form text field, with partial string match) | 85 <input type="checkbox" name="showTodosCheckbox" value="true" |
| 88 <br> | 86 ng-checked="showTodos == true" |
| 89 TODO(epoger): Add more columns, such as pixel diffs, notes/bugs, | 87 ng-click="showTodos = !showTodos"> |
| 90 ignoreFailure boolean | 88 show |
| 91 <br> | 89 <ul ng-hide="!showTodos"> |
| 92 TODO(epoger): Improve the column sorting, as per | 90 <li> |
| 93 <a href="http://jsfiddle.net/vojtajina/js64b/14/"> | 91 Implement editing of results (we have added the --editable |
| 94 http://jsfiddle.net/vojtajina/js64b/14/ | 92 flag to the server, but it's not fully implemented yet). |
| 95 </a> | 93 <div ng-hide="!header.isEditable"> |
| 96 <br> | 94 Currently selected items are: {{selectedItems}} |
| 97 TODO(epoger): Right now, if you change which column is used to | 95 </div> |
| 98 sort the data, the column widths may fluctuate based on the | 96 </li><li> |
| 99 longest string <i>currently visible</i> within the top {{displayLimit}} | 97 If server was run with --reload flag, automatically check for |
| 100 results. Can we fix the column widths to be wide enough to hold | 98 new results and tell the user when new results are available |
| 101 any result, even the currently hidden results? | 99 (the user can reload the page if he wants to see them). |
| 100 </li><li> |
| 101 Add ability to filter builder and test names |
| 102 (using a free-form text field, with partial string match) |
| 103 </li><li> |
| 104 Add more columns, such as pixel diffs, notes/bugs, |
| 105 ignoreFailure boolean |
| 106 </li><li> |
| 107 Improve the column sorting, as per |
| 108 <a href="http://jsfiddle.net/vojtajina/js64b/14/"> |
| 109 http://jsfiddle.net/vojtajina/js64b/14/ |
| 110 </a> |
| 111 </li><li> |
| 112 Right now, if you change which column is used to |
| 113 sort the data, the column widths may fluctuate based on the |
| 114 longest string <i>currently visible</i> within the top {{displayLimit}
} |
| 115 results. Can we fix the column widths to be wide enough to hold |
| 116 any result, even the currently hidden results? |
| 117 </li> |
| 118 </ul> |
| 102 <p> | 119 <p> |
| 103 Found {{filteredTestData.length}} matches, and displaying the first | 120 Found {{filteredTestData.length}} matches, and displaying the first |
| 104 {{displayLimit}}: <br> | 121 {{displayLimit}}: <br> |
| 105 <!-- TODO(epoger): If (displayLimit <= filteredTestData.length), | 122 <!-- TODO(epoger): If (displayLimit <= filteredTestData.length), |
| 106 modify this message to indicate that all results are shown. --> | 123 modify this message to indicate that all results are shown. --> |
| 107 (click on the column header radio buttons to re-sort by that column) | 124 (click on the column header radio buttons to re-sort by that column) |
| 108 <br> | 125 <br> |
| 109 <table border="1"> | 126 <table border="1"> |
| 110 <tr> | 127 <tr> |
| 111 <th ng-repeat="categoryName in ['resultType', 'builder', 'test', 'conf
ig']"> | 128 <th ng-repeat="categoryName in ['resultType', 'builder', 'test', 'conf
ig']"> |
| (...skipping 15 matching lines...) Expand all Loading... |
| 127 <th> | 144 <th> |
| 128 <input type="radio" | 145 <input type="radio" |
| 129 name="sortColumnRadio" | 146 name="sortColumnRadio" |
| 130 value="actualHashDigest" | 147 value="actualHashDigest" |
| 131 ng-checked="(sortColumn == 'actualHashDigest')" | 148 ng-checked="(sortColumn == 'actualHashDigest')" |
| 132 ng-click="sortResultsBy('actualHashDigest')"> | 149 ng-click="sortResultsBy('actualHashDigest')"> |
| 133 actual image | 150 actual image |
| 134 </th> | 151 </th> |
| 135 <th ng-hide="!header.isEditable"> | 152 <th ng-hide="!header.isEditable"> |
| 136 <!-- item-selection checkbox column --> | 153 <!-- item-selection checkbox column --> |
| 137 {{selectedItems}} <!-- TODO(epoger): temporary debug output --> | |
| 138 </th> | 154 </th> |
| 139 </tr> | 155 </tr> |
| 140 <tr ng-repeat="result in limitedTestData"> | 156 <tr ng-repeat="result in limitedTestData"> |
| 141 <td>{{result.resultType}}</td> | 157 <td>{{result.resultType}}</td> |
| 142 <td>{{result.builder}}</td> | 158 <td>{{result.builder}}</td> |
| 143 <td>{{result.test}}</td> | 159 <td>{{result.test}}</td> |
| 144 <td>{{result.config}}</td> | 160 <td>{{result.config}}</td> |
| 145 <td> | 161 <td> |
| 146 <a target="_blank" href="http://chromium-skia-gm.commondatastorage.g
oogleapis.com/gm/{{result.expectedHashType}}/{{result.test}}/{{result.expectedHa
shDigest}}.png"> | 162 <a target="_blank" href="http://chromium-skia-gm.commondatastorage.g
oogleapis.com/gm/{{result.expectedHashType}}/{{result.test}}/{{result.expectedHa
shDigest}}.png"> |
| 147 <img width="{{imageSize}}" src="http://chromium-skia-gm.commondata
storage.googleapis.com/gm/{{result.expectedHashType}}/{{result.test}}/{{result.e
xpectedHashDigest}}.png"/> | 163 <img width="{{imageSize}}" src="http://chromium-skia-gm.commondata
storage.googleapis.com/gm/{{result.expectedHashType}}/{{result.test}}/{{result.e
xpectedHashDigest}}.png"/> |
| 148 </a> | 164 </a> |
| 149 </td> | 165 </td> |
| 150 <td> | 166 <td> |
| 151 <a target="_blank" href="http://chromium-skia-gm.commondatastorage.g
oogleapis.com/gm/{{result.actualHashType}}/{{result.test}}/{{result.actualHashDi
gest}}.png"> | 167 <a target="_blank" href="http://chromium-skia-gm.commondatastorage.g
oogleapis.com/gm/{{result.actualHashType}}/{{result.test}}/{{result.actualHashDi
gest}}.png"> |
| 152 <img width="{{imageSize}}" src="http://chromium-skia-gm.commondata
storage.googleapis.com/gm/{{result.actualHashType}}/{{result.test}}/{{result.act
ualHashDigest}}.png"/> | 168 <img width="{{imageSize}}" src="http://chromium-skia-gm.commondata
storage.googleapis.com/gm/{{result.actualHashType}}/{{result.test}}/{{result.act
ualHashDigest}}.png"/> |
| 153 </a> | 169 </a> |
| 154 </td> | 170 </td> |
| 155 <td ng-hide="!header.isEditable"> | 171 <td ng-hide="!header.isEditable"> |
| 156 <input type="checkbox" | 172 <input type="checkbox" |
| 157 name="rowSelect" | 173 name="rowSelect" |
| 158 value="{{result.index}}" | 174 value="{{result.index}}" |
| 159 ng-checked="isItemSelected(result.index)" | 175 ng-checked="isItemSelected(result.index)" |
| 160 ng-click="toggleItemSelected(result.index)"> | 176 ng-click="toggleItemSelected(result.index)"> |
| 161 </tr> | 177 </tr> |
| 162 </table> | 178 </table> |
| 163 </div> | 179 </div> |
| 164 </div> | |
| 165 | 180 |
| 166 <!-- TODO(epoger): Can we get the base URLs (commondatastorage and | 181 <!-- TODO(epoger): Can we get the base URLs (commondatastorage and |
| 167 issues list) from | 182 issues list) from |
| 168 http://skia.googlecode.com/svn/buildbot/site_config/global_variables.json | 183 http://skia.googlecode.com/svn/buildbot/site_config/global_variables.json |
| 169 ? I tried importing the | 184 ? I tried importing the |
| 170 http://skia.googlecode.com/svn/buildbot/skia_tools.js script and using | 185 http://skia.googlecode.com/svn/buildbot/skia_tools.js script and using |
| 171 that to do so, but I got Access-Control-Allow-Origin errors. | 186 that to do so, but I got Access-Control-Allow-Origin errors. |
| 172 --> | 187 --> |
| 173 | 188 |
| 174 </body> | 189 </body> |
| 175 </html> | 190 </html> |
| OLD | NEW |