From 63e50c35b0367e2528de896fb2b720712b9c0c5e Mon Sep 17 00:00:00 2001 From: "bryner%uiuc.edu" Date: Thu, 22 Mar 2001 00:21:54 +0000 Subject: [PATCH] Bugs 70745, 70747. Making the following XUL syntax changes: -> -> <label/> value -> label for all widgets except textbox, progressmeter, and text. progresstext -> label data -> value r=blake, hewitt. sr=ben, hyatt. checking in for maolson@earthlink.net and blakeross@telocity.com. --- .../pki/resources/content/CAOverlay.xul | 12 +- .../pki/resources/content/MineOverlay.xul | 10 +- .../pki/resources/content/PageInfoOverlay.xul | 2 +- .../pki/resources/content/PrefOverlay.xul | 4 +- .../pki/resources/content/WebSitesOverlay.xul | 8 +- .../pki/resources/content/certManager.js | 20 +- .../pki/resources/content/certManager.xul | 10 +- .../pki/resources/content/changepassword.xul | 12 +- .../pki/resources/content/domainMismatch.xul | 8 +- .../pki/resources/content/downloadcert.xul | 16 +- .../pki/resources/content/newserver.js | 12 +- .../pki/resources/content/newserver.xul | 18 +- .../pki/resources/content/pref-security.xul | 12 +- .../pki/resources/content/pref-ssl.xul | 32 +-- .../resources/content/serverCertExpired.xul | 8 +- .../pki/resources/content/setp12password.xul | 222 +++++++++--------- .../pki/resources/content/viewCertDetails.js | 4 +- .../pki/resources/content/viewCertDetails.xul | 2 +- 18 files changed, 206 insertions(+), 206 deletions(-) diff --git a/security/manager/pki/resources/content/CAOverlay.xul b/security/manager/pki/resources/content/CAOverlay.xul index ead276747ccb..bf56012f2de8 100644 --- a/security/manager/pki/resources/content/CAOverlay.xul +++ b/security/manager/pki/resources/content/CAOverlay.xul @@ -45,7 +45,7 @@ <treehead> --> <treerow> - <treecell value="&certmgr.ca.builtins;" flex="1"/> + <treecell label="&certmgr.ca.builtins;" flex="1"/> <treecell collapsed="true" flex="1"/> </treerow> <!-- @@ -58,7 +58,7 @@ <treehead> --> <treerow> - <treecell value="&certmgr.ca.mycas;" flex="1"/> + <treecell label="&certmgr.ca.mycas;" flex="1"/> <treecell collapsed="true" flex="1"/> </treerow> <!-- @@ -70,18 +70,18 @@ </tree> <box> <button id="ca_viewButton" class="normal" - value="&certmgr.view.label;" orient="horizontal" + label="&certmgr.view.label;" orient="horizontal" disabled="true" onclick="viewCerts();"/> <button id="ca_editButton" class="normal" - value="&certmgr.edit.label;" orient="horizontal" + label="&certmgr.edit.label;" orient="horizontal" disabled="true" onclick="editCerts();"/> <!-- future - import a DER cert? <button id="ca_addButton" class="normal" - value="&certmgr.add.label;" orient="horizontal" + label="&certmgr.add.label;" orient="horizontal" onclick="addCerts();"/> --> <button id="ca_deleteButton" class="normal" - value="&certmgr.delete.label;" orient="horizontal" + label="&certmgr.delete.label;" orient="horizontal" disabled="true" onclick="deleteCerts();"/> </box> </box> diff --git a/security/manager/pki/resources/content/MineOverlay.xul b/security/manager/pki/resources/content/MineOverlay.xul index 0c2b01204e4a..7059b1fa1ac5 100644 --- a/security/manager/pki/resources/content/MineOverlay.xul +++ b/security/manager/pki/resources/content/MineOverlay.xul @@ -45,19 +45,19 @@ </tree> <box> <button id="mine_viewButton" class="normal" - value="&certmgr.view.label;" orient="horizontal" + label="&certmgr.view.label;" orient="horizontal" disabled="true" onclick="viewCerts();"/> <button id="mine_backupButton" class="normal" - value="&certmgr.backup.label;" orient="horizontal" + label="&certmgr.backup.label;" orient="horizontal" disabled="true" onclick="backupCerts();"/> <button id="mine_backupAllButton" class="normal" - value="&certmgr.backupall.label;" orient="horizontal" + label="&certmgr.backupall.label;" orient="horizontal" onclick="backupAllCerts();"/> <button id="mine_restoreButton" class="normal" - value="&certmgr.restore.label;" orient="horizontal" + label="&certmgr.restore.label;" orient="horizontal" onclick="restoreCerts();"/> <button id="mine_deleteButton" class="normal" - value="&certmgr.delete.label;" orient="horizontal" + label="&certmgr.delete.label;" orient="horizontal" disabled="true" onclick="deleteCerts();"/> </box> </box> diff --git a/security/manager/pki/resources/content/PageInfoOverlay.xul b/security/manager/pki/resources/content/PageInfoOverlay.xul index 7d7a43e24e2c..49b4b1efff81 100644 --- a/security/manager/pki/resources/content/PageInfoOverlay.xul +++ b/security/manager/pki/resources/content/PageInfoOverlay.xul @@ -34,7 +34,7 @@ ]]> </script> <tabbox id="tabbox"> - <tab id="securityTab" value="&pageInfo.securityTab;" /> + <tab id="securityTab" label="&pageInfo.securityTab;" /> </tabbox> <tabpanel id="tabpanel"> <box id="securityPanel" flex="1"> diff --git a/security/manager/pki/resources/content/PrefOverlay.xul b/security/manager/pki/resources/content/PrefOverlay.xul index fb88e96b6d52..b1e1ff46a93e 100644 --- a/security/manager/pki/resources/content/PrefOverlay.xul +++ b/security/manager/pki/resources/content/PrefOverlay.xul @@ -32,14 +32,14 @@ <treeitem id="securityItem" open="true" position="3" container="true" > <treerow> <treecell class="treecell-indent" url="chrome://pippki/content/pref-security.xul" - value="&security.label;" /> + label="&security.label;" /> </treerow> <!-- Subitems go here --> <treechildren id="securityChildren"> <treeitem id="sslItem" open="true" > <treerow> <treecell class="treecell-indent" url="chrome://pippki/content/pref-ssl.xul" - value="&ssl.label;" /> + label="&ssl.label;" /> </treerow> </treeitem> </treechildren> diff --git a/security/manager/pki/resources/content/WebSitesOverlay.xul b/security/manager/pki/resources/content/WebSitesOverlay.xul index 0c4d8dd0912e..400ed19b8e6a 100644 --- a/security/manager/pki/resources/content/WebSitesOverlay.xul +++ b/security/manager/pki/resources/content/WebSitesOverlay.xul @@ -45,18 +45,18 @@ </tree> <box> <button id="websites_viewButton" class="normal" - value="&certmgr.view.label;" orient="horizontal" + label="&certmgr.view.label;" orient="horizontal" disabled="true" onclick="viewCerts();"/> <button id="websites_editButton" class="normal" - value="&certmgr.edit.label;" orient="horizontal" + label="&certmgr.edit.label;" orient="horizontal" disabled="true" onclick="editCerts();"/> <!-- future - import a DER cert? <button id="websites_addButton" class="normal" - value="&certmgr.add.label;" orient="horizontal" + label="&certmgr.add.label;" orient="horizontal" onclick="addCerts();"/> --> <button id="websites_deleteButton" class="normal" - value="&certmgr.delete.label;" orient="horizontal" + label="&certmgr.delete.label;" orient="horizontal" disabled="true" onclick="deleteCerts();"/> </box> </box> diff --git a/security/manager/pki/resources/content/certManager.js b/security/manager/pki/resources/content/certManager.js index fed1ccab88c6..8c24c5d6db41 100644 --- a/security/manager/pki/resources/content/certManager.js +++ b/security/manager/pki/resources/content/certManager.js @@ -44,8 +44,8 @@ function getSelectedCerts() if (items.length > 0) { selected_certs = []; for (var t=0; t<items.length; t++) { - var tokenName = items[t].firstChild.lastChild.getAttribute('value'); - var certName = items[t].firstChild.firstChild.getAttribute('value'); + var tokenName = items[t].firstChild.lastChild.getAttribute('label'); + var certName = items[t].firstChild.firstChild.getAttribute('label'); selected_certs[selected_certs.length] = [tokenName, certName]; } } @@ -59,7 +59,7 @@ function AddItem(children, cells, prefix, idfier) for (var i=0; i<cells.length; i++) { var cell = document.createElement("treecell"); cell.setAttribute("class", "propertylist"); - cell.setAttribute("value", cells[i]); + cell.setAttribute("label", cells[i]); row.appendChild(cell); } item.appendChild(row); @@ -75,7 +75,7 @@ function AddNameWithToken(children, cells, prefix, idfier) for (var i=0; i<2; i++) { var cell = document.createElement("treecell"); cell.setAttribute("class", "propertylist"); - cell.setAttribute("value", cells[i]); + cell.setAttribute("label", cells[i]); if (i==1) { cell.setAttribute("collapsed", "true"); } @@ -206,12 +206,12 @@ function backupCerts() } var bundle = srGetStrBundle("chrome://pippki/locale/pippki.properties"); var fp = Components.classes[nsFilePicker].createInstance(nsIFilePicker); - fp.init(window, + fp.init(window, bundle.GetStringFromName("chooseP12BackupFileDialog"), nsIFilePicker.modeSave); fp.appendFilter("PKCS12 Files (*.p12)", "*.p12"); fp.appendFilters(nsIFilePicker.filterAll); - if (fp.show() == nsIFilePicker.returnOK || + if (fp.show() == nsIFilePicker.returnOK || fp.show() == nsIFilePicker.returnReplace) { var certdb = Components.classes[nsX509CertDB].getService(nsIX509CertDB); certdb.exportPKCS12File(null, fp.file, numcerts, certs); @@ -243,7 +243,7 @@ function editCerts() } else { windowName = selected_certs[t][1]; } - window.open('chrome://pippki/content/editcerts.xul', windowName, + window.open('chrome://pippki/content/editcerts.xul', windowName, 'chrome,width=500,height=400,resizable=1'); } } @@ -252,7 +252,7 @@ function restoreCerts() { var bundle = srGetStrBundle("chrome://pippki/locale/pippki.properties"); var fp = Components.classes[nsFilePicker].createInstance(nsIFilePicker); - fp.init(window, + fp.init(window, bundle.GetStringFromName("chooseP12RestoreFileDialog"), nsIFilePicker.modeOpen); fp.appendFilter("PKCS12 Files (*.p12)", "*.p12"); @@ -277,7 +277,7 @@ function deleteCerts() } alert("You want to delete \"" + windowName + "\""); /* - window.open('chrome://pippki/content/deleteCert.xul', windowName, + window.open('chrome://pippki/content/deleteCert.xul', windowName, 'chrome,width=500,height=400,resizable=1'); */ } @@ -293,7 +293,7 @@ function viewCerts() } else { windowName = selected_certs[t][1]; } - window.open('chrome://pippki/content/viewCertDetails.xul', windowName, + window.open('chrome://pippki/content/viewCertDetails.xul', windowName, 'chrome,width=500,height=400,resizable=1'); } } diff --git a/security/manager/pki/resources/content/certManager.xul b/security/manager/pki/resources/content/certManager.xul index 7355612e235a..a56cf1b0dccc 100644 --- a/security/manager/pki/resources/content/certManager.xul +++ b/security/manager/pki/resources/content/certManager.xul @@ -52,9 +52,9 @@ <row flex="1"> <tabcontrol flex="0" orient="vertical"> <tabbox orient="horizontal"> - <tab id="mine_tab" value="&certmgr.tab.mine;" /> - <tab id="others_tab" value="&certmgr.tab.others;" /> - <tab id="websites_tab" value="&certmgr.tab.websites;" /> + <tab id="mine_tab" label="&certmgr.tab.mine;" /> + <tab id="others_tab" label="&certmgr.tab.others;" /> + <tab id="websites_tab" label="&certmgr.tab.websites;" /> <tab id="ca_tab" value="&certmgr.tab.ca;" selected="true"/> </tabbox> <tabpanel flex="1"> @@ -68,10 +68,10 @@ <row> <box orient="horizontal" flex="1"> <button id="HelpButton" class="normal" - value="&certmgr.help.label;" + label="&certmgr.help.label;" orient="horizontal" accesskey="h" /> <button id="closeButton" class="normal" - value="&certmgr.close.label;" + label="&certmgr.close.label;" orient="horizontal" accesskey="c" onclick="window.close();" onkeypress="window.close();"/> diff --git a/security/manager/pki/resources/content/changepassword.xul b/security/manager/pki/resources/content/changepassword.xul index fd92307ea43d..5ad3a0a214eb 100644 --- a/security/manager/pki/resources/content/changepassword.xul +++ b/security/manager/pki/resources/content/changepassword.xul @@ -47,8 +47,8 @@ <!-- <menulist id="signerList" disabled="true"> <menupopup> - <menuitem id="token-menu" value="Built-in private key database"/> - <menuitem value="Bob Lord's iButton"/> + <menuitem id="token-menu" label="Built-in private key database"/> + <menuitem label="Bob Lord's iButton"/> </menupopup> </menulist> --> @@ -96,7 +96,7 @@ mode="determined" value="0%" align="horizontal" - progresstext="Loading" + label="Loading" width="200" style="forground-color: red" /> @@ -136,11 +136,11 @@ <box> -<button id="ok-button" class="dialog" value="&ok.label;" +<button id="ok-button" class="dialog" label="&ok.label;" style="width: 8ex" oncommand="setPassword();" disabled="true"/> -<button id="cancel-button" class="dialog" value="&cancel.label;" +<button id="cancel-button" class="dialog" label="&cancel.label;" style="width: 8ex" oncommand="window.close();" /> -<button id="help-button" class="dialog" value="&help.label;" +<button id="help-button" class="dialog" label="&help.label;" style="width: 8ex" oncommand="alert('The old password you entered is incorrect. Try again.');" /> </box> diff --git a/security/manager/pki/resources/content/domainMismatch.xul b/security/manager/pki/resources/content/domainMismatch.xul index f6bb9f6848e8..de7e37e51d66 100644 --- a/security/manager/pki/resources/content/domainMismatch.xul +++ b/security/manager/pki/resources/content/domainMismatch.xul @@ -40,17 +40,17 @@ <html id="message2" /> <box> - <button id="examineCert-button" class="dialog" value="&examineCert.label;" + <button id="examineCert-button" class="dialog" label="&examineCert.label;" onclick="viewCert();"/> </box> <separator/> <box> - <button id="ok-button" class="dialog" value="&ok.label;" + <button id="ok-button" class="dialog" label="&ok.label;" style="width: 8ex" onclick="doOK();" disabled="false"/> - <button id="cancel-button" class="dialog" value="&cancel.label;" + <button id="cancel-button" class="dialog" label="&cancel.label;" style="width: 8ex" onclick="doCancel();" /> - <button id="help-button" class="dialog" value="&help.label;" + <button id="help-button" class="dialog" label="&help.label;" style="width: 8ex" onclick="alert('Will bring up help one day');" /> </box> </box> diff --git a/security/manager/pki/resources/content/downloadcert.xul b/security/manager/pki/resources/content/downloadcert.xul index c28b6535d4a0..f1bcf3206e46 100644 --- a/security/manager/pki/resources/content/downloadcert.xul +++ b/security/manager/pki/resources/content/downloadcert.xul @@ -55,11 +55,11 @@ --> <box orient = "vertical"> <html id="message2"/> - <checkbox value="&downloadCert.trustSSL;" checked="false" + <checkbox label="&downloadCert.trustSSL;" checked="false" id="trustSSL"/> - <checkbox value="&downloadCert.trustEmail;" checked="false" + <checkbox label="&downloadCert.trustEmail;" checked="false" id="trustEmail"/> - <checkbox value="&downloadCert.trustObjSign;" checked="false" + <checkbox label="&downloadCert.trustObjSign;" checked="false" id="trustObjSign"/> </box> @@ -81,13 +81,13 @@ <rows> <row> <button id="viewC-button" class="dialog" - value="&downloadCert.viewCert.label;" + label="&downloadCert.viewCert.label;" style="width: 8ex" oncommand="viewCert();"/> <html>&downloadCert.viewCert.text;</html> </row> <row> <button id="viewP-button" class="dialog" - value="&downloadCert.viewPolicy.label;" + label="&downloadCert.viewPolicy.label;" style="width: 8ex" oncommand="viewPolicy();" /> <html>&downloadCert.viewPolicy.text;</html> </row> @@ -101,11 +101,11 @@ - <ok> <cancel> <help> --> <box orient="horizontal" align="center"> - <button id="ok-button" class="dialog" value="&ok.label;" + <button id="ok-button" class="dialog" label="&ok.label;" style="width: 8ex" oncommand="doOK();"/> - <button id="cancel-button" class="dialog" value="&cancel.label;" + <button id="cancel-button" class="dialog" label="&cancel.label;" style="width: 8ex" oncommand="doCancel();" /> - <button id="help-button" class="dialog" value="&help.label;" + <button id="help-button" class="dialog" label="&help.label;" style="width: 8ex" oncommand="alert('Help to add here');" /> </box> diff --git a/security/manager/pki/resources/content/newserver.js b/security/manager/pki/resources/content/newserver.js index 3343f6a38efa..bc9374defce2 100644 --- a/security/manager/pki/resources/content/newserver.js +++ b/security/manager/pki/resources/content/newserver.js @@ -33,20 +33,20 @@ var cert; function onLoad() { - pkiParams = window.arguments[0].QueryInterface(nsIPKIParamBlock); + pkiParams = window.arguments[0].QueryInterface(nsIPKIParamBlock); dialogParams = pkiParams.QueryInterface(nsIDialogParamBlock); - var isupport = pkiParams.getISupportAtIndex(1); + var isupport = pkiParams.getISupportAtIndex(1); cert = isupport.QueryInterface(nsIX509Cert); var bundle = srGetStrBundle("chrome://pippki/locale/newserver.properties"); var gBundleBrand = srGetStrBundle("chrome://global/locale/brand.properties"); var brandName = gBundleBrand.GetStringFromName("brandShortName"); - var message1 = bundle.formatStringFromName("newServerMessage1", + var message1 = bundle.formatStringFromName("newServerMessage1", [ cert.commonName, brandName ], 2); - var message4 = bundle.formatStringFromName("newServerMessage4", + var message4 = bundle.formatStringFromName("newServerMessage4", [ cert.commonName ], 1); setText("message1", message1); @@ -57,7 +57,7 @@ function doOK() { dialogParams.SetInt(1,1); var radioGroup = document.getElementById("trustSiteCert"); - dialogParams.SetInt(2,parseInt(radioGroup.selectedItem.data)); + dialogParams.SetInt(2,parseInt(radioGroup.selectedItem.value)); window.close(); } @@ -70,5 +70,5 @@ function doCancel() function viewCert() { window.openDialog('chrome://pippki/content/viewCertDetails.xul', cert.dbKey, - 'chrome,width=500,height=400,resizable=1'); + 'chrome,width=500,height=400,resizable=1'); } diff --git a/security/manager/pki/resources/content/newserver.xul b/security/manager/pki/resources/content/newserver.xul index 1335e42b3dd0..4621b208e9c4 100644 --- a/security/manager/pki/resources/content/newserver.xul +++ b/security/manager/pki/resources/content/newserver.xul @@ -51,30 +51,30 @@ <radiogroup id="trustSiteCert" pref="false" orient="vertical"> <radio group="trustSiteCert" - value="&newserver.acceptperm;" + label="&newserver.acceptperm;" id="acceptRadio" - data="0"/> + value="0"/> <radio group="trustSiteCert" - value="&newserver.accepttemp;" + label="&newserver.accepttemp;" id="tmpAcceptRadio" - data="1" checked="true"/> + value="1" checked="true"/> <radio group="trustSiteCert" id="rejectRadio" - value="&newserver.reject;" data="2"/> + label="&newserver.reject;" value="2"/> </radiogroup> <box> - <button id="examineCert-button" class="dialog" value="&examineCert.label;" + <button id="examineCert-button" class="dialog" label="&examineCert.label;" onclick="viewCert();"/> </box> <separator/> <box> - <button id="ok-button" class="dialog" value="&ok.label;" + <button id="ok-button" class="dialog" label="&ok.label;" style="width: 10ex" onclick="doOK();" disabled="false"/> - <button id="cancel-button" class="dialog" value="&cancel.label;" + <button id="cancel-button" class="dialog" label="&cancel.label;" style="width: 10ex" onclick="doCancel();" /> - <button id="help-button" class="dialog" value="&help.label;" + <button id="help-button" class="dialog" label="&help.label;" style="width: 10ex" onclick="alert('Will bring up help one day');" /> </box> </box> diff --git a/security/manager/pki/resources/content/pref-security.xul b/security/manager/pki/resources/content/pref-security.xul index 989dd9030afd..da3f749b4660 100644 --- a/security/manager/pki/resources/content/pref-security.xul +++ b/security/manager/pki/resources/content/pref-security.xul @@ -59,33 +59,33 @@ description="&security.description;"/> <titledbox orient="vertical"> - <title><text value="&resetsettings.label;"/> +