Author: orudyy
Date: Mon Feb 2 14:43:34 2015
New Revision: 1656477
URL: http://svn.apache.org/r1656477
Log:
QPID-6346: Improve field labels and prompt messages in UI for non java
keystores/truststores, display timezone for certificate start/end time
Modified:
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/store/nonjavakeystore/show.js
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/store/nonjavatruststore/show.js
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/store/nonjavakeystore/add.html
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/store/nonjavatruststore/add.html
Modified:
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/store/nonjavakeystore/show.js
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/store/nonjavakeystore/show.js?rev=1656477&r1=1656476&r2=1656477&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/store/nonjavakeystore/show.js
(original)
+++
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/store/nonjavakeystore/show.js
Mon Feb 2 14:43:34 2015
@@ -23,7 +23,7 @@ define(["qpid/common/util", "qpid/common
function toDate(value)
{
- return value ?
entities.encode(String(UserPreferences.formatDateTime(value))) : "";
+ return value ?
entities.encode(String(UserPreferences.formatDateTime(value, {addOffset: true,
appendTimeZone: true}))) : "";
}
var dateFields = ["certificateValidEnd","certificateValidStart"];
Modified:
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/store/nonjavatruststore/show.js
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/store/nonjavatruststore/show.js?rev=1656477&r1=1656476&r2=1656477&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/store/nonjavatruststore/show.js
(original)
+++
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/store/nonjavatruststore/show.js
Mon Feb 2 14:43:34 2015
@@ -37,14 +37,15 @@ define(["dojo/query",
this.fields.push(name);
}
util.buildUI(data.containerNode, data.parent,
"store/nonjavatruststore/show.html", this.fields, this);
- var gridNode = query(".details", data.containerNode)[0]
+ var gridNode = query(".details", data.containerNode)[0];
+ var dateTimeFormatter = function(value){ return value ?
UserPreferences.formatDateTime(value, {addOffset: true, appendTimeZone: true})
: "";};
this.detailsGrid = new UpdatableStore([],
gridNode,
[
{ name: 'Subject', field: 'SUBJECT_NAME', width: '25%' },
{ name: 'Issuer', field: 'ISSUER_NAME', width: '25%' },
- { name: 'Valid from', field: 'VALID_START', width: '25%',
formatter: function(value){ return value ?
UserPreferences.formatDateTime(value) : "";}},
- { name: 'Valid to', field: 'VALID_END', width: '25%',
formatter: function(value){ return value ?
UserPreferences.formatDateTime(value) : "";}}
+ { name: 'Valid from', field: 'VALID_START', width: '25%',
formatter: dateTimeFormatter },
+ { name: 'Valid to', field: 'VALID_END', width: '25%',
formatter: dateTimeFormatter}
]);
}
Modified:
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/store/nonjavakeystore/add.html
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/store/nonjavakeystore/add.html?rev=1656477&r1=1656476&r2=1656477&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/store/nonjavakeystore/add.html
(original)
+++
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/store/nonjavakeystore/add.html
Mon Feb 2 14:43:34 2015
@@ -22,45 +22,45 @@
<div id="addStore.oldBrowserWarning" class="infoMessage hidden
clear"></div>
<div class="clear">
- <div id="addStore.privateKeyLabel" class="formLabel-labelCell
tableContainer-labelCell">Private Key*:</div>
+ <div id="addStore.privateKeyLabel" class="formLabel-labelCell
tableContainer-labelCell">Private Key (Server path or upload)*:</div>
<div class="formLabel-controlCell tableContainer-valueCell">
<input type="text" id="addStore.privateKeyUrl"
data-dojo-type="qpid/common/ResourceWidget"
data-dojo-props="
name: 'privateKeyUrl',
- placeHolder: 'Private key URL or path to file on
server',
+ placeHolder: 'path to file with private key in
PEM/DER format',
required: true,
- promptMessage: 'Location of the private key',
- title: 'Enter private key URL or path to file
containing private key in DER or PEM format'" />
+ promptMessage: 'Enter broker server path to file
containing unencrypted private key in DER or PEM format',
+ title: 'Enter broker server path to file
containing unencrypted private key in DER or PEM format'" />
</div>
</div>
<div class="clear">
- <div id="addStore.serverPathLabel" class="formLabel-labelCell
tableContainer-labelCell">Certificate*:</div>
+ <div id="addStore.serverPathLabel" class="formLabel-labelCell
tableContainer-labelCell">Certificate (Server path or upload)*:</div>
<div class="formLabel-controlCell tableContainer-valueCell">
<input type="text" id="addStore.certificateUrl"
data-dojo-type="qpid/common/ResourceWidget"
data-dojo-props="
name: 'certificateUrl',
- placeHolder: 'Certificate URL or path to
certificate file on server',
+ placeHolder: 'path to file with certificate in
PEM/DER format',
required: true,
- promptMessage: 'Location of the certificate',
- title: 'Enter certificate URL or path to file
containing certificate in DER or PEM format'" />
+ promptMessage: 'Enter broker server path to file
containing certificate in DER or PEM format',
+ title: 'Enter broker server path to file
containing certificate in DER or PEM format'" />
</div>
</div>
<div class="clear">
- <div id="addStore.intermediateCertificateLabel"
class="formLabel-labelCell tableContainer-labelCell">Intermediate
Certificate(s):</div>
+ <div id="addStore.intermediateCertificateLabel"
class="formLabel-labelCell tableContainer-labelCell">Intermediate Certificates
(Server path or upload):</div>
<div class="formLabel-controlCell tableContainer-valueCell">
<input type="text" id="addStore.intermediateCertificateUrl"
data-dojo-type="qpid/common/ResourceWidget"
data-dojo-props="
name: 'intermediateCertificateUrl',
- placeHolder: 'Intermediate certificates URL or
path to file on server',
+ placeHolder: 'path to file with certificates in
PEM/DER format',
required: false,
- promptMessage: 'Location of the intermediate
certificates',
- title: 'Enter URL containing intermediate
certificates or path to file with certificates in format DER or PEM'" />
+ promptMessage: 'Enter broker server path to file
containing intermediate certificates in DER or PEM format',
+ title: 'Enter path to file containing
intermediate certificates in format DER or PEM'" />
</div>
</div>
</div>
Modified:
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/store/nonjavatruststore/add.html
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/store/nonjavatruststore/add.html?rev=1656477&r1=1656476&r2=1656477&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/store/nonjavatruststore/add.html
(original)
+++
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/store/nonjavatruststore/add.html
Mon Feb 2 14:43:34 2015
@@ -22,16 +22,16 @@
<div id="addStore.oldBrowserWarning" class="infoMessage hidden
clear"></div>
<div class="clear">
- <div id="addStore.certificatesLabel" class="formLabel-labelCell
tableContainer-labelCell">Certificate URL or Path*:</div>
+ <div id="addStore.certificatesLabel" class="formLabel-labelCell
tableContainer-labelCell">Certificates (Server path or upload)*:</div>
<div class="formLabel-controlCell tableContainer-valueCell">
<input type="text" id="addStore.certificatesUrl"
data-dojo-type="qpid/common/ResourceWidget"
data-dojo-props="
name: 'certificatesUrl',
- placeHolder: 'Certificate URL or path to
certificate file on server',
+ placeHolder: 'path to file with certificate(s)
in PEM/DER format',
required: true,
- promptMessage: 'Location of the certificate',
- title: 'Enter certificate URL or path to file
containing certificate in DER or PEM format'" />
+ promptMessage: 'Enter broker server path to file
containing certificate(s) in DER or PEM format',
+ title: 'Enter broker server path to file
containing certificate(s) in DER or PEM format'" />
</div>
</div>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
