Bugzilla Bug #497583 - web wizard tps - menu highlight and label typo

git-svn-id: svn+ssh://svn.fedorahosted.org/svn/pki/trunk@484 c9f7a03b-bd48-0410-a16d-cbbf54688b0b

24 files changed, 214 insertions, 25 deletions

diff --git a/pki/base/tps/doc/CS.cfg b/pki/base/tps/doc/CS.cfg
index f42046c64..5e7e96fa4 100644
--- a/pki/base/tps/doc/CS.cfg
+++ b/pki/base/tps/doc/CS.cfg
@@ -375,6 +375,29 @@ preop.keysize.customsize=2048
 preop.keysize.select=default
 preop.keysize.size=2048
 preop.keysize.ecc.size=256
+preop.adminauth.done=false
+preop.adminpanel.done=false
+preop.agentauth.done=false
+preop.authdb.done=false
+preop.cainfo.done=false
+preop.certprettyprint.done=false
+preop.certrequest.done=false
+preop.confighsmlogin.done=false
+preop.confighsm.done=false
+preop.database.done=false
+preop.displaycertchain2.done=false
+preop.displaycertchain.done=false
+preop.donepanel.done=false
+preop.drminfo.done=false
+preop.importadmincert.done=false
+preop.loginpanel.done=false
+preop.ModulePanel.done=false
+preop.namepanel.done=false
+preop.securitydomain.done=false
+preop.SizePanel.done=false
+preop.subsystemtype.done=false
+preop.tksinfo.done=false
+preop.welcome.done=false
 op.enroll._000=#########################################
 op.enroll._001=# Default Operations
 op.enroll._002=#
@@ -1419,4 +1442,3 @@ target.tokenType.list=userKey,soKey,soCleanUserToken,soUserKey,cleanToken,soClea
 log.instance.SignedAudit.selected.events=ROLE_ASSUME,CONFIG_CERT_POLICY,CONFIG_CERT_PROFILE,CONFIG_CRL_PROFILE,CONFIG_OCSP_PROFILE,CONFIG_AUTH,CONFIG_ROLE,CONFIG_ACL,CONFIG_SIGNED_AUDIT,CONFIG_ENCRYPTION,CONFIG_TRUSTED_PUBLIC_KEY,CONFIG_DRM,SELFTESTS_EXECUTION,AUDIT_LOG_DELETE,LOG_PATH_CHANGE,LOG_EXPIRATION_CHANGE
 log.instance.SignedAudit.selectable.events=ROLE_ASSUME,CONFIG_CERT_POLICY,CONFIG_CERT_PROFILE,CONFIG_CRL_PROFILE,CONFIG_OCSP_PROFILE,CONFIG_AUTH,CONFIG_ROLE,CONFIG_ACL,CONFIG_SIGNED_AUDIT,CONFIG_ENCRYPTION,CONFIG_TRUSTED_PUBLIC_KEY,CONFIG_DRM,SELFTESTS_EXECUTION,AUDIT_LOG_DELETE,LOG_PATH_CHANGE,LOG_EXPIRATION_CHANGE,PRIVATE_KEY_ARCHIVE,PRIVATE_KEY_ARCHIVE_PROCESSED,KEY_RECOVERY_REQUEST,KEY_RECOVERY_AGENT_LOGIN,KEY_RECOVERY_PROCESSED,KEY_GEN_ASYMMETRIC,NON_PROFILE_CERT_REQUEST
 log.instance.SignedAudit.nonselectable.events=AUDIT_LOG_STARTUP,AUDIT_LOG_SHUTDOWN,CERT_REQUEST_PROCESSED,CERT_STATUS_CHANGE_REQUEST,CERT_STATUS_CHANGE_REQUEST_PROCESSED,AUTHZ_SUCCESS,AUTHZ_FAIL,INTER_BOUNDARY,AUTH_FAIL,AUTH_SUCCESS,CERT_PROFILE_APPROVAL,PROOF_OF_POSSESSION,CRL_RETRIEVAL,CRL_VALIDATION,CMC_SIGNED_REQUEST_SIG_VERIFY,SERVER_SIDE_KEYGEN_PROCESSED,SERVER_SIDE_KEYGEN_REQUEST
