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

Side by Side Diff: new-options.html

Issue 29338983: issue 3741 - Add "remove" option to list items in new options page (Closed)
Patch Set: Rebaseed to changeset 84 Created June 10, 2016, 4:36 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | Download patch
OLDNEW
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-2016 Eyeo GmbH 4 - Copyright (C) 2006-2016 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 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
82 <div class="hbox"> 82 <div class="hbox">
83 <div id="blocking-languages"> 83 <div id="blocking-languages">
84 <div class="option-name"> 84 <div class="option-name">
85 <span class="i18n_options_language_title"></span> 85 <span class="i18n_options_language_title"></span>
86 <span class="i18n_options_readMore" 86 <span class="i18n_options_readMore"
87 data-tooltip="options_language_title_tooltip" 87 data-tooltip="options_language_title_tooltip"
88 data-tooltip-image="skin/tooltips/block.png"></span> 88 data-tooltip-image="skin/tooltips/block.png"></span>
89 </div> 89 </div>
90 <ul id="blocking-languages-table" class="table list"> 90 <ul id="blocking-languages-table" class="table list">
91 <template> 91 <template>
92 <button role="checkbox" class="control"></button> 92 <button data-action="toggle-disable-subscription" role="chec kbox" class="control" title="toggle"></button>
Thomas Greiner 2016/06/16 10:42:22 The titles need to be translatable as well.
saroyanm 2016/06/16 18:22:59 Done.
93 <label class="display"></label> 93 <label class="display"></label>
94 <button data-action="remove-subscription" class="delete cont rol" title="remove"></button>
94 </template> 95 </template>
95 </ul> 96 </ul>
96 <div class="controls"> 97 <div class="controls">
97 <button data-action="open-dialog" data-dialog="language"> 98 <button data-action="open-dialog" data-dialog="language">
98 <span class="icon icon-add"></span> 99 <span class="icon icon-add"></span>
99 <span class="i18n_options_language_add"></span> 100 <span class="i18n_options_language_add"></span>
100 </button> 101 </button>
101 </div> 102 </div>
102 </div> 103 </div>
103 <div id="further-blocking"> 104 <div id="further-blocking">
104 <div class="option-name"> 105 <div class="option-name">
105 <strong class="i18n_options_more_title"></strong> 106 <strong class="i18n_options_more_title"></strong>
106 <span class="i18n_options_readMore" 107 <span class="i18n_options_readMore"
107 data-tooltip="options_more_title_tooltip" 108 data-tooltip="options_more_title_tooltip"
108 data-tooltip-image="skin/tooltips/more.png" 109 data-tooltip-image="skin/tooltips/more.png"
109 data-tooltip-flip="horizontal"></span> 110 data-tooltip-flip="horizontal"></span>
110 </div> 111 </div>
111 <div id="custom-wrapper"> 112 <div id="custom-wrapper">
112 <ul id="recommend-list-table" class="table list"> 113 <ul id="recommend-list-table" class="table list">
113 <template> 114 <template>
114 <button role="checkbox" class="control"></button> 115 <button data-action="toggle-remove-subscription" role="che ckbox" class="control"></button>
115 <div class="fill"> 116 <div class="fill">
116 <label class="display" 117 <label class="display"
117 data-tooltip="options_more_%value%_tooltip" 118 data-tooltip="options_more_%value%_tooltip"
118 data-tooltip-native></label> 119 data-tooltip-native></label>
119 </div> 120 </div>
120 <span class="i18n_options_popular popular"></span>
121 </template> 121 </template>
122 </ul> 122 </ul>
123 <ul id="custom-list-table" class="table list"> 123 <ul id="custom-list-table" class="table list">
124 <template> 124 <template>
125 <button role="checkbox" class="control"></button> 125 <button data-action="toggle-disable-subscription" role="ch eckbox" class="control" title="toggle"></button>
126 <label class="display"></label> 126 <label class="display"></label>
127 <button data-action="remove-subscription" class="delete co ntrol" title="remove"></button>
127 </template> 128 </template>
128 </ul> 129 </ul>
129 </div> 130 </div>
130 <div class="controls"> 131 <div class="controls">
131 <button data-action="open-dialog" data-dialog="custom"> 132 <button data-action="open-dialog" data-dialog="custom">
132 <span class="icon icon-add"></span> 133 <span class="icon icon-add"></span>
133 <span class="i18n_options_more_add"><span> 134 <span class="i18n_options_more_add"><span>
134 </button> 135 </button>
135 </div> 136 </div>
136 </div> 137 </div>
137 </div> 138 </div>
138 </div> 139 </div>
139 <div> 140 <div>
140 <h1 class="i18n_options_exceptions_title"></h1> 141 <h1 class="i18n_options_exceptions_title"></h1>
141 <div class="hbox"> 142 <div class="hbox">
142 <div id="acceptable-ads"> 143 <div id="acceptable-ads">
143 <div class="option-name"> 144 <div class="option-name">
144 <strong class="i18n_options_acceptableAds_title"></strong> 145 <strong class="i18n_options_acceptableAds_title"></strong>
145 <span class="i18n_options_readMore" 146 <span class="i18n_options_readMore"
146 data-tooltip="options_acceptableAds_title_tooltip" 147 data-tooltip="options_acceptableAds_title_tooltip"
147 data-tooltip-image="skin/tooltips/acceptable-ads.png"></sp an> 148 data-tooltip-image="skin/tooltips/acceptable-ads.png"></sp an>
148 </div> 149 </div>
149 <ul id="acceptableads-table" class="table list"> 150 <ul id="acceptableads-table" class="table list">
150 <template> 151 <template>
151 <button role="checkbox" class="control"></button> 152 <button data-action="toggle-remove-subscription" role="check box" class="control"></button>
152 <label class="display"></label> 153 <label class="display"></label>
153 </template> 154 </template>
154 </ul> 155 </ul>
155 </div> 156 </div>
156 <div id="whitelisting"> 157 <div id="whitelisting">
157 <div class="option-name"> 158 <div class="option-name">
158 <strong class="i18n_options_whitelisted_title"></strong> 159 <strong class="i18n_options_whitelisted_title"></strong>
159 <span class="i18n_options_readMore" 160 <span class="i18n_options_readMore"
160 data-tooltip="options_whitelisted_title_tooltip" 161 data-tooltip="options_whitelisted_title_tooltip"
161 data-tooltip-image="skin/tooltips/whitelisted.png" 162 data-tooltip-image="skin/tooltips/whitelisted.png"
162 data-tooltip-flip="horizontal"></span> 163 data-tooltip-flip="horizontal"></span>
163 </div> 164 </div>
164 <ul id="whitelisting-table" class="table list"> 165 <ul id="whitelisting-table" class="table list">
165 <template> 166 <template>
166 <button class="delete control"></button>
167 <label class="display"></label> 167 <label class="display"></label>
168 <button data-action="remove-filter" class="delete control" t itle="remove"></button>
168 </template> 169 </template>
169 </ul> 170 </ul>
170 <div class="controls"> 171 <div class="controls">
171 <button data-action="edit-domain-exception"> 172 <button data-action="edit-domain-exception">
172 <span class="icon icon-add"></span> 173 <span class="icon icon-add"></span>
173 <span class="i18n_options_whitelisted_add"></span> 174 <span class="i18n_options_whitelisted_add"></span>
174 </button> 175 </button>
175 <div> 176 <div>
176 <span class="icon icon-add" data-action="add-domain-exceptio n"></span> 177 <span class="icon icon-add" data-action="add-domain-exceptio n"></span>
177 <input type="text" id="whitelisting-textbox" placeholder="ww w.example.com" /> 178 <input type="text" id="whitelisting-textbox" placeholder="ww w.example.com" />
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
234 <li class="i18n_options_tab_ownList" data-action="switch-tab" data -tab="advanced-customFilters"></li> 235 <li class="i18n_options_tab_ownList" data-action="switch-tab" data -tab="advanced-customFilters"></li>
235 </ul> 236 </ul>
236 <div id="filter-lists"> 237 <div id="filter-lists">
237 <div id="all-filter-lists"> 238 <div id="all-filter-lists">
238 <div class="table-header"> 239 <div class="table-header">
239 <h2 class="i18n_options_column_name"></h2> 240 <h2 class="i18n_options_column_name"></h2>
240 <h2 class="i18n_options_column_date"></h2> 241 <h2 class="i18n_options_column_date"></h2>
241 </div> 242 </div>
242 <ul class="table cols" id="all-filter-lists-table"> 243 <ul class="table cols" id="all-filter-lists-table">
243 <template> 244 <template>
244 <button role="checkbox" class="control"></button> 245 <button data-action="toggle-disable-subscription" role="chec kbox" class="control"></button>
245 <div> 246 <div>
246 <label data-action="open-context-menu" class="display"></l abel> 247 <label data-action="open-context-menu" class="display"></l abel>
247 <div data-action="open-context-menu" class="arrow"> 248 <div data-action="open-context-menu" class="arrow">
248 <div class="context-menu"> 249 <div class="context-menu">
249 <div class="content"> 250 <div class="content">
250 <a class="i18n_options_filterList_updateNow update-s ubscription" data-action="update-subscription"></a> 251 <a class="i18n_options_filterList_updateNow update-s ubscription" data-action="update-subscription"></a>
251 <a class="i18n_options_filterList_website website" t arget="_blank"></a> 252 <a class="i18n_options_filterList_website website" t arget="_blank"></a>
252 <a class="i18n_options_filterList_source source" tar get="_blank"></a> 253 <a class="i18n_options_filterList_source source" tar get="_blank"></a>
253 <a class="i18n_options_filterList_delete delete" dat a-action="remove-subscription"></a> 254 <a class="i18n_options_filterList_delete delete" dat a-action="remove-subscription"></a>
254 </div> 255 </div>
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
365 </template> 366 </template>
366 </ul> 367 </ul>
367 </div> 368 </div>
368 <div id="other-language" class="dialog-content-block"> 369 <div id="other-language" class="dialog-content-block">
369 <div> 370 <div>
370 <label for="find-language" class="i18n_options_dialog_language_oth er"></label> 371 <label for="find-language" class="i18n_options_dialog_language_oth er"></label>
371 <input type="search" id="find-language" class="default-focus" /> 372 <input type="search" id="find-language" class="default-focus" />
372 </div> 373 </div>
373 <ul id="all-lang-table" class="table list"> 374 <ul id="all-lang-table" class="table list">
374 <template> 375 <template>
375 <button class="button-add control"> 376 <button data-action="add-language-subscription" class="button-ad d control">
376 +<span class="i18n_options_button_add"></span> 377 +<span class="i18n_options_button_add"></span>
377 </button> 378 </button>
378 <label class="display"></label> 379 <label class="display"></label>
379 </template> 380 </template>
380 </ul> 381 </ul>
381 </div> 382 </div>
382 </div> 383 </div>
383 <!-- Add custom subscription --> 384 <!-- Add custom subscription -->
384 <div id="dialog-content-custom" class="dialog-content"> 385 <div id="dialog-content-custom" class="dialog-content">
385 <div class="dialog-content-block"> 386 <div class="dialog-content-block">
(...skipping 15 matching lines...) Expand all
401 <div class="url"></div> 402 <div class="url"></div>
402 <button class="i18n_options_dialog_predefined_confirm default-focus" data-action="add-predefined-subscription"></button> 403 <button class="i18n_options_dialog_predefined_confirm default-focus" data-action="add-predefined-subscription"></button>
403 </div> 404 </div>
404 </div> 405 </div>
405 </div> 406 </div>
406 <!-- Placeholder element to determine when to wrap focus around --> 407 <!-- Placeholder element to determine when to wrap focus around -->
407 <span class="focus-last" tabindex="0"></span> 408 <span class="focus-last" tabindex="0"></span>
408 </div> 409 </div>
409 </body> 410 </body>
410 </html> 411 </html>
OLDNEW
« no previous file with comments | « locale/en-US/new-options.json ('k') | new-options.js » ('j') | new-options.js » ('J')

Powered by Google App Engine
This is Rietveld