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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: chrome/browser/resources/options/advanced_options.html

Issue 6541086: WebUI Prefs: Don't use display:block for labels (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Remove pointless rul Created 9 years, 10 months 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/advanced_options.css ('k') | chrome/browser/resources/options/autofill_options.html » ('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="advancedPage" class="page hidden"> 1 <div id="advancedPage" class="page hidden">
2 <h1 i18n-content="advancedPage"></h1> 2 <h1 i18n-content="advancedPage"></h1>
3 <section> 3 <section>
4 <h3 i18n-content="advancedSectionTitlePrivacy"></h3> 4 <h3 i18n-content="advancedSectionTitlePrivacy"></h3>
5 <div> 5 <div>
6 <div class="section-group"> 6 <div class="section-group">
7 <button id="privacyContentSettingsButton" 7 <button id="privacyContentSettingsButton"
8 i18n-content="privacyContentSettingsButton"></button> 8 i18n-content="privacyContentSettingsButton"></button>
9 <button id="privacyClearDataButton" 9 <button id="privacyClearDataButton"
10 i18n-content="privacyClearDataButton"></button> 10 i18n-content="privacyClearDataButton"></button>
11 </div> 11 </div>
12 <div i18n-content="improveBrowsingExperience" class="informational-text"> 12 <div i18n-content="improveBrowsingExperience" class="informational-text">
13 </div> 13 </div>
14 <div> 14 <div>
15 <span i18n-content="disableWebServices" class="informational-text"> 15 <span i18n-content="disableWebServices" class="informational-text">
16 </span> 16 </span>
17 <a target="_blank" i18n-content="learnMore" 17 <a target="_blank" i18n-content="learnMore"
18 i18n-values="href:privacyLearnMoreURL"></a> 18 i18n-values="href:privacyLearnMoreURL"></a>
19 </div> 19 </div>
20 <label class="checkbox"> 20 <div class="checkbox">
21 <input id="alternateErrorPagesEnabled" pref="alternate_error_pages.enabl ed" 21 <label>
22 metric="Options_LinkDoctorCheckbox" type="checkbox"> 22 <input id="alternateErrorPagesEnabled" pref="alternate_error_pages.ena bled"
23 <span i18n-content="linkDoctorPref"></span> 23 metric="Options_LinkDoctorCheckbox" type="checkbox">
24 </label> 24 <span i18n-content="linkDoctorPref"></span>
25 <label class="checkbox"> 25 </label>
26 <input id="searchSuggestEnabled" pref="search.suggest_enabled" 26 </div>
27 metric="Options_UseSuggestCheckbox" type="checkbox"> 27 <div class="checkbox">
28 <span i18n-content="suggestPref"></span> 28 <label>
29 </label> 29 <input id="searchSuggestEnabled" pref="search.suggest_enabled"
30 <label class="checkbox"> 30 metric="Options_UseSuggestCheckbox" type="checkbox">
31 <input id="dnsPrefetchingEnabled" pref="dns_prefetching.enabled" 31 <span i18n-content="suggestPref"></span>
32 metric="Options_DnsPrefetchCheckbox" type="checkbox"> 32 </label>
33 <span i18n-content="networkDNSPrefetchEnabledDescription"></span> 33 </div>
34 </label> 34 <div class="checkbox">
35 <label class="checkbox"> 35 <label>
36 <input id="safeBrowsingEnabled" pref="safebrowsing.enabled" 36 <input id="dnsPrefetchingEnabled" pref="dns_prefetching.enabled"
37 metric="Options_SafeBrowsingCheckbox" type="checkbox"> 37 metric="Options_DnsPrefetchCheckbox" type="checkbox">
38 <span i18n-content="safeBrowsingEnableProtection"></span> 38 <span i18n-content="networkDNSPrefetchEnabledDescription"></span>
39 </label> 39 </label>
40 </div>
41 <div class="checkbox">
42 <label>
43 <input id="safeBrowsingEnabled" pref="safebrowsing.enabled"
44 metric="Options_SafeBrowsingCheckbox" type="checkbox">
45 <span i18n-content="safeBrowsingEnableProtection"></span>
46 </label>
47 </div>
40 <if expr="pp_ifdef('_google_chrome') and pp_ifdef('chromeos')"> 48 <if expr="pp_ifdef('_google_chrome') and pp_ifdef('chromeos')">
41 <label class="checkbox" id="metricsReportingSetting"> 49 <div class="checkbox" id="metricsReportingSetting">
42 <input id="metricsReportingEnabled" 50 <label>
43 pref="cros.metrics.reportingEnabled" type="checkbox"> 51 <input id="metricsReportingEnabled"
44 <span i18n-content="enableLogging" id="metricsReportingEnabledText"> 52 pref="cros.metrics.reportingEnabled" type="checkbox">
45 </span> 53 <span i18n-content="enableLogging" id="metricsReportingEnabledText">
46 </label> 54 </span>
55 </label>
56 </div>
47 </if> 57 </if>
48 <if expr="pp_ifdef('_google_chrome') and not pp_ifdef('chromeos')"> 58 <if expr="pp_ifdef('_google_chrome') and not pp_ifdef('chromeos')">
49 <label class="checkbox" id="metricsReportingSetting"> 59 <div class="checkbox" id="metricsReportingSetting">
50 <input id="metricsReportingEnabled" type="checkbox"> 60 <label>
51 <span i18n-content="enableLogging"></span> 61 <input id="metricsReportingEnabled" type="checkbox">
52 </label> 62 <span i18n-content="enableLogging"></span>
63 </label>
64 </div>
53 </if> 65 </if>
54 </div> 66 </div>
55 </section> 67 </section>
56 <section> 68 <section>
57 <h3 i18n-content="advancedSectionTitleContent"></h3> 69 <h3 i18n-content="advancedSectionTitleContent"></h3>
58 <div> 70 <div>
59 <div class="section-group"> 71 <div class="section-group">
60 <label class="web-content-select-label"> 72 <label class="web-content-select-label">
61 <span i18n-content="defaultFontSizeLabel"></span> 73 <span i18n-content="defaultFontSizeLabel"></span>
62 <select id="defaultFontSize"> 74 <select id="defaultFontSize">
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
96 i18n-content="languageAndSpellCheckSettingsButton"></button> 108 i18n-content="languageAndSpellCheckSettingsButton"></button>
97 </if> 109 </if>
98 <if expr="os == 'win32'"> 110 <if expr="os == 'win32'">
99 <button id="gearSettingsConfigureGearsButton" 111 <button id="gearSettingsConfigureGearsButton"
100 i18n-content="gearSettingsConfigureGearsButton"></button> 112 i18n-content="gearSettingsConfigureGearsButton"></button>
101 </if> 113 </if>
102 <if expr="not pp_ifdef('chromeos') or os == 'win32'"> 114 <if expr="not pp_ifdef('chromeos') or os == 'win32'">
103 </div> 115 </div>
104 </if> 116 </if>
105 <if expr="os == 'darwin'"> 117 <if expr="os == 'darwin'">
106 <label class="checkbox"> 118 <div class="checkbox">
107 <input id="tabsToLinksPref" pref="webkit.webprefs.tabs_to_links" 119 <label>
108 metric="Options_TabsToLinks" type="checkbox"> 120 <input id="tabsToLinksPref" pref="webkit.webprefs.tabs_to_links"
109 <span i18n-content="tabsToLinksPref"></span> 121 metric="Options_TabsToLinks" type="checkbox">
110 </label> 122 <span i18n-content="tabsToLinksPref"></span>
123 </label>
124 </div>
111 </if> 125 </if>
112 </div> 126 </div>
113 </section> 127 </section>
114 <section> 128 <section>
115 <h3 i18n-content="advancedSectionTitleNetwork"></h3> 129 <h3 i18n-content="advancedSectionTitleNetwork"></h3>
116 <div> 130 <div>
117 <div id="proxiesLabel"></div> 131 <div id="proxiesLabel"></div>
118 <div class="section-group"> 132 <div class="section-group">
119 <button id="proxiesConfigureButton" 133 <button id="proxiesConfigureButton"
120 i18n-content="proxiesConfigureButton"></button> 134 i18n-content="proxiesConfigureButton"></button>
121 </div> 135 </div>
122 </div> 136 </div>
123 </section> 137 </section>
124 <section> 138 <section>
125 <h3 i18n-content="advancedSectionTitleTranslate"></h3> 139 <h3 i18n-content="advancedSectionTitleTranslate"></h3>
126 <div> 140 <div class="checkbox">
127 <label class="checkbox"> 141 <label>
128 <input id="enableTranslate" pref="translate.enabled" 142 <input id="enableTranslate" pref="translate.enabled"
129 metric="Options_Translate" type="checkbox"> 143 metric="Options_Translate" type="checkbox">
130 <span i18n-content="translateEnableTranslate"></span> 144 <span i18n-content="translateEnableTranslate"></span>
131 </label> 145 </label>
132 </div> 146 </div>
133 </section> 147 </section>
134 <if expr="not pp_ifdef('chromeos')"> 148 <if expr="not pp_ifdef('chromeos')">
135 <section> 149 <section>
136 <h3 i18n-content="downloadLocationGroupName"></h3> 150 <h3 i18n-content="downloadLocationGroupName"></h3>
137 <div> 151 <div>
138 <div id="download-location-group"> 152 <div id="download-location-group">
139 <label> 153 <label>
140 <span i18n-content="downloadLocationBrowseTitle"></span> 154 <span i18n-content="downloadLocationBrowseTitle"></span>
141 <input id="downloadLocationPath" type="text" size="60" disabled> 155 <input id="downloadLocationPath" type="text" size="60" disabled>
142 </label> 156 </label>
143 <button id="downloadLocationChangeButton" 157 <button id="downloadLocationChangeButton"
144 i18n-content="downloadLocationChangeButton"></button> 158 i18n-content="downloadLocationChangeButton"></button>
145 </div> 159 </div>
146 <label class="checkbox"> 160 <div class="checkbox">
147 <input id="promptForDownload" metric="Options_AskForSaveLocation" 161 <label>
148 type="checkbox"> 162 <input id="promptForDownload" metric="Options_AskForSaveLocation"
149 <span id="promptForDownloadLabel" 163 type="checkbox">
150 i18n-content="downloadLocationAskForSaveLocation"></span> 164 <span id="promptForDownloadLabel"
151 </label> 165 i18n-content="downloadLocationAskForSaveLocation"></span>
166 </label>
167 </div>
152 <div id="auto-open-file-types-label" 168 <div id="auto-open-file-types-label"
153 i18n-content="autoOpenFileTypesInfo"></div> 169 i18n-content="autoOpenFileTypesInfo"></div>
154 <div class="section-group"> 170 <div class="section-group">
155 <button id="autoOpenFileTypesResetToDefault" 171 <button id="autoOpenFileTypesResetToDefault"
156 i18n-content="autoOpenFileTypesResetToDefault"></button> 172 i18n-content="autoOpenFileTypesResetToDefault"></button>
157 </div> 173 </div>
158 </div> 174 </div>
159 </section> 175 </section>
160 </if> 176 </if>
161 <section> 177 <section>
162 <h3 i18n-content="advancedSectionTitleSecurity"></h3> 178 <h3 i18n-content="advancedSectionTitleSecurity"></h3>
163 <div> 179 <div>
164 <div><button id="certificatesManageButton" 180 <div><button id="certificatesManageButton"
165 i18n-content="certificatesManageButton"></button></div> 181 i18n-content="certificatesManageButton"></button></div>
166 <if expr="os == 'win32'"> 182 <if expr="os == 'win32'">
167 <!-- Configure these options for manual handling on windows --> 183 <!-- Configure these options for manual handling on windows -->
168 <label class="checkbox"> 184 <div class="checkbox">
169 <input id="sslCheckRevocation" type="checkbox"> 185 <label>
170 <span i18n-content="sslCheckRevocation"></span> 186 <input id="sslCheckRevocation" type="checkbox">
171 </label> 187 <span i18n-content="sslCheckRevocation"></span>
172 <label class="checkbox"> 188 </label>
173 <input id="sslUseSSL3" type="checkbox"> 189 </div>
174 <span i18n-content="sslUseSSL3"></span> 190 <div class="checkbox">
175 </label> 191 <label>
176 <label class="checkbox"> 192 <input id="sslUseSSL3" type="checkbox">
177 <input id="sslUseTLS1" type="checkbox"> 193 <span i18n-content="sslUseSSL3"></span>
178 <span i18n-content="sslUseTLS1"></span> 194 </label>
179 </label> 195 </div>
196 <div class="checkbox">
197 <label>
198 <input id="sslUseTLS1" type="checkbox">
199 <span i18n-content="sslUseTLS1"></span>
200 </label>
201 </div>
180 </if> 202 </if>
181 <if expr="os == 'linux2' or os.find('bsd') != -1"> 203 <if expr="os == 'linux2' or os.find('bsd') != -1">
182 <!-- Configure these options for CrOS/Linux/BSD as preference keys --> 204 <!-- Configure these options for CrOS/Linux/BSD as preference keys -->
183 <label class="checkbox"> 205 <div class="checkbox">
184 <input id="sslCheckRevocation" pref="ssl.rev_checking.enabled" 206 <label>
185 metric="Options_CheckCertRevocation" type="checkbox"> 207 <input id="sslCheckRevocation" pref="ssl.rev_checking.enabled"
186 <span i18n-content="sslCheckRevocation"></span> 208 metric="Options_CheckCertRevocation" type="checkbox">
187 </label> 209 <span i18n-content="sslCheckRevocation"></span>
188 <label class="checkbox"> 210 </label>
189 <input id="sslUseSSL3" pref="ssl.ssl3.enabled" metric="Options_SSL3" 211 </div>
190 type="checkbox"> 212 <div class="checkbox">
191 <span i18n-content="sslUseSSL3"></span> 213 <label>
192 </label> 214 <input id="sslUseSSL3" pref="ssl.ssl3.enabled" metric="Options_SSL3"
193 <label class="checkbox"> 215 type="checkbox">
194 <input id="sslUseTLS1" pref="ssl.tls1.enabled" metric="Options_TLS1" 216 <span i18n-content="sslUseSSL3"></span>
195 type="checkbox"> 217 </label>
196 <span i18n-content="sslUseTLS1"></span> 218 </div>
197 </label> 219 <div class="checkbox">
220 <label>
221 <input id="sslUseTLS1" pref="ssl.tls1.enabled" metric="Options_TLS1"
222 type="checkbox">
223 <span i18n-content="sslUseTLS1"></span>
224 </label>
225 </div>
198 </if> 226 </if>
199 </div> 227 </div>
200 </section> 228 </section>
201 <if expr="not pp_ifdef('chromeos')"> 229 <if expr="not pp_ifdef('chromeos')">
202 <section id="cloud-print-proxy-section"> 230 <section id="cloud-print-proxy-section">
203 <h3 i18n-content="advancedSectionTitleCloudPrint"></h3> 231 <h3 i18n-content="advancedSectionTitleCloudPrint"></h3>
204 <div> 232 <div>
205 <div id="cloudPrintProxyLabel" 233 <div id="cloudPrintProxyLabel"
206 i18n-content="cloudPrintProxyDisabledLabel"></div> 234 i18n-content="cloudPrintProxyDisabledLabel"></div>
207 <div class="section-group"> 235 <div class="section-group">
(...skipping 15 matching lines...) Expand all
223 i18n-content="remotingSetupButton" 251 i18n-content="remotingSetupButton"
224 style="display:none;"></button> 252 style="display:none;"></button>
225 <button id="remotingStopButton" 253 <button id="remotingStopButton"
226 i18n-content="remotingStopButton" 254 i18n-content="remotingStopButton"
227 style="display:none;"></button> 255 style="display:none;"></button>
228 </div> 256 </div>
229 </div> 257 </div>
230 </section> 258 </section>
231 </if> 259 </if>
232 </div> 260 </div>
OLDNEW
« no previous file with comments | « chrome/browser/resources/options/advanced_options.css ('k') | chrome/browser/resources/options/autofill_options.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698