Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code
Issues
All Issues

Delta Between Two Patch Sets: desktop-options.html

Issue 29655630: Issue 5873 - Show original subscription title in languages table (Closed)
Left Patch Set: Created Jan. 3, 2018, 8:51 p.m.
Right Patch Set: Created Jan. 8, 2018, 12:53 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
Left: Side by side diff | Download
Right: Side by side diff | Download
« no previous file with change/comment | « no previous file | desktop-options.js » ('j') | no next file with change/comment »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
LEFTRIGHT
1 <!DOCTYPE html> 1 <!DOCTYPE html>
2 <!-- 2 <!--
3 - This file is part of Adblock Plus <https://adblockplus.org/>, 3 - This file is part of Adblock Plus <https://adblockplus.org/>,
4 - Copyright (C) 2006-present eyeo GmbH 4 - Copyright (C) 2006-present eyeo GmbH
5 - 5 -
6 - Adblock Plus is free software: you can redistribute it and/or modify 6 - Adblock Plus is free software: you can redistribute it and/or modify
7 - it under the terms of the GNU General Public License version 3 as 7 - it under the terms of the GNU General Public License version 3 as
8 - published by the Free Software Foundation. 8 - published by the Free Software Foundation.
9 - 9 -
10 - Adblock Plus is distributed in the hope that it will be useful, 10 - Adblock Plus is distributed in the hope that it will be useful,
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
79 <div id="content-general" role="tabpanel" aria-labelledby="tab-general"> 79 <div id="content-general" role="tabpanel" aria-labelledby="tab-general">
80 <header> 80 <header>
81 <h1 class="i18n_options_tab_general"></h1> 81 <h1 class="i18n_options_tab_general"></h1>
82 <p class="i18n_options_general_description"></p> 82 <p class="i18n_options_general_description"></p>
83 </header> 83 </header>
84 <section class="cols"> 84 <section class="cols">
85 <h2 class="i18n_options_privacy_header"></h2> 85 <h2 class="i18n_options_privacy_header"></h2>
86 <ul class="list" id="recommend-protection-list-table"> 86 <ul class="list" id="recommend-protection-list-table">
87 <template> 87 <template>
88 <button data-action="toggle-remove-subscription" role="checkbox" c lass="control icon"></button> 88 <button data-action="toggle-remove-subscription" role="checkbox" c lass="control icon"></button>
89 <label data-display="title"></label> 89 <span data-display="title"></span>
90 <span data-tooltip="options_protection_%value%_tooltip"></span> 90 <span data-tooltip="options_protection_%value%_tooltip"></span>
91 </template> 91 </template>
92 </ul> 92 </ul>
93 </section> 93 </section>
94 <section class="cols"> 94 <section class="cols">
95 <header> 95 <header>
96 <h2 class="i18n_options_acceptableAds_header"></h2> 96 <h2 class="i18n_options_acceptableAds_header"></h2>
97 <p class="i18n_options_acceptableAds_description"></p> 97 <p class="i18n_options_acceptableAds_description"></p>
98 </header> 98 </header>
99 <form id="acceptable-ads"> 99 <form id="acceptable-ads">
(...skipping 27 matching lines...) Expand all
127 </form> 127 </form>
128 </section> 128 </section>
129 <section class="cols"> 129 <section class="cols">
130 <header> 130 <header>
131 <h2 class="i18n_options_language_header"></h2> 131 <h2 class="i18n_options_language_header"></h2>
132 <p class="i18n_options_language_description"></p> 132 <p class="i18n_options_language_description"></p>
133 </header> 133 </header>
134 <div id="blocking-languages"> 134 <div id="blocking-languages">
135 <ul id="blocking-languages-table" class="table list bottom-control"> 135 <ul id="blocking-languages-table" class="table list bottom-control">
136 <template> 136 <template>
137 <label> 137 <span>
ire 2018/01/04 08:32:52 Using the <label> element here (and below) may not
saroyanm 2018/01/04 21:28:52 Agree, done.
138 <span data-display="title"></span> 138 <span data-display="title"></span>
139 <em>(<span data-display="originalTitle"></span>)</em> 139 <span class="dimmed">
140 </label> 140 (<span data-display="originalTitle"></span>)
141 </span>
142 </span>
141 <button data-single="hidden" data-action="remove-subscription" c lass="icon delete control" title="options_control_remove_title"></button> 143 <button data-single="hidden" data-action="remove-subscription" c lass="icon delete control" title="options_control_remove_title"></button>
142 <button data-single="visible" data-action="open-dialog" data-dia log="language-change" class="i18n_options_language_change link"></button> 144 <button data-single="visible" data-action="open-dialog" data-dia log="language-change" class="i18n_options_language_change link"></button>
143 </template> 145 </template>
144 </ul> 146 </ul>
145 <button class="i18n_options_language_add list" data-action="open-dia log" data-dialog="language-add"></button> 147 <button class="i18n_options_language_add list" data-action="open-dia log" data-dialog="language-add"></button>
146 <p class="i18n_options_language_tip"></p> 148 <p class="i18n_options_language_tip"></p>
147 </div> 149 </div>
148 </section> 150 </section>
149 <section id="more-filters" class="cols"> 151 <section id="more-filters" class="cols">
150 <header> 152 <header>
151 <h2 class="i18n_options_more_filters_header"></h2> 153 <h2 class="i18n_options_more_filters_header"></h2>
152 <p class="i18n_options_more_filters_description"></p> 154 <p class="i18n_options_more_filters_description"></p>
153 </header> 155 </header>
154 <div> 156 <div>
155 <ul id="more-list-table" class="table list"> 157 <ul id="more-list-table" class="table list">
156 <template> 158 <template>
157 <label data-display="title"></label> 159 <span data-display="title"></span>
158 <button data-action="remove-subscription" class="i18n_options_co ntrol_remove_title link control" title="options_control_remove_title"></button> 160 <button data-action="remove-subscription" class="i18n_options_co ntrol_remove_title link control" title="options_control_remove_title"></button>
159 </template> 161 </template>
160 </ul> 162 </ul>
161 <p class="i18n_options_more_filters_note"></p> 163 <p class="i18n_options_more_filters_note"></p>
162 </div> 164 </div>
163 </section> 165 </section>
164 </div> 166 </div>
165 167
166 <!-- Whitelist tab content --> 168 <!-- Whitelist tab content -->
167 <div id="content-whitelist" role="tabpanel" aria-labelledby="tab-whitelist "> 169 <div id="content-whitelist" role="tabpanel" aria-labelledby="tab-whitelist ">
168 <header> 170 <header>
169 <h1 class="i18n_options_tab_whitelist"></h1> 171 <h1 class="i18n_options_tab_whitelist"></h1>
170 <p> 172 <p>
171 <span class="i18n_options_whitelist_description"></span> 173 <span class="i18n_options_whitelist_description"></span>
172 <a id="whitelist-learn-more" class="i18n_options_learn_more" target= "_blank"></a> 174 <a id="whitelist-learn-more" class="i18n_options_learn_more" target= "_blank"></a>
173 </p> 175 </p>
174 </header> 176 </header>
175 <form class="section"> 177 <form class="section">
176 <input id="whitelisting-textbox" type="text"> 178 <input id="whitelisting-textbox" type="text">
177 <button id="whitelisting-add-button" 179 <button id="whitelisting-add-button"
178 type="submit" 180 type="submit"
179 data-action="add-domain-exception" 181 data-action="add-domain-exception"
180 class="i18n_options_whitelist_add primary" disabled> 182 class="i18n_options_whitelist_add primary" disabled>
181 </button> 183 </button>
182 </form> 184 </form>
183 <ul id="whitelisting-table" class="table list"> 185 <ul id="whitelisting-table" class="table list">
184 <template> 186 <template>
185 <label data-display="title"></label> 187 <span data-display="title"></span>
186 <button data-action="remove-filter" class="icon delete control" 188 <button data-action="remove-filter" class="icon delete control"
187 title="options_control_remove_title"> 189 title="options_control_remove_title">
188 </button> 190 </button>
189 </template> 191 </template>
190 </ul> 192 </ul>
191 </div> 193 </div>
192 194
193 <!-- Advanced tab content --> 195 <!-- Advanced tab content -->
194 <div id="content-advanced" role="tabpanel" 196 <div id="content-advanced" role="tabpanel"
195 aria-labelledby="tab-advanced"> 197 aria-labelledby="tab-advanced">
196 <header> 198 <header>
197 <h1 class="i18n_options_tab_advanced"></h1> 199 <h1 class="i18n_options_tab_advanced"></h1>
198 <p class="i18n_options_advanced_description"></p> 200 <p class="i18n_options_advanced_description"></p>
199 </header> 201 </header>
200 <section class="cols"> 202 <section class="cols">
201 <h2 class="i18n_options_customize_header"></h2> 203 <h2 class="i18n_options_customize_header"></h2>
202 <ul id="customize" class="list"> 204 <ul id="customize" class="list">
203 <li data-pref="shouldShowBlockElementMenu"> 205 <li data-pref="shouldShowBlockElementMenu">
204 <button class="icon" role="checkbox" data-action="toggle-pref"></b utton> 206 <button class="icon" role="checkbox" data-action="toggle-pref"></b utton>
205 <label class="i18n_options_customize_blockElement" data-display="t itle"></label> 207 <span class="i18n_options_customize_blockElement" data-display="ti tle"></span>
206 <span data-tooltip="options_customize_blockElement_tooltip"></span > 208 <span data-tooltip="options_customize_blockElement_tooltip"></span >
207 </li> 209 </li>
208 <li data-pref="show_devtools_panel"> 210 <li data-pref="show_devtools_panel">
209 <button class="icon" role="checkbox" data-action="toggle-pref"></b utton> 211 <button class="icon" role="checkbox" data-action="toggle-pref"></b utton>
210 <span class="i18n_options_customize_showDevToolsPanel" data-displa y="title"></span> 212 <span class="i18n_options_customize_showDevToolsPanel" data-displa y="title"></span>
211 <span data-tooltip="options_customize_showDevToolsPanel_tooltip">< /span> 213 <span data-tooltip="options_customize_showDevToolsPanel_tooltip">< /span>
212 </li> 214 </li>
213 <li data-pref="notifications_ignoredcategories"> 215 <li data-pref="notifications_ignoredcategories">
214 <button class="icon" role="checkbox" data-action="toggle-pref"></b utton> 216 <button class="icon" role="checkbox" data-action="toggle-pref"></b utton>
215 <span class="i18n_options_customize_showNotifications" data-displa y="title"></span> 217 <span class="i18n_options_customize_showNotifications" data-displa y="title"></span>
(...skipping 22 matching lines...) Expand all
238 <template> 240 <template>
239 <div class="col5"> 241 <div class="col5">
240 <button data-action="toggle-disable-subscription" role="checkbox " class="control icon toggle"> 242 <button data-action="toggle-disable-subscription" role="checkbox " class="control icon toggle">
241 </button> 243 </button>
242 <div class="state"> 244 <div class="state">
243 <span class="i18n_options_filterList_state_active" id="state-a ctive"></span> 245 <span class="i18n_options_filterList_state_active" id="state-a ctive"></span>
244 <span class="i18n_options_filterList_state_disabled" id="state -disabled"></span> 246 <span class="i18n_options_filterList_state_disabled" id="state -disabled"></span>
245 </div> 247 </div>
246 </div> 248 </div>
247 <div class="col5"> 249 <div class="col5">
248 <label data-display="originalTitle"></label> 250 <span data-display="originalTitle"></span>
249 </div> 251 </div>
250 <div class="col5"> 252 <div class="col5">
251 <span class="last-update"></span> 253 <span class="last-update"></span>
252 <span class="message"></span> 254 <span class="message"></span>
253 </div> 255 </div>
254 <div class="col5"> 256 <div class="col5">
255 <button data-action="open-context-menu" class="icon gear"></butt on> 257 <button data-action="open-context-menu" class="icon gear"></butt on>
256 <div role="menubar" class="context-menu-wrapper"> 258 <div role="menubar" class="context-menu-wrapper">
257 <div class="context-menu"> 259 <div class="context-menu">
258 <ul class="content" role="menu"> 260 <ul class="content" role="menu">
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after
367 <p class="i18n_options_dialog_about_trademark"></p> 369 <p class="i18n_options_dialog_about_trademark"></p>
368 <p> 370 <p>
369 <button class="i18n_options_close primary default-focus" data-action ="close-dialog"></button> 371 <button class="i18n_options_close primary default-focus" data-action ="close-dialog"></button>
370 </p> 372 </p>
371 </div> 373 </div>
372 <!-- Add language subscription --> 374 <!-- Add language subscription -->
373 <div id="dialog-content-language-add" class="dialog-content"> 375 <div id="dialog-content-language-add" class="dialog-content">
374 <ul id="all-lang-table-add" class="table list default-focus"> 376 <ul id="all-lang-table-add" class="table list default-focus">
375 <template> 377 <template>
376 <button data-action="add-language-subscription,close-dialog" class ="control icon add" role="checkbox"> 378 <button data-action="add-language-subscription,close-dialog" class ="control icon add" role="checkbox">
377 <label> 379 <span>
ire 2018/01/04 08:32:52 As I mentioned above the <label> here isn't approp
saroyanm 2018/01/04 21:28:52 Agree, done.
378 <span data-display="title"></span> 380 <span data-display="title"></span>
379 <em>(<span data-display="originalTitle"></span>)</em> 381 <span class="dimmed">
ire 2018/01/04 08:32:52 Should this be an `<em>` element? In the spec scre
saroyanm 2018/01/04 21:28:52 Initially I though we would like to <em> as stress
380 </label> 382 (<span data-display="originalTitle"></span>)
383 </span>
384 </span>
381 </button> 385 </button>
382 <button data-action="change-language-subscription,close-dialog" cl ass="control icon change" role="checkbox"> 386 <button data-action="change-language-subscription,close-dialog" cl ass="control icon change" role="checkbox">
383 <label> 387 <span>
384 <span data-display="title"></span> 388 <span data-display="title"></span>
385 <em>(<span data-display="originalTitle"></span>)</em> 389 <span class="dimmed">
386 </label> 390 (<span data-display="originalTitle"></span>)
391 </span>
392 </span>
387 </button> 393 </button>
388 </template> 394 </template>
389 </ul> 395 </ul>
390 </div> 396 </div>
391 <!-- Add import subscription --> 397 <!-- Add import subscription -->
392 <div id="dialog-content-import" class="dialog-content"> 398 <div id="dialog-content-import" class="dialog-content">
393 <form data-validation="custom" novalidate> 399 <form data-validation="custom" novalidate>
394 <p class="floating-input"> 400 <p class="floating-input">
395 <input placeholder=" " id="import-list-title" type="text" class="d efault-focus" required /> 401 <input placeholder=" " id="import-list-title" type="text" class="d efault-focus" required />
396 <label for="import-list-title" class="i18n_options_dialog_import_s ubscription_title"></label> 402 <label for="import-list-title" class="i18n_options_dialog_import_s ubscription_title"></label>
(...skipping 26 matching lines...) Expand all
423 </div> 429 </div>
424 <!-- Notification --> 430 <!-- Notification -->
425 <div id="notification" aria-hidden="true" aria-live="polite"> 431 <div id="notification" aria-hidden="true" aria-live="polite">
426 <strong id="notification-text"></strong> 432 <strong id="notification-text"></strong>
427 <button class="icon close secondary" data-action="hide-notification"> 433 <button class="icon close secondary" data-action="hide-notification">
428 <span class="i18n_options_notification_hide sr-only"></span> 434 <span class="i18n_options_notification_hide sr-only"></span>
429 </button> 435 </button>
430 </div> 436 </div>
431 </body> 437 </body>
432 </html> 438 </html>
LEFTRIGHT
« no previous file | desktop-options.js » ('j') | Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Toggle Comments ('s')

Powered by Google App Engine
This is Rietveld