Bug 1333168 Use <span> for addon name in permission dialog
MozReview-Commit-ID: Hwj6MBeEG8p
--- a/browser/modules/ExtensionsUI.jsm
+++ b/browser/modules/ExtensionsUI.jsm
@@ -169,38 +169,38 @@ this.ExtensionsUI = {
let win = target.ownerGlobal;
let name = info.addon.name;
if (name.length > 50) {
name = name.slice(0, 49) + "…";
}
name = this._sanitizeName(name);
- let addonLabel = `<label class="addon-webext-name">${name}</label>`;
+ let addonName = `<span class="addon-webext-name">${name}</span>`;
let bundle = win.gNavigatorBundle;
- let header = bundle.getFormattedString("webextPerms.header", [addonLabel]);
+ let header = bundle.getFormattedString("webextPerms.header", [addonName]);
let text = "";
let listIntro = bundle.getString("webextPerms.listIntro");
let acceptText = bundle.getString("webextPerms.add.label");
let acceptKey = bundle.getString("webextPerms.add.accessKey");
let cancelText = bundle.getString("webextPerms.cancel.label");
let cancelKey = bundle.getString("webextPerms.cancel.accessKey");
if (info.type == "sideload") {
- header = bundle.getFormattedString("webextPerms.sideloadHeader", [addonLabel]);
+ header = bundle.getFormattedString("webextPerms.sideloadHeader", [addonName]);
text = bundle.getString("webextPerms.sideloadText");
acceptText = bundle.getString("webextPerms.sideloadEnable.label");
acceptKey = bundle.getString("webextPerms.sideloadEnable.accessKey");
cancelText = bundle.getString("webextPerms.sideloadDisable.label");
cancelKey = bundle.getString("webextPerms.sideloadDisable.accessKey");
} else if (info.type == "update") {
header = "";
- text = bundle.getFormattedString("webextPerms.updateText", [addonLabel]);
+ text = bundle.getFormattedString("webextPerms.updateText", [addonName]);
acceptText = bundle.getString("webextPerms.updateAccept.label");
acceptKey = bundle.getString("webextPerms.updateAccept.accessKey");
}
let msgs = [];
for (let permission of perms.permissions) {
let key = `webextPerms.description.${permission}`;
if (permission == "nativeMessaging") {
@@ -316,26 +316,26 @@ this.ExtensionsUI = {
});
},
showInstallNotification(target, addon) {
let win = target.ownerGlobal;
let popups = win.PopupNotifications;
let name = this._sanitizeName(addon.name);
- let addonLabel = `<label class="addon-webext-name">${name}</label>`;
+ let addonName = `<span class="addon-webext-name">${name}</span>`;
let addonIcon = '<image class="addon-addon-icon"/>';
let toolbarIcon = '<image class="addon-toolbar-icon"/>';
let brandBundle = win.document.getElementById("bundle_brand");
let appName = brandBundle.getString("brandShortName");
let bundle = win.gNavigatorBundle;
let msg1 = bundle.getFormattedString("addonPostInstall.message1",
- [addonLabel, appName]);
+ [addonName, appName]);
let msg2 = bundle.getFormattedString("addonPostInstall.messageDetail",
[addonIcon, toolbarIcon]);
return new Promise(resolve => {
let action = {
label: bundle.getString("addonPostInstall.okay.label"),
accessKey: bundle.getString("addonPostInstall.okay.key"),
callback: resolve,
--- a/browser/themes/linux/browser.css
+++ b/browser/themes/linux/browser.css
@@ -833,16 +833,17 @@ menuitem.bookmark-item {
font-weight: bold;
}
.addon-webext-perm-header {
font-size: 1.3em;
}
.addon-webext-name {
+ display: inline;
font-weight: bold;
margin: 0;
}
.addon-addon-icon {
width: 14px;
height: 14px;
list-style-image: url("chrome://browser/skin/menuPanel.svg");
--- a/browser/themes/osx/browser.css
+++ b/browser/themes/osx/browser.css
@@ -3091,16 +3091,17 @@ menulist.translate-infobar-element > .me
font-weight: bold;
}
.addon-webext-perm-header {
font-size: 1.3em;
}
.addon-webext-name {
+ display: inline;
font-weight: bold;
margin: 0;
}
.addon-addon-icon {
width: 14px;
height: 14px;
list-style-image: url("chrome://browser/skin/menuPanel.svg");
--- a/browser/themes/windows/browser.css
+++ b/browser/themes/windows/browser.css
@@ -2136,16 +2136,17 @@ toolbarbutton.bookmark-item[dragover="tr
font-weight: bold;
}
.addon-webext-perm-header {
font-size: 1.3em;
}
.addon-webext-name {
+ display: inline;
font-weight: bold;
margin: 0;
}
.addon-addon-icon {
width: 14px;
height: 14px;
list-style-image: url("chrome://browser/skin/menuPanel.svg");