Issue 2193 - Added notification opt-out (Firefox)

chrome/content/ui/overlay.xul

 <?xml version="1.0"?>
 
 <!--
   - This file is part of Adblock Plus <https://adblockplus.org/>,
   - Copyright (C) 2006-2015 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.
   -
@@ skipping 43 matching lines @@
     <menuseparator id="abp-status-whitelist-sep"/>
     <menuitem id="abp-status-whitelistsite" labeltempl="&whitelist.site.label;" type="checkbox" command="abp-command-togglesitewhitelist"/>
     <menuitem id="abp-status-whitelistpage" label="&whitelist.page.label;" type="checkbox" command="abp-command-togglepagewhitelist"/>
     <menuitem id="abp-status-disabled" label="&disable.label;" type="checkbox" key="abp-key-enable" command="abp-command-enable"/>
     <menuseparator/>
     <menu id="abp-status-options" label="&options.label;">
       <menupopup id="abp-status-options-popup">
         <menuitem id="abp-status-frameobjects" label="&objecttabs.label;" type="checkbox" command="abp-command-toggleobjtabs"/>
         <menuitem id="abp-status-savestats" label="&counthits.label;" type="checkbox" command="abp-command-togglesavestats"/>
         <menuitem id="abp-status-sync" label="&sync.label;" type="checkbox" command="abp-command-togglesync"/>
+        <menuitem id="abp-status-shownotifications" label="&shownotifications.label;" type="checkbox" command="abp-command-toggleshownotifications"/>
         <menuseparator id="abp-status-iconSettingsSeparator"/>
         <menuitem id="abp-status-showintoolbar" label="&showintoolbar.label;" type="checkbox" command="abp-command-toggleshowintoolbar"/>
         <menuitem id="abp-status-showinstatusbar" label="&showinstatusbar.label;" type="checkbox" command="abp-command-toggleshowinstatusbar"/>
       </menupopup>
     </menu>
 
     <hbox class="abp-contributebutton" id="abp-status-contributebutton" pack="center" align="center">
       <!-- noautoclose attribute tells Australis menu that it shouldn't close when
            these are clicked, see https://bugzilla.mozilla.org/show_bug.cgi?id=940693 -->
       <button class="abp-contributebutton-btn" label="&contribute.label;" command="abp-command-contribute" flex="1" noautoclose="true"/>
@@ skipping 12 matching lines @@
     <command id="abp-command-togglesitewhitelist"/>
     <command id="abp-command-togglepagewhitelist"/>
     <command id="abp-command-toggleobjtabs"/>
     <command id="abp-command-togglesavestats"/>
     <command id="abp-command-togglesync"/>
     <command id="abp-command-toggleshowintoolbar"/>
     <command id="abp-command-toggleshowinstatusbar"/>
     <command id="abp-command-enable" oncommand="//"/>
     <command id="abp-command-contribute"/>
     <command id="abp-command-contribute-hide"/>
+    <command id="abp-command-toggleshownotifications"/>
   </commandset>
 
   <statusbarpanel id="abp-status" class="statusbarpanel-iconic"
       tooltip="abp-tooltip"/>
 
   <toolbarbutton id="abp-toolbarbutton" class="toolbarbutton-1" label="&toolbarbutton.label;"
       tooltip="abp-tooltip"/>
 
   <!-- Tools menu -->
   <menu id="abp-menuitem" label="&toolbarbutton.label;"/>
 
   <!-- Bottom bar -->
   <hbox id="abp-bottombar-container">
     <splitter id="abp-bottombar-splitter"/>
     <vbox id="abp-bottombar">
       <toolbox id="abp-bottombar-header">
         <toolbar id="abp-bottombar-toolbar" align="center" grippyhidden="true" fullscreentoolbar="true">
           <label id="abp-bottombar-title" control="abp-bottombar-browser" value="&sidebar.title;" flex="1" crop="end"/>
           <toolbarbutton id="abp-bottombar-close" command="abp-command-sidebar" tooltiptext="&closesidebar.label;"/>
         </toolbar>
       </toolbox>
       <iframe id="abp-bottombar-browser" src="chrome://adblockplus/content/ui/sidebar.xul" flex="1"/>
     </vbox>
   </hbox>
 
   <!-- Notification panel -->
   <panel id="abp-notification" type="arrow" orient="vertical"
     xmlns:html="http://www.w3.org/1999/xhtml">
-    <label id="abp-notification-title" class="header"/>
-    <html:p id="abp-notification-message"/>
-    <hbox id="abp-notification-question">
-      <button id="abp-notification-yes" label="&notification.button.yes;"/>
-      <button id="abp-notification-no" label="&notification.button.no;"/>
-      <toolbarbutton id="abp-notification-close" label="&notification.button.close;"></toolbarbutton>
-    </hbox>
+    <vbox id="abp-notification-content">
+      <toolbar align="start">
+        <label id="abp-notification-title" class="header" flex="1" crop="end"/>
+        <toolbarbutton id="abp-notification-close" tooltiptext="&notification.button.close;"/>
+      </toolbar>
+      <html:p id="abp-notification-message"/>
+      <hbox id="abp-notification-question">
+        <button id="abp-notification-yes" label="&notification.button.yes;"/>
+        <button id="abp-notification-no" label="&notification.button.no;"/>
+      </hbox>
+    </vbox>
+    <vbox id="abp-notification-close-content">
+      <toolbarbutton id="abp-notification-hide" label="&notification.closing.button.hide;"/>
+      <toolbarbutton id="abp-notification-optout" label="&notification.closing.button.optout;"/>
+    </vbox>
   </panel>
 </overlay>