Bug 226955 Convert modal about to a <dialog> p=gautheri@noos.fr r=me sr=alecf

xpfe/global/jar.mn

@@ -13,7 +13,6 @@ toolkit.jar:
         content/global/logo.gif                     (resources/content/logo.gif) 
         content/global/aboutAbout.html              (resources/content/aboutAbout.html) 
         content/global/about.xul                    (resources/content/about.xul) 
-        content/global/about.js                     (resources/content/about.js) 
         content/global/config.xul                   (resources/content/config.xul) 
         content/global/config.css                   (resources/content/config.css) 
         content/global/config.js                    (resources/content/config.js) 

xpfe/global/resources/content/about.js

@@ -1,46 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
-* Version: NPL 1.1/GPL 2.0/LGPL 2.1
-*
-* The contents of this file are subject to the Netscape Public License
-* Version 1.1 (the "License"); you may not use this file except in
-* compliance with the License. You may obtain a copy of the License at
-* http://www.mozilla.org/NPL/
-*
-* Software distributed under the License is distributed on an "AS IS" basis,
-* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-* for the specific language governing rights and limitations under the
-* License.
-*
-* The Original Code is mozilla.org code.
-*
-* The Initial Developer of the Original Code is 
-* Netscape Communications Corporation.
-* Portions created by the Initial Developer are Copyright (C) 2002
-* the Initial Developer. All Rights Reserved.
-*
-* Contributor(s):
-*   Andrew Wooldridge <andreww@netscape.com>
-*
-* Alternatively, the contents of this file may be used under the terms of
-* either the GNU General Public License Version 2 or later (the "GPL"), or 
-* the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-* in which case the provisions of the GPL or the LGPL are applicable instead
-* of those above. If you wish to allow use of your version of this file only
-* under the terms of either the GPL or the LGPL, and not to allow others to
-* use your version of this file under the terms of the NPL, indicate your
-* decision by deleting the provisions above and replace them with the notice
-* and other provisions required by the GPL or the LGPL. If you do not delete
-* the provisions above, a recipient may use your version of this file under
-* the terms of any one of the NPL, the GPL or the LGPL.
-*
-* ***** END LICENSE BLOCK ***** */
-
-function aboutStartUp(){
-    //trigger setTimeout for fetching the contributors tab
-    setTimeout("aboutGetContributors()", 0);
-}
-
-function aboutGetContributors(){
-    var contributorsTab = document.getElementById("creditsframe");
-    contributorsTab.setAttribute("src","about:credits");
-}

xpfe/global/resources/content/about.xul

@@ -21,23 +21,17 @@ Rights Reserved.
 Contributor(s): Michael Lowe <michael.lowe@bigfoot.com> -->
 
 <?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?> 
-<?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
 
-<!DOCTYPE window [
+<!DOCTYPE dialog [
 <!ENTITY % brandDTD SYSTEM "chrome://global/locale/brand.dtd" >
 %brandDTD;
 <!ENTITY % aboutDTD SYSTEM "chrome://global/locale/about.dtd" >
 %aboutDTD;
 ]>
 
-<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        class="dialog"
+<dialog xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         title="&title.label;"
-        onload="aboutStartUp();">
-        
-<script type="application/x-javascript" src="chrome://global/content/about.js"/>
-
-<keyset id="dialogKeys"/>
+        buttons="accept">
 
 <vbox flex="100%" style="margin: 0.5em;">
 
@@ -48,15 +42,10 @@ Contributor(s): Michael Lowe <michael.lowe@bigfoot.com> -->
   </tabs>
 
   <tabpanels flex="100%">
-    <iframe id="aboutframe"  src="about:"/>
-    <iframe id="creditsframe"  src="about:blank"/>
+    <iframe src="about:"/>
+    <iframe src="about:credits"/>
   </tabpanels>
 </tabbox>
 
-<hbox style="margin-top: 1em;">
-  <spacer flex="100%"/>
-  <button id="ok" label="&okButton.label;" default="true" onclick="doOKButton()"/>
-</hbox>
-
 </vbox>
-</window>
+</dialog>

xpfe/global/resources/locale/en-US/about.dtd

@@ -1,4 +1,3 @@
 <!ENTITY     title.label             "About &brandShortName;">
-<!ENTITY     okButton.label          "OK">
 <!ENTITY     aboutTab.label          "About &brandShortName;">
 <!ENTITY     contributorsTab.label   "Contributors">