Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(36)

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: chrome/browser/resources/options/chromeos/system_options.html

Issue 8539022: Bluetooth UI update. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge with trunk. Created 9 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/browser/resources/options/chromeos/bluetooth_list_element.js ('k') | chrome/browser/resources/options/chromeos/system_options.js » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 <div id="systemPage" class="page" hidden> 1 <div id="systemPage" class="page" hidden>
2 <h1 i18n-content="systemPage"></h1> 2 <h1 i18n-content="systemPage"></h1>
3 <div class="displaytable"> 3 <div class="displaytable">
4 <section> 4 <section>
5 <h3 i18n-content="datetimeTitle"></h3> 5 <h3 i18n-content="datetimeTitle"></h3>
6 <div class="option-control-table"> 6 <div class="option-control-table">
7 <span class="option-name" i18n-content="timezone"></span> 7 <span class="option-name" i18n-content="timezone"></span>
8 <div id="timezone-value"> 8 <div id="timezone-value">
9 <select id="timezone-select" class="control" 9 <select id="timezone-select" class="control"
10 i18n-options="timezoneList" 10 i18n-options="timezoneList"
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
54 <span i18n-content="enableTapToClick"></span> 54 <span i18n-content="enableTapToClick"></span>
55 </label> 55 </label>
56 </div> 56 </div>
57 </div> 57 </div>
58 </section> 58 </section>
59 <!-- By default, the bluetooth section is hidden. It is only 59 <!-- By default, the bluetooth section is hidden. It is only
60 visible if the command line flag --enable_bluetooth is set. --> 60 visible if the command line flag --enable_bluetooth is set. -->
61 <section id="bluetooth-devices" hidden> 61 <section id="bluetooth-devices" hidden>
62 <h3 i18n-content="bluetooth"></h3> 62 <h3 i18n-content="bluetooth"></h3>
63 <div id="bluetooth-options-div"> 63 <div id="bluetooth-options-div">
64 <div id="enable-bluetooth" class="checkbox"> 64 <div id="bluetooth-buttons">
65 <label> 65 <button id="enable-bluetooth" i18n-content="enableBluetooth" hidden>
66 <input id="enable-bluetooth-check" type="checkbox" 66 <button id="disable-bluetooth" i18n-content="disableBluetooth">
67 checked="checked" pref="settings.enable_bluetooth"> 67 </div>
68 <span i18n-content="enableBluetooth"></span> 68 <div id="no-bluetooth-devices-label"
69 </label> 69 i18n-content="noBluetoothDevicesFound">
70 </div> 70 </div>
71 <div id="bluetooth-device-list"> 71 <div id="bluetooth-device-list">
72 <!-- A list of connected devices is inserted here on page load. --> 72 <!-- A list of connected devices is inserted here on page load. -->
73 <!-- The list of devices is updated asynchronously on clicking 73 <!-- The list of devices is updated asynchronously on clicking
74 'Find Devices' --> 74 'Find Devices'. -->
75 </div>
76 <!-- Template for items in list of Bluetooth devices -->
77 <div id="bluetooth-item-template" class="bluetooth-item" hidden>
78 <div class="bluetooth-item-text">
79 <div class="network-name-label"></div>
80 <div class="bluetooth-status">
81 <span class="network-status-label"></span>
82 <div class="inline-spinner" hidden></div>
83 </div>
84 <div class="bluetooth-instructions"></div>
85 </div>
86 <div class="bluetooth-button-group"></div>
75 </div> 87 </div>
76 <div id = "bluetooth-finder-container"> 88 <div id = "bluetooth-finder-container">
77 <button id="bluetooth-find-devices" 89 <button id="bluetooth-find-devices"
78 i18n-content="findBluetoothDevices"></button> 90 i18n-content="findBluetoothDevices"></button>
91 <div id="bluetooth-scanning-icon"
92 class="inline-spinner transparent"></div>
79 <span id="bluetooth-scanning-label" class="transparent" 93 <span id="bluetooth-scanning-label" class="transparent"
80 i18n-content="bluetoothScanning"></span> 94 i18n-content="bluetoothScanning"></span>
81 <div id="bluetooth-scanning-icon"
82 class="throbber transparent"></div>
83 </div> 95 </div>
84 </div> 96 </div>
85 </section> 97 </section>
86 <section> 98 <section>
87 <h3 i18n-content="language"></h3> 99 <h3 i18n-content="language"></h3>
88 <div class="option-control-table"> 100 <div class="option-control-table">
89 <div class="option-name"> 101 <div class="option-name">
90 <button id="language-button" i18n-content="languageCustomize"> 102 <button id="language-button" i18n-content="languageCustomize">
91 </button> 103 </button>
92 </div> 104 </div>
(...skipping 11 matching lines...) Expand all
104 <label> 116 <label>
105 <input id="accesibility-check" type="checkbox"> 117 <input id="accesibility-check" type="checkbox">
106 <span i18n-content="accessibility"></span> 118 <span i18n-content="accessibility"></span>
107 </label> 119 </label>
108 </div> 120 </div>
109 </div> 121 </div>
110 </div> 122 </div>
111 </section> 123 </section>
112 </div> 124 </div>
113 </div> 125 </div>
OLDNEW
« no previous file with comments | « chrome/browser/resources/options/chromeos/bluetooth_list_element.js ('k') | chrome/browser/resources/options/chromeos/system_options.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698