Bookmarks support

diff --git a/windows/en-US/firefox.adml b/windows/en-US/firefox.adml
index 547b96d074dc56c61ff4bb692a5ac9a3e0099640..63027bac4a3977fb336ce6b5eb093407e9b59732 100644 (file)
--- a/windows/en-US/firefox.adml
+++ b/windows/en-US/firefox.adml
@@ -7,6 +7,7 @@
       <string id="SUPPORTED_WINXPSP2">Microsoft Windows XP SP2 or later</string>
       <string id="firefox">Firefox</string>
       <string id="Permissions_group">Permissions</string>
       <string id="SUPPORTED_WINXPSP2">Microsoft Windows XP SP2 or later</string>
       <string id="firefox">Firefox</string>
       <string id="Permissions_group">Permissions</string>

+      <string id="Bookmarks_group">Bookmarks</string>

       <string id="Popups_group">Popups</string>
       <string id="Cookies_group">Cookies</string>
       <string id="Addons_group">Addons</string>
       <string id="Popups_group">Popups</string>
       <string id="Cookies_group">Cookies</string>
       <string id="Addons_group">Addons</string>


@@ -51,6 +52,14 @@
       <string id="CookiesBlock_Explain">URLs to block cookies.</string>
       <string id="FlashAllow_Explain">URLs to allow Flash.</string>
       <string id="FlashBlock_Explain">URLs to block Flash.</string>
       <string id="CookiesBlock_Explain">URLs to block cookies.</string>
       <string id="FlashAllow_Explain">URLs to allow Flash.</string>
       <string id="FlashBlock_Explain">URLs to block Flash.</string>

+      <string id="Bookmark1">Bookmark 1</string>
+      <string id="Bookmark2">Bookmark 2</string>
+      <string id="Bookmark3">Bookmark 3</string>
+      <string id="Bookmark4">Bookmark 4</string>
+      <string id="Bookmark5">Bookmark 5</string>
+      <string id="Bookmark_Explain">Bookmark Explanation</string>
+      <string id="BookmarkPlacementToolbar">Toolbar</string>
+      <string id="BookmarkPlacementFolder">Folder</string>

     </stringTable>
     <presentationTable>
       <presentation id="PopupsAllow"><listBox refId="PopupsAllowDesc">Allow popups for websites</listBox></presentation>
     </stringTable>
     <presentationTable>
       <presentation id="PopupsAllow"><listBox refId="PopupsAllowDesc">Allow popups for websites</listBox></presentation>


@@ -59,6 +68,26 @@
       <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="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="Bookmark">
+        <text>Title:</text>
+        <textBox refId="BookmarkTitle">
+          <label/>
+        </textBox>
+        <text>URL:</text>
+        <textBox refId="BookmarkURL">
+          <label/>
+        </textBox>
+        <text>Favicon URL:</text>
+        <textBox refId="BookmarkFavicon">
+          <label/>
+        </textBox>
+        <text>Placement:</text>
+        <dropdownList refId="BookmarkPlacement"/>
+        <text>Folder name:</text>
+        <textBox refId="BookmarkFolder">
+          <label/>
+        </textBox>
+      </presentation>

     </presentationTable>
   </resources>
 </policyDefinitionResources>
     </presentationTable>
   </resources>
 </policyDefinitionResources>

diff --git a/windows/firefox.admx b/windows/firefox.admx
index 1396c88adbfaad3b6675cafb364c7ae1d70eb0d2..8bcef8c865b8bf791d8348a814fad5281351b372 100644 (file)
--- a/windows/firefox.admx
+++ b/windows/firefox.admx
@@ -30,6 +30,9 @@
     <category displayName="$(string.Flash_group)" name="Flash">
       <parentCategory ref="Permissions"/>
     </category>
     <category displayName="$(string.Flash_group)" name="Flash">
       <parentCategory ref="Permissions"/>
     </category>

+    <category displayName="$(string.Bookmarks_group)" name="Bookmarks">
+      <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">


@@ -224,5 +227,115 @@
         <list id="FlashBlockDesc" key="Software\Policies\Mozilla\Firefox\Flash\Block" valuePrefix=""/>
       </elements>
     </policy>
         <list id="FlashBlockDesc" key="Software\Policies\Mozilla\Firefox\Flash\Block" 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)" >