-
diff --git a/pki/base/tps/lib/perl/PKI/TPS/AdminAuthPanel.pm b/pki/base/tps/lib/perl/PKI/TPS/AdminAuthPanel.pm
index f25da642b..e9a23af2a 100755
--- a/pki/base/tps/lib/perl/PKI/TPS/AdminAuthPanel.pm
+++ b/pki/base/tps/lib/perl/PKI/TPS/AdminAuthPanel.pm
@@ -38,7 +38,7 @@ sub new {
 
     $self->{"isSubPanel"} = \&is_sub_panel;
     $self->{"hasSubPanel"} = \&has_sub_panel;
-    $self->{"isPanelDone"} = \&PKI::TPS::Common::no;
+    $self->{"isPanelDone"} = \&is_panel_done;
     $self->{"getPanelNo"} = &PKI::TPS::Common::r(8);
     $self->{"getName"} = &PKI::TPS::Common::r("Admin Authentication");
     $self->{"vmfile"} = "adminauthenticatepanel.vm";
@@ -72,6 +72,8 @@ sub update
 {
     my ($q) = @_;
     &PKI::TPS::Wizard::debug_log("AdminAuthPanel: update");
+    $::config->put("preop.adminauth.done", "true");
+    $::config->commit();
     return 1;
 }
 
@@ -82,4 +84,10 @@ sub display
     return 1;
 }
 
+sub is_panel_done
+{
+   return $::config->get("preop.adminauth.done");
+}
+
+
 1;
diff --git a/pki/base/tps/lib/perl/PKI/TPS/AdminPanel.pm b/pki/base/tps/lib/perl/PKI/TPS/AdminPanel.pm
index 6607abd1b..e75123e20 100755
--- a/pki/base/tps/lib/perl/PKI/TPS/AdminPanel.pm
+++ b/pki/base/tps/lib/perl/PKI/TPS/AdminPanel.pm
@@ -40,7 +40,7 @@ sub new {
 
     $self->{"isSubPanel"} = \&is_sub_panel;
     $self->{"hasSubPanel"} = \&has_sub_panel;
-    $self->{"isPanelDone"} = \&PKI::TPS::Common::no;
+    $self->{"isPanelDone"} = \&is_panel_done;
     $self->{"getPanelNo"} = &PKI::TPS::Common::r(14);
     $self->{"getName"} = &PKI::TPS::Common::r("Administrator");
     $self->{"vmfile"} = "adminpanel.vm";
@@ -192,6 +192,7 @@ sub update
     $::config->put("preop.admincert.requestId.0", $reqid);
     my $sn = $response->{Requests}->{Request}->{serialno};
     $::config->put("preop.admincert.serialno.0", $sn);
+    $::config->put("preop.adminpanel.done", "true");
     $::config->commit();
 
     return 1;
@@ -213,4 +214,10 @@ sub display
     return 1;
 }
 
+sub is_panel_done
+{
+   return $::config->get("preop.adminpanel.done");
+}
+
+
 1;
diff --git a/pki/base/tps/lib/perl/PKI/TPS/AgentAuthPanel.pm b/pki/base/tps/lib/perl/PKI/TPS/AgentAuthPanel.pm
index 422dcf9bc..7e8586dce 100755
--- a/pki/base/tps/lib/perl/PKI/TPS/AgentAuthPanel.pm
+++ b/pki/base/tps/lib/perl/PKI/TPS/AgentAuthPanel.pm
@@ -38,7 +38,7 @@ sub new {
 
     $self->{"isSubPanel"} = \&is_sub_panel;
     $self->{"hasSubPanel"} = \&has_sub_panel;
-    $self->{"isPanelDone"} = \&PKI::TPS::Common::no;
+    $self->{"isPanelDone"} = \&is_panel_done;
     $self->{"getPanelNo"} = &PKI::TPS::Common::r(7);
     $self->{"getName"} = &PKI::TPS::Common::r("Agent Authentication");
     $self->{"vmfile"} = "agentauthenticatepanel.vm";
@@ -71,6 +71,8 @@ sub update
 {
     my ($q) = @_;
     &PKI::TPS::Wizard::debug_log("AgentAuthPanel: update");
+    $::config->put("preop.agentauth.done", "true");
+    $::config->commit();
     return 1;
 }
 
@@ -81,5 +83,9 @@ sub display
     return 1;
 }
 
+sub is_panel_done
+{
+   return $::config->get("preop.agentauth.done");
+}
 
 1;
diff --git a/pki/base/tps/lib/perl/PKI/TPS/AuthDBPanel.pm b/pki/base/tps/lib/perl/PKI/TPS/AuthDBPanel.pm
index 36a64f3ed..690264578 100755
--- a/pki/base/tps/lib/perl/PKI/TPS/AuthDBPanel.pm
+++ b/pki/base/tps/lib/perl/PKI/TPS/AuthDBPanel.pm
@@ -38,7 +38,7 @@ sub new {
 
     $self->{"isSubPanel"} = \&is_sub_panel;
     $self->{"hasSubPanel"} = \&has_sub_panel;
-    $self->{"isPanelDone"} = \&PKI::TPS::Common::no;
+    $self->{"isPanelDone"} = \&is_panel_done;
     $self->{"getPanelNo"} = &PKI::TPS::Common::r(7);
     $self->{"getName"} = &PKI::TPS::Common::r("Authentication Directory");
     $self->{"vmfile"} = "authdbpanel.vm";
@@ -112,6 +112,7 @@ sub update
     # save values to CS.cfg
     $::config->put("auth.instance.0.baseDN", $basedn);
     $::config->put("auth.instance.0.hostport", $host . ":" . $port);
+    $::config->put("preop.authdb.done", "true");
     $::config->commit();
 
     return 1;
@@ -155,4 +156,9 @@ sub display
     return 1;
 }
 
