Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-08 19:04:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 822366 - Change the icon for Mixed Active Content to the triangle with exclamation point. r=dao

Browse Source
This commit is contained in:
Tanvi Vyas 2013-01-29 11:51:17 -08:00
parent 35c9f7670d
commit b262a21af4
11 changed files with 35 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
browser/base/content/browser.js
View File

@ -6487,6 +6487,7 @@ var gIdentityHandler = {
IDENTITY_MODE_DOMAIN_VERIFIED : "verifiedDomain", // Minimal SSL CA-signed domain verification
IDENTITY_MODE_UNKNOWN : "unknownIdentity", // No trusted identity information
IDENTITY_MODE_MIXED_CONTENT : "unknownIdentity mixedContent", // SSL with unauthenticated content
IDENTITY_MODE_MIXED_ACTIVE_CONTENT : "unknownIdentity mixedContent mixedActiveContent", // SSL with unauthenticated content
IDENTITY_MODE_CHROMEUI : "chromeUI", // Part of the product's UI
// Cache the most recent SSLStatus and Location seen in checkIdentity
@ -6506,6 +6507,8 @@ var gIdentityHandler = {
gNavigatorBundle.getString("identity.unencrypted");
this._encryptionLabel[this.IDENTITY_MODE_MIXED_CONTENT] =
gNavigatorBundle.getString("identity.mixed_content");
this._encryptionLabel[this.IDENTITY_MODE_MIXED_ACTIVE_CONTENT] =
gNavigatorBundle.getString("identity.mixed_content");
return this._encryptionLabel;
},
get _identityPopup () {
@ -6638,16 +6641,21 @@ var gIdentityHandler = {
this._lastLocation = location;
let nsIWebProgressListener = Ci.nsIWebProgressListener;
if (location.protocol == "chrome:" || location.protocol == "about:")
if (location.protocol == "chrome:" || location.protocol == "about:") {
this.setMode(this.IDENTITY_MODE_CHROMEUI);
else if (state & nsIWebProgressListener.STATE_IDENTITY_EV_TOPLEVEL)
} else if (state & nsIWebProgressListener.STATE_IDENTITY_EV_TOPLEVEL) {
this.setMode(this.IDENTITY_MODE_IDENTIFIED);
else if (state & nsIWebProgressListener.STATE_IS_SECURE)
} else if (state & nsIWebProgressListener.STATE_IS_SECURE) {
this.setMode(this.IDENTITY_MODE_DOMAIN_VERIFIED);
else if (state & nsIWebProgressListener.STATE_IS_BROKEN)
this.setMode(this.IDENTITY_MODE_MIXED_CONTENT);
else
} else if (state & nsIWebProgressListener.STATE_IS_BROKEN) {
if (gBrowser.docShell.hasMixedActiveContentLoaded) {
this.setMode(this.IDENTITY_MODE_MIXED_ACTIVE_CONTENT);
} else {
this.setMode(this.IDENTITY_MODE_MIXED_CONTENT);
}
} else {
this.setMode(this.IDENTITY_MODE_UNKNOWN);
}
},
/**

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

@ -1019,6 +1019,10 @@ toolbar[iconsize="small"] #webrtc-status-button {
list-style-image: url(chrome://browser/skin/identity-icons-https-ev.png);
}
.mixedActiveContent > #page-proxy-favicon[pageproxystate="valid"] {
list-style-image: url(chrome://browser/skin/identity-icons-https-mixed-active.png);
}
#identity-box:hover > #page-proxy-favicon {
-moz-image-region: rect(0, 32px, 16px, 16px);
}

BIN
browser/themes/gnomestripe/identity-icons-https-mixed-active.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 984 B

1
browser/themes/gnomestripe/jar.mn
View File

@ -27,6 +27,7 @@ browser.jar:
skin/classic/browser/identity-icons-generic.png
skin/classic/browser/identity-icons-https.png
skin/classic/browser/identity-icons-https-ev.png
skin/classic/browser/identity-icons-https-mixed-active.png
skin/classic/browser/Info.png
skin/classic/browser/KUI-close.png
skin/classic/browser/monitor.png

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

@ -1366,6 +1366,10 @@ toolbar[mode="icons"] #zoom-in-button {
list-style-image: url(chrome://browser/skin/identity-icons-https-ev.png);
}
.mixedActiveContent > #page-proxy-favicon[pageproxystate="valid"] {
list-style-image: url(chrome://browser/skin/identity-icons-https-mixed-active.png);
}
#identity-box:hover:active > #page-proxy-favicon,
#identity-box[open=true] > #page-proxy-favicon {
-moz-image-region: rect(0, 32px, 16px, 16px);
@ -1385,6 +1389,10 @@ toolbar[mode="icons"] #zoom-in-button {
list-style-image: url(chrome://browser/skin/identity-icons-https-ev@2x.png);
}
.mixedActiveContent > #page-proxy-favicon[pageproxystate="valid"] {
list-style-image: url(chrome://browser/skin/identity-icons-https-mixed-active@2x.png);
}
#identity-box:hover:active > #page-proxy-favicon,
#identity-box[open=true] > #page-proxy-favicon {
-moz-image-region: rect(0, 64px, 32px, 32px);

BIN
browser/themes/pinstripe/identity-icons-https-mixed-active.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 679 B

BIN
browser/themes/pinstripe/identity-icons-https-mixed-active@2x.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.5 KiB

2
browser/themes/pinstripe/jar.mn
View File

@ -33,6 +33,8 @@ browser.jar:
skin/classic/browser/identity-icons-https@2x.png
skin/classic/browser/identity-icons-https-ev.png
skin/classic/browser/identity-icons-https-ev@2x.png
skin/classic/browser/identity-icons-https-mixed-active.png
skin/classic/browser/identity-icons-https-mixed-active@2x.png
skin/classic/browser/Info.png
skin/classic/browser/KUI-background.png
skin/classic/browser/KUI-close.png

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

@ -1423,6 +1423,10 @@ html|*.urlbar-input:-moz-lwtheme::-moz-placeholder,
list-style-image: url(chrome://browser/skin/identity-icons-https-ev.png);
}
.mixedActiveContent > #page-proxy-favicon[pageproxystate="valid"] {
list-style-image: url(chrome://browser/skin/identity-icons-https-mixed-active.png);
}
#identity-box:hover > #page-proxy-favicon {
-moz-image-region: rect(0, 32px, 16px, 16px);
}

BIN
browser/themes/winstripe/identity-icons-https-mixed-active.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 984 B

2
browser/themes/winstripe/jar.mn
View File

@ -31,6 +31,7 @@ browser.jar:
skin/classic/browser/identity-icons-generic.png
skin/classic/browser/identity-icons-https.png
skin/classic/browser/identity-icons-https-ev.png
skin/classic/browser/identity-icons-https-mixed-active.png
skin/classic/browser/keyhole-forward-mask.svg
skin/classic/browser/KUI-background.png
skin/classic/browser/KUI-close.png
@ -257,6 +258,7 @@ browser.jar:
skin/classic/aero/browser/identity-icons-generic.png
skin/classic/aero/browser/identity-icons-https.png
skin/classic/aero/browser/identity-icons-https-ev.png
skin/classic/aero/browser/identity-icons-https-mixed-active.png
skin/classic/aero/browser/keyhole-forward-mask.svg
skin/classic/aero/browser/KUI-background.png
skin/classic/aero/browser/KUI-close.png