Delta Between Two Patch Sets: popup.html
Issue 29317001:
Relocated icon and redesigned icon popup (Closed)
Left Patch Set:
Created Nov. 7, 2013, 5:44 p.m.
Right Patch Set: Merged setBadgeNumber and setBadgeBackgroundColor
Created Dec. 13, 2013, 10:36 a.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« lib/stats.js ('K')
|
« notification.js ('k')
|
popup.js » ('j')
|
skin/popup.css » ('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')
| LEFT | RIGHT |
|---|---|
| 1 <!DOCTYPE html> | 1 <!DOCTYPE html> |
| 2 | 2 |
| 3 <!-- | 3 <!-- |
| 4 - This file is part of Adblock Plus <http://adblockplus.org/>, | 4 - This file is part of Adblock Plus <http://adblockplus.org/>, |
| 5 - Copyright (C) 2006-2013 Eyeo GmbH | 5 - Copyright (C) 2006-2013 Eyeo GmbH |
| 6 - | 6 - |
| 7 - Adblock Plus is free software: you can redistribute it and/or modify | 7 - Adblock Plus is free software: you can redistribute it and/or modify |
| 8 - it under the terms of the GNU General Public License version 3 as | 8 - it under the terms of the GNU General Public License version 3 as |
| 9 - published by the Free Software Foundation. | 9 - published by the Free Software Foundation. |
| 10 - | 10 - |
| 11 - Adblock Plus is distributed in the hope that it will be useful, | 11 - Adblock Plus is distributed in the hope that it will be useful, |
| 12 - but WITHOUT ANY WARRANTY; without even the implied warranty of | 12 - but WITHOUT ANY WARRANTY; without even the implied warranty of |
| 13 - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 13 - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
| 14 - GNU General Public License for more details. | 14 - GNU General Public License for more details. |
| 15 - | 15 - |
| 16 - You should have received a copy of the GNU General Public License | 16 - You should have received a copy of the GNU General Public License |
| 17 - along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>. | 17 - along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>. |
| 18 --> | 18 --> |
| 19 | 19 |
| 20 <html> | 20 <html> |
| 21 <head> | 21 <head> |
| 22 <link rel="stylesheet" type="text/css" href="skin/popup.css"> | 22 <link rel="stylesheet" type="text/css" href="skin/popup.css"> |
| 23 <script src="ext/common.js"></script> | |
| 24 <script src="ext/background.js"></script> | |
| 23 <script src="i18n.js"></script> | 25 <script src="i18n.js"></script> |
| 24 <script src="popup.js"></script> | 26 <script src="popup.js"></script> |
| 25 <script src="notification.js"></script> | 27 <script src="notification.js"></script> |
| 26 <script src="stats.js"></script> | 28 <script src="stats.js"></script> |
| 27 </head> | 29 </head> |
| 28 <!-- Set tabindex to work around Chromium issue 304532 --> | 30 <!-- Set tabindex to work around Chromium issue 304532 --> |
| 29 <body tabindex="1"> | 31 <body tabindex="1"> |
| 30 | 32 |
| 31 <header> | 33 <header> |
| 32 <div id="logo"></div> | 34 <div id="logo"></div> |
| 33 </header> | 35 </header> |
| 34 | 36 |
| 35 <div id="wrapper"> | 37 <div id="wrapper"> |
| 36 <div id="notification"> | 38 <div id="notification"> |
| 37 <h1> | 39 <h1> |
| 38 <span id="notification-title"></span> | 40 <span id="notification-title"></span> |
| 39 <div id="close-notification"></div> | 41 <span id="close-notification"></span> |
| 40 </h1> | 42 </h1> |
| 41 <div id="notification-message"></div> | 43 <div id="notification-message"></div> |
| 42 </div> | 44 </div> |
| 43 | 45 |
| 44 <div id="clickhide-instructions" class="i18n_clickhide_instructions"></div> | 46 <div id="clickhide-instructions" class="i18n_clickhide_instructions"></div> |
| 45 | 47 |
| 46 <ul id="menu"> | 48 <ul id="menu"> |
| 47 <li id="enabled" class="menu-item" role="button"> | 49 <li id="enabled" class="menu-item" role="button"> |
| 48 <div class="icon"></div> | 50 <div class="icon"></div> |
| 49 <span id="enabled-on" class="i18n_disable_for_site"></span> | 51 <span id="enabled-yes" class="i18n_enabled_for_site"></span> |
| 50 <span id="enabled-off" class="i18n_enable_for_site"></span> | 52 <span id="enabled-no" class="i18n_disabled_for_site"></span> |
| 51 </li> | 53 </li> |
| 52 | 54 |
| 53 <li id="clickhide" class="menu-item" role="button"> | 55 <li id="clickhide" class="menu-item" role="button"> |
| 54 <div class="icon"></div> | 56 <div class="icon"></div> |
| 55 <span class="i18n_easy_create_filter"></span> | 57 <span class="i18n_easy_create_filter"></span> |
| 56 </li> | 58 </li> |
| 57 <li id="clickhide-cancel" class="menu-item" role="button"> | 59 <li id="clickhide-cancel" class="menu-item" role="button"> |
| 58 <div class="icon"></div> | 60 <div class="icon"></div> |
| 59 <span class="i18n_cancel"></span> | 61 <span class="i18n_cancel"></span> |
| 60 </li> | 62 </li> |
| 61 | 63 |
| 62 <li id="stats-container"> | 64 <li id="stats-container"> |
| 63 <div class="menu-item collapse" data-option="show_popupstats" data-collaps able="stats-container" role="button"> | 65 <div class="menu-item collapse" data-option="show_statsinpopup" data-colla psable="stats-container" role="button"> |
| 64 <div class="icon"></div> | 66 <div class="icon"></div> |
| 65 <span class="i18n_stats_title"></span> | 67 <span class="i18n_stats_title"></span> |
| 66 <div class="collapse-icon"></div> | 68 <div class="collapse-icon"></div> |
| 67 </div> | 69 </div> |
| 68 <ul id="stats" class="collapsable"> | 70 <ul id="stats" class="collapsable"> |
| 69 <li> | 71 <li> |
| 70 <div> | 72 <div> |
| 71 <div id="stats-page"></div> | 73 <div id="stats-page"></div> |
| 72 <div id="stats-total"></div> | 74 <div id="stats-total"></div> |
| 73 </div> | 75 </div> |
| (...skipping 16 matching lines...) Expand all Loading... | |
| 90 </ul> | 92 </ul> |
| 91 </div> | 93 </div> |
| 92 | 94 |
| 93 <footer id="options" role="button"> | 95 <footer id="options" role="button"> |
| 94 <div class="icon"></div> | 96 <div class="icon"></div> |
| 95 <span class="i18n_options_short"></span> | 97 <span class="i18n_options_short"></span> |
| 96 </footer> | 98 </footer> |
| 97 | 99 |
| 98 </body> | 100 </body> |
| 99 </html> | 101 </html> |
| LEFT | RIGHT |
« notification.js ('k')
|
popup.js » ('j')
|
Toggle Intra-line Diffs ('i')
|
Expand Comments ('e')
|
Collapse Comments ('c')
|
Toggle Comments ('s')