+sub is_panel_done
+{
+   return $::config->get("preop.authdb.done");
+}
+
 1;
diff --git a/pki/base/tps/lib/perl/PKI/TPS/CAInfoPanel.pm b/pki/base/tps/lib/perl/PKI/TPS/CAInfoPanel.pm
index a08f059b9..8830a1ea7 100755
--- a/pki/base/tps/lib/perl/PKI/TPS/CAInfoPanel.pm
+++ b/pki/base/tps/lib/perl/PKI/TPS/CAInfoPanel.pm
@@ -42,7 +42,7 @@ sub new {
 
     $self->{"isSubPanel"} = \&is_sub_panel;
     $self->{"hasSubPanel"} = \&has_sub_panel;
-    $self->{"isPanelDone"} = \&PKI::TPS::Common::no;
+    $self->{"isPanelDone"} = \&is_panel_done;
     $self->{"getPanelNo"} = &PKI::TPS::Common::r(4);
     $self->{"getName"} = &PKI::TPS::Common::r("CA Information");
     $self->{"vmfile"} = "cainfopanel.vm";
@@ -156,6 +156,9 @@ sub update
         }
     }
 
+    $::config->put("preop.cainfo.done", "true");
+    $::config->commit();
+
     return 1;
 }
 
@@ -240,4 +243,10 @@ sub get_secure_admin_port_from_domain_xml
     return $https_admin_port;
 }
 
+sub is_panel_done
+{
+   return $::config->get("preop.cainfo.done");
+}
+
+
 1;
diff --git a/pki/base/tps/lib/perl/PKI/TPS/CertPrettyPrintPanel.pm b/pki/base/tps/lib/perl/PKI/TPS/CertPrettyPrintPanel.pm
index 51d4e5e87..259bc3b30 100755
--- a/pki/base/tps/lib/perl/PKI/TPS/CertPrettyPrintPanel.pm
+++ b/pki/base/tps/lib/perl/PKI/TPS/CertPrettyPrintPanel.pm
@@ -38,7 +38,7 @@ sub new {
 
     $self->{"isSubPanel"} = \&is_sub_panel;
     $self->{"hasSubPanel"} = \&has_sub_panel;
-    $self->{"isPanelDone"} = \&PKI::TPS::Common::no;
+    $self->{"isPanelDone"} = \&is_panel_done;
     $self->{"getPanelNo"} = &PKI::TPS::Common::r(13);
     $self->{"getName"} = &PKI::TPS::Common::r("Certificates");
     $self->{"vmfile"} = "certprettyprintpanel.vm";
@@ -71,6 +71,8 @@ sub update
 {
     my ($q) = @_;
     &PKI::TPS::Wizard::debug_log("CertPrettyPrintPanel: update");
+    $::config->put("preop.certprettyprint.done", "true");
+    $::config->commit();
     return 1;
 }
 
@@ -81,4 +83,9 @@ sub display
     return 1;
 }
 
+sub is_panel_done
+{
+   return $::config->get("preop.certprettyprint.done");
+}
+
 1;
diff --git a/pki/base/tps/lib/perl/PKI/TPS/CertRequestPanel.pm b/pki/base/tps/lib/perl/PKI/TPS/CertRequestPanel.pm
index 156c0d0ab..f003ecc06 100755
--- a/pki/base/tps/lib/perl/PKI/TPS/CertRequestPanel.pm
+++ b/pki/base/tps/lib/perl/PKI/TPS/CertRequestPanel.pm
@@ -45,7 +45,7 @@ sub new {
 
     $self->{"isSubPanel"} = \&is_sub_panel;
     $self->{"hasSubPanel"} = \&has_sub_panel;
-    $self->{"isPanelDone"} = \&PKI::TPS::Common::no;
+    $self->{"isPanelDone"} = \&is_panel_done; 
     $self->{"getPanelNo"} = &PKI::TPS::Common::r(13);
     $self->{"getName"} = &PKI::TPS::Common::r("Certificate Requests");
     $self->{"vmfile"} = "certrequestpanel.vm";
@@ -210,6 +210,7 @@ sub update
     }
 
 DONE:
+    $::config->put("preop.certrequest.done", "true");
     $::config->commit();
     my $tmp = `rm $instanceDir/conf/.pwfile`;
 
@@ -296,5 +297,10 @@ sub extract_cert_from_file_sans_header_and_footer
     return $cert;
 }
 
