Move homepage settings into two settings in a group - Fixes #12

diff --git a/windows/en-US/firefox.adml b/windows/en-US/firefox.adml
index d5c3b87912121ce005ed35f901e41cb8b9c3ffcc..75c709811eb08560e24c535c464f39c33bcacf8f 100644 (file)
--- a/windows/en-US/firefox.adml
+++ b/windows/en-US/firefox.adml
@@ -12,6 +12,7 @@
       <string id="Cookies_group">Cookies</string>
       <string id="Addons_group">Addons</string>
       <string id="Flash_group">Flash</string>
+      <string id="Homepage_group">Home page</string>
       <string id="Allow">Allow</string>
       <string id="Block">Block</string>
       <string id="BlockAboutAddons">Block About Addons</string>
@@ -64,8 +65,10 @@
       <string id="Bookmark_Explain">Bookmark Explanation</string>
       <string id="BookmarkPlacementToolbar">Toolbar</string>
       <string id="BookmarkPlacementFolder">Folder</string>
-      <string id="Homepage">Homepage</string>
-      <string id="Homepage_Explain">Homepage Settings</string>
+      <string id="HomepageURL">URL for Home page</string>
+      <string id="HomepageURL_Explain">Homepage Settings</string>
+      <string id="HomepageAdditional">Additional Homepages</string>
+      <string id="HomepageAdditional_Explain">If you want to have more than one homepage</string>
     </stringTable>
     <presentationTable>
       <presentation id="PopupsAllow"><listBox refId="PopupsAllowDesc">Allow popups for websites</listBox></presentation>
@@ -74,13 +77,15 @@
       <presentation id="CookiesBlock"><listBox refId="CookiesBlockDesc">Block cookies for websites</listBox></presentation>
       <presentation id="FlashAllow"><listBox refId="FlashAllowDesc">Allow Flash for websites</listBox></presentation>
       <presentation id="FlashBlock"><listBox refId="FlashBlockDesc">Block Flash for websites</listBox></presentation>
-      <presentation id="Homepage">
+      <presentation id="HomepageURL">
         <text>URL:</text>
         <textBox refId="HomepageURL">
           <label/>
         </textBox>
-        <checkBox refId="HomepageLocked">Don't allow the homepage to be changed.</checkBox>
-        <listBox refId="HomepageAdditional">Additional homepages (optional)</listBox>
+               <checkBox refId="HomepageLocked">Don't allow the homepage to be changed.</checkBox>
+      </presentation>
+      <presentation id="HomepageAdditional">
+               <listBox refId="HomepageAdditional">Additional homepages</listBox>
       </presentation>
       <presentation id="Bookmark">
         <text>Title:</text>

diff --git a/windows/firefox.admx b/windows/firefox.admx
index 0051be0b711d4adf9eaeeaae243224a82b1d2c82..777cbc39894fc674d96c77e6fe10e5f49dd74b42 100644 (file)
--- a/windows/firefox.admx
+++ b/windows/firefox.admx
@@ -33,6 +33,9 @@
     <category displayName="$(string.Bookmarks_group)" name="Bookmarks">
       <parentCategory ref="firefox"/>
     </category>
+    <category displayName="$(string.Homepage_group)" name="Homepage">
+      <parentCategory ref="firefox"/>
+    </category>
   </categories>
   <policies>
     <policy name="BlockAboutAddons" class="Both" displayName="$(string.BlockAboutAddons)" explainText="$(string.BlockAboutAddons_Explain)" key="Software\Policies\Mozilla\Firefox" valueName="BlockAboutAddons">
@@ -247,20 +250,26 @@
         <list id="FlashBlockDesc" key="Software\Policies\Mozilla\Firefox\FlashPlugin\Block" valuePrefix=""/>
       </elements>
     </policy>
-    <policy class="Both" displayName="$(string.Homepage)" name="Homepage" explainText="$(string.Homepage_Explain)" key="Software\Policies\Mozilla\Firefox\Homepage" presentation="$(presentation.Homepage)" >
-      <parentCategory ref="firefox" />
+    <policy class="Both" displayName="$(string.HomepageURL)" name="HomepageURL" explainText="$(string.HomepageURL_Explain)" key="Software\Policies\Mozilla\Firefox\Homepage" presentation="$(presentation.HomepageURL)" >
+      <parentCategory ref="Homepage" />
       <supportedOn ref="SUPPORTED_WINXPSP2" />
       <elements >
         <text id="HomepageURL" valueName="URL" required="true" />
-        <boolean id="HomepageLocked" key="Software\Policies\Mozilla\Firefox\Homepage" valueName="Locked">
-          <trueValue>
-            <decimal value="1"/>
-          </trueValue>
-          <falseValue>
-            <decimal value="0"/>
-          </falseValue>
-        </boolean>
-        <list id="HomepageAdditional" key="Software\Policies\Mozilla\Firefox\Homepage\Additional" valuePrefix=""/>
+               <boolean id="HomepageLocked" key="Software\Policies\Mozilla\Firefox\Homepage" valueName="Locked">
+               <trueValue>
+               <decimal value="1"/>
+               </trueValue>
+               <falseValue>
+               <decimal value="0"/>
+               </falseValue>
+               </boolean>
+      </elements>
+    </policy>
+    <policy class="Both" displayName="$(string.HomepageAdditional)" name="HomepageAdditional" explainText="$(string.HomepageAdditional_Explain)" key="Software\Policies\Mozilla\Firefox\Homepage" presentation="$(presentation.HomepageAdditional)" >
+      <parentCategory ref="Homepage" />
+      <supportedOn ref="SUPPORTED_WINXPSP2" />
+      <elements >
+               <list id="HomepageAdditional" key="Software\Policies\Mozilla\Firefox\Homepage\Additional" valuePrefix=""/>
       </elements>
     </policy>
     <policy class="Both" displayName="$(string.Bookmark1)" name="Bookmark1" explainText="$(string.Bookmark_Explain)" key="Software\Policies\Mozilla\Firefox\Bookmarks\1" presentation="$(presentation.Bookmark)" >