Side by Side Diff: options.html
Issue 6088024630755328:
issue 1526 - Implement new options page design for Chrome/Opera/Safari (Closed)
Patch Set:
Created Jan. 28, 2015, 3:59 p.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« locale/en-US/options.json ('k')
|
options.js » ('j')
|
options.js » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| OLD | NEW |
|---|---|
| (Empty) | |
| 1 <!DOCTYPE html> | |
| 2 <!-- | |
| 3 - This file is part of Adblock Plus <https://adblockplus.org/>, | |
| 4 - Copyright (C) 2006-2015 Eyeo GmbH | |
| 5 - | |
| 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 | |
| 8 - published by the Free Software Foundation. | |
| 9 - | |
| 10 - Adblock Plus is distributed in the hope that it will be useful, | |
| 11 - but WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 12 - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
| 13 - GNU General Public License for more details. | |
| 14 - | |
| 15 - You should have received a copy of the GNU General Public License | |
| 16 - along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>. | |
| 17 --> | |
| 18 | |
| 19 <html> | |
| 20 <head> | |
| 21 <meta charset="utf-8"> | |
| 22 <title class="i18n_options_page_title"></title> | |
| 23 <link rel="stylesheet" href="skin/options.css"> | |
| 24 <script src="ext/common.js"></script> | |
| 25 <script src="ext/content.js"></script> | |
| 26 <script src="i18n.js"></script> | |
| 27 <script src="options.js"></script> | |
| 28 </head> | |
| 29 <body> | |
| 30 <!-- Navigation sidebar --> | |
| 31 <div id="nav-sidebar"> | |
| 32 <div id="fixed-sidebar" class="fixed"> | |
| 33 <div id="page-title"> | |
| 34 <p class="i18n_options_page_name"></p> | |
| 35 <h1 class="i18n_options_abp"></h1> | |
| 36 </div> | |
| 37 <ul class="tabs vertical" id="main-navigation-tabs"> | |
| 38 <li id="tab-general" data-show="content-general" class="active"> | |
| 39 <span class="i18n_options_tab_general"></span> | |
| 40 <span class="icon"></span> | |
| 41 </li> | |
| 42 <li id="tab-advanced" data-show="content-advanced"> | |
| 43 <span class="i18n_options_tab_advanced"></span> | |
| 44 <span class="icon"></span> | |
| 45 </li> | |
| 46 <li id="tab-help" data-show="content-help"> | |
| 47 <span class="i18n_options_tab_help"></span> | |
| 48 <span class="icon"></span> | |
| 49 </li> | |
| 50 </ul> | |
| 51 <p class="nav-link"> | |
| 52 <span class="i18n_options_version"></span> <span id="abp-version"></sp an> | |
| 53 </p> | |
| 54 <ul class="tabs vertical bottom"> | |
| 55 <li id="tab-share"> | |
| 56 <span class="i18n_options_tab_share"></span><span class="icon"></spa n> | |
| 57 </li> | |
| 58 <li id="tab-donate"> | |
| 59 <span class="i18n_options_tab_donate"></span><span class="icon"></sp an> | |
| 60 </li> | |
| 61 </ul> | |
| 62 </div> | |
| 63 </div> | |
| 64 <div id="tab-content"> | |
| 65 <div id="content-wrapper"> | |
| 66 <div id="modal-background"></div> | |
| 67 | |
| 68 <!-- General tab content --> | |
| 69 <div id="content-general"> | |
| 70 <div> | |
| 71 <h1 class="i18n_options_blocking"></h1> | |
| 72 <div class="flex-container"> | |
| 73 <div id="blocking-languages"> | |
| 74 <p class="option-name"> | |
| 75 <span class="i18n_options_language_title"></span> | |
| 76 <a class="i18n_options_readMore tooltip" href="#" target="_bla nk"></a> | |
| 77 </p> | |
| 78 <ul class="table list" id="blocking-languages-table"></ul> | |
| 79 <div class="controls"> | |
| 80 <button id="add-website-language" data-show="blocking-language s-modal"> | |
| 81 <span class="icon icon-add"></span> | |
| 82 <span class="i18n_options_language_add"></span> | |
| 83 </button> | |
| 84 </div> | |
| 85 </div> | |
| 86 <div id="further-blocking"> | |
| 87 <p class="option-name"> | |
| 88 <strong class="i18n_options_furtherBlocking_title"></strong> | |
| 89 <a class="i18n_options_readMore tooltip" href="#" target="_bla nk"></a> | |
| 90 </p> | |
| 91 <ul class="table list" id="further-list-table"></ul> | |
| 92 <div class="controls"> | |
| 93 <button id="add-blocking-list" data-show="further-blocking-mod al"> | |
| 94 <span class="icon icon-add"></span> | |
| 95 <span class="i18n_options_furtherBlocking_add"><span> | |
| 96 </button> | |
| 97 </div> | |
| 98 </div> | |
| 99 </div> | |
| 100 </div> | |
| 101 <div> | |
| 102 <h1 class="i18n_options_exceptions"></h1> | |
| 103 <div class="flex-container"> | |
| 104 <div id="acceptable-ads"> | |
| 105 <p class="option-name"> | |
| 106 <strong class="i18n_options_acceptableAds_title"></strong> | |
| 107 <a class="i18n_options_readMore tooltip" href="#" target="_bla nk"></a> | |
| 108 </p> | |
| 109 <ul class="table list"> | |
| 110 <li> | |
| 111 <input type="checkbox" id="allow-whitelist-cb"/> | |
| 112 <span>Allow some non-intrusive advertising</span> | |
| 113 </li> | |
| 114 </ul> | |
| 115 </div> | |
| 116 <div id="whitelisting"> | |
| 117 <p class="option-name"> | |
| 118 <strong class="i18n_options_whitelisted_title"></strong> | |
| 119 <a class="i18n_options_readMore tooltip" href="#" target="_bla nk"></a> | |
| 120 </p> | |
| 121 <ul class="table list" id="whitelisting-table"></ul> | |
| 122 <div class="controls"> | |
| 123 <div> | |
| 124 <span class="icon icon-add" id="whitelisting-add-icon"></spa n> | |
| 125 <input type="text" id="whitelisting-textbox" /> | |
| 126 <span class="icon icon-enter" id="whitelisting-enter-icon">< /span> | |
| 127 </div> | |
| 128 <div> | |
| 129 <button class="button-add" id="whitelisting-add-btn"> | |
| 130 +<span class="i18n_options_btn_add"></span> | |
| 131 </button> | |
| 132 <span></span> | |
| 133 <button class="i18n_options_btn_cancel cancelbtn" id="whitel isting-cancel-btn"></button> | |
| 134 </div> | |
| 135 </div> | |
| 136 </div> | |
| 137 </div> | |
| 138 </div> | |
| 139 </div> | |
| 140 | |
| 141 <!-- Advanced tab content --> | |
| 142 <div id="content-advanced"> | |
| 143 <div> | |
| 144 <h1><span class="i18n_options_tweaks"></span><a class="i18n_options_ readMore tooltip" href="#"></a></h1> | |
|
Thomas Greiner
2015/01/30 13:55:52
Don't put everything in one line. Not only here bu
| |
| 145 <ul class="table" style="width: auto;"> | |
| 146 <li> | |
| 147 <input type="checkbox" id="easylist"/><span id="block-element-ex planation" class="i18n_options_tweaks_blockElement"></span></li> | |
| 148 </ul> | |
| 149 </div> | |
| 150 <div> | |
| 151 <h1><span class="i18n_options_blockingList"></span><a class="i18n_op tions_readMore tooltip" href="#" target="_blank"></a></h1> | |
| 152 <ul class="tabs horizontal" id="blocking-list-tabs"> | |
| 153 <li class="i18n_options_tab_overview active" data-show="blocking-l ist-overview"></li><li class="i18n_options_tab_ownList" data-show="blocking-list -own"></li> | |
| 154 </ul> | |
| 155 <div id="blocking-list"> | |
| 156 <div id="blocking-list-overview"> | |
| 157 <ul class="table cols" style="width: auto;"> | |
| 158 <li class="col-name"><span class="i18n_options_tableCol_name"> </span><span class="i18n_options_tableCol_description"></span><span class="i18n_ options_tableCol_date"></span></li> | |
| 159 <li><input type="checkbox" id="easylist"/><span>Easylist</span ><span>Adblocking english sites</span><span>15 March 14 - 10:31</span></li> | |
| 160 <li><input type="checkbox" id="easylist+de"/><span>Easylist Ge rmany + Easylist</span><span>Adblocking english + german sites</span><span>15 Ma rch 14 - 10:31</span></li> | |
| 161 <li><input type="checkbox" id="annoyance-fb"/><span>Facebook a nnoyance blocker</span><span>Blocks Facebook annoyances</span><span>15 March 14 - 10:31</span></li> | |
| 162 <li><input type="checkbox" id="annoyance-youtube"/><span>Faceb ook annoyance blocker</span><span>Blocks Facebook annoyances</span><span>15 Marc h 14 - 10:31</span></li> | |
| 163 <li><input type="checkbox" id="own-list"/><span>Own blocking l ist</span><span>Your own blocking list</span><span><a href="#">edit your blockin g list</a></span></li> | |
| 164 </ul> | |
| 165 <div class="controls"> | |
| 166 <button> | |
| 167 <span class="icon icon-add"></span><span class="i18n_options _blockingList_add"></span> | |
| 168 </button> | |
| 169 <button> | |
| 170 <span class="icon icon-update"></span><span class="i18n_opti ons_blockingList_update"></span> | |
| 171 </button> | |
| 172 </div> | |
| 173 </div> | |
| 174 <div id="blocking-list-own"> | |
| 175 <p class="i18n_options_blockingRules"></p> | |
| 176 <ul class="table list"> | |
| 177 <li><span>zap2it.com##.zc-station-position</span></li> | |
| 178 <li><span>downturk.net##.zippo</span></li> | |
| 179 <li><span>yahoo.com##.y708-promo-middle</span></li> | |
| 180 <li><span>reflector.com##.yahooboss</span></li> | |
| 181 <li><span>yardbarker.com##.yard_leader</span></li> | |
| 182 <li><span>espn.co.uk##.will_hill</span></li> | |
| 183 <li><span>listverse.com##.wiki</span></li> | |
| 184 <li><span>planet5d.com##.wp-image-1573</span></li> | |
| 185 <li><span>buzzinn.net##.wpn_finner</span></li> | |
| 186 <li><span>talkers.com##.wpss_slideshow</span></li> | |
| 187 </ul> | |
| 188 <div class="controls" style="margin: 0px;"> | |
| 189 <input type="text" placeholder="add your blocking rule here"/> | |
| 190 <div class="input-control"> | |
| 191 <span class="input-separator"></span> | |
| 192 <span class="i18n_options_btn_add input-btn-text"></span> | |
| 193 <span class="icon icon-enter-blue"></span> | |
| 194 </div> | |
| 195 </div> | |
| 196 <div class="controls"> | |
| 197 <button> | |
| 198 <span class="icon icon-edit"></span> | |
| 199 <span class="i18n_options_blockingRules_edit"></span> | |
| 200 </button> | |
| 201 </div> | |
| 202 </div> | |
| 203 </div> | |
| 204 </div> | |
| 205 </div> | |
| 206 | |
| 207 <!-- Help tab content --> | |
| 208 <div id="content-help"> | |
| 209 <h1 class="i18n_options_faq"></h1> | |
| 210 <p class="i18n_options_faq_description"></p> | |
| 211 <p> | |
| 212 <a class="i18n_options_faq_link" href="#" target="_blank"></a> | |
| 213 </p> | |
| 214 <h1 class="i18n_options_forum"></h1> | |
| 215 <p class="i18n_options_forum_description"></p> | |
| 216 <p> | |
| 217 <a class="i18n_options_forum_link" href="#" target="_blank"></a> | |
| 218 </p> | |
| 219 <h1 class="i18n_options_media"></h1> | |
| 220 <p class="i18n_options_media_description"></p> | |
| 221 <p> | |
| 222 <a href="#" target="_blank">Twitter</a> | |
| 223 <a href="#" target="_blank">Facebook</a> | |
| 224 <a href="#" target="_blank">Google+</a> | |
| 225 </p> | |
| 226 </div> | |
| 227 </div> | |
| 228 </div> | |
| 229 | |
| 230 <!-- Modal --> | |
| 231 <div id="modal"> | |
| 232 <header> | |
| 233 <span id="modal-title"></span> | |
| 234 <button id="modal-close" class="i18n_options_close"></button> | |
| 235 </header> | |
| 236 <div class="content" id="modal-content"> | |
| 237 <!-- Add other website language: Modal --> | |
| 238 <div id="blocking-languages-modal" data-title="options_modal_language_ti tle"> | |
| 239 <div> | |
| 240 <h3 class="i18n_options_modal_language_added"></h3> | |
| 241 <ul class="table list" id="blocking-languages-modal-table"></ul> | |
| 242 </div> | |
| 243 <div id="other-language"> | |
| 244 <h3 class="i18n_options_modal_language_other"></h3> | |
| 245 <div> | |
| 246 <input type="text" id="find-language" /> | |
| 247 </div> | |
| 248 <ul class="table list" id="all-lang-table"></ul> | |
| 249 </div> | |
| 250 </div> | |
| 251 <!-- Add other blocking list: Modal --> | |
| 252 <div id="further-blocking-modal" data-title="options_modal_blocklist_tit le"> | |
| 253 <div> | |
| 254 <h3 class="i18n_options_modal_blocklist_subscription_title"></h3> | |
| 255 <div> | |
| 256 <input id="blockingList-textbox" type="text" placeholder="www.exam ple.com/blockinglist.txt" /> | |
| 257 </div> | |
| 258 <div class="btn-wrapper" id="import-blockingList-btn"> | |
| 259 <span class="icon icon-arrow"></span> | |
| 260 <span class="i18n_options_modal_blocklist_import"></span> | |
| 261 </div> | |
| 262 </div> | |
| 263 <div> | |
| 264 <h3 class="i18n_options_modal_edit_own_list"></h3> | |
| 265 <div class="btn-wrapper" id="edit-ownBlockingList-btn"> | |
| 266 <span class="icon icon-arrow"></span> | |
| 267 <span class="i18n_options_modal_create_own_list"></span> | |
| 268 </div> | |
| 269 </div> | |
| 270 </div> | |
| 271 </div> | |
| 272 </div> | |
| 273 </body> | |
| 274 </html> | |
| OLD | NEW |
« no previous file with comments
|
« locale/en-US/options.json ('k')
|
options.js » ('j')
|
options.js » ('J')