+sub is_panel_done
+{
+   return $::config->get("preop.certrequest.done");
+}
+
 
 1;
diff --git a/pki/base/tps/lib/perl/PKI/TPS/ConfigHSMLoginPanel.pm b/pki/base/tps/lib/perl/PKI/TPS/ConfigHSMLoginPanel.pm
index 756c3ee49..36d2c4d32 100755
--- a/pki/base/tps/lib/perl/PKI/TPS/ConfigHSMLoginPanel.pm
+++ b/pki/base/tps/lib/perl/PKI/TPS/ConfigHSMLoginPanel.pm
@@ -38,7 +38,7 @@ sub new {
 
     $self->{"isSubPanel"} = \&is_sub_panel;
     $self->{"hasSubPanel"} = \&has_sub_panel;
-    $self->{"isPanelDone"} = \&PKI::TPS::Common::no;
+    $self->{"isPanelDone"} = \&is_panel_done;
     $self->{"getPanelNo"} = &PKI::TPS::Common::r(9);
     $self->{"getName"} = &PKI::TPS::Common::r("Security Modules Login");
     $self->{"vmfile"} = "config_hsmloginpanel.vm";
@@ -79,6 +79,9 @@ sub update
     $::pwdconf->put($uTokName, $uPasswd);
     $::pwdconf->commit();
 
+    $::config->put("preop.confighsmlogin.done", "true");
+    $::config->commit();
+
     return 1;
 }
 
@@ -100,4 +103,10 @@ sub display
     return 1;
 }
 
+sub is_panel_done
+{
+   return $::config->get("preop.confighsmlogin.done");
+}
+
+
 1;
diff --git a/pki/base/tps/lib/perl/PKI/TPS/ConfigHSMPanel.pm b/pki/base/tps/lib/perl/PKI/TPS/ConfigHSMPanel.pm
index f0e065425..4c39d1821 100755
--- a/pki/base/tps/lib/perl/PKI/TPS/ConfigHSMPanel.pm
+++ b/pki/base/tps/lib/perl/PKI/TPS/ConfigHSMPanel.pm
@@ -37,7 +37,7 @@ sub new {
     my $self = {}; 
 
     $self->{"isSubPanel"} = \&PKI::TPS::Common::no;
-    $self->{"isPanelDone"} = \&PKI::TPS::Common::no;
+    $self->{"isPanelDone"} = \&is_panel_done;
     $self->{"getPanelNo"} = &PKI::TPS::Common::r(12);
     $self->{"getName"} = &PKI::TPS::Common::r("ConfigHSMLogin");
     $self->{"vmfile"} = "config_hsm.vm";
@@ -58,6 +58,8 @@ sub update
 {
     my ($q) = @_;
     &PKI::TPS::Wizard::debug_log("ConfigHSMPanel: update");
+    $::config->put("preop.confighsm.done", "true");
+    $::config->commit();
     return 1;
 }
 
@@ -68,4 +70,9 @@ sub display
     return 1;
 }
 
+sub is_panel_done
+{
+   return $::config->get("preop.confighsm.done");
+}
+
 1;
diff --git a/pki/base/tps/lib/perl/PKI/TPS/DRMInfoPanel.pm b/pki/base/tps/lib/perl/PKI/TPS/DRMInfoPanel.pm
index 61d3fb52e..19e70d063 100755
--- a/pki/base/tps/lib/perl/PKI/TPS/DRMInfoPanel.pm
+++ b/pki/base/tps/lib/perl/PKI/TPS/DRMInfoPanel.pm
@@ -39,7 +39,7 @@ sub new {
 
     $self->{"isSubPanel"} = \&is_sub_panel;
     $self->{"hasSubPanel"} = \&has_sub_panel;
-    $self->{"isPanelDone"} = \&PKI::TPS::Common::no;
+    $self->{"isPanelDone"} = \&is_panel_done;
     $self->{"getPanelNo"} = &PKI::TPS::Common::r(6);
     $self->{"getName"} = &PKI::TPS::Common::r("DRM Information");
     $self->{"vmfile"} = "drminfopanel.vm";
@@ -117,6 +117,7 @@ sub update
       $::config->put("op.enroll.soKey.keyGen.encryption.recovery.destroyed.scheme", "GenerateNewKey");
       $::config->put("op.enroll.soKeyTemporary.keyGen.encryption.recovery.onHold.scheme", "GenerateNewKey");
     }
+    $::config->put("preop.drminfo.done", "true");
     $::config->commit();
 
     return 1;
@@ -144,4 +145,10 @@ DONE:
     return 1;
 }
 
+sub is_panel_done
+{
+   return $::config->get("preop.drminfo.done");
+}
+
+
 1;
