From 5f7ebe70430131f87e705cf6d57de06ecaae7711 Mon Sep 17 00:00:00 2001
From: Endi Sukma Dewata <edewata@redhat.com>
Date: Fri, 2 Nov 2012 15:43:35 -0400
Subject: Updated pki-icon-software.gif paths.

---
 dogtag/ca-ui/shared/webapps/ca/admin/ca/securitydomainlogin.template    | 2 +-
 dogtag/common-ui/shared/admin/console/config/config_addhsm.vm           | 2 +-
 dogtag/common-ui/shared/admin/console/config/login.vm                   | 2 +-
 .../common-ui/shared/admin/console/config/securitydomainloginpanel.vm   | 2 +-
 dogtag/common-ui/shared/admin/console/config/wizard.vm                  | 2 +-
 dogtag/ra-ui/shared/docroot/ra/admin/console/config/config_addhsm.vm    | 2 +-
 dogtag/ra-ui/shared/docroot/ra/admin/console/config/config_db.vm        | 2 +-
 dogtag/ra-ui/shared/docroot/ra/admin/console/config/config_hsm.vm       | 2 +-
 dogtag/ra-ui/shared/docroot/ra/admin/console/config/config_join.vm      | 2 +-
 dogtag/ra-ui/shared/docroot/ra/admin/console/config/config_rootca.vm    | 2 +-
 dogtag/ra-ui/shared/docroot/ra/admin/console/config/login.vm            | 2 +-
 .../shared/docroot/ra/admin/console/config/securitydomainloginpanel.vm  | 2 +-
 dogtag/ra-ui/shared/docroot/ra/admin/console/config/wizard.vm           | 2 +-
 dogtag/tps-ui/shared/docroot/tps/admin/console/config/config_addhsm.vm  | 2 +-
 dogtag/tps-ui/shared/docroot/tps/admin/console/config/config_db.vm      | 2 +-
 dogtag/tps-ui/shared/docroot/tps/admin/console/config/config_hsm.vm     | 2 +-
 dogtag/tps-ui/shared/docroot/tps/admin/console/config/config_join.vm    | 2 +-
 dogtag/tps-ui/shared/docroot/tps/admin/console/config/config_rootca.vm  | 2 +-
 dogtag/tps-ui/shared/docroot/tps/admin/console/config/login.vm          | 2 +-
 .../shared/docroot/tps/admin/console/config/securitydomainloginpanel.vm | 2 +-
 dogtag/tps-ui/shared/docroot/tps/admin/console/config/wizard.vm         | 2 +-
 21 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/dogtag/ca-ui/shared/webapps/ca/admin/ca/securitydomainlogin.template b/dogtag/ca-ui/shared/webapps/ca/admin/ca/securitydomainlogin.template
index 6ffa70ec1..7accba4c2 100644
--- a/dogtag/ca-ui/shared/webapps/ca/admin/ca/securitydomainlogin.template
+++ b/dogtag/ca-ui/shared/webapps/ca/admin/ca/securitydomainlogin.template
@@ -54,7 +54,7 @@
     <table width="100%" cellspacing="0">
       <tr>
         <td width="100%">
-  <h1><img src="/ca/admin/console/img/rhn-icon-software.gif" />
+  <h1><img src="/pki/images/pki-icon-software.gif" />
 <script language=javascript>
 document.write('Security Domain ('+result.header.sdname+') Login </h1>');
 </script>
diff --git a/dogtag/common-ui/shared/admin/console/config/config_addhsm.vm b/dogtag/common-ui/shared/admin/console/config/config_addhsm.vm
index a670dc12f..ce4e027e8 100644
--- a/dogtag/common-ui/shared/admin/console/config/config_addhsm.vm
+++ b/dogtag/common-ui/shared/admin/console/config/config_addhsm.vm
@@ -55,7 +55,7 @@
     <table width="100%" cellspacing="0">
       <tr>
         <td class="page-content" width="100%">
