Bug 1508752 - Make "managed by policy" message less preference specific. r=flod
authorMichael Kaply <mozilla@kaply.com>
Fri, 17 May 2019 05:48:20 +0000
changeset 533168 b84060d7fa8d43fe978058f976308194195d6a2d
parent 533167 c7a169c8670c79253241ed244a51e0927346bf15
child 533169 b3788c8a7cac8b757c02278f7cbea028819964ca
push id11276
push userrgurzau@mozilla.com
push dateMon, 20 May 2019 13:11:24 +0000
treeherdermozilla-beta@847755a7c325 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersflod
bugs1508752
milestone68.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1508752 - Make "managed by policy" message less preference specific. r=flod Differential Revision: https://phabricator.services.mozilla.com/D31543
browser/components/preferences/in-content/preferences.xul
browser/locales/en-US/browser/preferences/preferences.ftl
browser/themes/shared/incontentprefs/preferences.inc.css
--- a/browser/components/preferences/in-content/preferences.xul
+++ b/browser/components/preferences/in-content/preferences.xul
@@ -164,17 +164,17 @@
     <vbox class="main-content" flex="1" align="start">
       <vbox class="pane-container">
         <hbox class="sticky-container" pack="end" align="top">
           <hbox id="policies-container" align="stretch" flex="1" hidden="true">
             <hbox align="top">
               <image class="info-icon"></image>
             </hbox>
             <hbox align="center" flex="1">
-              <label class="policies-label" flex="1" data-l10n-id="policies-notice"></label>
+              <label class="policies-label" flex="1" data-l10n-id="managed-notice"></label>
             </hbox>
           </hbox>
           <textbox
             is="search-textbox" id="searchInput"
             data-l10n-id="search-input-box"
             data-l10n-attrs="style"
             hidden="true" clickSelectsAll="true"/>
         </hbox>
--- a/browser/locales/en-US/browser/preferences/preferences.ftl
+++ b/browser/locales/en-US/browser/preferences/preferences.ftl
@@ -27,21 +27,17 @@ pref-page =
 search-input-box =
     .style = width: 15.4em
     .placeholder =
         { PLATFORM() ->
             [windows] Find in Options
            *[other] Find in Preferences
         }
 
-policies-notice =
-    { PLATFORM() ->
-        [windows] Your organization has disabled the ability to change some options.
-       *[other] Your organization has disabled the ability to change some preferences.
-    }
+managed-notice = Your browser is being managed by your organization.
 
 pane-general-title = General
 category-general =
     .tooltiptext = { pane-general-title }
 
 pane-home-title = Home
 category-home =
     .tooltiptext = { pane-home-title }
--- a/browser/themes/shared/incontentprefs/preferences.inc.css
+++ b/browser/themes/shared/incontentprefs/preferences.inc.css
@@ -743,16 +743,20 @@ image.update-throbber {
 
 #policies-container {
   background-color: var(--in-content-warning-container);
   padding: 0px 8px;
   margin-inline-end: 16px;
   border-radius: 2px;
 }
 
+.policies-label {
+  margin-left: 2px;
+}
+
 .info-icon {
   list-style-image: url("chrome://browser/skin/identity-icon.svg");
   width: 16px;
   height: 16px;
   margin-top: calc((32px - 16px) / 2);
 }
 
 .sticky-container {