From: Michael Kaply <consulting@kaply.com>
Date: Mon, 9 Apr 2018 15:17:46 +0000 (-0500)
Subject: SearchBar Policy
X-Git-Tag: 0.9~12^2
X-Git-Url: https://git.p6c8.net/policy-templates.git/commitdiff_plain/e1a558d42ec7aeab3bacfdb90d25730a06309af5?ds=inline

SearchBar Policy
---

diff --git a/README.md b/README.md
index 4cc4496..5c9515c 100644
--- a/README.md
+++ b/README.md
@@ -445,3 +445,12 @@ If this policy is set to true,  all data is cleared when Firefox is closed. This
   }
 }
 ```
+### SearchBar
+This policy can be used to determine if the search bar is separate or combined with the URL bar.
+```
+{
+  "policies": {
+    "SearchBar": ["unified", "separate"]
+  }
+}
+```
diff --git a/windows/en-US/firefox.adml b/windows/en-US/firefox.adml
index 42113ab..f4abe85 100644
--- a/windows/en-US/firefox.adml
+++ b/windows/en-US/firefox.adml
@@ -213,6 +213,12 @@ If this policy is disabled or not configured, data is not cleared when the brows
 If this policy is disabled, tracking protection is disabled and locked in both the browser and private browsing.
 
 If this policy is enabled, private browsing is enabled by default in both the browser and private browsing and you can choose whether or not to prevent the user from changing it.</string>
+      <string id="SearchBar">Search bar location</string>
+      <string id="SearchBar_Explain">If this policy is enabled, you can set whether the search bar is separate from the URL bar.
+
+If this policy is not configured or disabled, new users get a unified search bar, users upgrading from Firefox 56 and below get a separate search bar.</string>
+      <string id="SearchBar_Unified">Unified</string>
+      <string id="SearchBar_Separate">Separate</string>
     </stringTable>
     <presentationTable>
       <presentation id="Authentication">
@@ -226,6 +232,9 @@ If this policy is enabled, private browsing is enabled by default in both the br
       <presentation id="Cookies_AcceptThirdParty">
         <dropdownList refId="Cookies_AcceptThirdParty"/>
       </presentation>
+      <presentation id="SearchBar">
+        <dropdownList refId="SearchBar"/>
+      </presentation>
       <presentation id="TrackingProtection">
         <checkBox refId="TrackingProtectionLocked">Don't allow tracking protection preferences to be changed.</checkBox>
       </presentation>
diff --git a/windows/firefox.admx b/windows/firefox.admx
index f8589c6..8620630 100644
--- a/windows/firefox.admx
+++ b/windows/firefox.admx
@@ -783,5 +783,23 @@
         </boolean>
       </elements>
     </policy>
+    <policy name="SearchBar" class="Both" displayName="$(string.SearchBar)" explainText="$(string.SearchBar_Explain)" key="Software\Policies\Mozilla\Firefox"  presentation="$(presentation.SearchBar)">
+      <parentCategory ref="firefox"/>
+      <supportedOn ref="SUPPORTED_WINXPSP2"/>
+      <elements>
+        <enum id="SearchBar" valueName="SearchBar">
+          <item displayName="$(string.SearchBar_Unified)">
+            <value>
+              <string>unified</string>
+            </value>
+          </item>
+          <item displayName="$(string.SearchBar_Separate)">
+            <value>
+              <string>separate</string>
+            </value>
+          </item>
+        </enum>
+      </elements>
+    </policy>
   </policies>
 </policyDefinitions>