diff --git a/pki/base/tps/lib/perl/PKI/TPS/DatabasePanel.pm b/pki/base/tps/lib/perl/PKI/TPS/DatabasePanel.pm
index b6a96d813..95c0a1f61 100755
--- a/pki/base/tps/lib/perl/PKI/TPS/DatabasePanel.pm
+++ b/pki/base/tps/lib/perl/PKI/TPS/DatabasePanel.pm
@@ -38,7 +38,7 @@ sub new {
 
     $self->{"isSubPanel"} = \&is_sub_panel;
     $self->{"hasSubPanel"} = \&has_sub_panel;
-    $self->{"isPanelDone"} = \&PKI::TPS::Common::no;
+    $self->{"isPanelDone"} = \&is_panel_done;
     $self->{"getPanelNo"} = &PKI::TPS::Common::r(8);
     $self->{"getName"} = &PKI::TPS::Common::r("Internal Database");
     $self->{"vmfile"} = "databasepanel.vm";
@@ -173,6 +173,9 @@ sub update
               "-f '$tmp'");
     system("rm $tmp");
 
+    $::config->put("preop.database.done", "true");
+    $::config->commit();
+
     return 1;
 }
 
@@ -215,4 +218,10 @@ sub display
     return 1;
 }
 
+sub is_panel_done
+{
+   return $::config->get("preop.database.done");
+}
+
+
 1;
diff --git a/pki/base/tps/lib/perl/PKI/TPS/DisplayCertChain2Panel.pm b/pki/base/tps/lib/perl/PKI/TPS/DisplayCertChain2Panel.pm
index 00e1ce64e..910b94510 100755
--- a/pki/base/tps/lib/perl/PKI/TPS/DisplayCertChain2Panel.pm
+++ b/pki/base/tps/lib/perl/PKI/TPS/DisplayCertChain2Panel.pm
@@ -42,7 +42,7 @@ sub new {
 
     $self->{"isSubPanel"} = \&is_sub_panel;
     $self->{"hasSubPanel"} = \&has_sub_panel;
-    $self->{"isPanelDone"} = \&PKI::TPS::Common::no;
+    $self->{"isPanelDone"} = \&is_panel_done;
     $self->{"getPanelNo"} = &PKI::TPS::Common::r(7);
     $self->{"getName"} = &PKI::TPS::Common::r("Display Certificate Chain");
     $self->{"vmfile"} = "displaycertchain2panel.vm";
@@ -111,6 +111,9 @@ sub update
 #    my $tmp = `rm $instanceDir/conf/caCertChain2.txt`;
 #    $tmp = `rm $instanceDir/conf/CAchain2_pp.txt`;
 
+    $::config->put("preop.displaycertchain2.done", "true");
+    $::config->commit();
+
     return 1;
 }
 
@@ -175,4 +178,9 @@ sub extract_cert_from_file_sans_header_and_footer
     return $cert;
 }
 
+sub is_panel_done
+{
+   return $::config->get("preop.displaycertchain2.done");
+}
+
 1;
diff --git a/pki/base/tps/lib/perl/PKI/TPS/DisplayCertChainPanel.pm b/pki/base/tps/lib/perl/PKI/TPS/DisplayCertChainPanel.pm
index 01f6e76d1..1ab9c3cf1 100755
--- a/pki/base/tps/lib/perl/PKI/TPS/DisplayCertChainPanel.pm
+++ b/pki/base/tps/lib/perl/PKI/TPS/DisplayCertChainPanel.pm
@@ -40,7 +40,7 @@ sub new {
 
     $self->{"isSubPanel"} = \&is_sub_panel;
     $self->{"hasSubPanel"} = \&has_sub_panel;
-    $self->{"isPanelDone"} = \&PKI::TPS::Common::no;
+    $self->{"isPanelDone"} = \&is_panel_done;
     $self->{"getPanelNo"} = &PKI::TPS::Common::r(2);
     $self->{"getName"} = &PKI::TPS::Common::r("Display Certificate Chain");
     $self->{"vmfile"} = "displaycertchainpanel.vm";
@@ -121,6 +121,8 @@ sub update
 
     get_domain_xml($sdomainAdminURL);
 
+    $::config->put("preop.displaycertchain.done", "true");
+    $::config->commit();
 
     return 3;
 }
@@ -343,4 +345,10 @@ sub get_domain_xml
     $::config->commit();
 }
 
+sub is_panel_done
+{
+    return $::config->get("preop.displaycertchain.done");
+}
+
+
 1;
