diff --git a/extensions/wallet/editor/MANIFEST b/extensions/wallet/editor/MANIFEST index 5bc272e87de..e69de29bb2d 100644 --- a/extensions/wallet/editor/MANIFEST +++ b/extensions/wallet/editor/MANIFEST @@ -1,3 +0,0 @@ -WalletEditor.xul -WalletEditor.js -privacy.xul diff --git a/extensions/wallet/editor/MANIFEST_PROPERTIES b/extensions/wallet/editor/MANIFEST_PROPERTIES index 49709dd0dd3..603f9325e7c 100644 --- a/extensions/wallet/editor/MANIFEST_PROPERTIES +++ b/extensions/wallet/editor/MANIFEST_PROPERTIES @@ -1,7 +1,5 @@ -WalletEditor.properties -WalletEditor.dtd +WalletViewer.dtd privacy.dtd -interview.html privacy.html index.html sample1.html diff --git a/extensions/wallet/editor/index.html b/extensions/wallet/editor/index.html index 9d827ddb0d7..e69de29bb2d 100644 --- a/extensions/wallet/editor/index.html +++ b/extensions/wallet/editor/index.html @@ -1,69 +0,0 @@ - - - - - - - Samples - - -  -
- - - -
-
Welcome to the Wonderful World of Wallets
- -


-
-

The wallet feature (a.k.a. "Form Manager") remembers data that you have -entered on forms and pre-fills that data on future visits to the same form -or on other forms that ask for the same data. -

You need not pre-specify your data, but you certainly can if you like.  -If you would like to pre-specify your data, click -here. -

Alternatively, you can specify the data later when you encounter actual -forms that you will want to submit.  In that case select save form -data from the Edit Menu before submitting the form. -

To try filling out some forms, click on any one of the samples listed -below and then select prefill form from the Edit Menu.  To -review the stored data, select view captured form data from the -Form Manager submenu. -
  -
  - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Sample1Sample4Sample7Sample10
Sample2Sample5Sample8
Sample3Sample6Sample9
-

- - - diff --git a/extensions/wallet/jar.mn b/extensions/wallet/jar.mn index 36d84dc313d..33675b7c660 100644 --- a/extensions/wallet/jar.mn +++ b/extensions/wallet/jar.mn @@ -1,13 +1,26 @@ comm.jar: content/communicator/wallet/CookieViewer.js (cookieviewer/CookieViewer.js) content/communicator/wallet/CookieViewer.xul (cookieviewer/CookieViewer.xul) - content/communicator/wallet/WalletEditor.js (editor/WalletEditor.js) - content/communicator/wallet/WalletEditor.xul (editor/WalletEditor.xul) content/communicator/wallet/privacy.xul (editor/privacy.xul) content/communicator/wallet/SignonViewer.js (signonviewer/SignonViewer.js) content/communicator/wallet/SignonViewer.xul (signonviewer/SignonViewer.xul) content/communicator/wallet/WalletPreview.js (walletpreview/WalletPreview.js) content/communicator/wallet/WalletPreview.xul (walletpreview/WalletPreview.xul) + content/communicator/wallet/WalletAddress.xul (editor/WalletAddress.xul) + content/communicator/wallet/WalletBilling.xul (editor/WalletBilling.xul) + content/communicator/wallet/WalletConcatenated.xul (editor/WalletConcatenated.xul) + content/communicator/wallet/WalletCredit.xul (editor/WalletCredit.xul) + content/communicator/wallet/WalletEmploy.xul (editor/WalletEmploy.xul) + content/communicator/wallet/WalletMisc.xul (editor/WalletMisc.xul) + content/communicator/wallet/WalletName.xul (editor/WalletName.xul) + content/communicator/wallet/WalletOther.xul (editor/WalletOther.xul) + content/communicator/wallet/WalletPhone.xul (editor/WalletPhone.xul) + content/communicator/wallet/WalletPrimary.xul (editor/WalletPrimary.xul) + content/communicator/wallet/WalletShipping.xul (editor/WalletShipping.xul) + content/communicator/wallet/WalletTree.xul (editor/WalletTree.xul) + content/communicator/wallet/WalletUrlspecific.xul (editor/WalletUrlspecific.xul) + content/communicator/wallet/WalletViewer.xul (editor/WalletViewer.xul) + content/communicator/wallet/WalletViewer.js (editor/WalletViewer.js) en-US.jar: locale/en-US/communicator/wallet/CookieViewer.properties (cookieviewer/CookieViewer.properties) @@ -32,4 +45,4 @@ en-US.jar: locale/en-US/communicator/wallet/sample8.html (editor/sample8.html) locale/en-US/communicator/wallet/sample9.html (editor/sample9.html) locale/en-US/communicator/wallet/sample10.html (editor/sample10.html) - locale/en-US/communicator/wallet/interview.html (editor/interview.html) + locale/en-US/communicator/wallet/WalletViewer.dtd (editor/WalletViewer.dtd) diff --git a/xpfe/communicator/resources/content/tasksOverlay.js b/xpfe/communicator/resources/content/tasksOverlay.js index 274b5ef816e..3d9fa8d5cc1 100644 --- a/xpfe/communicator/resources/content/tasksOverlay.js +++ b/xpfe/communicator/resources/content/tasksOverlay.js @@ -391,9 +391,9 @@ function WalletDialog( which ) case "samples": window._content.location.href = 'chrome://communicator/locale/wallet/index.html'; break; - case "interview": - window._content.location.href = 'chrome://communicator/locale/wallet/interview.html'; - break; +// case "interview": +// window._content.location.href = 'chrome://communicator/locale/wallet/interview.html'; +// break; case "walletsites": window.openDialog("chrome://communicator/content/wallet/SignonViewer.xul","SSViewer","modal=yes,chrome,resizable=no","W"); break; @@ -403,7 +403,10 @@ function WalletDialog( which ) break; case "wallet": default: - window.openDialog("chrome://communicator/content/wallet/WalletEditor.xul","walletEditor","modal=yes,chrome,resizable=no"); + window.openDialog( + "chrome://communicator/content/wallet/WalletViewer.xul", + "WalletViewer", + "chrome,titlebar,modal=yes,resizable=yes"); break; } } diff --git a/xpfe/communicator/resources/content/tasksOverlay.xul b/xpfe/communicator/resources/content/tasksOverlay.xul index f8c18931d97..0df7a1d4857 100644 --- a/xpfe/communicator/resources/content/tasksOverlay.xul +++ b/xpfe/communicator/resources/content/tasksOverlay.xul @@ -91,8 +91,8 @@ ---> +--> diff --git a/xpfe/components/prefwindow/resources/content/pref-wallet.xul b/xpfe/components/prefwindow/resources/content/pref-wallet.xul index 1734ced3126..3d08c1e5643 100644 --- a/xpfe/components/prefwindow/resources/content/pref-wallet.xul +++ b/xpfe/components/prefwindow/resources/content/pref-wallet.xul @@ -44,7 +44,10 @@