+      <parentCategory ref="Bookmarks" />
+      <supportedOn ref="SUPPORTED_WINXPSP2" />
+      <elements >
+        <text id="BookmarkTitle" valueName="Title" required="true" />
+        <text id="BookmarkURL" valueName="URL" required="true" />
+        <text id="BookmarkFolder" valueName="Folder" />
+        <text id="BookmarkFavicon" valueName="Favicon" />
+        <enum id="BookmarkPlacement" valueName="Placement">
+          <item displayName="$(string.BookmarkPlacementToolbar)">
+            <value>
+              <string>toolbar</string>
+            </value>
+          </item>
+          <item displayName="$(string.BookmarkPlacementFolder)">
+            <value>
+              <string>folder</string>
+            </value>
+          </item>
+        </enum>
+      </elements>
+    </policy>
+    <policy class="Both" displayName="$(string.Bookmark2)" name="Bookmark2" explainText="$(string.Bookmark_Explain)" key="Software\Policies\Mozilla\Firefox\Bookmarks\2" presentation="$(presentation.Bookmark)" >
+      <parentCategory ref="Bookmarks" />
+      <supportedOn ref="SUPPORTED_WINXPSP2" />
+      <elements >
+        <text id="BookmarkTitle" valueName="Title" required="true" />
+        <text id="BookmarkURL" valueName="URL" required="true" />
+        <text id="BookmarkFolder" valueName="Folder" />
+        <text id="BookmarkFavicon" valueName="Favicon" />
+        <enum id="BookmarkPlacement" valueName="Placement">
+          <item displayName="$(string.BookmarkPlacementToolbar)">
+            <value>
+              <string>toolbar</string>
+            </value>
+          </item>
+          <item displayName="$(string.BookmarkPlacementFolder)">
+            <value>
+              <string>folder</string>
+            </value>
+          </item>
+        </enum>
+      </elements>
+    </policy>
+    <policy class="Both" displayName="$(string.Bookmark3)" name="Bookmark3" explainText="$(string.Bookmark_Explain)" key="Software\Policies\Mozilla\Firefox\Bookmarks\3" presentation="$(presentation.Bookmark)" >
+      <parentCategory ref="Bookmarks" />
+      <supportedOn ref="SUPPORTED_WINXPSP2" />
+      <elements >
+        <text id="BookmarkTitle" valueName="Title" required="true" />
+        <text id="BookmarkURL" valueName="URL" required="true" />
+        <text id="BookmarkFolder" valueName="Folder" />
+        <text id="BookmarkFavicon" valueName="Favicon" />
+        <enum id="BookmarkPlacement" valueName="Placement">
+          <item displayName="$(string.BookmarkPlacementToolbar)">
+            <value>
+              <string>toolbar</string>
+            </value>
+          </item>
+          <item displayName="$(string.BookmarkPlacementFolder)">
+            <value>
+              <string>folder</string>
+            </value>
+          </item>
+        </enum>
+      </elements>
+    </policy>
+    <policy class="Both" displayName="$(string.Bookmark4)" name="Bookmark4" explainText="$(string.Bookmark_Explain)" key="Software\Policies\Mozilla\Firefox\Bookmarks\4" presentation="$(presentation.Bookmark)" >
+      <parentCategory ref="Bookmarks" />
+      <supportedOn ref="SUPPORTED_WINXPSP2" />
+      <elements >
+        <text id="BookmarkTitle" valueName="Title" required="true" />
+        <text id="BookmarkURL" valueName="URL" required="true" />
+        <text id="BookmarkFolder" valueName="Folder" />
+        <text id="BookmarkFavicon" valueName="Favicon" />
+        <enum id="BookmarkPlacement" valueName="Placement">
+          <item displayName="$(string.BookmarkPlacementToolbar)">
+            <value>
+              <string>toolbar</string>
+            </value>
+          </item>
+          <item displayName="$(string.BookmarkPlacementFolder)">
+            <value>
+              <string>folder</string>
+            </value>
+          </item>
+        </enum>
+      </elements>
+    </policy>
+    <policy class="Both" displayName="$(string.Bookmark5)" name="Bookmark5" explainText="$(string.Bookmark_Explain)" key="Software\Policies\Mozilla\Firefox\Bookmarks\5s" presentation="$(presentation.Bookmark)" >
+      <parentCategory ref="Bookmarks" />
+      <supportedOn ref="SUPPORTED_WINXPSP2" />
+      <elements >
+        <text id="BookmarkTitle" valueName="Title" required="true" />
+        <text id="BookmarkURL" valueName="URL" required="true" />
+        <text id="BookmarkFolder" valueName="Folder" />
+        <text id="BookmarkFavicon" valueName="Favicon" />
+        <enum id="BookmarkPlacement" valueName="Placement">
+          <item displayName="$(string.BookmarkPlacementToolbar)">
+            <value>
+              <string>toolbar</string>
+            </value>
+          </item>
+          <item displayName="$(string.BookmarkPlacementFolder)">
+            <value>
+              <string>folder</string>
+            </value>
+          </item>
+        </enum>
+      </elements>
+    </policy>

   </policies>
 </policyDefinitions>
   </policies>
 </policyDefinitions>