diff options
Diffstat (limited to 'chrome/browser/resources')
8 files changed, 89 insertions, 57 deletions
diff --git a/chrome/browser/resources/extensions/extensions.css b/chrome/browser/resources/extensions/extensions.css index 213fbb0..02c2160 100644 --- a/chrome/browser/resources/extensions/extensions.css +++ b/chrome/browser/resources/extensions/extensions.css @@ -253,3 +253,17 @@ html[dir='rtl'] #extension-settings .trash { .may-not-disable .optional-controls { display: none; } + +.page:not(.dev-mode) #dev-controls { + display: none; +} + +/* Managed mode */ + +.page:not(.managed-mode) #managed-mode-banner { + display: none; +} + +.managed-mode .more-extensions-link { + display: none; +} diff --git a/chrome/browser/resources/extensions/extensions.html b/chrome/browser/resources/extensions/extensions.html index cd2babd..4f6b1c7 100644 --- a/chrome/browser/resources/extensions/extensions.html +++ b/chrome/browser/resources/extensions/extensions.html @@ -42,8 +42,15 @@ <input id="toggle-dev-on" type="checkbox"> <span i18n-content="extensionSettingsDeveloperMode"> </label></div> + <div id="managed-mode-banner" + class="page-banner managed-mode-banner"> + <div class="page-banner-gradient"> + <span id="managed-prefs-text" class="page-banner-text" + i18n-content="extensionSettingsManagedMode"></span> + </div> + </div> </header> - <div id="dev-controls" hidden> + <div id="dev-controls"> <button id="load-unpacked" i18n-content="extensionSettingsLoadUnpackedButton"></button> <button id="pack-extension" @@ -56,12 +63,12 @@ <div id="no-extensions"> <span id="no-extensions-message" i18n-content="extensionSettingsNoExtensions"></span> - <span id="suggest-gallery" + <span id="suggest-gallery" class="more-extensions-link" i18n-values=".innerHTML:extensionSettingsSuggestGallery"> </span> </div> <div id="footer-section"> - <a target="blank_" + <a target="blank_" class="more-extensions-link" i18n-values="href:extensionSettingsGetMoreExtensionsUrl" i18n-content="extensionSettingsGetMoreExtensions"></a> <a target="blank_" hidden diff --git a/chrome/browser/resources/extensions/extensions.js b/chrome/browser/resources/extensions/extensions.js index bfcf3e8..1fe0c19 100644 --- a/chrome/browser/resources/extensions/extensions.js +++ b/chrome/browser/resources/extensions/extensions.js @@ -223,13 +223,23 @@ cr.define('extensions', function() { }); } - if (extensionsData.developerMode) { + var pageDiv = $('extension-settings'); + if (extensionsData.managedMode) { + pageDiv.classList.add('showing-banner'); + pageDiv.classList.add('managed-mode'); + $('toggle-dev-on').disabled = true; + } else { + pageDiv.classList.remove('showing-banner'); + pageDiv.classList.remove('managed-mode'); + $('toggle-dev-on').disabled = false; + } + + if (extensionsData.developerMode && !extensionsData.managedMode) { + pageDiv.classList.add('dev-mode'); $('toggle-dev-on').checked = true; - $('extension-settings').classList.add('dev-mode'); - $('dev-controls').hidden = false; } else { + pageDiv.classList.remove('dev-mode'); $('toggle-dev-on').checked = false; - $('extension-settings').classList.remove('dev-mode'); } $('load-unpacked').disabled = extensionsData.loadUnpackedDisabled; diff --git a/chrome/browser/resources/options2/chromeos/internet_detail.html b/chrome/browser/resources/options2/chromeos/internet_detail.html index 0e3da70..19a5757e 100644 --- a/chrome/browser/resources/options2/chromeos/internet_detail.html +++ b/chrome/browser/resources/options2/chromeos/internet_detail.html @@ -453,8 +453,8 @@ <div id="network-proxy-tab" class="subpages-tab-contents"> <section> <div id="info-banner" hidden> - <span id="banner-icon" class="managed-prefs-icon"></span> - <span id="banner-text" class="managed-prefs-text"></span> + <span id="banner-icon" class="page-banner-icon"></span> + <span id="banner-text" class="page-banner-text"></span> </div> <div class="radio"> <label> diff --git a/chrome/browser/resources/options2/options.html b/chrome/browser/resources/options2/options.html index e28a48d..ab9ec85 100644 --- a/chrome/browser/resources/options2/options.html +++ b/chrome/browser/resources/options2/options.html @@ -150,9 +150,9 @@ </div> <div id="templates" hidden> - <div id="managed-prefs-banner" class="managed-prefs-banner"> - <div class="managed-prefs-gradient"> - <span id="managed-prefs-text" class="managed-prefs-text"></span> + <div id="managed-prefs-banner" class="page-banner managed-prefs-banner"> + <div class="page-banner-gradient"> + <span id="managed-prefs-text" class="page-banner-text"></span> </div> </div> </div> diff --git a/chrome/browser/resources/options2/options_page.css b/chrome/browser/resources/options2/options_page.css index e6273ff..b65aa53 100644 --- a/chrome/browser/resources/options2/options_page.css +++ b/chrome/browser/resources/options2/options_page.css @@ -109,50 +109,6 @@ div.disabled { padding-top: 0; } -.managed-prefs-banner { - background-color: white; - width: 100%; - z-index: 2; -} - -.page:not(.showing-banner) .managed-prefs-banner { - display: none; -} - -.managed-prefs-gradient { - background: -webkit-linear-gradient(rgb(255, 242, 183), - rgb(250, 230, 145)); - border: 1px solid rgb(201, 189, 141); - border-radius: 3px; - height: 25px; - margin: 9px 9px 0 9px; -} - -.main-page-banner .managed-prefs-gradient { - -webkit-margin-end: 20px; - -webkit-margin-start: 0; - margin-bottom: 9px; -} - -.managed-prefs-text { - background-image: url('chrome://theme/IDR_MANAGED'); - background-position: 5px center; - background-repeat: no-repeat; - background-size: 16px; - display: block; - line-height: 24px; - padding-left: 26px; -} - -.managed-prefs-banner.clickable:active .managed-prefs-text { - background: -webkit-linear-gradient(rgb(250, 230, 145), - rgb(255, 242, 183)); -} - -#page-container .page.showing-banner { - margin-top: 45px; -} - .page list { /* Min height is a multiple of the list item height (32) */ min-height: 192px; diff --git a/chrome/browser/resources/options2/options_page.js b/chrome/browser/resources/options2/options_page.js index 7bb67f0..c42cac4 100644 --- a/chrome/browser/resources/options2/options_page.js +++ b/chrome/browser/resources/options2/options_page.js @@ -708,7 +708,7 @@ cr.define('options', function() { } else { this.pageDiv.classList.add('showing-banner'); - var text = bannerDiv.querySelector('.managed-prefs-text'); + var text = bannerDiv.querySelector('#managed-prefs-text'); if (controlledByPolicy && !controlledByExtension) { text.textContent = loadTimeData.getString('policyManagedPrefsBannerText'); diff --git a/chrome/browser/resources/uber/uber_shared.css b/chrome/browser/resources/uber/uber_shared.css index 2a8f9bc..0fb3209 100644 --- a/chrome/browser/resources/uber/uber_shared.css +++ b/chrome/browser/resources/uber/uber_shared.css @@ -116,3 +116,48 @@ body.uber-frame section > h3 { body.uber-frame section > div:only-of-type { -webkit-box-flex: 1; } + +/* Styles for a hideable notification banner at the top of a page. + * See the Options page .managed-prefs-banner for a usage example. */ +.page.showing-banner { + margin-top: 45px; +} + +.page-banner { + background-color: white; + width: 100%; + z-index: 2; +} + +.page:not(.showing-banner) .page-banner { + display: none; +} + +.page-banner-gradient { + background: -webkit-linear-gradient(rgb(255, 242, 183), + rgb(250, 230, 145)); + border: 1px solid rgb(201, 189, 141); + border-radius: 3px; + height: 25px; + margin: 9px 9px 0 9px; +} + +.page-banner .page-banner-gradient { + -webkit-margin-end: 20px; + -webkit-margin-start: 0; + margin-bottom: 9px; +} + +.page-banner-text { + background-image: url('chrome://theme/IDR_MANAGED'); + background-position: 5px center; + background-repeat: no-repeat; + display: block; + line-height: 24px; + padding-left: 26px; +} + +.page-banner.clickable:active .page-banner-text { + background: -webkit-linear-gradient(rgb(250, 230, 145), + rgb(255, 242, 183)); +} |