-  <h1><img src="../img/icon-software.gif" />
+  <h1><img src="/pki/images/pki-icon-software.gif" />
   Security Modules</h1>
 Keys will be generated and stored on security modules. A security module can be hardware-based or software-based. Hardware-based security modules are more secure.
 <p>
diff --git a/dogtag/common-ui/shared/admin/console/config/login.vm b/dogtag/common-ui/shared/admin/console/config/login.vm
index 1646fe2d4..82cfcb0fb 100644
--- a/dogtag/common-ui/shared/admin/console/config/login.vm
+++ b/dogtag/common-ui/shared/admin/console/config/login.vm
@@ -67,7 +67,7 @@
          
 	</td>
         <td class="page-content" width="100%">
-  <h1><img src="../img/icon-software.gif" />
+  <h1><img src="/pki/images/pki-icon-software.gif" />
   Login</h1>
 
 A one time random pin has been generated during setup to protect unauthorized access to this configuration wizard. This pin has been stored in the "CS.cfg" configuration file as the value of the 'preop.pin' parameter. Please enter this pin to continue.
diff --git a/dogtag/common-ui/shared/admin/console/config/securitydomainloginpanel.vm b/dogtag/common-ui/shared/admin/console/config/securitydomainloginpanel.vm
index 46ff12b86..59256871d 100644
--- a/dogtag/common-ui/shared/admin/console/config/securitydomainloginpanel.vm
+++ b/dogtag/common-ui/shared/admin/console/config/securitydomainloginpanel.vm
@@ -55,7 +55,7 @@
     <table width="100%" cellspacing="0">
       <tr>
         <td width="100%">
-  <h1><img src="/ca/admin/console/img/icon-software.gif" />
+  <h1><img src="/pki/images/pki-icon-software.gif" />
   Security Domain ($name) Login </h1>
 
     <form name=sdForm action="getCookie" method="post">
