From 6c4963e02aa8e47bea63a723c7dd8f48b2cd0a96 Mon Sep 17 00:00:00 2001
From: "ben%netscape.com" <ben%netscape.com>
Date: Fri, 6 Jul 2001 05:53:08 +0000
Subject: [PATCH] bug 65241, add 'download more' button to Content Pack pref
 panel. uncomment-out button and add string to dtd file for button r=matt,
 sr=blake

---
 .../resources/content/pref-contentpacks.xul    | 18 +++++++++---------
 .../locale/en-US/pref-contentpacks.dtd         |  3 ++-
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/extensions/content-packs/resources/content/pref-contentpacks.xul b/extensions/content-packs/resources/content/pref-contentpacks.xul
index 670cab6911e..6a6f5d8622c 100644
--- a/extensions/content-packs/resources/content/pref-contentpacks.xul
+++ b/extensions/content-packs/resources/content/pref-contentpacks.xul
@@ -113,10 +113,9 @@
       }
     }
 
-
     function DownloadRegionPacks()
     {
-      window.openDialog("chrome://navigator/content/navigator.xul", "_blank", "chrome,all,dialog=no", xlateURL("urn:clienturl:viewmenu:intlwebcontent"));
+      openTopWin(xlateURL("urn:clienturl:viewmenu:intlwebcontent"));
     }
   ]]>
   </script>
@@ -153,12 +152,13 @@
 
   <separator class="thin"/>
 
-  <box orient="horizontal">
-      <!--separator flex="1"/     -->
-      <!-- see blocker bug 84232  -->
-      <!--button id="downloadContentPacks" label="&downloadContentPacks.label;" accesskey="&downloadContentPacks.accesskey;" oncommand="DownloadRegionPacks()"/-->
-  </box>
+  <hbox>
+    <spring flex="1"/>
+    <button id="downloadContentPacks" 
+            label="&downloadContentPacks.label;" 
+            accesskey="&downloadContentPacks.accesskey;" 
+            oncommand="DownloadRegionPacks()"/>
+  </hbox>
 
-  <separator flex="1"/>
+</window>
 
-</window>
\ No newline at end of file
diff --git a/extensions/content-packs/resources/locale/en-US/pref-contentpacks.dtd b/extensions/content-packs/resources/locale/en-US/pref-contentpacks.dtd
index 1570dd412e4..8d8461d9a3a 100644
--- a/extensions/content-packs/resources/locale/en-US/pref-contentpacks.dtd
+++ b/extensions/content-packs/resources/locale/en-US/pref-contentpacks.dtd
@@ -2,4 +2,5 @@
 <!ENTITY lHeader                        "Content Packs">
 <!ENTITY contentIntro.label             "Selecting a new content pack changes items in My Sidebar and the Search menu, and changes the home page, certain bookmarks, and other items. You will not lose bookmarks and other items that you have customized when you switch content packs. You must restart for a new content pack to take effect.">
 <!ENTITY installedContentPacks.label    "Installed content packs:">
-
+<!ENTITY downloadContentPacks.accesskey "d">
+<!ENTITY downloadContentPacks.label     "Download More...">
\ No newline at end of file