Issue 394 - hit statistics tool data collection

chrome/content/ui/filters.xul

 <?xml version="1.0"?>
 
 <!--
   - This file is part of Adblock Plus <https://adblockplus.org/>,
-  - Copyright (C) 2006-2015 Eyeo GmbH
+  - Copyright (C) 2006-2016 Eyeo GmbH
   -
   - Adblock Plus is free software: you can redistribute it and/or modify
   - it under the terms of the GNU General Public License version 3 as
   - published by the Free Software Foundation.
   -
   - Adblock Plus is distributed in the hope that it will be useful,
   - but WITHOUT ANY WARRANTY; without even the implied warranty of
   - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   - GNU General Public License for more details.
   -
@@ skipping 164 matching lines @@
             oncontextmenu="SubscriptionActions.openMenu(event, this);">
           <vbox class="{subscription.disabled ? 'disabled' : ''}">
             <hbox align="center">
               <checkbox label="&subscription.enabled.label;" class="enabledCheckbox tabable" tabindex="-1"
                 checked="{subscription.disabled ? 'false' : 'true'}" oncommand="SubscriptionActions.setDisabled(this, !this.checked);"/>
 
               <vbox flex="1">
                 <hbox align="center">
                   <deck class="titleBox" flex="1" selectedIndex="0" onselect="event.stopPropagation();">
                     <description ondblclick="if (event.button == 0) TitleEditor.start(this, true);">
-                      <description class="title" value="{subscription.title}" flex="1" crop="end"/>
+                      <description class="title" value="{getSubscriptionTitle(subscription)}" flex="1" crop="end"/>
                       (<if condition="{isExternal}">
                         <description value="&subscription.external.label;"/>
                       <else/>
                         <if condition="{subscription.homepage}">
                           <description class="link" value="&subscription.homepage.label;"
                             _url="{subscription.homepage}" tooltiptext="{subscription.homepage}"
                             onclick="if (event.button == 0) { event.stopPropagation();UI.loadInBrowser(this.getAttribute('_url')); }"/>,&#160;
                         </if>
                         <description class="link" value="&subscription.source.label;"
                           _url="{subscription.url}" tooltiptext="{subscription.url}"
@@ skipping 38 matching lines @@
                   <menuitem label="&subscription.update.label;" key="subscription-update-key" command="subscription-update-command"/>
                   <menuitem label="&subscription.showHideFilters.label;" key="subscription-showHideFilters-key" command="subscription-showHideFilters-command"/>
                   <menuitem label="&subscription.delete.label;…" key="delete-key" command="subscription-delete-command"/>
                   <menuseparator/>
                   <menuitem label="&subscription.moveUp.label;" key="moveUp-key" command="subscription-moveUp-command"/>
                   <menuitem label="&subscription.moveDown.label;" key="moveDown-key" command="subscription-moveDown-command"/>
                 </menupopup>
               </button>
             </hbox>
 
-            <description class="warning" hidden="{!subscription.upgradeRequired}">&subscription.minVersion.warning;</description>
+            <description class="warning" hidden="{!upgradeRequired}">&subscription.minVersion.warning;</description>
             <description class="warning" hidden="{!disabledFilters}">
               &subscription.disabledFilters.warning;
               <description class="link" value="&subscription.disabledFilters.enable;" onclick="SubscriptionActions.enableFilters(this);"/>
             </description>
           </vbox>
         </richlistitem>
 
         <deck id="noSubscriptionsDeck" flex="1">
           <description flex="1">&noSubscriptions.text;</description>
           <richlistbox id="subscriptions" class="initialFocus" flex="1"
               onselect="onSelectionChange(this);"
               ondragover="SubscriptionActions.dragOver(event);"
               ondrop="SubscriptionActions.drop(event, null);"
               onkeypress="SubscriptionActions.keyPress(event);">
           </richlistbox>
         </deck>
 
         <description>
           <checkbox id="acceptableAds" label="&acceptableAds2.label;" oncommand="ListManager.allowAcceptableAds(this.checked);"/>
           <label class="text-link" value="&viewList.label;" onclick="UI.loadInBrowser(Prefs.subscriptions_exceptionsurl);"/>
           <label class="text-link" value="&readMore.label;" onclick="UI.loadDocLink('acceptable_ads');"/>
         </description>
-        <description>
+        <description id="sendStats-container">
           <checkbox id="sendStats" label="&sendStats.label;" oncommand="toggleSendStats(this.checked);"/>
           <label class="text-link" value="&privacyPolicy.label;" onclick="UI.loadDocLink('privacy_filter_hits');"/>
         </description>
       </tabpanel>
       <tabpanel id="filtersTab" orient="vertical" flex="1">
         <hbox pack="end">
           <button id="addGroupButton" label="&addGroup.label;" command="group-add-command"/>
         </hbox>
 
         <richlistitem id="groupTemplate" class="subscription" hidden="true" orient="vertical"
             onmousedown="this._wasSelected = (this.parentNode.selectedItem == this);"
             ondragstart="SubscriptionActions.startDrag(event, this);"
             ondragend="SubscriptionActions.endDrag();"
             ondragover="SubscriptionActions.dragOver(event);"
             ondrop="SubscriptionActions.drop(event, this);"
             oncontextmenu="SubscriptionActions.openMenu(event, this);">
           <hbox class="{subscription.disabled ? 'disabled' : ''}" align="center">
             <checkbox label="&subscription.enabled.label;" class="enabledCheckbox tabable" tabindex="-1"
               checked="{subscription.disabled ? 'false' : 'true'}" oncommand="SubscriptionActions.setDisabled(this, !this.checked);"/>
             <hbox align="center" flex="1">
               <deck class="titleBox" flex="1" selectedIndex="0" onselect="event.stopPropagation();">
-                <description class="title" value="{subscription.title}" crop="end" ondblclick="if (event.button == 0) TitleEditor.start(this, true);"/>
+                <description class="title" value="{getSubscriptionTitle(subscription)}" crop="end" ondblclick="if (event.button == 0) TitleEditor.start(this, true);"/>
                 <textbox oncontextmenu="event.stopPropagation();" class="titleEditor" onkeypress="TitleEditor.keyPress(event);" onblur="TitleEditor.end(true);"/>
               </deck>
             </hbox>
             <button class="actionButton tabable" type="menu" label="&subscription.actions.label;" tabindex="-1">
               <menupopup class="actionMenu">
                 <menuitem label="&subscription.editTitle.label;" key="edit-key" command="subscription-editTitle-command"/>
                 <menuitem label="&subscription.showHideFilters.label;" key="subscription-showHideFilters-key" command="subscription-showHideFilters-command"/>
                 <menuitem label="&subscription.delete.label;…" key="delete-key" command="subscription-delete-command"/>
                 <menuseparator/>
                 <menuitem label="&subscription.moveUp.label;" key="moveUp-key" command="subscription-moveUp-command"/>
@@ skipping 90 matching lines @@
       <menuitem id="restoreOwnBackup" key="restore-key" label="&restore.own.label;…" oncommand="Backup.restoreFromFile();"/>
     </menupopup>
   </button>
 
   <spacer flex="1"/>
 
   <button id="close" dlgtype="accept" label="&close.label;"/>
 </hbox>
 
 </dialog>