mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-09 19:35:51 +00:00
bug 50097, can't close privacy window, r=dveditz
This commit is contained in:
parent
c7e80bb30c
commit
af0f539026
@ -1,2 +1,3 @@
|
||||
WalletEditor.xul
|
||||
WalletEditor.js
|
||||
privacy.xul
|
||||
|
@ -1,5 +1,6 @@
|
||||
WalletEditor.properties
|
||||
WalletEditor.dtd
|
||||
privacy.dtd
|
||||
interview.html
|
||||
privacy.html
|
||||
index.html
|
||||
|
@ -42,10 +42,10 @@ override NO_STATIC_LIB=
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
install:: $(TARGETS)
|
||||
$(INSTALL) $(srcdir)/WalletEditor.xul $(srcdir)/WalletEditor.js $(DIST)/bin/chrome/packages/core/communicator/content/wallet
|
||||
$(INSTALL) $(srcdir)/WalletEditor.xul $(srcdir)/WalletEditor.js $(srcdir)/privacy.xul $(DIST)/bin/chrome/packages/core/communicator/content/wallet
|
||||
$(INSTALL) $(srcdir)/interview.html $(srcdir)/index.html $(srcdir)/privacy.html $(DIST)/bin/chrome/locales/en-US/communicator/locale/wallet
|
||||
$(INSTALL) $(srcdir)/sample1.html $(srcdir)/sample2.html $(srcdir)/sample3.html $(DIST)/bin/chrome/locales/en-US/communicator/locale/wallet
|
||||
$(INSTALL) $(srcdir)/sample4.html $(srcdir)/sample5.html $(srcdir)/sample6.html $(DIST)/bin/chrome/locales/en-US/communicator/locale/wallet
|
||||
$(INSTALL) $(srcdir)/sample7.html $(srcdir)/sample8.html $(srcdir)/sample9.html $(DIST)/bin/chrome/locales/en-US/communicator/locale/wallet
|
||||
$(INSTALL) $(srcdir)/sample10.html $(DIST)/bin/chrome/locales/en-US/communicator/locale/wallet
|
||||
$(INSTALL) $(srcdir)/WalletEditor.properties $(srcdir)/WalletEditor.dtd $(DIST)/bin/chrome/locales/en-US/communicator/locale/wallet
|
||||
$(INSTALL) $(srcdir)/WalletEditor.properties $(srcdir)/WalletEditor.dtd $(srcdir)/privacy.dtd $(DIST)/bin/chrome/locales/en-US/communicator/locale/wallet
|
||||
|
@ -70,6 +70,8 @@ clobber::
|
||||
rm -f $(DIST)\bin\chrome\packages\core\communicator\content\wallet\WalletEditor.js
|
||||
rm -f $(DIST)\bin\chrome\locales\en-US\communicator\locale\wallet\WalletEditor.properties
|
||||
rm -f $(DIST)\bin\chrome\locales\en-US\communicator\locale\wallet\WalletEditor.dtd
|
||||
rm -f $(DIST)\bin\chrome\packages\core\communicator\content\wallet\privacy.xul
|
||||
rm -f $(DIST)\bin\chrome\locales\en-US\communicator\locale\wallet\privacy.dtd
|
||||
|
||||
install:: $(DLL)
|
||||
$(MAKE_INSTALL) interview.html $(DIST)\bin\chrome\locales\en-US\communicator\locale\wallet
|
||||
@ -89,3 +91,5 @@ install:: $(DLL)
|
||||
$(MAKE_INSTALL) WalletEditor.js $(DIST)\bin\chrome\packages\core\communicator\content\wallet
|
||||
$(MAKE_INSTALL) WalletEditor.properties $(DIST)\bin\chrome\locales\en-US\communicator\locale\wallet
|
||||
$(MAKE_INSTALL) WalletEditor.dtd $(DIST)\bin\chrome\locales\en-US\communicator\locale\wallet
|
||||
$(MAKE_INSTALL) privacy.xul $(DIST)\bin\chrome\packages\core\communicator\content\wallet
|
||||
$(MAKE_INSTALL) privacy.dtd $(DIST)\bin\chrome\locales\en-US\communicator\locale\wallet
|
||||
|
2
extensions/wallet/editor/privacy.dtd
Normal file
2
extensions/wallet/editor/privacy.dtd
Normal file
@ -0,0 +1,2 @@
|
||||
<!ENTITY ok "OK">
|
||||
<!ENTITY windowtitle.label "Understanding Privacy">
|
54
extensions/wallet/editor/privacy.xul
Normal file
54
extensions/wallet/editor/privacy.xul
Normal file
@ -0,0 +1,54 @@
|
||||
<?xml version="1.0"?>
|
||||
<!--
|
||||
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 Communicator client code, released
|
||||
March 31, 1998.
|
||||
|
||||
The Initial Developer of the Original Code is Netscape
|
||||
Communications Corporation. Portions created by Netscape are
|
||||
Copyright (C) 1998-1999 Netscape Communications Corporation. All
|
||||
Rights Reserved.
|
||||
|
||||
Contributor(s):
|
||||
-->
|
||||
|
||||
<!-- CHANGE THIS WHEN MOVING FILES -->
|
||||
<?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
|
||||
<?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
|
||||
|
||||
<!-- CHANGE THIS WHEN MOVING FILES -->
|
||||
<!DOCTYPE window SYSTEM "chrome://communicator/locale/wallet/privacy.dtd" >
|
||||
|
||||
<window id="privacy"
|
||||
class="dialog"
|
||||
title="&windowtitle.label;"
|
||||
xmlns:html="http://www.w3.org/1999/xhtml"
|
||||
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
|
||||
orient="vertical">
|
||||
<!--
|
||||
<script language="javascript" src="chrome://global/content/strres.js" />
|
||||
-->
|
||||
<keyset id="keyset"/>
|
||||
|
||||
<html:iframe id="it-doesnt-matter-anyway" class="output-container"
|
||||
type="content" src="chrome://communicator/locale/wallet/privacy.html" flex="1"/>
|
||||
|
||||
|
||||
<!-- from dialogOverlay.xul -->
|
||||
<spring style="height: 5px;"/>
|
||||
<box orient="horizontal">
|
||||
<spring flex="100%"/>
|
||||
<button class="right dialog" id="ok" value="&ok;" default="true" onclick="doOKButton()"/>
|
||||
</box>
|
||||
<spring style="height: 5px;"/>
|
||||
|
||||
</window>
|
@ -48,7 +48,7 @@
|
||||
function viewTutorial()
|
||||
{
|
||||
window.openDialog
|
||||
("chrome://communicator/locale/wallet/privacy.html","","modal=yes,chrome,resizable=yes,height=400,width=600", 0);
|
||||
("chrome://communicator/content/wallet/privacy.xul","","modal=yes,chrome,resizable=yes,height=400,width=600", 0);
|
||||
}
|
||||
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user