Index: pki/redhat/ca-ui/shared/webapps/ca/ee/ca/reasonToRevoke.template
===================================================================
--- pki/redhat/ca-ui/shared/webapps/ca/ee/ca/reasonToRevoke.template (revision 16054)
+++ pki/redhat/ca-ui/shared/webapps/ca/ee/ca/reasonToRevoke.template (working copy)
@@ -33,7 +33,7 @@
var filter = "(|";
var n = 0;
- if (!dateIsEmpty(document.forms[0])) {
+ if (document.forms[0].invalidityEnabled.checked) {
var d = convertDate(document.forms[0], "Invalidity Date");
if (d == null) return false;
document.forms[0].invalidityDate.value = d;
@@ -77,6 +77,26 @@
return true;
}
+function clickedOnInvalidityEnabled()
+{
+ if (document.forms[0].invalidityEnabled.checked) {
+ var date = new Date();
+ if (document.forms[0].day.options[document.forms[0].day.selectedIndex].value == 0) {
+ document.forms[0].day.selectedIndex = date.getDate();
+ }
+ if (document.forms[0].month.options[document.forms[0].month.selectedIndex].value == 13) {
+ document.forms[0].month.selectedIndex = date.getMonth() +1;
+ }
+ if (document.forms[0].year.options[document.forms[0].year.selectedIndex].value == 0) {
+ for (var i = 0; i < document.forms[0].year.options.length; i++) {
+ if (document.forms[0].year.options[i].value == date.getFullYear()) {
+ document.forms[0].year.selectedIndex = i;
+ }
+ }
+ }
+ }
+}
+
function toHex1(number)
{
var absValue = "", sign = "";
@@ -283,6 +303,7 @@
+
Invalidity date:
Index: pki/redhat/ca-ui/shared/webapps/ca/ee/ca/srchCert.html
===================================================================
--- pki/redhat/ca-ui/shared/webapps/ca/ee/ca/srchCert.html (revision 16054)
+++ pki/redhat/ca-ui/shared/webapps/ca/ee/ca/srchCert.html (working copy)
@@ -345,7 +345,7 @@
@@ -667,7 +643,7 @@
@@ -730,23 +706,11 @@
December
@@ -912,7 +864,7 @@
@@ -1132,7 +1060,7 @@
@@ -1275,23 +1191,11 @@
December
Index: pki/redhat/ca-ui/shared/webapps/ca/ee/cms-funcs.js
===================================================================
--- pki/redhat/ca-ui/shared/webapps/ca/ee/cms-funcs.js (revision 16054)
+++ pki/redhat/ca-ui/shared/webapps/ca/ee/cms-funcs.js (working copy)
@@ -337,6 +337,49 @@
return 3600 * 24 * days;
}
+function clickedOnTimeRangeCheckBox(inUse, start, end)
+{
+ if (inUse.checked) {
+ var date = new Date();
+ if (start.day.options[start.day.selectedIndex].value == 0) {
+ start.day.selectedIndex = date.getDate();
+ }
+ if (end.day.options[end.day.selectedIndex].value == 0) {
+ end.day.selectedIndex = date.getDate();
+ }
+ if (start.month.options[start.month.selectedIndex].value == 13) {
+ start.month.selectedIndex = date.getMonth() + 1;
+ }
+ if (end.month.options[end.month.selectedIndex].value == 13) {
+ end.month.selectedIndex = date.getMonth() + 1;
+ }
+ if (start.year.options[start.year.selectedIndex].value == 0) {
+ for (var i = 0; i < start.year.options.length; i++) {
+ if (start.year.options[i].value == date.getFullYear()) {
+ start.year.selectedIndex = i;
+ }
+ }
+ }
+ if (end.year.options[end.year.selectedIndex].value == 0) {
+ for (var i = 0; i < end.year.options.length; i++) {
+ if (end.year.options[i].value == date.getFullYear()) {
+ end.year.selectedIndex = i;
+ }
+ }
+ }
+ }
+}
+
+function generateYearOptions(before, after)
+{
+ var now = new Date();
+ var year = now.getFullYear();
+ document.writeln("");
+ for (var i = year-before-1; i < year+after+1; i++) {
+ document.writeln(""+i);
+ }
+}
+
// encloses value in double quotes preceding all embedded double quotes with \
function escapeValue(value)
{
Index: pki/redhat/ca-ui/shared/webapps/ca/agent/ca/SrchCert.html
===================================================================
--- pki/redhat/ca-ui/shared/webapps/ca/agent/ca/SrchCert.html (revision 16054)
+++ pki/redhat/ca-ui/shared/webapps/ca/agent/ca/SrchCert.html (working copy)
@@ -367,7 +367,7 @@
@@ -697,7 +673,7 @@
@@ -840,23 +804,11 @@
December
@@ -961,7 +913,7 @@
@@ -1104,23 +1044,11 @@
December
@@ -1180,7 +1108,7 @@
@@ -1323,23 +1239,11 @@
December
Index: pki/redhat/ca-ui/shared/webapps/ca/agent/ca/SrchRevokeCert.html
===================================================================
--- pki/redhat/ca-ui/shared/webapps/ca/agent/ca/SrchRevokeCert.html (revision 16054)
+++ pki/redhat/ca-ui/shared/webapps/ca/agent/ca/SrchRevokeCert.html (working copy)
@@ -334,7 +334,7 @@
@@ -579,7 +555,7 @@
@@ -798,7 +750,7 @@
Index: pki/redhat/ca-ui/shared/webapps/ca/agent/ca/reasonToRevoke.template
===================================================================
--- pki/redhat/ca-ui/shared/webapps/ca/agent/ca/reasonToRevoke.template (revision 16054)
+++ pki/redhat/ca-ui/shared/webapps/ca/agent/ca/reasonToRevoke.template (working copy)
@@ -32,7 +32,7 @@
var filter = "(|";
var n = 0;
- if (!dateIsEmpty(document.forms[0])) {
+ if (document.forms[0].invalidityEnabled.checked) {
var d = convertDate(document.forms[0], "Invalidity Date");
if (d == null) return false;
document.forms[0].invalidityDate.value = d;
@@ -76,6 +76,26 @@
return true;
}
+function clickedOnInvalidityEnabled()
+{
+ if (document.forms[0].invalidityEnabled.checked) {
+ var date = new Date();
+ if (document.forms[0].day.options[document.forms[0].day.selectedIndex].value == 0) {
+ document.forms[0].day.selectedIndex = date.getDate();
+ }
+ if (document.forms[0].month.options[document.forms[0].month.selectedIndex].value == 13) {
+ document.forms[0].month.selectedIndex = date.getMonth() +1;
+ }
+ if (document.forms[0].year.options[document.forms[0].year.selectedIndex].value == 0) {
+ for (var i = 0; i < document.forms[0].year.options.length; i++) {
+ if (document.forms[0].year.options[i].value == date.getFullYear()) {
+ document.forms[0].year.selectedIndex = i;
+ }
+ }
+ }
+ }
+}
+
function toHex1(number)
{
var absValue = "", sign = "";
@@ -287,6 +307,7 @@
+
Invalidity date:
Index: pki/redhat/ca-ui/shared/webapps/ca/agent/funcs.js
===================================================================
--- pki/redhat/ca-ui/shared/webapps/ca/agent/funcs.js (revision 16054)
+++ pki/redhat/ca-ui/shared/webapps/ca/agent/funcs.js (working copy)
@@ -403,6 +403,49 @@
return 3600 * 24 * days;
}
+function clickedOnTimeRangeCheckBox(inUse, start, end)
+{
+ if (inUse.checked) {
+ var date = new Date();
+ if (start.day.options[start.day.selectedIndex].value == 0) {
+ start.day.selectedIndex = date.getDate();
+ }
+ if (end.day.options[end.day.selectedIndex].value == 0) {
+ end.day.selectedIndex = date.getDate();
+ }
+ if (start.month.options[start.month.selectedIndex].value == 13) {
+ start.month.selectedIndex = date.getMonth() + 1;
+ }
+ if (end.month.options[end.month.selectedIndex].value == 13) {
+ end.month.selectedIndex = date.getMonth() + 1;
+ }
+ if (start.year.options[start.year.selectedIndex].value == 0) {
+ for (var i = 0; i < start.year.options.length; i++) {
+ if (start.year.options[i].value == date.getFullYear()) {
+ start.year.selectedIndex = i;
+ }
+ }
+ }
+ if (end.year.options[end.year.selectedIndex].value == 0) {
+ for (var i = 0; i < end.year.options.length; i++) {
+ if (end.year.options[i].value == date.getFullYear()) {
+ end.year.selectedIndex = i;
+ }
+ }
+ }
+ }
+}
+
+function generateYearOptions(before, after)
+{
+ var now = new Date();
+ var year = now.getFullYear();
+ document.writeln("");
+ for (var i = year-before-1; i < year+after+1; i++) {
+ document.writeln(""+i);
+ }
+}
+
// encloses value in double quotes preceding all embedded double quotes with \
function escapeValue(value)
{
| |