Merge pull request #33 from mozilla/1439443_NoSmart_or_DefaultBookmarks

Policy for disabling smart and default bookmarks. Fixes #20

diff --git a/README.md b/README.md
index ae374bb132aab0c6d1d907e73851d61c5430d523..42e038291bc027fde2c091d5bea0a930de554ac8 100644 (file)
--- a/README.md
+++ b/README.md
@@ -197,6 +197,24 @@ This policy stops Firefox from checking if it is the default browser at startup.
   }
 }
 ```
+### NoDefaultBookmarks
+Don't create the default bookmarks. Note: this policy is only effective if used before the first run of the profile.
+```
+{
+  "policies": {
+    "NoDefaultBookmarks": true
+  }
+}
+```
+### NoSmartBookmarks
+Remove the Smart Bookmarks (Most Visited, Recent Tags)
+```
+{
+  "policies": {
+    "NoSmartBookmarks": true
+  }
+}
+```
 ### RememberPasswords
 This policy sets the signon.rememberSignons preference. It can either be enabled or disabled.
 ```

diff --git a/windows/en-US/firefox.adml b/windows/en-US/firefox.adml
index e1fab39632c75e8b3c1ea2c91436d72b4cc9dab4..2c4a9b70b73804de7c01925940e1c58d07ff7ae6 100644 (file)
--- a/windows/en-US/firefox.adml
+++ b/windows/en-US/firefox.adml
@@ -73,6 +73,10 @@
       <string id="Bookmark_Explain">Bookmark Explanation</string>
       <string id="BookmarkPlacementToolbar">Toolbar</string>
       <string id="BookmarkPlacementMenu">Menu</string>
+      <string id="NoDefaultBookmarks">No Default Bookmarks</string>
+      <string id="NoDefaultBookmarks_Explain">Don't create the default bookmarks. Note: this policy is only effective if used before the first run of the profile.</string>
+      <string id="NoSmartBookmarks">No Smart Bookmarks</string>
+      <string id="NoSmartBookmarks_Explain">Remove the Smart Bookmarks (Most Visited, Recent Tags)</string>
       <string id="HomepageURL">URL for Home page</string>
       <string id="HomepageURL_Explain">Homepage Settings</string>
       <string id="HomepageAdditional">Additional Homepages</string>

diff --git a/windows/firefox.admx b/windows/firefox.admx
index eb110e6edf89bbc6ca5c9f133d81b9e0f7d25a8f..bb83f056252a28318dec494cf3ce6aa010a72045 100644 (file)
--- a/windows/firefox.admx
+++ b/windows/firefox.admx
@@ -238,6 +238,26 @@
         <decimal value="0"/>
       </disabledValue>
     </policy>
+    <policy name="NoDefaultBookmarks" class="Both" displayName="$(string.NoDefaultBookmarks)" explainText="$(string.NoDefaultBookmarks_Explain)" key="Software\Policies\Mozilla\Firefox" valueName="NoDefaultBookmarks">
+      <parentCategory ref="firefox"/>
+      <supportedOn ref="SUPPORTED_WINXPSP2"/>
+      <enabledValue>
+        <decimal value="1"/>
+      </enabledValue>
+      <disabledValue>
+        <decimal value="0"/>
+      </disabledValue>
+    </policy>
+    <policy name="NoSmartBookmarks" class="Both" displayName="$(string.NoSmartBookmarks)" explainText="$(string.NoSmartBookmarks_Explain)" key="Software\Policies\Mozilla\Firefox" valueName="NoSmartBookmarks">
+      <parentCategory ref="firefox"/>
+      <supportedOn ref="SUPPORTED_WINXPSP2"/>
+      <enabledValue>
+        <decimal value="1"/>
+      </enabledValue>
+      <disabledValue>
+        <decimal value="0"/>
+      </disabledValue>
+    </policy>
     <policy name="DontCheckDefaultBrowser" class="Both" displayName="$(string.DontCheckDefaultBrowser)" explainText="$(string.DontCheckDefaultBrowser_Explain)" key="Software\Policies\Mozilla\Firefox" valueName="DontCheckDefaultBrowser">
       <parentCategory ref="firefox"/>
       <supportedOn ref="SUPPORTED_WINXPSP2"/>