Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-03 20:49:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 573536: add 'Learn more' link to geolocation notifications, r=gavin, a=blocking

Browse Source
This commit is contained in:
Margaret Leibovic 2010-08-30 12:55:17 -04:00
parent 30726f670e
commit 1c0c4eb208
5 changed files with 51 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
browser/base/content/browser.css
View File

@ -348,3 +348,7 @@ window[chromehidden~="toolbar"] toolbar:not(.toolbar-primary):not(.chromeclass-m
#notification-popup-box[anchorid="addons-notification-icon"] > #addons-notification-icon {
display: -moz-box;
}
#geolocation-notification {
-moz-binding: url("chrome://browser/content/urlbarBindings.xml#geolocation-notification");
}

33
browser/base/content/urlbarBindings.xml
View File

@ -688,4 +688,37 @@
</implementation>
</binding>
<binding id="geolocation-notification" extends="chrome://global/content/bindings/notification.xml#popup-notification">
<content>
<xul:image class="popup-notification-icon"
xbl:inherits="popupid"/>
<xul:vbox>
<xul:description class="popup-notification-description"
xbl:inherits="value=label"/>
<xul:spacer flex="1"/>
<xul:hbox pack="end">
<xul:label anonid="learnmore" class="text-link geolocation-text-link"/>
<xul:spacer flex="1"/>
<xul:button anonid="button"
class="popup-notification-menubutton"
xbl:inherits="oncommand=buttoncommand,label=buttonlabel,accesskey=buttonaccesskey,type=buttontype">
<xul:menupopup anonid="menupopup"
xbl:inherits="oncommand=menucommand">
<children/>
</xul:menupopup>
</xul:button>
</xul:hbox>
</xul:vbox>
</content>
<implementation>
<constructor><![CDATA[
let link = document.getAnonymousElementByAttribute(this, "anonid", "learnmore");
link.value = gNavigatorBundle.getString("geolocation.learnMore");
let formatter = Cc["@mozilla.org/toolkit/URLFormatterService;1"].getService(Ci.nsIURLFormatter);
link.href = formatter.formatURLPref("browser.geolocation.warning.infoURL");
]]></constructor>
</implementation>
</binding>
</bindings>

5
browser/themes/gnomestripe/browser/browser.css
View File

@ -1027,6 +1027,11 @@ toolbar[iconsize="small"] #fullscreen-button {
list-style-image: url(chrome://browser/skin/Geolocation-16.png);
}
.geolocation-text-link {
-moz-padding-start: 13px;
padding-top: 10px;
}
#addons-notification-icon {
list-style-image: url(chrome://mozapps/skin/extensions/extensionGeneric-16.png);
}

9
browser/themes/pinstripe/browser/browser.css
View File

@ -1859,6 +1859,7 @@ toolbarbutton.chevron > .toolbarbutton-menu-dropmarker {
}
#notification-popup {
color: #fff;
margin-top: -1px;
margin-left: -27px;
}
@ -1882,12 +1883,12 @@ toolbarbutton.chevron > .toolbarbutton-menu-dropmarker {
list-style-image: url(chrome://browser/skin/Geolocation-16.png);
}
#addons-notification-icon {
list-style-image: url(chrome://mozapps/skin/extensions/extensionGeneric-16.png);
.geolocation-text-link {
color: #fff;
}
.popup-notification-description {
color: #fff;
#addons-notification-icon {
list-style-image: url(chrome://mozapps/skin/extensions/extensionGeneric-16.png);
}
.popup-notification-icon {

4
browser/themes/winstripe/browser/browser.css
View File

@ -1807,6 +1807,10 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] {
list-style-image: url(chrome://browser/skin/Geolocation-64.png);
}
.geolocation-text-link {
padding-top: 5px;
}
.popup-notification-icon[popupid="xpinstall-disabled"],
.popup-notification-icon[popupid="addon-install-blocked"],
.popup-notification-icon[popupid="addon-install-failed"],