diff --git a/pki/base/tps/lib/perl/PKI/TPS/DonePanel.pm b/pki/base/tps/lib/perl/PKI/TPS/DonePanel.pm
index 641ecf210..adcdecb05 100755
--- a/pki/base/tps/lib/perl/PKI/TPS/DonePanel.pm
+++ b/pki/base/tps/lib/perl/PKI/TPS/DonePanel.pm
@@ -40,7 +40,7 @@ sub new {
 
     $self->{"isSubPanel"} = \&is_sub_panel;
     $self->{"hasSubPanel"} = \&has_sub_panel;
-    $self->{"isPanelDone"} = \&PKI::TPS::Common::no;
+    $self->{"isPanelDone"} = \&is_panel_done;
     $self->{"getPanelNo"} = &PKI::TPS::Common::r(16);
     $self->{"getName"} = &PKI::TPS::Common::r("Done");
     $self->{"vmfile"} = "donepanel.vm";
@@ -416,7 +416,15 @@ sub display
     system( "touch $restart_server" );
     system( "chmod 00660 $restart_server" );
 
+    $::config->put("preop.donepanel.done", "true");
+    $::config->commit();
+
     return 1;
 }
 
+sub is_panel_done
+{
+   return $::config->get("preop.donepanel.done");
+}
+
 1;
diff --git a/pki/base/tps/lib/perl/PKI/TPS/ImportAdminCertPanel.pm b/pki/base/tps/lib/perl/PKI/TPS/ImportAdminCertPanel.pm
index 343b8b95f..2c6ac9a51 100755
--- a/pki/base/tps/lib/perl/PKI/TPS/ImportAdminCertPanel.pm
+++ b/pki/base/tps/lib/perl/PKI/TPS/ImportAdminCertPanel.pm
@@ -39,7 +39,7 @@ sub new {
 
     $self->{"isSubPanel"} = \&is_sub_panel;
     $self->{"hasSubPanel"} = \&has_sub_panel;
-    $self->{"isPanelDone"} = \&PKI::TPS::Common::no;
+    $self->{"isPanelDone"} = \&is_panel_done;
     $self->{"getPanelNo"} = &PKI::TPS::Common::r(15);
     $self->{"getName"} = &PKI::TPS::Common::r("Import Administrator Certificate");
     $self->{"vmfile"} = "importadmincertpanel.vm";
@@ -113,6 +113,9 @@ sub update
     $content = $1;
     &PKI::TPS::Wizard::debug_log($content);
 
+    $::config->put("preop.importadmincert.done", "true");
+    $::config->commit();
+
     return 1;
 }
 
@@ -139,4 +142,9 @@ sub display
     return 1;
 }
 
+sub is_panel_done
+{
+   return $::config->get("preop.importadmincert.done");
+}
+
 1;
diff --git a/pki/base/tps/lib/perl/PKI/TPS/LoginPanel.pm b/pki/base/tps/lib/perl/PKI/TPS/LoginPanel.pm
index d8d358f43..c57e61779 100755
--- a/pki/base/tps/lib/perl/PKI/TPS/LoginPanel.pm
+++ b/pki/base/tps/lib/perl/PKI/TPS/LoginPanel.pm
@@ -38,7 +38,7 @@ sub new {
 
     $self->{"isSubPanel"} = \&is_sub_panel;
     $self->{"hasSubPanel"} = \&has_sub_panel;
-    $self->{"isPanelDone"} = \&PKI::TPS::Common::no;
+    $self->{"isPanelDone"} = \&is_panel_done;
     $self->{"getPanelNo"} = &PKI::TPS::Common::r(0);
     $self->{"getName"} = &PKI::TPS::Common::r("Welcome");
     $self->{"vmfile"} = "login.vm";
@@ -71,6 +71,9 @@ sub update
 {
     my ($q) = @_;
     &PKI::TPS::Wizard::debug_log("WelcomePanel: update");
+    $::config->put("preop.loginpanel.done", "true");
+    $::config->commit();
+
     return 1;
 }
 
@@ -87,4 +90,9 @@ sub display
     return 1;
 }
 
+sub is_panel_done
+{
+   return $::config->get("preop.loginpanel.done");
+}
+
 1;
diff --git a/pki/base/tps/lib/perl/PKI/TPS/ModulePanel.pm b/pki/base/tps/lib/perl/PKI/TPS/ModulePanel.pm
index c841cc1c8..668165d2f 100755
--- a/pki/base/tps/lib/perl/PKI/TPS/ModulePanel.pm
+++ b/pki/base/tps/lib/perl/PKI/TPS/ModulePanel.pm
@@ -41,7 +41,7 @@ sub new {
 
     $self->{"isSubPanel"} = \&is_sub_panel;
     $self->{"hasSubPanel"} = \&has_sub_panel;
-    $self->{"isPanelDone"} = \&PKI::TPS::Common::no;
+    $self->{"isPanelDone"} = \&is_panel_done;
     $self->{"getPanelNo"} = &PKI::TPS::Common::r(9);
     $self->{"getName"} = &PKI::TPS::Common::r("Security Modules");
     $self->{"vmfile"} = "modulepanel.vm";
@@ -88,12 +88,13 @@ sub update
     } elsif ($defTok ne $select) {
         &PKI::TPS::Wizard::debug_log("ModulePanel -> update changing defTok to $select");
         $::config->put("preop.module.token", $select);
-        $::config->put("preop.ModulePanel.done", "true");
     } else {
         # this is not an error...just information
         &PKI::TPS::Wizard::debug_log("ModulePanel -> update  defTok not changed");
     }
 
