From e9a62602e3eeefd44eafd1e69d0a3938ce4835ac Mon Sep 17 00:00:00 2001 From: "rdevlin.cronin" Date: Mon, 8 Sep 2014 09:16:16 -0700 Subject: [PATCH] Reorder "action links" on chrome://extensions Move the Options, Permissions, Visit website, Launch, and Reload links to be on the same line in the chrome://extensions page, directly below the description (so they are in the same place for all extensions in the list). Also reword "Visit website" to be either "Details" or "Developer website", depending on whether it will link to the developer's website or the chrome web store. Finally, tweak the css to give a bit more padding to the description and make the version text grey. ---------------------------- NOTE: The reviewed version of this patch is at https://codereview.chromium.org/540113002, but that one had the wrong Base URL (whoops). (TBRs are original reviewers) TBR=dbeam@chromium.org TBR=yoz@chromium.org BUG=410895 Review URL: https://codereview.chromium.org/550443003 Cr-Commit-Position: refs/heads/master@{#293739} --- chrome/app/generated_resources.grd | 4 +-- .../browser/resources/extensions/extension_list.js | 3 +- chrome/browser/resources/extensions/extensions.css | 25 +++++++++++------ .../browser/resources/extensions/extensions.html | 32 ++++++++++------------ .../webui/extensions/extension_settings_handler.cc | 2 +- chrome/common/extensions/manifest_url_handler.cc | 5 ++++ chrome/common/extensions/manifest_url_handler.h | 4 +++ 7 files changed, 45 insertions(+), 30 deletions(-) diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd index 24cc6d0a919b..64ad9a0475a1 100644 --- a/chrome/app/generated_resources.grd +++ b/chrome/app/generated_resources.grd @@ -4795,10 +4795,10 @@ Make sure you do not expose any sensitive information. Allow access to file URLs - Visit website + Developer website - View in Web Store + Details Reload diff --git a/chrome/browser/resources/extensions/extension_list.js b/chrome/browser/resources/extensions/extension_list.js index f7e0b083cdb5..cad02657c025 100644 --- a/chrome/browser/resources/extensions/extension_list.js +++ b/chrome/browser/resources/extensions/extension_list.js @@ -200,8 +200,9 @@ cr.define('options', function() { var blacklistText = node.querySelector('.blacklist-text'); blacklistText.textContent = extension.blacklistText; - var description = node.querySelector('.extension-description span'); + var description = document.createElement('span'); description.textContent = extension.description; + node.querySelector('.extension-description').appendChild(description); // The 'Show Browser Action' button. if (extension.enable_show_button) { diff --git a/chrome/browser/resources/extensions/extensions.css b/chrome/browser/resources/extensions/extensions.css index 8f170047d0fa..28a6abd475fc 100644 --- a/chrome/browser/resources/extensions/extensions.css +++ b/chrome/browser/resources/extensions/extensions.css @@ -187,6 +187,11 @@ html[dir=rtl] #footer-section { min-height: 48px; } +.extension-list-item a { + -webkit-margin-start: 0.5em; + display: inline-block; +} + html[dir='rtl'] .extension-list-item { background-position: right; } @@ -215,12 +220,23 @@ html[dir='rtl'] .extension-list-item { white-space: normal; } +.action-links { + -webkit-margin-after: 0.5em; +} + +.action-links :-webkit-any(a, .link-button) { + -webkit-margin-end: 1em; + -webkit-margin-start: 0; +} + .extension-details { -webkit-box-flex: 1; + -webkit-padding-end: 7px; -webkit-padding-start: 55px; } .extension-description, +.extension-version, .extension-list-item-wrapper.inactive-extension .extension-details, .location-text, .blacklist-text, @@ -263,11 +279,6 @@ html[dir='rtl'] .extension-list-item { padding-top: 7px; } -.extension-list-item a { - -webkit-margin-start: 0.5em; - display: inline-block; -} - .install-warnings a { -webkit-margin-start: 0; } @@ -376,10 +387,6 @@ html[dir='rtl'] #extension-settings .trash { padding: 5px 0 5px 5px; } -.may-not-modify .optional-controls .optional-controls-disableable { - display: none; -} - /* Supervised users */ .page:not(.profile-is-supervised) .profile-is-supervised-banner, diff --git a/chrome/browser/resources/extensions/extensions.html b/chrome/browser/resources/extensions/extensions.html index 56dd88ec8fc7..b19449a5fc76 100644 --- a/chrome/browser/resources/extensions/extensions.html +++ b/chrome/browser/resources/extensions/extensions.html @@ -133,14 +133,19 @@ -

- - - +

+
+ + -

+ + +
- -