diff --git a/dogtag/common-ui/shared/admin/console/config/wizard.vm b/dogtag/common-ui/shared/admin/console/config/wizard.vm
index 81a8fb27e..74bf99d67 100644
--- a/dogtag/common-ui/shared/admin/console/config/wizard.vm
+++ b/dogtag/common-ui/shared/admin/console/config/wizard.vm
@@ -103,7 +103,7 @@ function process(fop) {
 
 	</td>
         <td class="page-content" width="100%">
-  <h1><img alt="" src="../img/icon-software.gif" />
+  <h1><img alt="" src="/pki/images/pki-icon-software.gif" />
   $title </h1>
 
 <OBJECT classid="clsid:127698E4-E730-4E5C-A2b1-21490A70C8A1"
diff --git a/dogtag/ra-ui/shared/docroot/ra/admin/console/config/config_addhsm.vm b/dogtag/ra-ui/shared/docroot/ra/admin/console/config/config_addhsm.vm
index 9e0471d47..26545d0e8 100644
--- a/dogtag/ra-ui/shared/docroot/ra/admin/console/config/config_addhsm.vm
+++ b/dogtag/ra-ui/shared/docroot/ra/admin/console/config/config_addhsm.vm
@@ -55,7 +55,7 @@
     <table width="100%" cellspacing="0">
       <tr>
         <td class="page-content" width="100%">
-  <h1><img src="../img/pki-icon-software.gif" />
+  <h1><img src="/pki/images/pki-icon-software.gif" />
   Security Modules</h1>
 Keys will be generated and stored on security modules. A security module can be hardware-based or software-based. Hardware-based security modules are more secure.
 <p>
diff --git a/dogtag/ra-ui/shared/docroot/ra/admin/console/config/config_db.vm b/dogtag/ra-ui/shared/docroot/ra/admin/console/config/config_db.vm
index 70ace4faf..c3e3932df 100644
--- a/dogtag/ra-ui/shared/docroot/ra/admin/console/config/config_db.vm
+++ b/dogtag/ra-ui/shared/docroot/ra/admin/console/config/config_db.vm
@@ -57,7 +57,7 @@
     <table width="100%" cellspacing="0">
       <tr>
         <td width="100%">
-  <h1><img src="../img/pki-icon-software.gif" />
+  <h1><img src="/pki/images/pki-icon-software.gif" />
   Internal Database </h1>
 
     <form name=configForm action="config_db" method="post">
diff --git a/dogtag/ra-ui/shared/docroot/ra/admin/console/config/config_hsm.vm b/dogtag/ra-ui/shared/docroot/ra/admin/console/config/config_hsm.vm
index cc4cd8b6c..71dcac332 100644
--- a/dogtag/ra-ui/shared/docroot/ra/admin/console/config/config_hsm.vm
+++ b/dogtag/ra-ui/shared/docroot/ra/admin/console/config/config_hsm.vm
@@ -56,7 +56,7 @@
     <table width="100%" cellspacing="0">
       <tr>
         <td width="100%">
-  <h1><img src="../img/pki-icon-software.gif" />
+  <h1><img src="/pki/images/pki-icon-software.gif" />
   Security Modules </h1>
 
 <form name=configForm action="config_hsm" method="post">
diff --git a/dogtag/ra-ui/shared/docroot/ra/admin/console/config/config_join.vm b/dogtag/ra-ui/shared/docroot/ra/admin/console/config/config_join.vm
index d8b5dfcb1..45b5591b4 100644
--- a/dogtag/ra-ui/shared/docroot/ra/admin/console/config/config_join.vm
+++ b/dogtag/ra-ui/shared/docroot/ra/admin/console/config/config_join.vm
@@ -56,7 +56,7 @@
     <table width="100%" cellspacing="0">
       <tr>
         <td width="100%">
-  <h1><img src="../img/pki-icon-software.gif" />
+  <h1><img src="/pki/images/pki-icon-software.gif" />
   Join the PKI Network </h1>
 
 To join this PKI network, the setup wizard needs to submit the certificate request to a Root or another subordinate CA for signing.
diff --git a/dogtag/ra-ui/shared/docroot/ra/admin/console/config/config_rootca.vm b/dogtag/ra-ui/shared/docroot/ra/admin/console/config/config_rootca.vm
index 9163f564c..001cb1173 100644
--- a/dogtag/ra-ui/shared/docroot/ra/admin/console/config/config_rootca.vm
+++ b/dogtag/ra-ui/shared/docroot/ra/admin/console/config/config_rootca.vm
@@ -56,7 +56,7 @@
     <table width="100%" cellspacing="0">
       <tr>
         <td width="100%">
-  <h1><img src="../img/pki-icon-software.gif" />
+  <h1><img src="/pki/images/pki-icon-software.gif" />
   Root CA </h1>
 
 A Root CA provides a set of predefined signing capabilities. Please select the capabilities that this CA needs to provide.
diff --git a/dogtag/ra-ui/shared/docroot/ra/admin/console/config/login.vm b/dogtag/ra-ui/shared/docroot/ra/admin/console/config/login.vm
index 9595783b7..bc3b7af69 100644
--- a/dogtag/ra-ui/shared/docroot/ra/admin/console/config/login.vm
+++ b/dogtag/ra-ui/shared/docroot/ra/admin/console/config/login.vm
@@ -65,7 +65,7 @@
          
 	</td>
         <td class="page-content" width="100%">
-  <h1><img src="../img/pki-icon-software.gif" />
+  <h1><img src="/pki/images/pki-icon-software.gif" />
   Login</h1>
 
 A one time random pin has been generated during setup to protect unauthorized access to this configuration wizard. This pin has been stored in the "CS.cfg" configuration file as the value of the 'preop.pin' parameter. Please enter this pin to continue.
diff --git a/dogtag/ra-ui/shared/docroot/ra/admin/console/config/securitydomainloginpanel.vm b/dogtag/ra-ui/shared/docroot/ra/admin/console/config/securitydomainloginpanel.vm
index 2557616ce..c761a2304 100644
--- a/dogtag/ra-ui/shared/docroot/ra/admin/console/config/securitydomainloginpanel.vm
+++ b/dogtag/ra-ui/shared/docroot/ra/admin/console/config/securitydomainloginpanel.vm
@@ -55,7 +55,7 @@
     <table width="100%" cellspacing="0">
       <tr>
         <td width="100%">
-  <h1><img src="/ca/admin/console/img/pki-icon-software.gif" />
+  <h1><img src="/pki/images/pki-icon-software.gif" />
   Security Domain ($name) Login </h1>
 
     <form name=sdForm action="getCookie" method="post">
diff --git a/dogtag/ra-ui/shared/docroot/ra/admin/console/config/wizard.vm b/dogtag/ra-ui/shared/docroot/ra/admin/console/config/wizard.vm
index bab26b970..710783a4c 100644
--- a/dogtag/ra-ui/shared/docroot/ra/admin/console/config/wizard.vm
+++ b/dogtag/ra-ui/shared/docroot/ra/admin/console/config/wizard.vm
@@ -100,7 +100,7 @@ function process(fop) {
 
 	</td>
         <td class="page-content" width="100%">
-  <h1><img src="../img/pki-icon-software.gif" />
+  <h1><img src="/pki/images/pki-icon-software.gif" />
   $title </h1>
 
 <form name=f method=post action="wizard">
diff --git a/dogtag/tps-ui/shared/docroot/tps/admin/console/config/config_addhsm.vm b/dogtag/tps-ui/shared/docroot/tps/admin/console/config/config_addhsm.vm
index 8e22d5470..58a255cb6 100644
--- a/dogtag/tps-ui/shared/docroot/tps/admin/console/config/config_addhsm.vm
+++ b/dogtag/tps-ui/shared/docroot/tps/admin/console/config/config_addhsm.vm
@@ -54,7 +54,7 @@
     <table width="100%" cellspacing="0">
       <tr>
         <td class="page-content" width="100%">
-  <h1><img src="../img/pki-icon-software.gif" />
+  <h1><img src="/pki/images/pki-icon-software.gif" />
   Security Modules</h1>
 Keys will be generated and stored on security modules. A security module can be hardware-based or software-based. Hardware-based security modules are more secure.
 <p>
diff --git a/dogtag/tps-ui/shared/docroot/tps/admin/console/config/config_db.vm b/dogtag/tps-ui/shared/docroot/tps/admin/console/config/config_db.vm
index 2ceb928c2..26ac063e4 100644
--- a/dogtag/tps-ui/shared/docroot/tps/admin/console/config/config_db.vm
+++ b/dogtag/tps-ui/shared/docroot/tps/admin/console/config/config_db.vm
@@ -56,7 +56,7 @@
     <table width="100%" cellspacing="0">
       <tr>
         <td width="100%">
-  <h1><img src="../img/pki-icon-software.gif" />
+  <h1><img src="/pki/images/pki-icon-software.gif" />
   Internal Database </h1>
 
     <form name=configForm action="config_db" method="post">
diff --git a/dogtag/tps-ui/shared/docroot/tps/admin/console/config/config_hsm.vm b/dogtag/tps-ui/shared/docroot/tps/admin/console/config/config_hsm.vm
index e6b3e0e18..dba8a86b7 100644
--- a/dogtag/tps-ui/shared/docroot/tps/admin/console/config/config_hsm.vm
+++ b/dogtag/tps-ui/shared/docroot/tps/admin/console/config/config_hsm.vm
@@ -55,7 +55,7 @@
     <table width="100%" cellspacing="0">
       <tr>
         <td width="100%">
-  <h1><img src="../img/pki-icon-software.gif" />
+  <h1><img src="/pki/images/pki-icon-software.gif" />
   Security Modules </h1>
 
 <form name=configForm action="config_hsm" method="post">
diff --git a/dogtag/tps-ui/shared/docroot/tps/admin/console/config/config_join.vm b/dogtag/tps-ui/shared/docroot/tps/admin/console/config/config_join.vm
index 71c26bdb3..833a79d2d 100644
--- a/dogtag/tps-ui/shared/docroot/tps/admin/console/config/config_join.vm
+++ b/dogtag/tps-ui/shared/docroot/tps/admin/console/config/config_join.vm
@@ -55,7 +55,7 @@
     <table width="100%" cellspacing="0">
       <tr>
         <td width="100%">
-  <h1><img src="../img/pki-icon-software.gif" />
+  <h1><img src="/pki/images/pki-icon-software.gif" />
   Join the PKI Network </h1>
 
 To join this PKI network, the setup wizard needs to submit the certificate request to a Root or another subordinate CA for signing.
diff --git a/dogtag/tps-ui/shared/docroot/tps/admin/console/config/config_rootca.vm b/dogtag/tps-ui/shared/docroot/tps/admin/console/config/config_rootca.vm
index 4e85a2077..a0878045e 100644
--- a/dogtag/tps-ui/shared/docroot/tps/admin/console/config/config_rootca.vm
+++ b/dogtag/tps-ui/shared/docroot/tps/admin/console/config/config_rootca.vm
@@ -55,7 +55,7 @@
     <table width="100%" cellspacing="0">
       <tr>
         <td width="100%">
-  <h1><img src="../img/pki-icon-software.gif" />
+  <h1><img src="/pki/images/pki-icon-software.gif" />
   Root CA </h1>
 
 A Root CA provides a set of predefined signing capabilities. Please select the capabilities that this CA needs to provide.
diff --git a/dogtag/tps-ui/shared/docroot/tps/admin/console/config/login.vm b/dogtag/tps-ui/shared/docroot/tps/admin/console/config/login.vm
index 97cec6320..4fdbc3bf1 100644
--- a/dogtag/tps-ui/shared/docroot/tps/admin/console/config/login.vm
+++ b/dogtag/tps-ui/shared/docroot/tps/admin/console/config/login.vm
@@ -64,7 +64,7 @@
          
 	</td>
         <td class="page-content" width="100%">
-  <h1><img src="../img/pki-icon-software.gif" />
+  <h1><img src="/pki/images/pki-icon-software.gif" />
   Login</h1>
 
 A one time random pin has been generated during setup to protect unauthorized access to this configuration wizard. This pin has been stored in the "CS.cfg" configuration file as the value of the 'preop.pin' parameter. Please enter this pin to continue.
diff --git a/dogtag/tps-ui/shared/docroot/tps/admin/console/config/securitydomainloginpanel.vm b/dogtag/tps-ui/shared/docroot/tps/admin/console/config/securitydomainloginpanel.vm
index 47462d773..97ed94794 100644
--- a/dogtag/tps-ui/shared/docroot/tps/admin/console/config/securitydomainloginpanel.vm
+++ b/dogtag/tps-ui/shared/docroot/tps/admin/console/config/securitydomainloginpanel.vm
@@ -54,7 +54,7 @@
     <table width="100%" cellspacing="0">
       <tr>
         <td width="100%">
-  <h1><img src="/ca/admin/console/img/pki-icon-software.gif" />
+  <h1><img src="/pki/images/pki-icon-software.gif" />
   Security Domain ($name) Login </h1>
 
     <form name=sdForm action="getCookie" method="post">
diff --git a/dogtag/tps-ui/shared/docroot/tps/admin/console/config/wizard.vm b/dogtag/tps-ui/shared/docroot/tps/admin/console/config/wizard.vm
index db454e90e..7d319f952 100644
--- a/dogtag/tps-ui/shared/docroot/tps/admin/console/config/wizard.vm
+++ b/dogtag/tps-ui/shared/docroot/tps/admin/console/config/wizard.vm
@@ -103,7 +103,7 @@ function process(fop) {
 
 	</td>
         <td class="page-content" width="100%">
-  <h1><img src="../img/pki-icon-software.gif" />
+  <h1><img src="/pki/images/pki-icon-software.gif" />
   $title </h1>
 
 <form name=f method=post action="wizard">
-- 
cgit