+    $::config->put("preop.ModulePanel.done", "true");
+
     $::config->commit();
     return 1;
 }
@@ -269,4 +270,9 @@ sub getModules {
     &PKI::TPS::Wizard::debug_log("ModulePanel -> set sms, oms");
 }
 
+sub is_panel_done
+{
+   return $::config->get("preop.ModulePanel.done");
+}
+
 1;
diff --git a/pki/base/tps/lib/perl/PKI/TPS/NamePanel.pm b/pki/base/tps/lib/perl/PKI/TPS/NamePanel.pm
index 9d8335a2e..476ff75db 100755
--- a/pki/base/tps/lib/perl/PKI/TPS/NamePanel.pm
+++ b/pki/base/tps/lib/perl/PKI/TPS/NamePanel.pm
@@ -46,7 +46,7 @@ sub new {
 
     $self->{"isSubPanel"} = \&is_sub_panel;
     $self->{"hasSubPanel"} = \&has_sub_panel;
-    $self->{"isPanelDone"} = \&PKI::TPS::Common::no;
+    $self->{"isPanelDone"} = \&is_panel_done;
     $self->{"getPanelNo"} = &PKI::TPS::Common::r(12);
     $self->{"getName"} = &PKI::TPS::Common::r("Subject Names");
     $self->{"vmfile"} = "namepanel.vm";
@@ -402,6 +402,9 @@ $debug_req = "/usr/bin/sslget -e \"$params\" -d \"$instanceDir/alias\" -p \"(sen
     }
 
 DONE:
+    $::config->put("preop.namepanel.done", "true");
+    $::config->commit();
+
     &PKI::TPS::Wizard::debug_log("NamePanel: removing pwfile");
     my $tmp = `rm $instanceDir/conf/.pwfile`;
     return 1;
@@ -563,4 +566,9 @@ sub extract_cert_req_from_file_sans_header_and_footer
     return $cert_request;
 }
 
+sub is_panel_done
+{
+   return $::config->get("preop.namepanel.done");
+}
+
 1;
diff --git a/pki/base/tps/lib/perl/PKI/TPS/SecurityDomainPanel.pm b/pki/base/tps/lib/perl/PKI/TPS/SecurityDomainPanel.pm
index a7f46dbd9..c422a8bcc 100755
--- a/pki/base/tps/lib/perl/PKI/TPS/SecurityDomainPanel.pm
+++ b/pki/base/tps/lib/perl/PKI/TPS/SecurityDomainPanel.pm
@@ -41,7 +41,7 @@ sub new {
 
     $self->{"isSubPanel"} = \&is_sub_panel;
     $self->{"hasSubPanel"} = \&has_sub_panel;
-    $self->{"isPanelDone"} = \&PKI::TPS::Common::no;
+    $self->{"isPanelDone"} = \&is_panel_done;
     $self->{"getPanelNo"} = &PKI::TPS::Common::r(1);
     $self->{"getName"} = &PKI::TPS::Common::r("Security Domain");
     $self->{"vmfile"} = "securitydomainpanel.vm";
@@ -188,9 +188,15 @@ sub update
     $::config->put("securitydomain.select", "existing");
     $::config->put("securitydomain.host", $sdomainURL_info->host);
     $::config->put("securitydomain.httpsadminport", $sdomainURL_info->port);
+    $::config->put("preop.securitydomain.done", "true");
     $::config->commit();
 
     return 1;
 }
 
+sub is_panel_done
+{
+   return $::config->get("preop.securitydomain.done");
+}
+
 1;
diff --git a/pki/base/tps/lib/perl/PKI/TPS/SizePanel.pm b/pki/base/tps/lib/perl/PKI/TPS/SizePanel.pm
index 3f8151fe2..3f21404f8 100755
--- a/pki/base/tps/lib/perl/PKI/TPS/SizePanel.pm
+++ b/pki/base/tps/lib/perl/PKI/TPS/SizePanel.pm
@@ -39,7 +39,7 @@ sub new {
 
     $self->{"isSubPanel"} = \&is_sub_panel;
     $self->{"hasSubPanel"} = \&has_sub_panel;
-    $self->{"isPanelDone"} = \&PKI::TPS::Common::no;
+    $self->{"isPanelDone"} = \&is_panel_done;
     $self->{"getPanelNo"} = &PKI::TPS::Common::r(11);
     $self->{"getName"} = &PKI::TPS::Common::r("Key Pairs");
     $self->{"vmfile"} = "sizepanel.vm";
@@ -124,6 +124,7 @@ sub update
     }
 #XXX should have better error checking to work better
     $done = $::config->put("preop.SizePanel.done", "true");
