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

Delta Between Two Patch Sets: chrome/content/ui/filters.xul

Issue 6337686776315904: Issue 394 - hit statistics tool data collection (Closed)
Left Patch Set: Rebase to changeset: 4095 Created Dec. 15, 2015, 6:09 p.m.
Right Patch Set: Use Downloader to send the data to server Created April 6, 2016, 3 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
Left: Side by side diff | Download
Right: Side by side diff | Download
LEFTRIGHT
1 <?xml version="1.0"?> 1 <?xml version="1.0"?>
2 2
3 <!-- 3 <!--
4 - This file is part of Adblock Plus <https://adblockplus.org/>, 4 - This file is part of Adblock Plus <https://adblockplus.org/>,
5 - Copyright (C) 2006-2015 Eyeo GmbH 5 - Copyright (C) 2006-2016 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 -
(...skipping 164 matching lines...) Expand 10 before | Expand all | Expand 10 after
180 oncontextmenu="SubscriptionActions.openMenu(event, this);"> 180 oncontextmenu="SubscriptionActions.openMenu(event, this);">
181 <vbox class="{subscription.disabled ? 'disabled' : ''}"> 181 <vbox class="{subscription.disabled ? 'disabled' : ''}">
182 <hbox align="center"> 182 <hbox align="center">
183 <checkbox label="&subscription.enabled.label;" class="enabledCheck box tabable" tabindex="-1" 183 <checkbox label="&subscription.enabled.label;" class="enabledCheck box tabable" tabindex="-1"
184 checked="{subscription.disabled ? 'false' : 'true'}" oncommand=" SubscriptionActions.setDisabled(this, !this.checked);"/> 184 checked="{subscription.disabled ? 'false' : 'true'}" oncommand=" SubscriptionActions.setDisabled(this, !this.checked);"/>
185 185
186 <vbox flex="1"> 186 <vbox flex="1">
187 <hbox align="center"> 187 <hbox align="center">
188 <deck class="titleBox" flex="1" selectedIndex="0" onselect="ev ent.stopPropagation();"> 188 <deck class="titleBox" flex="1" selectedIndex="0" onselect="ev ent.stopPropagation();">
189 <description ondblclick="if (event.button == 0) TitleEditor. start(this, true);"> 189 <description ondblclick="if (event.button == 0) TitleEditor. start(this, true);">
190 <description class="title" value="{subscription.title}" fl ex="1" crop="end"/> 190 <description class="title" value="{getSubscriptionTitle(su bscription)}" flex="1" crop="end"/>
191 (<if condition="{isExternal}"> 191 (<if condition="{isExternal}">
192 <description value="&subscription.external.label;"/> 192 <description value="&subscription.external.label;"/>
193 <else/> 193 <else/>
194 <if condition="{subscription.homepage}"> 194 <if condition="{subscription.homepage}">
195 <description class="link" value="&subscription.homepag e.label;" 195 <description class="link" value="&subscription.homepag e.label;"
196 _url="{subscription.homepage}" tooltiptext="{subscri ption.homepage}" 196 _url="{subscription.homepage}" tooltiptext="{subscri ption.homepage}"
197 onclick="if (event.button == 0) { event.stopPropagat ion();UI.loadInBrowser(this.getAttribute('_url')); }"/>,&#160; 197 onclick="if (event.button == 0) { event.stopPropagat ion();UI.loadInBrowser(this.getAttribute('_url')); }"/>,&#160;
198 </if> 198 </if>
199 <description class="link" value="&subscription.source.la bel;" 199 <description class="link" value="&subscription.source.la bel;"
200 _url="{subscription.url}" tooltiptext="{subscription.u rl}" 200 _url="{subscription.url}" tooltiptext="{subscription.u rl}"
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
239 <menuitem label="&subscription.update.label;" key="subscriptio n-update-key" command="subscription-update-command"/> 239 <menuitem label="&subscription.update.label;" key="subscriptio n-update-key" command="subscription-update-command"/>
240 <menuitem label="&subscription.showHideFilters.label;" key="su bscription-showHideFilters-key" command="subscription-showHideFilters-command"/> 240 <menuitem label="&subscription.showHideFilters.label;" key="su bscription-showHideFilters-key" command="subscription-showHideFilters-command"/>
241 <menuitem label="&subscription.delete.label;…" key="delete-key " command="subscription-delete-command"/> 241 <menuitem label="&subscription.delete.label;…" key="delete-key " command="subscription-delete-command"/>
242 <menuseparator/> 242 <menuseparator/>
243 <menuitem label="&subscription.moveUp.label;" key="moveUp-key" command="subscription-moveUp-command"/> 243 <menuitem label="&subscription.moveUp.label;" key="moveUp-key" command="subscription-moveUp-command"/>
244 <menuitem label="&subscription.moveDown.label;" key="moveDown- key" command="subscription-moveDown-command"/> 244 <menuitem label="&subscription.moveDown.label;" key="moveDown- key" command="subscription-moveDown-command"/>
245 </menupopup> 245 </menupopup>
246 </button> 246 </button>
247 </hbox> 247 </hbox>
248 248
249 <description class="warning" hidden="{!subscription.upgradeRequired} ">&subscription.minVersion.warning;</description> 249 <description class="warning" hidden="{!upgradeRequired}">&subscripti on.minVersion.warning;</description>
250 <description class="warning" hidden="{!disabledFilters}"> 250 <description class="warning" hidden="{!disabledFilters}">
251 &subscription.disabledFilters.warning; 251 &subscription.disabledFilters.warning;
252 <description class="link" value="&subscription.disabledFilters.ena ble;" onclick="SubscriptionActions.enableFilters(this);"/> 252 <description class="link" value="&subscription.disabledFilters.ena ble;" onclick="SubscriptionActions.enableFilters(this);"/>
253 </description> 253 </description>
254 </vbox> 254 </vbox>
255 </richlistitem> 255 </richlistitem>
256 256
257 <deck id="noSubscriptionsDeck" flex="1"> 257 <deck id="noSubscriptionsDeck" flex="1">
258 <description flex="1">&noSubscriptions.text;</description> 258 <description flex="1">&noSubscriptions.text;</description>
259 <richlistbox id="subscriptions" class="initialFocus" flex="1" 259 <richlistbox id="subscriptions" class="initialFocus" flex="1"
260 onselect="onSelectionChange(this);" 260 onselect="onSelectionChange(this);"
261 ondragover="SubscriptionActions.dragOver(event);" 261 ondragover="SubscriptionActions.dragOver(event);"
262 ondrop="SubscriptionActions.drop(event, null);" 262 ondrop="SubscriptionActions.drop(event, null);"
263 onkeypress="SubscriptionActions.keyPress(event);"> 263 onkeypress="SubscriptionActions.keyPress(event);">
264 </richlistbox> 264 </richlistbox>
265 </deck> 265 </deck>
266 266
267 <description> 267 <description>
268 <checkbox id="acceptableAds" label="&acceptableAds2.label;" oncommand= "ListManager.allowAcceptableAds(this.checked);"/> 268 <checkbox id="acceptableAds" label="&acceptableAds2.label;" oncommand= "ListManager.allowAcceptableAds(this.checked);"/>
269 <label class="text-link" value="&viewList.label;" onclick="UI.loadInBr owser(Prefs.subscriptions_exceptionsurl);"/> 269 <label class="text-link" value="&viewList.label;" onclick="UI.loadInBr owser(Prefs.subscriptions_exceptionsurl);"/>
270 <label class="text-link" value="&readMore.label;" onclick="UI.loadDocL ink('acceptable_ads');"/> 270 <label class="text-link" value="&readMore.label;" onclick="UI.loadDocL ink('acceptable_ads');"/>
271 </description> 271 </description>
272 <description> 272 <description id="sendStats-container">
273 <checkbox id="sendStats" label="&sendStats.label;" oncommand="toggleSe ndStats(this.checked);"/> 273 <checkbox id="sendStats" label="&sendStats.label;" oncommand="toggleSe ndStats(this.checked);"/>
274 <label class="text-link" value="&privacyPolicy.label;" onclick="UI.loa dDocLink('privacy_filter_hits');"/> 274 <label class="text-link" value="&privacyPolicy.label;" onclick="UI.loa dDocLink('privacy_filter_hits');"/>
275 </description> 275 </description>
276 </tabpanel> 276 </tabpanel>
277 <tabpanel id="filtersTab" orient="vertical" flex="1"> 277 <tabpanel id="filtersTab" orient="vertical" flex="1">
278 <hbox pack="end"> 278 <hbox pack="end">
279 <button id="addGroupButton" label="&addGroup.label;" command="group-ad d-command"/> 279 <button id="addGroupButton" label="&addGroup.label;" command="group-ad d-command"/>
280 </hbox> 280 </hbox>
281 281
282 <richlistitem id="groupTemplate" class="subscription" hidden="true" orie nt="vertical" 282 <richlistitem id="groupTemplate" class="subscription" hidden="true" orie nt="vertical"
283 onmousedown="this._wasSelected = (this.parentNode.selectedItem == th is);" 283 onmousedown="this._wasSelected = (this.parentNode.selectedItem == th is);"
284 ondragstart="SubscriptionActions.startDrag(event, this);" 284 ondragstart="SubscriptionActions.startDrag(event, this);"
285 ondragend="SubscriptionActions.endDrag();" 285 ondragend="SubscriptionActions.endDrag();"
286 ondragover="SubscriptionActions.dragOver(event);" 286 ondragover="SubscriptionActions.dragOver(event);"
287 ondrop="SubscriptionActions.drop(event, this);" 287 ondrop="SubscriptionActions.drop(event, this);"
288 oncontextmenu="SubscriptionActions.openMenu(event, this);"> 288 oncontextmenu="SubscriptionActions.openMenu(event, this);">
289 <hbox class="{subscription.disabled ? 'disabled' : ''}" align="center" > 289 <hbox class="{subscription.disabled ? 'disabled' : ''}" align="center" >
290 <checkbox label="&subscription.enabled.label;" class="enabledCheckbo x tabable" tabindex="-1" 290 <checkbox label="&subscription.enabled.label;" class="enabledCheckbo x tabable" tabindex="-1"
291 checked="{subscription.disabled ? 'false' : 'true'}" oncommand="Su bscriptionActions.setDisabled(this, !this.checked);"/> 291 checked="{subscription.disabled ? 'false' : 'true'}" oncommand="Su bscriptionActions.setDisabled(this, !this.checked);"/>
292 <hbox align="center" flex="1"> 292 <hbox align="center" flex="1">
293 <deck class="titleBox" flex="1" selectedIndex="0" onselect="event. stopPropagation();"> 293 <deck class="titleBox" flex="1" selectedIndex="0" onselect="event. stopPropagation();">
294 <description class="title" value="{subscription.title}" crop="en d" ondblclick="if (event.button == 0) TitleEditor.start(this, true);"/> 294 <description class="title" value="{getSubscriptionTitle(subscrip tion)}" crop="end" ondblclick="if (event.button == 0) TitleEditor.start(this, tr ue);"/>
295 <textbox oncontextmenu="event.stopPropagation();" class="titleEd itor" onkeypress="TitleEditor.keyPress(event);" onblur="TitleEditor.end(true);"/ > 295 <textbox oncontextmenu="event.stopPropagation();" class="titleEd itor" onkeypress="TitleEditor.keyPress(event);" onblur="TitleEditor.end(true);"/ >
296 </deck> 296 </deck>
297 </hbox> 297 </hbox>
298 <button class="actionButton tabable" type="menu" label="&subscriptio n.actions.label;" tabindex="-1"> 298 <button class="actionButton tabable" type="menu" label="&subscriptio n.actions.label;" tabindex="-1">
299 <menupopup class="actionMenu"> 299 <menupopup class="actionMenu">
300 <menuitem label="&subscription.editTitle.label;" key="edit-key" command="subscription-editTitle-command"/> 300 <menuitem label="&subscription.editTitle.label;" key="edit-key" command="subscription-editTitle-command"/>
301 <menuitem label="&subscription.showHideFilters.label;" key="subs cription-showHideFilters-key" command="subscription-showHideFilters-command"/> 301 <menuitem label="&subscription.showHideFilters.label;" key="subs cription-showHideFilters-key" command="subscription-showHideFilters-command"/>
302 <menuitem label="&subscription.delete.label;…" key="delete-key" command="subscription-delete-command"/> 302 <menuitem label="&subscription.delete.label;…" key="delete-key" command="subscription-delete-command"/>
303 <menuseparator/> 303 <menuseparator/>
304 <menuitem label="&subscription.moveUp.label;" key="moveUp-key" c ommand="subscription-moveUp-command"/> 304 <menuitem label="&subscription.moveUp.label;" key="moveUp-key" c ommand="subscription-moveUp-command"/>
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
395 <menuitem id="restoreOwnBackup" key="restore-key" label="&restore.own.labe l;…" oncommand="Backup.restoreFromFile();"/> 395 <menuitem id="restoreOwnBackup" key="restore-key" label="&restore.own.labe l;…" oncommand="Backup.restoreFromFile();"/>
396 </menupopup> 396 </menupopup>
397 </button> 397 </button>
398 398
399 <spacer flex="1"/> 399 <spacer flex="1"/>
400 400
401 <button id="close" dlgtype="accept" label="&close.label;"/> 401 <button id="close" dlgtype="accept" label="&close.label;"/>
402 </hbox> 402 </hbox>
403 403
404 </dialog> 404 </dialog>
LEFTRIGHT

Powered by Google App Engine
This is Rietveld