Bug 289555 - Remove non-functional help buttons from PSM for toolkit apps r=mconnor+rrelyea a=asa
This commit is contained in:
Родитель
e0a926bf15
Коммит
bd668e0965
|
@ -1,10 +1,15 @@
|
|||
#filter substitution
|
||||
|
||||
@AB_CD@.jar:
|
||||
#ifdef MOZ_XUL_APP
|
||||
% locale pipnss @AB_CD@ %locale/@AB_CD@/pipnss/
|
||||
% locale pippki @AB_CD@ %locale/@AB_CD@/pippki/
|
||||
#else
|
||||
* locale/@AB_CD@/pipnss/contents.rdf (generic/chrome/pipnss/contents.rdf)
|
||||
* locale/@AB_CD@/pippki/contents.rdf (generic/chrome/pippki/contents.rdf)
|
||||
#endif
|
||||
locale/@AB_CD@/pipnss/pipnss.properties (%chrome/pipnss/pipnss.properties)
|
||||
locale/@AB_CD@/pipnss/security.properties (%chrome/pipnss/security.properties)
|
||||
* locale/@AB_CD@/pippki/contents.rdf (generic/chrome/pippki/contents.rdf)
|
||||
locale/@AB_CD@/pippki/pippki.dtd (%chrome/pippki/pippki.dtd)
|
||||
locale/@AB_CD@/pippki/pref-ssl.dtd (%chrome/pippki/pref-ssl.dtd)
|
||||
locale/@AB_CD@/pippki/pippki.properties (%chrome/pippki/pippki.properties)
|
||||
|
@ -16,4 +21,4 @@
|
|||
locale/@AB_CD@/pippki/certManager.dtd (%chrome/pippki/certManager.dtd)
|
||||
locale/@AB_CD@/pippki/deviceManager.dtd (%chrome/pippki/deviceManager.dtd)
|
||||
locale/@AB_CD@/pippki/pref-validation.dtd (%chrome/pippki/pref-validation.dtd)
|
||||
locale/@AB_CD@/pippki/pref-masterpass.dtd (%chrome/pippki/pref-masterpass.dtd)
|
||||
locale/@AB_CD@/pippki/pref-masterpass.dtd (%chrome/pippki/pref-masterpass.dtd)
|
||||
|
|
|
@ -44,3 +44,8 @@ VPATH = @srcdir@
|
|||
include $(DEPTH)/config/autoconf.mk
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
ifdef MOZ_XUL_APP
|
||||
DEFINES += -DHELP_BUTTON=
|
||||
else
|
||||
DEFINES += "-DHELP_BUTTON=,help"
|
||||
endif
|
||||
|
|
|
@ -51,7 +51,7 @@
|
|||
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
|
||||
title="&certmgr.title;"
|
||||
onload="LoadCerts();"
|
||||
buttons="accept,help"
|
||||
#expand buttons="accept__HELP_BUTTON__"
|
||||
ondialoghelp="return doHelpButton();"
|
||||
style="width: 48em; height: 32em;"
|
||||
persist="screenX screenY width height">
|
||||
|
|
|
@ -49,7 +49,7 @@
|
|||
<dialog id="certDetails"
|
||||
title="&certmgr.certdetail.title;"
|
||||
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
|
||||
buttons="accept,help"
|
||||
#expand buttons="accept__HELP_BUTTON__"
|
||||
buttonlabelaccept="&certmgr.close.label;"
|
||||
ondialoghelp="openHelp('cert_details');"
|
||||
onload="setWindowName();">
|
||||
|
|
|
@ -43,7 +43,7 @@
|
|||
|
||||
<dialog id="set_password" title="&setPassword.title;"
|
||||
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
|
||||
buttons="accept,cancel,help"
|
||||
#expand buttons="accept,cancel__HELP_BUTTON__"
|
||||
ondialogaccept="return setPassword();"
|
||||
ondialoghelp="openHelp('change_pwd');"
|
||||
onload="onLoad();">
|
||||
|
|
|
@ -47,7 +47,7 @@
|
|||
<dialog id="ssl_warning" title="&chooseToken.title;"
|
||||
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
|
||||
style="width: 40em;"
|
||||
buttons="accept,cancel,help"
|
||||
#expand buttons="accept,cancel__HELP_BUTTON__"
|
||||
ondialogaccept="return doOk();"
|
||||
ondialogcancel="return doCancel();"
|
||||
ondialoghelp="openHelp('which_token');"
|
||||
|
|
|
@ -46,7 +46,7 @@
|
|||
|
||||
<dialog id="ssl_warning" title="&clientAuthAsk.title;"
|
||||
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
|
||||
buttons="accept,cancel,help"
|
||||
#expand buttons="accept,cancel__HELP_BUTTON__"
|
||||
ondialogaccept="return doOK();"
|
||||
ondialogcancel="return doCancel();"
|
||||
ondialoghelp="openHelp('which_cert');"
|
||||
|
|
|
@ -44,7 +44,7 @@
|
|||
title="&crl.import.status.title;"
|
||||
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
|
||||
onload="onLoad();"
|
||||
buttons="accept,cancel,help"
|
||||
#expand buttons="accept,cancel__HELP_BUTTON__"
|
||||
ondialogaccept="return onAccept();"
|
||||
ondialogcancel="return onCancel();"
|
||||
ondialoghelp="return doHelpButton();">
|
||||
|
|
|
@ -53,7 +53,9 @@
|
|||
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
|
||||
style="width: 30em;"
|
||||
onload="onLoad();"
|
||||
#ifndef MOZ_XUL_APP
|
||||
buttons="help"
|
||||
#endif
|
||||
ondialoghelp="openHelp('validation-crl-manage');"
|
||||
persist="screenX screenY width height">
|
||||
|
||||
|
|
|
@ -44,7 +44,7 @@
|
|||
title="&certmgr.deletecert.title;"
|
||||
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
|
||||
onload="setWindowName();"
|
||||
buttons="accept,cancel,help"
|
||||
#expand buttons="accept,cancel__HELP_BUTTON__"
|
||||
ondialogaccept="return doOK();"
|
||||
ondialogcancel="return doCancel();"
|
||||
ondialoghelp="doHelp();">
|
||||
|
|
|
@ -53,7 +53,7 @@
|
|||
style="width: 52em; height: 32em;"
|
||||
persist="screenX screenY width height"
|
||||
onload="LoadModules();"
|
||||
buttons="accept,help"
|
||||
#expand buttons="accept__HELP_BUTTON__"
|
||||
ondialoghelp="openHelp('sec_devices');">
|
||||
|
||||
<script type="application/x-javascript" src="chrome://global/content/strres.js"/>
|
||||
|
|
|
@ -45,7 +45,7 @@
|
|||
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
|
||||
style="width: 32em;"
|
||||
spacerflex="1"
|
||||
buttons="accept,cancel,help,extra2"
|
||||
#expand buttons="accept,cancel__HELP_BUTTON__,extra2"
|
||||
buttonlabelextra2="&examineCert.label;"
|
||||
buttonaccesskeyextra2="&examineCert.accesskey;"
|
||||
ondialogaccept="return doOK();"
|
||||
|
|
|
@ -43,7 +43,7 @@
|
|||
<dialog id="download_cert" title="&downloadCert.title;"
|
||||
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
|
||||
style="width: 46em;"
|
||||
buttons="accept,cancel,help"
|
||||
#expand buttons="accept,cancel__HELP__"
|
||||
ondialogaccept="return doOK();"
|
||||
ondialogcancel="return doCancel();"
|
||||
ondialoghelp="openHelp('new_ca');"
|
||||
|
|
|
@ -44,7 +44,7 @@
|
|||
<dialog id="editCaCert"
|
||||
title="&certmgr.editcacert.title;"
|
||||
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
|
||||
buttons="accept,cancel,help"
|
||||
#expand buttons="accept,cancel__HELP_BUTTON__"
|
||||
ondialogaccept="return doOK();"
|
||||
ondialoghelp="openHelp('edit_ca_certs');"
|
||||
onload="setWindowName();"
|
||||
|
|
|
@ -44,7 +44,7 @@
|
|||
<dialog id="editEmailCert"
|
||||
title="&certmgr.editemailcert.title;"
|
||||
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
|
||||
buttons="accept,cancel,help"
|
||||
#expand buttons="accept,cancel__HELP_BUTTON__"
|
||||
ondialogaccept="return doEmailOK();"
|
||||
ondialoghelp="openHelp('edit_email_certs');"
|
||||
onload="doLoadForEmailCert();"
|
||||
|
|
|
@ -44,7 +44,7 @@
|
|||
<dialog id="editWebsiteCert"
|
||||
title="&certmgr.editsslcert.title;"
|
||||
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
|
||||
buttons="accept,cancel,help"
|
||||
#expand buttons="accept,cancel__HELP_BUTTON__"
|
||||
ondialogaccept="return doSSLOK();"
|
||||
ondialoghelp="openHelp('edit_web_certs');"
|
||||
onload="doLoadForSSLCert();"
|
||||
|
|
|
@ -45,7 +45,7 @@
|
|||
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
|
||||
style="width: 40em;"
|
||||
spacerflex="1"
|
||||
buttons="accept,cancel,help,extra2"
|
||||
#expand buttons="accept,cancel__HELP_BUTTON__,extra2"
|
||||
buttonlabelextra2="&examineCert.label;"
|
||||
buttonaccesskeyextra2="&examineCert.accesskey;"
|
||||
ondialogaccept="return doOK();"
|
||||
|
|
|
@ -45,7 +45,7 @@
|
|||
<dialog id="getp12password" title="&pkcs12.getpassword.title;"
|
||||
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
|
||||
style="width: 30em;"
|
||||
buttons="accept,cancel,help"
|
||||
#expand buttons="accept,cancel__HELP_BUTTON__"
|
||||
ondialogaccept="return getPassword();"
|
||||
ondialoghelp="openHelp('my_certs');"
|
||||
onload="onP12Load(false);">
|
||||
|
|
|
@ -51,7 +51,7 @@
|
|||
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
|
||||
style="width: 47em;"
|
||||
onload="onLoad();"
|
||||
buttons="accept,cancel,help"
|
||||
#expand buttons="accept,cancel__HELP_BUTTON__"
|
||||
ondialogaccept="return doOK();"
|
||||
ondialogcancel="return doCancel();"
|
||||
ondialoghelp="openHelp('new_web_cert');">
|
||||
|
|
|
@ -44,7 +44,7 @@
|
|||
title="&validation.crl.autoupdate.title;"
|
||||
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
|
||||
onload="onLoad();"
|
||||
buttons="accept,cancel,help"
|
||||
#expand buttons="accept,cancel__HELP_BUTTON__"
|
||||
ondialogaccept="return onAccept();"
|
||||
ondialogcancel="return onCancel();"
|
||||
ondialoghelp="return doHelpButton();">
|
||||
|
|
|
@ -41,7 +41,7 @@
|
|||
|
||||
<dialog id="reset_password" title="&resetPassword.title;"
|
||||
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
|
||||
buttons="accept,cancel,help"
|
||||
#expand buttons="accept,cancel__HELP__"
|
||||
buttonlabelaccept="&resetPasswordButtonLabel;"
|
||||
ondialogaccept="return resetPassword();"
|
||||
ondialoghelp="openHelp('reset_pwd');"
|
||||
|
|
|
@ -45,7 +45,7 @@
|
|||
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
|
||||
style="width: 30em;"
|
||||
spacerflex="1"
|
||||
buttons="accept,cancel,help,extra2"
|
||||
#expand buttons="accept,cancel__HELP_BUTTON__,extra2"
|
||||
buttonlabelaccept="&serverCertExpired.accept.label;"
|
||||
buttonlabelextra2="&examineCert.label;"
|
||||
buttonaccesskeyextra2="&examineCert.accesskey;"
|
||||
|
|
|
@ -48,7 +48,7 @@
|
|||
id="serverCrlNextupdate"
|
||||
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
|
||||
style="width: 30em;"
|
||||
buttons="accept,help"
|
||||
#expand buttons="accept__HELP_BUTTON__"
|
||||
ondialoghelp="openHelp('exp_crl');"
|
||||
onload="onLoad();"
|
||||
>
|
||||
|
|
|
@ -45,7 +45,7 @@
|
|||
<dialog id="setp12password" title="&pkcs12.setpassword.title;"
|
||||
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
|
||||
style="width: 48em;"
|
||||
buttons="accept,cancel,help"
|
||||
#expand buttons="accept,cancel__HELP_BUTTON__"
|
||||
ondialogaccept="return setP12Password();"
|
||||
ondialoghelp="openHelp('cert_backup_pwd');"
|
||||
onload="onP12Load(true);">
|
||||
|
|
|
@ -1,9 +1,9 @@
|
|||
pippki.jar:
|
||||
* content/pippki/contents.rdf (content/contents.rdf)
|
||||
content/pippki/changepassword.xul (content/changepassword.xul)
|
||||
* content/pippki/changepassword.xul (content/changepassword.xul)
|
||||
content/pippki/getpassword.xul (content/getpassword.xul)
|
||||
content/pippki/password.js (content/password.js)
|
||||
content/pippki/resetpassword.xul (content/resetpassword.xul)
|
||||
* content/pippki/resetpassword.xul (content/resetpassword.xul)
|
||||
content/pippki/resetpassword.js (content/resetpassword.js)
|
||||
content/pippki/PrefOverlay.xul (content/PrefOverlay.xul)
|
||||
content/pippki/pref-security.js (content/pref-security.js)
|
||||
|
@ -18,57 +18,57 @@ pippki.jar:
|
|||
content/pippki/ssl3tlsciphers2.xul (content/ssl3tlsciphers2.xul)
|
||||
content/pippki/PageInfoOverlay.xul (content/PageInfoOverlay.xul)
|
||||
content/pippki/newserver.js (content/newserver.js)
|
||||
content/pippki/newserver.xul (content/newserver.xul)
|
||||
* content/pippki/newserver.xul (content/newserver.xul)
|
||||
content/pippki/downloadcert.js (content/downloadcert.js)
|
||||
content/pippki/downloadcert.xul (content/downloadcert.xul)
|
||||
* content/pippki/downloadcert.xul (content/downloadcert.xul)
|
||||
content/pippki/cacertexists.xul (content/cacertexists.xul)
|
||||
content/pippki/certManager.js (content/certManager.js)
|
||||
content/pippki/certManager.xul (content/certManager.xul)
|
||||
* content/pippki/certManager.xul (content/certManager.xul)
|
||||
content/pippki/CAOverlay.xul (content/CAOverlay.xul)
|
||||
content/pippki/WebSitesOverlay.xul (content/WebSitesOverlay.xul)
|
||||
content/pippki/OthersOverlay.xul (content/OthersOverlay.xul)
|
||||
content/pippki/MineOverlay.xul (content/MineOverlay.xul)
|
||||
content/pippki/viewCertDetails.xul (content/viewCertDetails.xul)
|
||||
content/pippki/editcacert.xul (content/editcacert.xul)
|
||||
content/pippki/editemailcert.xul (content/editemailcert.xul)
|
||||
content/pippki/editsslcert.xul (content/editsslcert.xul)
|
||||
* content/pippki/editcacert.xul (content/editcacert.xul)
|
||||
* content/pippki/editemailcert.xul (content/editemailcert.xul)
|
||||
* content/pippki/editsslcert.xul (content/editsslcert.xul)
|
||||
content/pippki/editcerts.js (content/editcerts.js)
|
||||
content/pippki/deletecert.xul (content/deletecert.xul)
|
||||
* content/pippki/deletecert.xul (content/deletecert.xul)
|
||||
content/pippki/deletecert.js (content/deletecert.js)
|
||||
content/pippki/viewCertDetails.js (content/viewCertDetails.js)
|
||||
content/pippki/getp12password.xul (content/getp12password.xul)
|
||||
content/pippki/setp12password.xul (content/setp12password.xul)
|
||||
* content/pippki/getp12password.xul (content/getp12password.xul)
|
||||
* content/pippki/setp12password.xul (content/setp12password.xul)
|
||||
content/pippki/pippki.js (content/pippki.js)
|
||||
content/pippki/domainMismatch.xul (content/domainMismatch.xul)
|
||||
* content/pippki/domainMismatch.xul (content/domainMismatch.xul)
|
||||
content/pippki/domainMismatch.js (content/domainMismatch.js)
|
||||
content/pippki/serverCertExpired.xul (content/serverCertExpired.xul)
|
||||
* content/pippki/serverCertExpired.xul (content/serverCertExpired.xul)
|
||||
content/pippki/serverCertExpired.js (content/serverCertExpired.js)
|
||||
content/pippki/clientauthask.xul (content/clientauthask.xul)
|
||||
* content/pippki/clientauthask.xul (content/clientauthask.xul)
|
||||
content/pippki/clientauthask.js (content/clientauthask.js)
|
||||
content/pippki/certpicker.xul (content/certpicker.xul)
|
||||
content/pippki/certpicker.js (content/certpicker.js)
|
||||
content/pippki/certViewer.xul (content/certViewer.xul)
|
||||
* content/pippki/certViewer.xul (content/certViewer.xul)
|
||||
content/pippki/certDump.xul (content/certDump.xul)
|
||||
content/pippki/device_manager.xul (content/device_manager.xul)
|
||||
* content/pippki/device_manager.xul (content/device_manager.xul)
|
||||
content/pippki/device_manager.js (content/device_manager.js)
|
||||
content/pippki/load_device.xul (content/load_device.xul)
|
||||
content/pippki/choosetoken.xul (content/choosetoken.xul)
|
||||
* content/pippki/choosetoken.xul (content/choosetoken.xul)
|
||||
content/pippki/choosetoken.js (content/choosetoken.js)
|
||||
content/pippki/escrowWarn.xul (content/escrowWarn.xul)
|
||||
* content/pippki/escrowWarn.xul (content/escrowWarn.xul)
|
||||
content/pippki/escrowWarn.js (content/escrowWarn.js)
|
||||
content/pippki/pref-validation.xul (content/pref-validation.xul)
|
||||
content/pippki/pref-validation.js (content/pref-validation.js)
|
||||
content/pippki/crlManager.xul (content/crlManager.xul)
|
||||
* content/pippki/crlManager.xul (content/crlManager.xul)
|
||||
content/pippki/crlManager.js (content/crlManager.js)
|
||||
content/pippki/pref-masterpass.js (content/pref-masterpass.js)
|
||||
content/pippki/pref-masterpass.xul (content/pref-masterpass.xul)
|
||||
content/pippki/serverCrlNextupdate.js (content/serverCrlNextupdate.js)
|
||||
content/pippki/serverCrlNextupdate.xul (content/serverCrlNextupdate.xul)
|
||||
* content/pippki/serverCrlNextupdate.xul (content/serverCrlNextupdate.xul)
|
||||
content/pippki/createCertInfo.xul (content/createCertInfo.xul)
|
||||
content/pippki/createCertInfo.js (content/createCertInfo.js)
|
||||
content/pippki/crlImportDialog.xul (content/crlImportDialog.xul)
|
||||
* content/pippki/crlImportDialog.xul (content/crlImportDialog.xul)
|
||||
content/pippki/crlImportDialog.js (content/crlImportDialog.js)
|
||||
content/pippki/pref-crlupdate.xul (content/pref-crlupdate.xul)
|
||||
* content/pippki/pref-crlupdate.xul (content/pref-crlupdate.xul)
|
||||
content/pippki/pref-crlupdate.js (content/pref-crlupdate.js)
|
||||
content/pippki/formsigning.xul (content/formsigning.xul)
|
||||
content/pippki/formsigning.js (content/formsigning.js)
|
||||
|
|
Загрузка…
Ссылка в новой задаче