+
     $::config->commit();
 
     return 1;
@@ -240,4 +241,9 @@ sub display
     return 1;
 }
 
+sub is_panel_done
+{
+   return $::config->get("preop.SizePanel.done");
+}
+
 1;
diff --git a/pki/base/tps/lib/perl/PKI/TPS/SubsystemTypePanel.pm b/pki/base/tps/lib/perl/PKI/TPS/SubsystemTypePanel.pm
index d36ef8faf..24307e9d2 100755
--- a/pki/base/tps/lib/perl/PKI/TPS/SubsystemTypePanel.pm
+++ b/pki/base/tps/lib/perl/PKI/TPS/SubsystemTypePanel.pm
@@ -38,7 +38,7 @@ sub new {
 
     $self->{"isSubPanel"} = \&is_sub_panel;
     $self->{"hasSubPanel"} = \&has_sub_panel;
-    $self->{"isPanelDone"} = \&PKI::TPS::Common::no;
+    $self->{"isPanelDone"} = \&is_panel_done;
     $self->{"getPanelNo"} = &PKI::TPS::Common::r(3);
     $self->{"getName"} = &PKI::TPS::Common::r("Subsystem Type");
     $self->{"vmfile"} = "createsubsystempanel.vm";
@@ -84,6 +84,7 @@ sub update
 
     my $subsystemName = $q->param('subsystemName');
     $::config->put("preop.subsystem.name", $subsystemName);
+    $::config->put("preop.subsystemtype.done", "true");
     $::config->commit();
 
     return 1;
@@ -137,5 +138,10 @@ DONE:
     return 1;
 }
 
+sub is_panel_done
+{
+   return $::config->get("preop.subsystemtype.done");
+}
+
 
 1;
diff --git a/pki/base/tps/lib/perl/PKI/TPS/TKSInfoPanel.pm b/pki/base/tps/lib/perl/PKI/TPS/TKSInfoPanel.pm
index 8a85b13c5..54e1243b9 100755
--- a/pki/base/tps/lib/perl/PKI/TPS/TKSInfoPanel.pm
+++ b/pki/base/tps/lib/perl/PKI/TPS/TKSInfoPanel.pm
@@ -39,7 +39,7 @@ sub new {
 
     $self->{"isSubPanel"} = \&is_sub_panel;
     $self->{"hasSubPanel"} = \&has_sub_panel;
-    $self->{"isPanelDone"} = \&PKI::TPS::Common::no;
+    $self->{"isPanelDone"} = \&is_panel_done;
     $self->{"getPanelNo"} = &PKI::TPS::Common::r(5);
     $self->{"getName"} = &PKI::TPS::Common::r("TKS Information");
     $self->{"vmfile"} = "tksinfopanel.vm";
@@ -100,6 +100,7 @@ sub update
     my $subsystemCertNickName = $::config->get("preop.cert.subsystem.nickname");
     $::config->put("conn.tks1.clientNickname", $subsystemCertNickName);
     $::config->put("conn.tks1.hostport", $host . ":" . $https_agent_port); 
+    $::config->put("preop.tksinfo.done", "true");
     $::config->commit();
 
     return 1;
@@ -130,4 +131,10 @@ DONE:
     return 1;
 }
 
+sub is_panel_done
+{
+   return $::config->get("preop.tksinfo.done");
+}
+
+
 1;
diff --git a/pki/base/tps/lib/perl/PKI/TPS/WelcomePanel.pm b/pki/base/tps/lib/perl/PKI/TPS/WelcomePanel.pm
index 252bf4f1d..032357b4a 100755
--- a/pki/base/tps/lib/perl/PKI/TPS/WelcomePanel.pm
+++ b/pki/base/tps/lib/perl/PKI/TPS/WelcomePanel.pm
@@ -38,7 +38,7 @@ sub new {
 
     $self->{"isSubPanel"} = \&is_sub_panel;
     $self->{"hasSubPanel"} = \&has_sub_panel;
-    $self->{"isPanelDone"} = \&PKI::TPS::Common::no;
+    $self->{"isPanelDone"} = \&is_panel_done;
     $self->{"getPanelNo"} = &PKI::TPS::Common::r(0);
     $self->{"getName"} = &PKI::TPS::Common::r("Welcome");
     $self->{"vmfile"} = "welcomepanel.vm";
@@ -71,6 +71,8 @@ sub update
 {
     my ($q) = @_;
     &PKI::TPS::Wizard::debug_log("WelcomePanel: update");
+    $::config->put("preop.welcome.done", "true");
+    $::config->commit();
     return 1;
 }
 
@@ -86,4 +88,9 @@ sub display
     return 1;
 }
 
+sub is_panel_done
+{
+   return $::config->get("preop.welcome.done");
+}
+
 1;