Bugs 70745, 70747. Making the following XUL syntax changes:

<textfield/> -> <textbox/>
<title/> -> <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.
This commit is contained in:
bryner%uiuc.edu 2001-03-22 00:21:54 +00:00
Родитель b5ef4f8688
Коммит 63e50c35b0
18 изменённых файлов: 206 добавлений и 206 удалений

Просмотреть файл

@ -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>

Просмотреть файл

@ -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>

Просмотреть файл

@ -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">

Просмотреть файл

@ -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>

Просмотреть файл

@ -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>

Просмотреть файл

@ -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");
}

Просмотреть файл

@ -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();"/>

Просмотреть файл

@ -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>

Просмотреть файл

@ -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>

Просмотреть файл

@ -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>

Просмотреть файл

@ -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();
}

Просмотреть файл

@ -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>

Просмотреть файл

@ -59,33 +59,33 @@
description="&security.description;"/>
<titledbox orient="vertical">
<title><text value="&resetsettings.label;"/></title>
<label value="&resetsettings.label;"/>
<html id="resetsettings.text" />
<!-- Prefs -->
<box halign="left" autostretch="never">
<button class="dialog" value="&resetpreferences.label;" disabled="true"
<button class="dialog" label="&resetpreferences.label;" disabled="true"
oncommand="alert('You FOOL! You'll get us ALL killed!');" />
</box>
</titledbox>
<titledbox orient="vertical">
<title><text value="&managecerts.label;"/></title>
<label value="&managecerts.label;"/>
<html>
&managecerts.text;
</html>
<box halign="left" autostretch="never">
<button class="dialog" value="&managecerts.button;" disabled="false"
<button class="dialog" label="&managecerts.button;" disabled="false"
oncommand="openCertManager();" />
</box>
</titledbox>
<titledbox orient="vertical">
<title><text value="&managedevices.label;"/></title>
<label value="&managedevices.label;"/>
<html>
&managedevices.text;
</html>
<box halign="left" autostretch="never">
<button class="dialog" value="&managedevices.button;" disabled="true"
<button class="dialog" label="&managedevices.button;" disabled="true"
oncommand="window.openDialog('chrome://pip/content/device_manager.xul', '',
'modal=yes,resizable,chrome');" />
</box>

Просмотреть файл

@ -46,23 +46,23 @@
<box class="box-smallheader" title="SSL" description="Settings for SSL"/>
<titledbox orient="horizontal">
<title><text value="&SSLProtocolVersions;"/></title>
<label value="&SSLProtocolVersions;"/>
<!-- Prefs -->
<box orient="vertical" flex="1" autostretch="never" >
<checkbox id="enableSSL2" value="Enable SSL version 2"
<checkbox id="enableSSL2" label="Enable SSL version 2"
pref="true" preftype="bool" prefstring="security.enable_ssl2"
prefattribute="checked"/>
<checkbox id="enableSSL3" value="Enable SSL version 3"
<checkbox id="enableSSL3" label="Enable SSL version 3"
pref="true" preftype="bool" prefstring="security.enable_ssl3"
prefattribute="checked"/>
<checkbox id="enableTLS" value="Enable TLS"
<checkbox id="enableTLS" label="Enable TLS"
pref="true" preftype="bool" prefstring="security.enable_tls"
prefattribute="checked"/>
</box>
<box orient="vertical" halign="right">
<button class="dialog" value="Edit SSL Ciphers..." disabled="true"
<button class="dialog" label="Edit SSL Ciphers..." disabled="true"
oncommand="window.openDialog('chrome://pippki/content/cipherViewer.xul', '',
'modal=yes,resizable,chrome');" />
</box>
@ -70,7 +70,7 @@
</titledbox>
<titledbox orient="vertical" autostretch="never" >
<title><text value="&SSLWarnings;"/></title>
<label value="&SSLWarnings;"/>
<html>
Netscape can alert you to the security status of the web page you are viewing.
Set Netscape to show a warning and ask permission before:
@ -78,38 +78,38 @@ Set Netscape to show a warning and ask permission before:
<!-- Prefs -->
<checkbox id="warnEnteringSecure"
value="Entering a site that supports encryption"
label="Entering a site that supports encryption"
pref="true" preftype="bool" prefstring="security.warn_entering_secure"
prefattribute="checked"/>
<checkbox id="warnInsecurePost"
value="Sending form data from an insecure page to an insecure page"
label="Sending form data from an insecure page to an insecure page"
pref="true" preftype="bool" prefstring="security.warn_submit_insecure"
prefattribute="checked"/>
<checkbox id="warnInsecurePostFromSecure"
value="Sending form data from a secure page to an insecure page"
label="Sending form data from a secure page to an insecure page"
pref="true" preftype="bool" prefstring="pip.security.warn_insecure_post_from_secure"
prefattribute="checked" checked="true" disabled="true"/>
<checkbox id="warnSecureRedirect" value="Redirection from one secure site to another"
<checkbox id="warnSecureRedirect" label="Redirection from one secure site to another"
pref="true" preftype="bool" prefstring="pip.security.warn_secure_redirect"
prefattribute="checked"/>
<checkbox id="warnSecureRedirectToInsecure"
value="Redirection from a secure site to an insecure site"
label="Redirection from a secure site to an insecure site"
pref="true" preftype="bool" prefstring="pip.security.warn_secure_redirect_to_insecure"
prefattribute="checked"/>
<checkbox id="warnViewMixed" value="Viewing a page with an encrypted/unencrypted mix"
<checkbox id="warnViewMixed" label="Viewing a page with an encrypted/unencrypted mix"
pref="true" preftype="bool" prefstring="security.warn_viewing_mixed"
prefattribute="checked" checked="true"/>
</titledbox>
<titledbox orient="vertical" autostretch="never" >
<title><text value="&SSLClientAuthMethod;"/></title>
<label value="&SSLClientAuthMethod;"/>
<html>Decide how Netscape selects a security certificate to
present to web sites that require one:</html>
<!-- Prefs -->
<radiogroup id="certSelection" pref="true" preftype="int"
prefstring="pip.security.default_personal_cert" prefattribute="data">
<radio group="certSelection" value="Select Automatically" data="0"/>
<radio group="certSelection" value="Select Manually" data="1"/>
prefstring="pip.security.default_personal_cert" prefattribute="value">
<radio group="certSelection" label="Select Automatically" value="0"/>
<radio group="certSelection" label="Select Manually" value="1"/>
</radiogroup>
</titledbox>

