From 1692dbb1a5cb3688205d984cf1bd9a82983be5af Mon Sep 17 00:00:00 2001
From: "timeless%mac.com" <timeless%mac.com>
Date: Thu, 14 Sep 2006 06:01:02 +0000
Subject: [PATCH] Bugzilla Bug 83017 Frame Info dialog has title 'View Page
 Info' patch by db48x@yahoo.com r=fabian sr=jst

---
 suite/browser/pageInfo.js                     | 14 +++++++-
 suite/browser/pageInfo.xul                    |  4 +--
 .../locales/en-US/chrome/browser/pageInfo.dtd | 33 +++++++++----------
 .../en-US/chrome/browser/pageInfo.properties  |  2 ++
 4 files changed, 31 insertions(+), 22 deletions(-)

diff --git a/suite/browser/pageInfo.js b/suite/browser/pageInfo.js
index cf4fc1177beb..236d2b9946ff 100644
--- a/suite/browser/pageInfo.js
+++ b/suite/browser/pageInfo.js
@@ -53,11 +53,23 @@ var onLoadRegistry = [ ];
  */
 function onLoadPageInfo()
 {
+  var strbundle = document.getElementById("pageinfobundle");
+
   var page;
+  var docTitle;
   if ((window.arguments.length >= 1) && window.arguments[0])
+  {
     page = window.arguments[0];
+    docTitle = strbundle.getString("frameInfo.title");
+  }
   else
+  {
     page = window.opener.frames[0].document;
+    docTitle = strbundle.getString("pageInfo.title");
+  }
+
+  window.document.title = docTitle;
+  
   var root = document.getElementById("cont");
 
   makeDocument(page, root);
@@ -128,7 +140,7 @@ function makeDocument(page, root)
     }
   } else {
     try {
-      var pageInfoBundle = document.getElementById("bundle_pageInfo");
+      var pageInfoBundle = document.getElementById("pageinfobundle");
       lastModified = pageInfoBundle.getString("unknown");
     } catch(e) {
       lastModified = "Unknown";
diff --git a/suite/browser/pageInfo.xul b/suite/browser/pageInfo.xul
index cc82e8bb0554..80c7f0be15a6 100644
--- a/suite/browser/pageInfo.xul
+++ b/suite/browser/pageInfo.xul
@@ -36,7 +36,6 @@
 
 <window id="main-window"
   xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-  title="&pageInfo.title;" 
   titlemodifier="&mainWindow.titlemodifier;" 
   titlepreface="&mainWindow.preface;"
   titlemenuseparator ="&mainWindow.titlemodifierseperator;"  
@@ -47,7 +46,7 @@
   persist="screenX screenY width height sizemode">
 
   <script type="application/x-javascript" src="chrome://navigator/content/pageInfo.js"/>
-  <stringbundle src="chrome://navigator/locale/pageInfo.properties" id="bundle_pageInfo"/>
+  <stringbundle id="pageinfobundle" src="chrome://navigator/locale/pageInfo.properties"/>
 
   <vbox id="cont" flex="1">  
    <label class="header" value="&pageInfo.description;"/>
@@ -62,7 +61,6 @@
 
     <!-- General page information -->
     <vbox>
-      <label class="header label" value="&pageInfo.description;"/>
       <vbox class="inset" id="documentinfo">
         <grid>
           <columns> 
diff --git a/suite/locales/en-US/chrome/browser/pageInfo.dtd b/suite/locales/en-US/chrome/browser/pageInfo.dtd
index a62870080996..50c3db7e34a8 100644
--- a/suite/locales/en-US/chrome/browser/pageInfo.dtd
+++ b/suite/locales/en-US/chrome/browser/pageInfo.dtd
@@ -4,23 +4,20 @@
 <!ENTITY mainWindow.titlemodifierseperator " - ">
 <!ENTITY mainWindow.preface "Info for: "> 
 
-<!ENTITY  pageInfo.title "Page Info"> 
-<!ENTITY  pageInfo.description "Information about the current page"> 
+<!ENTITY  pageInfo.generalTab    "General">
+<!ENTITY  pageInfo.pageTitle     "Title:"> 
+<!ENTITY  pageInfo.URL           "URL:"> 
+<!ENTITY  pageInfo.lastModified  "Last Modified:">
 
-<!ENTITY  pageInfo.generalTab "General">
-<!ENTITY  pageInfo.pageTitle "Title:"> 
-<!ENTITY  pageInfo.URL "URL:"> 
-<!ENTITY  pageInfo.lastModified "Last Modified:">
+<!ENTITY  pageInfo.formsTab      "Forms">
+<!ENTITY  pageInfo.formHeader    "Forms on this page">
+<!ENTITY  pageInfo.formAction    "Form Action">
+<!ENTITY  pageInfo.formMethod    "Method">
+<!ENTITY  pageInfo.formName      "Name">
 
-<!ENTITY  pageInfo.formsTab   "Forms">
-<!ENTITY  pageInfo.formHeader "Forms on this page">
-<!ENTITY  pageInfo.formAction "Form Action">
-<!ENTITY  pageInfo.formMethod "Method">
-<!ENTITY  pageInfo.formName "Name">
-
-<!ENTITY  pageInfo.imagesTab "Images">
-<!ENTITY  pageInfo.imageHeader "Images on this page">
-<!ENTITY  pageInfo.imageURL "Image URL">
-<!ENTITY  pageInfo.imageWidth "Width">
-<!ENTITY  pageInfo.imageHeight "Height">
-<!ENTITY  pageInfo.imageAltText "Alt Text">
+<!ENTITY  pageInfo.imagesTab     "Images">
+<!ENTITY  pageInfo.imageHeader   "Images on this page">
+<!ENTITY  pageInfo.imageURL      "Image URL">
+<!ENTITY  pageInfo.imageWidth    "Width">
+<!ENTITY  pageInfo.imageHeight   "Height">
+<!ENTITY  pageInfo.imageAltText  "Alt Text">
diff --git a/suite/locales/en-US/chrome/browser/pageInfo.properties b/suite/locales/en-US/chrome/browser/pageInfo.properties
index 91616b00a99c..3a7750ba699c 100644
--- a/suite/locales/en-US/chrome/browser/pageInfo.properties
+++ b/suite/locales/en-US/chrome/browser/pageInfo.properties
@@ -20,3 +20,5 @@
 #
 
 unknown=Unknown
+pageInfo.title=Page Info
+frameInfo.title=Frame Info