- Make Overlay work in SeaMonkey

- Correct positioning of menu item in Firefox
- Remove unnecessary param in reporterOverlay.js
- Localize Rogue String to About
- Add Neil to about

Not part of build

extensions/reporter/resources/content/reporter/about.xul

@@ -58,7 +58,7 @@
         <text value="Robert Accettura" onclick="window.open('http://robert.accettura.com/zoo/reporter');"/>
 
         <separator class="thin" />
-        <text value="Thanks:" style="font-weight: bold;"/>
+        <text value="&thanks.text;:" style="font-weight: bold;"/>
         <text value="Asa Dotzler"/>
         <text value="Ben Goodger"/>
         <text value="Adam Hauner"/>
@@ -66,6 +66,7 @@
         <text value="Myk Melez"/>
         <text value="David Miller"/>
         <text value="Jay Patel"/>
+        <text value="Neil Rashbrook"/>
         <text value="Doron Rosenberg"/>
         <text value="Daniel Wang"/>
         <text value="Boris Zbarsky"/>

extensions/reporter/resources/content/reporter/contents.rdf

@@ -16,17 +16,17 @@
   </RDF:Description>
   <!-- overlay information -->
   <RDF:Seq about="urn:mozilla:overlays">
-    <RDF:li resource="chrome://browser/content/browser.xul" />
+    <RDF:li resource="chrome://help/content/helpMenuOverlay.xul" />
+    <RDF:li resource="chrome://communicator/content/utilityOverlay.xul" />
+    <RDF:li resource="chrome://global/content/customizeToolbar.xul"/>
   </RDF:Seq>
-  <RDF:Seq about="chrome://browser/content/browser.xul">
+  <RDF:Seq about="chrome://help/content/helpMenuOverlay.xul">
     <RDF:li>chrome://reporter/content/reporterOverlay.xul</RDF:li>
   </RDF:Seq>
-  <!-- Fix -->
-  <RDF:Seq about="urn:mozilla:overlays">
-    <RDF:li resource="chrome://global/content/customizeToolbar.xul"/>
+  <RDF:Seq about="chrome://communicator/content/utilityOverlay.xul">
+    <RDF:li>chrome://reporter/content/reporterOverlay.xul</RDF:li>
   </RDF:Seq>
   <RDF:Seq about="chrome://global/content/customizeToolbar.xul">
     <RDF:li>chrome://reporter/content/reporterOverlay.xul</RDF:li>
   </RDF:Seq>
-  <!-- /Fix -->
 </RDF:RDF>

extensions/reporter/resources/content/reporter/reporterOverlay.js

@@ -37,8 +37,6 @@
 
 function loadReporterWizard()
 {
-  window.openDialog("chrome://reporter/content/reportWizard.xul", "", "chrome,centerscreen,wmodal,dialog,resizable=no,width=535,height=442",getBrowser().currentURI.spec);
+  window.openDialog("chrome://reporter/content/reportWizard.xul", "", "chrome,centerscreen,dialog,resizable=no,width=535,height=442",getBrowser().currentURI.spec);
   return true;
 }
-
-

extensions/reporter/resources/content/reporter/reporterOverlay.xul

@@ -47,17 +47,19 @@
 
   <!-- Firefox -->
   <menupopup id="menu_HelpPopup">
-    <menuitem id="reportertoolmenu" position="9" label="&reporterMenu.title;" accesskey="&reporterMenu.accesskey;" insertbefore="menu_HelpPopup"
-        oncommand="loadReporterWizard()" />
+    <menuitem id="reportertoolmenu" label="&reporterMenu.title;" accesskey="&reporterMenu.accesskey;" insertbefore="aboutName"
+              oncommand="loadReporterWizard()"/>
+    <menuseparator insertbefore="aboutName"/>
   </menupopup>
 
-  <!-- SeaMonkey -->
-<!--  <menupopup id="helpPopup">
-    <menuitem id="reportertoolmenu" position="9" label="&reporterMenu.title;" accesskey="&reporterMenu.accesskey;" insertbefore="menu_HelpPopup"
-        oncommand="loadReporterWizard()" />
-  </menupopup>     -->
-
   <toolbarpalette id="BrowserToolbarPalette">
-    <toolbarbutton id="reporterMenuButton" oncommand="loadReporterWizard();" class="toolbarbutton-1" label="Reporter" tooltiptext="Report Broken Websites"/>
+    <toolbarbutton id="reporterMenuButton" oncommand="loadReporterWizard();" class="toolbarbutton-1" label="&reporterMenu.title;" tooltiptext="&reporterMenu.tooltip;"/>
   </toolbarpalette>
+
+  <!-- SeaMonkey -->
+  <menupopup id="helpPopup">
+    <menuitem id="reportertoolmenu" label="&reporterMenu.title;" accesskey="&reporterMenu.accesskey;" insertafter="menu_HelpAboutSeparator"
+              oncommand="loadReporterWizard()"/>
+    <menuseparator insertafter="reportertoolmenu"/>
+  </menupopup>
 </overlay>

extensions/reporter/resources/locale/en-US/reporter/about.dtd

@@ -1,3 +1,4 @@
 <!ENTITY projectLead.text                         "Project Lead">
 <!ENTITY copyright.text                           "Copyright (C) 2004">
+<!ENTITY projectLead.text                         "Thanks">