mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-10 03:45:46 +00:00
Fix for bug 172322. Merge securityOverlay.xul with navigator.xul.
r=kaie, sr=jag
This commit is contained in:
varga%netscape.com
parent
2311a0b84b
commit
c0bc46e015
@ -1,11 +0,0 @@
|
||||
<?xml version="1.0"?>
|
||||
<?xml-stylesheet href="chrome://communicator/skin/securityOverlay.css" type="text/css"?>
|
||||
|
||||
<overlay id="NavSecurityOverlay"
|
||||
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
|
||||
|
||||
<script type="application/x-javascript" src="chrome://communicator/content/securityUI.js" />
|
||||
|
||||
<statusbarpanel id="security-button" onclick="displayPageInfo()"/>
|
||||
|
||||
</overlay>
|
||||
@ -1,27 +0,0 @@
|
||||
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
|
||||
*
|
||||
* The contents of this file are subject to the Mozilla Public
|
||||
* License Version 1.1 (the "License"); you may not use this file
|
||||
* except in compliance with the License. You may obtain a copy of
|
||||
* the License at http://www.mozilla.org/MPL/
|
||||
*
|
||||
* Software distributed under the License is distributed on an "AS
|
||||
* IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
|
||||
* implied. See the License for the specific language governing
|
||||
* rights and limitations under the License.
|
||||
*
|
||||
* The Original Code is mozilla.org code.
|
||||
*
|
||||
* The Initial Developer of the Original Code is Netscape
|
||||
* Communications Corporation. Portions created by Netscape are
|
||||
* Copyright (C) 1998 Netscape Communications Corporation. All
|
||||
* Rights Reserved.
|
||||
*
|
||||
* Contributor(s):
|
||||
*/
|
||||
|
||||
function displayPageInfo()
|
||||
{
|
||||
window.openDialog("chrome://navigator/content/pageInfo.xul", "_blank",
|
||||
"dialog=no", null, "securityTab");
|
||||
}
|
||||
@ -1,8 +1,6 @@
|
||||
comm.jar:
|
||||
content/necko/contents.rdf (content/contents.rdf)
|
||||
content/necko/redirect_loop.xul (content/redirect_loop.xul)
|
||||
content/communicator/securityOverlay.xul (content/securityOverlay.xul)
|
||||
content/communicator/securityUI.js (content/securityUI.js)
|
||||
|
||||
en-US.jar:
|
||||
locale/en-US/necko/contents.rdf (locale/en-US/contents.rdf)
|
||||
|
||||
@ -1,60 +0,0 @@
|
||||
/* ***** BEGIN LICENSE BLOCK *****
|
||||
* Version: NPL 1.1/GPL 2.0/LGPL 2.1
|
||||
*
|
||||
* The contents of this file are subject to the Netscape Public License
|
||||
* Version 1.1 (the "License"); you may not use this file except in
|
||||
* compliance with the License. You may obtain a copy of the License at
|
||||
* http://www.mozilla.org/NPL/
|
||||
*
|
||||
* Software distributed under the License is distributed on an "AS IS" basis,
|
||||
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
|
||||
* for the specific language governing rights and limitations under the
|
||||
* License.
|
||||
*
|
||||
* The Original Code is mozilla.org code.
|
||||
*
|
||||
* The Initial Developer of the Original Code is
|
||||
* Netscape Communications Corporation.
|
||||
* Portions created by the Initial Developer are Copyright (C) 1998
|
||||
* the Initial Developer. All Rights Reserved.
|
||||
*
|
||||
* Contributor(s):
|
||||
* Joe Hewitt <hewitt@netscape.com>
|
||||
*
|
||||
* Alternatively, the contents of this file may be used under the terms of
|
||||
* either the GNU General Public License Version 2 or later (the "GPL"), or
|
||||
* the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
|
||||
* in which case the provisions of the GPL or the LGPL are applicable instead
|
||||
* of those above. If you wish to allow use of your version of this file only
|
||||
* under the terms of either the GPL or the LGPL, and not to allow others to
|
||||
* use your version of this file under the terms of the NPL, indicate your
|
||||
* decision by deleting the provisions above and replace them with the notice
|
||||
* and other provisions required by the GPL or the LGPL. If you do not delete
|
||||
* the provisions above, a recipient may use your version of this file under
|
||||
* the terms of any one of the NPL, the GPL or the LGPL.
|
||||
*
|
||||
* ***** END LICENSE BLOCK ***** */
|
||||
|
||||
/* ==== securityOverlay.css =============================================
|
||||
== Styles used by the the overlay which contains security related
|
||||
== content that is used throughout the Communicator suite.
|
||||
====================================================================== */
|
||||
|
||||
@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
|
||||
|
||||
#security-button {
|
||||
list-style-image: url("chrome://communicator/skin/icons/lock-insecure.gif");
|
||||
}
|
||||
|
||||
#security-button[level="high"] {
|
||||
list-style-image: url("chrome://communicator/skin/icons/lock-secure.gif");
|
||||
}
|
||||
|
||||
#security-button[level="low"] {
|
||||
list-style-image: url("chrome://communicator/skin/icons/lock-secure.gif");
|
||||
}
|
||||
|
||||
#security-button[level="broken"] {
|
||||
list-style-image: url("chrome://communicator/skin/icons/lock-broken.gif");
|
||||
}
|
||||
|
||||
@ -3,7 +3,6 @@ classic.jar:
|
||||
skin/classic/communicator/tasksOverlay.css (communicator/tasksOverlay.css)
|
||||
skin/classic/communicator/button.css (communicator/button.css)
|
||||
skin/classic/communicator/brand.css (communicator/brand.css)
|
||||
skin/classic/communicator/securityOverlay.css (communicator/securityOverlay.css)
|
||||
skin/classic/communicator/dialogs.css (communicator/dialogs.css)
|
||||
skin/classic/communicator/printing.css (communicator/printing.css)
|
||||
skin/classic/communicator/communicator.css (communicator/communicator.css)
|
||||
|
||||
@ -322,6 +322,22 @@
|
||||
border-top: none;
|
||||
}
|
||||
|
||||
#security-button {
|
||||
list-style-image: url("chrome://communicator/skin/icons/lock-insecure.gif");
|
||||
}
|
||||
|
||||
#security-button[level="high"] {
|
||||
list-style-image: url("chrome://communicator/skin/icons/lock-secure.gif");
|
||||
}
|
||||
|
||||
#security-button[level="low"] {
|
||||
list-style-image: url("chrome://communicator/skin/icons/lock-secure.gif");
|
||||
}
|
||||
|
||||
#security-button[level="broken"] {
|
||||
list-style-image: url("chrome://communicator/skin/icons/lock-broken.gif");
|
||||
}
|
||||
|
||||
/* ::::: personal toolbar ::::: */
|
||||
|
||||
#home-button {
|
||||
|
||||
@ -1,60 +0,0 @@
|
||||
/* ***** BEGIN LICENSE BLOCK *****
|
||||
* Version: NPL 1.1/GPL 2.0/LGPL 2.1
|
||||
*
|
||||
* The contents of this file are subject to the Netscape Public License
|
||||
* Version 1.1 (the "License"); you may not use this file except in
|
||||
* compliance with the License. You may obtain a copy of the License at
|
||||
* http://www.mozilla.org/NPL/
|
||||
*
|
||||
* Software distributed under the License is distributed on an "AS IS" basis,
|
||||
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
|
||||
* for the specific language governing rights and limitations under the
|
||||
* License.
|
||||
*
|
||||
* The Original Code is mozilla.org code.
|
||||
*
|
||||
* The Initial Developer of the Original Code is
|
||||
* Netscape Communications Corporation.
|
||||
* Portions created by the Initial Developer are Copyright (C) 1998
|
||||
* the Initial Developer. All Rights Reserved.
|
||||
*
|
||||
* Contributor(s):
|
||||
* Joe Hewitt <hewitt@netscape.com>
|
||||
*
|
||||
* Alternatively, the contents of this file may be used under the terms of
|
||||
* either the GNU General Public License Version 2 or later (the "GPL"), or
|
||||
* the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
|
||||
* in which case the provisions of the GPL or the LGPL are applicable instead
|
||||
* of those above. If you wish to allow use of your version of this file only
|
||||
* under the terms of either the GPL or the LGPL, and not to allow others to
|
||||
* use your version of this file under the terms of the NPL, indicate your
|
||||
* decision by deleting the provisions above and replace them with the notice
|
||||
* and other provisions required by the GPL or the LGPL. If you do not delete
|
||||
* the provisions above, a recipient may use your version of this file under
|
||||
* the terms of any one of the NPL, the GPL or the LGPL.
|
||||
*
|
||||
* ***** END LICENSE BLOCK ***** */
|
||||
|
||||
/* ==== securityOverlay.css =============================================
|
||||
== Styles used by the the overlay which contains security related
|
||||
== content that is used throughout the Communicator suite.
|
||||
====================================================================== */
|
||||
|
||||
@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
|
||||
|
||||
#security-button {
|
||||
list-style-image: url("chrome://communicator/skin/icons/lock-insecure.gif");
|
||||
}
|
||||
|
||||
#security-button[level="high"] {
|
||||
list-style-image: url("chrome://communicator/skin/icons/lock-secure.gif");
|
||||
}
|
||||
|
||||
#security-button[level="low"] {
|
||||
list-style-image: url("chrome://communicator/skin/icons/lock-secure.gif");
|
||||
}
|
||||
|
||||
#security-button[level="broken"] {
|
||||
list-style-image: url("chrome://communicator/skin/icons/lock-broken.gif");
|
||||
}
|
||||
|
||||
@ -3,7 +3,6 @@ modern.jar:
|
||||
skin/modern/communicator/brand.css (communicator/brand.css)
|
||||
skin/modern/communicator/formatting.css (communicator/formatting.css)
|
||||
skin/modern/communicator/prefpanels.css (communicator/prefpanels.css)
|
||||
skin/modern/communicator/securityOverlay.css (communicator/securityOverlay.css)
|
||||
skin/modern/communicator/tasksOverlay.css (communicator/tasksOverlay.css)
|
||||
skin/modern/communicator/button.css (communicator/button.css)
|
||||
skin/modern/communicator/toolbar.css (communicator/toolbar.css)
|
||||
|
||||
@ -502,3 +502,19 @@
|
||||
#status-bar {
|
||||
border-top: none;
|
||||
}
|
||||
|
||||
#security-button {
|
||||
list-style-image: url("chrome://communicator/skin/icons/lock-insecure.gif");
|
||||
}
|
||||
|
||||
#security-button[level="high"] {
|
||||
list-style-image: url("chrome://communicator/skin/icons/lock-secure.gif");
|
||||
}
|
||||
|
||||
#security-button[level="low"] {
|
||||
list-style-image: url("chrome://communicator/skin/icons/lock-secure.gif");
|
||||
}
|
||||
|
||||
#security-button[level="broken"] {
|
||||
list-style-image: url("chrome://communicator/skin/icons/lock-broken.gif");
|
||||
}
|
||||
|
||||
@ -1355,12 +1355,13 @@ function BrowserViewSourceOfURL(url, charset, pageCookie)
|
||||
}
|
||||
|
||||
// doc=null for regular page info, doc=owner document for frame info.
|
||||
function BrowserPageInfo(doc)
|
||||
function BrowserPageInfo(doc, tab)
|
||||
{
|
||||
window.openDialog("chrome://navigator/content/pageInfo.xul",
|
||||
"_blank",
|
||||
"chrome,dialog=no",
|
||||
doc);
|
||||
doc,
|
||||
tab);
|
||||
}
|
||||
|
||||
function hiddenWindowStartup()
|
||||
|
||||
@ -30,7 +30,6 @@ Contributor(s):
|
||||
<?xul-overlay href="chrome://navigator/content/linkToolbarOverlay.xul"?>
|
||||
<?xul-overlay href="chrome://communicator/content/contentAreaContextOverlay.xul"?>
|
||||
<?xul-overlay href="chrome://communicator/content/sidebar/sidebarOverlay.xul"?>
|
||||
<?xul-overlay href="chrome://communicator/content/securityOverlay.xul"?>
|
||||
<?xul-overlay href="chrome://communicator/content/communicatorOverlay.xul"?>
|
||||
<?xul-overlay href="chrome://communicator/content/bookmarks/bookmarksOverlay.xul"?>
|
||||
|
||||
@ -410,6 +409,7 @@ Contributor(s):
|
||||
<progressmeter class="progressmeter-statusbar" id="statusbar-icon" mode="normal" value="0"/>
|
||||
</statusbarpanel>
|
||||
<statusbarpanel class="statusbarpanel-iconic" id="offline-status"/>
|
||||
<statusbarpanel class="statusbarpanel-iconic" id="security-button"/>
|
||||
<statusbarpanel class="statusbarpanel-iconic" id="security-button"
|
||||
onclick="BrowserPageInfo(null, 'securityTab')"/>
|
||||
</statusbar>
|
||||
</window>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user