Chromium Code Reviews Chromium Code Reviews
Issue 10900035:
Version 2 of CPM UI, with rearranged controls, multiple graphs, event rollovers, etc. (Closed)
Base URL: http://git.chromium.org/chromium/src.git@master| Index: chrome/browser/resources/performance_monitor/chart.html |
| diff --git a/chrome/browser/resources/performance_monitor/chart.html b/chrome/browser/resources/performance_monitor/chart.html |
| index 1ac46b1f50f2c0656d33ea9f95bda593ec406824..91b98c7657a312bfec924c4660a078a479ad49b1 100644 |
| --- a/chrome/browser/resources/performance_monitor/chart.html |
| +++ b/chrome/browser/resources/performance_monitor/chart.html |
| @@ -14,38 +14,58 @@ as of 6/2012. --> |
| <link rel="stylesheet" type="text/css" href="chart.css"> |
| </head> |
| <body> |
| - <div id="choose-block"> |
| - <div id="choose-metrics"> |
| - <h2>Choose Metrics</h2> |
| + <div class="horizontal-box"> |
| + <div id="choose-block"> |
| + <div id="choose-time-range-header" class="tab-label"> |
|
Jeffrey Yasskin
2012/08/30 00:15:10
Why <div class="tab-label"> instead of <h1>? (Acce
clintstaley
2012/08/30 21:40:18
We're still working on that left-bar, and among ot
|
| + Time Range |
| + </div> |
| + <div class="category-label">Time Resolution</div> |
| + <div id="choose-time-range"> |
| + </div> |
| + <div class="category-label">Back/Forward by Half-Ranges</div> |
| + <div class="horizontal-box"> |
| + <button id="back-time"><<</button> |
|
Jeffrey Yasskin
2012/08/30 00:15:10
title="Back"?
clintstaley
2012/08/30 21:40:18
Accessiblity?
Done.
|
| + <div class="spacer"></div> |
| + <button id="forward-time">>></button> |
| + </div> |
| + |
| + <div id="choose-metrics-header" class="tab-label"> |
| + Metrics to Display |
| + </div> |
| + <div id="choose-metrics"> |
| + </div> |
| + |
| + <div id="choose-events-header" class="tab-label"> |
| + Events to Display |
| + </div> |
| + <div id="choose-events"> |
| + </div> |
| </div> |
| - <div id="choose-events"> |
| - <h2>Choose Events</h2> |
| - </div> |
| - <div class="spacer"></div> |
| - <div id="choose-time-range"> |
| - <h2>Choose Time Range</h2> |
| - </div> |
| - </div> |
| - <div id="charts"></div> |
| - <div id="templates" hidden> |
| - <div id="label-template" class="event-label"></div> |
| - <div id="checkbox-template" class="checkbox"> |
| - <label> |
| - <input type="checkbox"></input> |
| - <span>Change this label</span> |
| - </label> |
| - </div> |
| - <div id="radio-template" class="radio"> |
| - <label> |
| - <input type="radio" name="time-range"> |
| - <span>Change this label</span> |
| - </label> |
| + |
| + <div id="charts"></div> |
| + <div id="templates" hidden> |
| + <div id="label-template" class="event-label"></div> |
| + <div id="category-label-template" class="category-label"></div> |
| + <div id="detail-checkbox-template" class="detail-checkbox"> |
| + <div class="horizontal-box"> |
| + <input type="checkbox"></input> |
| + <div class="detail-label">Change this label</div> |
| + <div class="spacer"></div> |
| + <div class="color-icon"></div> |
| + </div> |
| + </div> |
| + <div id="radio-template" class="radio"> |
| + <div class="horizontal-box"> |
| + <input type="radio" name="time-range"/> |
| + <span>Change this label</span> |
| + </div> |
| + </div> |
| </div> |
| + <script src="chrome://resources/js/cr.js"></script> |
|
Jeffrey Yasskin
2012/08/30 00:15:10
Why move the scripts inside the div?
clintstaley
2012/08/30 21:40:18
Sloppiness.:) Done.
|
| + <script src="chrome://resources/js/util.js"></script> |
| + <script src="jquery.js"></script> |
| + <script src="flot.js"></script> |
| + <script src="chart.js"></script> |
| </div> |
| - <script src="chrome://resources/js/cr.js"></script> |
| - <script src="chrome://resources/js/util.js"></script> |
| - <script src="jquery.js"></script> |
| - <script src="flot.js"></script> |
| - <script src="chart.js"></script> |
| </body> |
| </html> |
