Delta Between Two Patch Sets: popup.html
Issue 16067002:
Added Safari Support (Closed)
Left Patch Set: Added missing copyright disclaimers and websql implementation
Created Oct. 23, 2013, 2:46 p.m.
Right Patch Set: Bugfixes
Created Nov. 15, 2013, 8:58 a.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with change/comment
|
« options.js ('k')
|
popup.js » ('j')
|
no next file with change/comment »
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 - |
| (...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 70 | 70 |
| 71 .ui-button { | 71 .ui-button { |
| 72 padding: 3px; | 72 padding: 3px; |
| 73 } | 73 } |
| 74 | 74 |
| 75 .spacer { | 75 .spacer { |
| 76 height: 7px; | 76 height: 7px; |
| 77 width: 5px; | 77 width: 5px; |
| 78 display: block; | 78 display: block; |
| 79 } | 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 } | |
| 80 </style> | 114 </style> |
| 81 | 115 |
| 82 <script type="text/javascript" src="jquery-ui/js/jquery-1.7.1.min.js"></script> | 116 <script type="text/javascript" src="jquery-ui/js/jquery-1.7.1.min.js"></script> |
| 83 <script type="text/javascript" src="ext/common.js"></script> | 117 <script type="text/javascript" src="ext/common.js"></script> |
| 84 <script type="text/javascript" src="ext/background.js"></script> | 118 <script type="text/javascript" src="ext/background.js"></script> |
| 85 <script type="text/javascript" src="i18n.js"></script> | 119 <script type="text/javascript" src="i18n.js"></script> |
| 86 <script type="text/javascript" src="popup.js"></script> | 120 <script type="text/javascript" src="popup.js"></script> |
| 87 <script type="text/javascript" src="notification.js"></script> | 121 <script type="text/javascript" src="notification.js"></script> |
| 122 <script type="text/javascript" src="stats.js"></script> | |
| 88 </head> | 123 </head> |
| 89 <body id="main"> | 124 <!-- Set tabindex to work around Chromium issue 304532 --> |
| 125 <body id="main" tabindex="1"> | |
| 90 <div id="notification" style="display: none"> | 126 <div id="notification" style="display: none"> |
| 91 <h1 id="title"></h1> | 127 <h1 id="title"></h1> |
| 92 <p id="message"></p> | 128 <p id="message"></p> |
| 93 </div> | 129 </div> |
| 94 | 130 |
| 95 <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> | 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> |
| 96 <div id="clickHideInactiveStuff" style="display: none"> | 132 <div id="clickHideInactiveStuff" style="display: none"> |
| 97 <div class="spacer"></div> | 133 <div class="spacer"></div> |
| 98 <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> | 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> |
| 99 </div> | 135 </div> |
| 100 | 136 |
| 101 <div id="clickHideActiveStuff" style="display: none"> | 137 <div id="clickHideActiveStuff" style="display: none"> |
| 102 <div id="clickHideMsg"><span class="i18n_clickhide_instructions"></span></div> | 138 <div id="clickHideMsg"><span class="i18n_clickhide_instructions"></span></div> |
| 103 <div class="spacer"></div> | 139 <div class="spacer"></div> |
| 104 <button id="cancelButton" class="ui-button ui-widget ui-state-default ui-corner- all ui-button-text-only"><span class="i18n_cancel"></span></button> | 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> |
| 105 </div> | 141 </div> |
| 106 | 142 |
| 107 <div class="spacer"></div> | 143 <div class="spacer"></div> |
| 108 <button id="optionsButton" class="ui-button ui-widget ui-state-default ui-corner -all ui-button-text-only"><span class="i18n_options"></span></button> | 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> |
| 109 | 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 | |
| 110 </div> | 162 </div> |
| 111 </body> | 163 </body> |
| 112 </html> | 164 </html> |
| LEFT | RIGHT |
« options.js ('k')
|
popup.js » ('j')
|
Toggle Intra-line Diffs ('i')
|
Expand Comments ('e')
|
Collapse Comments ('c')
|
Toggle Comments ('s')
