Side by Side Diff: popup.html
Issue 29317001:
Relocated icon and redesigned icon popup (Closed)
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')
| OLD | NEW |
|---|---|
| 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 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> | 22 <link rel="stylesheet" type="text/css" href="skin/popup.css"> |
| 23 <link type="text/css" href="jquery-ui/css/smoothness/jquery-ui-1.8.16.custom.css " rel="stylesheet" /> | 23 <script src="ext/common.js"></script> |
| 24 <style type="text/css" media="screen"> | 24 <script src="ext/background.js"></script> |
| 25 body { | 25 <script src="i18n.js"></script> |
| 26 font-size: 75%; | 26 <script src="popup.js"></script> |
| 27 font-family: Helvetica, Arial, sans-serif; | 27 <script src="notification.js"></script> |
| 28 min-width: 170px; | 28 <script src="stats.js"></script> |
| 29 background: #ffffff; | |
| 30 color: #000000; | |
| 31 overflow: hidden; | |
| 32 } | |
| 33 | |
| 34 a { text-decoration: none } | |
| 35 | |
| 36 #notification | |
| 37 { | |
| 38 min-width: 240px; | |
| 39 margin-bottom: 10px; | |
| 40 border-radius: 5px; | |
| 41 border: 2px solid; | |
| 42 } | |
| 43 | |
| 44 #notification.information | |
| 45 { | |
| 46 border-color: #09d; | |
| 47 } | |
| 48 | |
| 49 #notification.critical | |
| 50 { | |
| 51 border-color: #e40; | |
| 52 } | |
| 53 | |
| 54 #notification>h1 | |
| 55 { | |
| 56 font-size: 16px; | |
| 57 } | |
| 58 | |
| 59 #notification>* | |
| 60 { | |
| 61 margin: 5px; | |
| 62 } | |
| 63 | |
| 64 #filtersList { | |
| 65 border: 1px dotted gray; | |
| 66 padding: 1px; | |
| 67 font-size: 75%; | |
| 68 display: none; | |
| 69 } | |
| 70 | |
| 71 .ui-button { | |
| 72 padding: 3px; | |
| 73 } | |
| 74 | |
| 75 .spacer { | |
| 76 height: 7px; | |
| 77 width: 5px; | |
| 78 display: block; | |
| 79 } | |
| 80 | |
| 81 #statsContainer | |
| 82 { | |
| 83 margin: 10px 5px; | |
| 84 padding: 5px; | |
| 85 border: 1px solid rgb(150, 150, 200); | |
| 86 border-radius: 5px; | |
| 87 white-space: nowrap; | |
| 88 background: -webkit-linear-gradient(rgb(250, 250, 255), rgb(200, 200, 255) 50p x); | |
| 89 background: linear-gradient(rgb(250, 250, 255), rgb(200, 200, 255) 50px); | |
| 90 } | |
| 91 | |
| 92 #statsPage > strong, | |
| 93 #statsTotal > strong | |
| 94 { | |
| 95 display: inline-block; | |
| 96 min-width: 50px; | |
| 97 color: rgb(255, 50, 50); | |
| 98 text-align: right; | |
| 99 } | |
| 100 | |
| 101 #share | |
| 102 { | |
| 103 display: block; | |
| 104 color: rgb(75, 75, 200); | |
| 105 text-align: right; | |
| 106 text-decoration: underline; | |
| 107 } | |
| 108 | |
| 109 #shareBox > a | |
| 110 { | |
| 111 display: block; | |
| 112 margin-top: 5px; | |
| 113 } | |
| 114 </style> | |
| 115 | |
| 116 <script type="text/javascript" src="jquery-ui/js/jquery-1.7.1.min.js"></script> | |
| 117 <script type="text/javascript" src="ext/common.js"></script> | |
| 118 <script type="text/javascript" src="ext/background.js"></script> | |
| 119 <script type="text/javascript" src="i18n.js"></script> | |
| 120 <script type="text/javascript" src="popup.js"></script> | |
| 121 <script type="text/javascript" src="notification.js"></script> | |
| 122 <script type="text/javascript" src="stats.js"></script> | |
| 123 </head> | 29 </head> |
| 124 <!-- Set tabindex to work around Chromium issue 304532 --> | 30 <!-- Set tabindex to work around Chromium issue 304532 --> |
| 125 <body id="main" tabindex="1"> | 31 <body tabindex="1"> |
| 126 <div id="notification" style="display: none"> | 32 |
| 127 <h1 id="title"></h1> | 33 <header> |
| 128 <p id="message"></p> | 34 <div id="logo"></div> |
| 35 </header> | |
| 36 | |
| 37 <div id="wrapper"> | |
| 38 <div id="notification"> | |
| 39 <h1> | |
| 40 <span id="notification-title"></span> | |
| 41 <span id="close-notification"></span> | |
| 42 </h1> | |
| 43 <div id="notification-message"></div> | |
| 44 </div> | |
| 45 | |
| 46 <div id="clickhide-instructions" class="i18n_clickhide_instructions"></div> | |
| 47 | |
| 48 <ul id="menu"> | |
| 49 <li id="enabled" class="menu-item" role="button"> | |
| 50 <div class="icon"></div> | |
| 51 <span id="enabled-yes" class="i18n_enabled_for_site"></span> | |
| 52 <span id="enabled-no" class="i18n_disabled_for_site"></span> | |
| 53 </li> | |
| 54 | |
| 55 <li id="clickhide" class="menu-item" role="button"> | |
| 56 <div class="icon"></div> | |
| 57 <span class="i18n_easy_create_filter"></span> | |
| 58 </li> | |
| 59 <li id="clickhide-cancel" class="menu-item" role="button"> | |
| 60 <div class="icon"></div> | |
| 61 <span class="i18n_cancel"></span> | |
| 62 </li> | |
| 63 | |
| 64 <li id="stats-container"> | |
| 65 <div class="menu-item collapse" data-option="show_statsinpopup" data-colla psable="stats-container" role="button"> | |
| 66 <div class="icon"></div> | |
| 67 <span class="i18n_stats_title"></span> | |
| 68 <div class="collapse-icon"></div> | |
| 69 </div> | |
| 70 <ul id="stats" class="collapsable"> | |
| 71 <li> | |
| 72 <div> | |
| 73 <div id="stats-page"></div> | |
| 74 <div id="stats-total"></div> | |
| 75 </div> | |
| 76 | |
| 77 <div id="share"> | |
| 78 <span class="i18n_stats_share_title"></span> | |
| 79 <div id="share-box"> | |
| 80 <div data-social="facebook"></div> | |
| 81 <div data-social="twitter"></div> | |
| 82 <div data-social="gplus"></div> | |
| 83 </div> | |
| 84 </div> | |
| 85 </li> | |
| 86 <li> | |
| 87 <div id="show-iconnumber" class="checkbox" role="checkbox" aria-checke d></div> | |
| 88 <label for="show-iconnumber" class="i18n_stats_show_iconnumber"></labe l> | |
| 89 </li> | |
| 90 </ul> | |
| 91 </li> | |
| 92 </ul> | |
| 129 </div> | 93 </div> |
| 130 | 94 |
| 131 <div id="enabledCheckboxAndLabel" style="display:none"><input id="enabled" type= "checkbox" checked><label for="enabled"><span class="i18n_enabled_for_site"></sp an></label></div> | 95 <footer id="options" role="button"> |
| 132 <div id="clickHideInactiveStuff" style="display: none"> | 96 <div class="icon"></div> |
| 133 <div class="spacer"></div> | 97 <span class="i18n_options_short"></span> |
| 134 <button id="clickHideButton" class="ui-button ui-widget ui-state-default ui-corn er-all ui-button-text-only"><span class="i18n_easy_create_filter"></span></butto n> | 98 </footer> |
| 135 </div> | |
| 136 | 99 |
| 137 <div id="clickHideActiveStuff" style="display: none"> | |
| 138 <div id="clickHideMsg"><span class="i18n_clickhide_instructions"></span></div> | |
| 139 <div class="spacer"></div> | |
| 140 <button id="cancelButton" class="ui-button ui-widget ui-state-default ui-corner- all ui-button-text-only"><span class="i18n_cancel"></span></button> | |
| 141 </div> | |
| 142 | |
| 143 <div class="spacer"></div> | |
| 144 <button id="optionsButton" class="ui-button ui-widget ui-state-default ui-corner -all ui-button-text-only"><span class="i18n_options"></span></button> | |
| 145 | |
| 146 <div id="statsContainer" hidden> | |
| 147 <strong class="i18n_stats_title"></strong> | |
| 148 <div id="stats"> | |
| 149 <div id="statsPage" class="label"></div> | |
| 150 <div id="statsTotal" class="label"></div> | |
| 151 </div> | |
| 152 <div> | |
| 153 <a id="share" class="i18n_stats_share_title" href="#"></a> | |
| 154 <div id="shareBox" hidden> | |
| 155 <a class="i18n_stats_share_label_fb ui-button ui-widget ui-state-default u i-corner-all" data-social="facebook"></a> | |
| 156 <a id="shareTwitter" class="i18n_stats_share_label_twitter ui-button ui-wi dget ui-state-default ui-corner-all" data-social="twitter"></a> | |
| 157 <a id="shareGplus" class="i18n_stats_share_label_gplus ui-button ui-widget ui-state-default ui-corner-all" data-social="gplus"></a> | |
| 158 </div> | |
| 159 </div> | |
| 160 </div> | |
| 161 | |
| 162 </div> | |
| 163 </body> | 100 </body> |
| 164 </html> | 101 </html> |
| OLD | NEW |