Просмотреть файл

@ -42,16 +42,16 @@
<text value="&serverCertExpired.continue;" />
<separator/>
<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>

Просмотреть файл

@ -47,12 +47,12 @@
<rows>
<row>
<text value="&pkcs12.setpassword.label1;" />
<textfield id="pw1" type="password" maxlength="30"
<textbox id="pw1" type="password" maxlength="30"
onkeypress="setPasswordStrength(); checkPasswords();"/>
</row>
<row>
<text value="&pkcs12.setpassword.label2;" />
<textfield id="pw2" type="password" maxlength="30"
<textbox id="pw2" type="password" maxlength="30"
onkeypress="checkPasswords();"/>
</row>
</rows>
@ -82,19 +82,19 @@
<rows>
<row>
<text value="&setPassword.stats.total;"/>
<textfield id="pwchars" size="2" readonly="true"/>
<textbox id="pwchars" size="2" readonly="true"/>
</row>
<row>
<text value="&setPassword.stats.numbers;"/>
<textfield id="pwnumbers" size="2" readonly="true"/>
<textbox id="pwnumbers" size="2" readonly="true"/>
</row>
<row>
<text value="&setPassword.stats.symbols;"/>
<textfield id="pwsymbols" size="2" readonly="true"/>
<textbox id="pwsymbols" size="2" readonly="true"/>
</row>
<row>
<text value="&setPassword.stats.upper;"/>
<textfield id="pwupper" size="2" readonly="true"/>
<textbox id="pwupper" size="2" readonly="true"/>
</row>
</rows>
</grid>

Просмотреть файл

@ -39,7 +39,7 @@ function AddCertChain(node, chain)
var rows = [document.createElement("treerow")];
var cell = document.createElement("treecell");
cell.setAttribute("class", "treecell-indent");
cell.setAttribute("value", chain[0]);
cell.setAttribute("label", chain[0]);
var cells = [cell];
for (var i=1; i<chain.length; i++) {
child[i] = items[i-1];
@ -50,7 +50,7 @@ function AddCertChain(node, chain)
rows[i] = document.createElement("treerow");
cell = document.createElement("treecell");
cell.setAttribute("class", "treecell-indent");
cell.setAttribute("value", chain[i]);
cell.setAttribute("label", chain[i]);
cells[i] = cell;
}
for (i=chain.length-1; i>=0; i--) {

Просмотреть файл

@ -106,7 +106,7 @@
<box>
<button id="closeButton"
class="normal"
value="&certmgr.close.label;"
label="&certmgr.close.label;"
orient="horizontal"
onclick="window.close();" />
</box>