Merge pull request #13 from mozilla/homepage_category

[policy-templates.git] / windows / firefox.admx

diff --git a/windows/firefox.admx b/windows/firefox.admx
index d05288794a17ef2b8e7ca1283001e398b9a92075..d5eb83f0e24862190e29308a01e4fb82d01f3f5f 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.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">
   </categories>
   <policies>
     <policy name="BlockAboutAddons" class="Both" displayName="$(string.BlockAboutAddons)" explainText="$(string.BlockAboutAddons_Explain)" key="Software\Policies\Mozilla\Firefox" valueName="BlockAboutAddons">


@@ -244,11 +247,11 @@
       <parentCategory ref="Flash"/>
       <supportedOn ref="SUPPORTED_WINXPSP2"/>
       <elements>
       <parentCategory ref="Flash"/>
       <supportedOn ref="SUPPORTED_WINXPSP2"/>
       <elements>

-        <list id="FlashBlockDesc" key="Software\Policies\Mozilla\Firefox\Flash\Block" valuePrefix=""/>
+        <list id="FlashBlockDesc" key="Software\Policies\Mozilla\Firefox\FlashPlugin\Block" valuePrefix=""/>

       </elements>
     </policy>
       </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" />
       <supportedOn ref="SUPPORTED_WINXPSP2" />
       <elements >
         <text id="HomepageURL" valueName="URL" required="true" />


@@ -260,6 +263,12 @@
             <decimal value="0"/>
           </falseValue>
         </boolean>
             <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>
         <list id="HomepageAdditional" key="Software\Policies\Mozilla\Firefox\Homepage\Additional" valuePrefix=""/>
       </elements>
     </policy>