Reorganized ESC images.

The ESC images have been moved from tps-ui into common-ui. The
pkicreate has been updated to deploy the ESC images from common-ui
into /pki/esc. The paths in templates and CSS file have been
modified to point to the new location.

Ticket #328

53 files changed, 34 insertions, 26 deletions

diff --git a/base/setup/pkicreate b/base/setup/pkicreate
index ac037f0a2..6b503fe7e 100755
--- a/base/setup/pkicreate
+++ b/base/setup/pkicreate
@@ -2073,6 +2073,14 @@ sub process_pki_directories
             $default_dir_permissions, $default_file_permissions,
             $pki_user, $pki_group);
 
+        # Copy /usr/share/pki/common-ui/esc
+        # to <instance>/docroot/pki/esc
+        return 0 if !copy_directory(
+            "$common_ui_subsystem_path/esc",
+            "$docroot_instance_path/pki/esc",
+            $default_dir_permissions, $default_file_permissions,
+            $pki_user, $pki_group);
+
         # Copy /usr/share/pki/common-ui/images
         # to <instance>/docroot/pki/images
         return 0 if !copy_directory(
diff --git a/dogtag/tps-ui/shared/docroot/esc/demo/logo.jpg b/dogtag/common-ui/shared/esc/demo/logo.jpg
index 7cb31affc..7cb31affc 100644
--- a/dogtag/tps-ui/shared/docroot/esc/demo/logo.jpg
+++ b/dogtag/common-ui/shared/esc/demo/logo.jpg
diff --git a/dogtag/tps-ui/shared/docroot/esc/home/logo.jpg b/dogtag/common-ui/shared/esc/home/logo.jpg
index 7cb31affc..7cb31affc 100644
--- a/dogtag/tps-ui/shared/docroot/esc/home/logo.jpg
+++ b/dogtag/common-ui/shared/esc/home/logo.jpg
diff --git a/dogtag/tps-ui/shared/docroot/esc/images/BannerBackground.gif b/dogtag/common-ui/shared/esc/images/BannerBackground.gif
index 55d41f6ea..55d41f6ea 100755
--- a/dogtag/tps-ui/shared/docroot/esc/images/BannerBackground.gif
+++ b/dogtag/common-ui/shared/esc/images/BannerBackground.gif
diff --git a/dogtag/tps-ui/shared/docroot/esc/images/CancelButton.gif b/dogtag/common-ui/shared/esc/images/CancelButton.gif
index 5b2f7e53a..5b2f7e53a 100755
--- a/dogtag/tps-ui/shared/docroot/esc/images/CancelButton.gif
+++ b/dogtag/common-ui/shared/esc/images/CancelButton.gif
diff --git a/dogtag/tps-ui/shared/docroot/esc/images/CloseButton.gif b/dogtag/common-ui/shared/esc/images/CloseButton.gif
index f0a8230a1..f0a8230a1 100755
--- a/dogtag/tps-ui/shared/docroot/esc/images/CloseButton.gif
+++ b/dogtag/common-ui/shared/esc/images/CloseButton.gif
diff --git a/dogtag/tps-ui/shared/docroot/esc/images/ContinueButton.gif b/dogtag/common-ui/shared/esc/images/ContinueButton.gif
index 3a6867258..3a6867258 100755
--- a/dogtag/tps-ui/shared/docroot/esc/images/ContinueButton.gif
+++ b/dogtag/common-ui/shared/esc/images/ContinueButton.gif
diff --git a/dogtag/tps-ui/shared/docroot/esc/images/HelpButton.gif b/dogtag/common-ui/shared/esc/images/HelpButton.gif
index 43e55dce2..43e55dce2 100755
--- a/dogtag/tps-ui/shared/docroot/esc/images/HelpButton.gif
+++ b/dogtag/common-ui/shared/esc/images/HelpButton.gif
diff --git a/dogtag/tps-ui/shared/docroot/esc/images/NetKey-Small.gif b/dogtag/common-ui/shared/esc/images/NetKey-Small.gif
index 6fed0d5ce..6fed0d5ce 100755
--- a/dogtag/tps-ui/shared/docroot/esc/images/NetKey-Small.gif
+++ b/dogtag/common-ui/shared/esc/images/NetKey-Small.gif
diff --git a/dogtag/tps-ui/shared/docroot/esc/images/NetKeyInsert.gif b/dogtag/common-ui/shared/esc/images/NetKeyInsert.gif
index 4fb74b2b7..4fb74b2b7 100755
--- a/dogtag/tps-ui/shared/docroot/esc/images/NetKeyInsert.gif
+++ b/dogtag/common-ui/shared/esc/images/NetKeyInsert.gif
diff --git a/dogtag/tps-ui/shared/docroot/esc/images/NetKeyLogo.gif b/dogtag/common-ui/shared/esc/images/NetKeyLogo.gif
index 53af00410..53af00410 100755
--- a/dogtag/tps-ui/shared/docroot/esc/images/NetKeyLogo.gif
+++ b/dogtag/common-ui/shared/esc/images/NetKeyLogo.gif
diff --git a/dogtag/tps-ui/shared/docroot/esc/images/NetKeyPair.gif b/dogtag/common-ui/shared/esc/images/NetKeyPair.gif
index b1ff91b5e..b1ff91b5e 100755
--- a/dogtag/tps-ui/shared/docroot/esc/images/NetKeyPair.gif
+++ b/dogtag/common-ui/shared/esc/images/NetKeyPair.gif
diff --git a/dogtag/tps-ui/shared/docroot/esc/images/NetKeyProgress.gif b/dogtag/common-ui/shared/esc/images/NetKeyProgress.gif
index aaadf358f..aaadf358f 100755
--- a/dogtag/tps-ui/shared/docroot/esc/images/NetKeyProgress.gif
+++ b/dogtag/common-ui/shared/esc/images/NetKeyProgress.gif
diff --git a/dogtag/tps-ui/shared/docroot/esc/images/NetKeyQuestionMark.gif b/dogtag/common-ui/shared/esc/images/NetKeyQuestionMark.gif
index b12a77908..b12a77908 100755
--- a/dogtag/tps-ui/shared/docroot/esc/images/NetKeyQuestionMark.gif
+++ b/dogtag/common-ui/shared/esc/images/NetKeyQuestionMark.gif
diff --git a/dogtag/tps-ui/shared/docroot/esc/images/OKButton.gif b/dogtag/common-ui/shared/esc/images/OKButton.gif
index 64d69e440..64d69e440 100755
--- a/dogtag/tps-ui/shared/docroot/esc/images/OKButton.gif
+++ b/dogtag/common-ui/shared/esc/images/OKButton.gif
diff --git a/dogtag/tps-ui/shared/docroot/esc/images/PadLock.gif b/dogtag/common-ui/shared/esc/images/PadLock.gif
index 5e4e044c8..5e4e044c8 100755
--- a/dogtag/tps-ui/shared/docroot/esc/images/PadLock.gif
+++ b/dogtag/common-ui/shared/esc/images/PadLock.gif
diff --git a/dogtag/tps-ui/shared/docroot/esc/images/PurchaseButton.gif b/dogtag/common-ui/shared/esc/images/PurchaseButton.gif
index beb0dacab..beb0dacab 100755
--- a/dogtag/tps-ui/shared/docroot/esc/images/PurchaseButton.gif
+++ b/dogtag/common-ui/shared/esc/images/PurchaseButton.gif
diff --git a/dogtag/tps-ui/shared/docroot/esc/images/ReactivateButton.gif b/dogtag/common-ui/shared/esc/images/ReactivateButton.gif
index 86de2eb68..86de2eb68 100755
--- a/dogtag/tps-ui/shared/docroot/esc/images/ReactivateButton.gif
+++ b/dogtag/common-ui/shared/esc/images/ReactivateButton.gif
diff --git a/dogtag/tps-ui/shared/docroot/esc/images/ReleaseButton.gif b/dogtag/common-ui/shared/esc/images/ReleaseButton.gif
index 7ab79be8c..7ab79be8c 100755
--- a/dogtag/tps-ui/shared/docroot/esc/images/ReleaseButton.gif
+++ b/dogtag/common-ui/shared/esc/images/ReleaseButton.gif
diff --git a/dogtag/tps-ui/shared/docroot/esc/images/SecureButton.gif b/dogtag/common-ui/shared/esc/images/SecureButton.gif
index fc37f2a77..fc37f2a77 100755
--- a/dogtag/tps-ui/shared/docroot/esc/images/SecureButton.gif
+++ b/dogtag/common-ui/shared/esc/images/SecureButton.gif
diff --git a/dogtag/tps-ui/shared/docroot/esc/images/SuspendButton.gif b/dogtag/common-ui/shared/esc/images/SuspendButton.gif
index 24ac0337a..24ac0337a 100755
--- a/dogtag/tps-ui/shared/docroot/esc/images/SuspendButton.gif
+++ b/dogtag/common-ui/shared/esc/images/SuspendButton.gif
diff --git a/dogtag/tps-ui/shared/docroot/esc/images/TryAgainButton.gif b/dogtag/common-ui/shared/esc/images/TryAgainButton.gif
index e71934677..e71934677 100755
--- a/dogtag/tps-ui/shared/docroot/esc/images/TryAgainButton.gif
+++ b/dogtag/common-ui/shared/esc/images/TryAgainButton.gif
diff --git a/dogtag/tps-ui/shared/docroot/esc/images/bg.jpg b/dogtag/common-ui/shared/esc/images/bg.jpg
index 56a4af048..56a4af048 100755
--- a/dogtag/tps-ui/shared/docroot/esc/images/bg.jpg
+++ b/dogtag/common-ui/shared/esc/images/bg.jpg
diff --git a/dogtag/tps-ui/shared/docroot/esc/images/logo.gif b/dogtag/common-ui/shared/esc/images/logo.gif
index 2d1ea5579..2d1ea5579 100644
--- a/dogtag/tps-ui/shared/docroot/esc/images/logo.gif
+++ b/dogtag/common-ui/shared/esc/images/logo.gif
diff --git a/dogtag/tps-ui/shared/docroot/esc/so/images/indicator.gif b/dogtag/common-ui/shared/esc/so/images/indicator.gif
index 5dafb9cb7..5dafb9cb7 100755
--- a/dogtag/tps-ui/shared/docroot/esc/so/images/indicator.gif
+++ b/dogtag/common-ui/shared/esc/so/images/indicator.gif
diff --git a/dogtag/tps-ui/shared/docroot/esc/so/images/logo.gif b/dogtag/common-ui/shared/esc/so/images/logo.gif
index 2d1ea5579..2d1ea5579 100755
--- a/dogtag/tps-ui/shared/docroot/esc/so/images/logo.gif
+++ b/dogtag/common-ui/shared/esc/so/images/logo.gif
diff --git a/dogtag/tps-ui/shared/docroot/esc/so/logo.jpg b/dogtag/common-ui/shared/esc/so/logo.jpg
index 7cb31affc..7cb31affc 100644
--- a/dogtag/tps-ui/shared/docroot/esc/so/logo.jpg
+++ b/dogtag/common-ui/shared/esc/so/logo.jpg
diff --git a/dogtag/tps-ui/shared/docroot/esc/sow/images/indicator.gif b/dogtag/common-ui/shared/esc/sow/images/indicator.gif
index 5dafb9cb7..5dafb9cb7 100755
--- a/dogtag/tps-ui/shared/docroot/esc/sow/images/indicator.gif
+++ b/dogtag/common-ui/shared/esc/sow/images/indicator.gif
diff --git a/dogtag/tps-ui/shared/docroot/esc/sow/images/logo.gif b/dogtag/common-ui/shared/esc/sow/images/logo.gif
index 2d1ea5579..2d1ea5579 100644
--- a/dogtag/tps-ui/shared/docroot/esc/sow/images/logo.gif
+++ b/dogtag/common-ui/shared/esc/sow/images/logo.gif
diff --git a/dogtag/tps-ui/shared/docroot/esc/sow/logo.jpg b/dogtag/common-ui/shared/esc/sow/logo.jpg
index 7cb31affc..7cb31affc 100644
--- a/dogtag/tps-ui/shared/docroot/esc/sow/logo.jpg
+++ b/dogtag/common-ui/shared/esc/sow/logo.jpg
diff --git a/dogtag/tps-ui/shared/cgi-bin/demo/Enroll.html b/dogtag/tps-ui/shared/cgi-bin/demo/Enroll.html
index d366f1a85..df00dbee4 100755
--- a/dogtag/tps-ui/shared/cgi-bin/demo/Enroll.html
+++ b/dogtag/tps-ui/shared/cgi-bin/demo/Enroll.html
@@ -31,7 +31,7 @@
 <table width="100%" class="logobar">
   <tr>
     <td>
-<img alt="" src="/demo/logo.jpg">
+<img alt="" src="/pki/esc/demo/logo.jpg">
     </td>
     <td>
       <p class="headerText">Veracify Investments Smartcard Enrollment</p>
diff --git a/dogtag/tps-ui/shared/cgi-bin/home/Enroll.html b/dogtag/tps-ui/shared/cgi-bin/home/Enroll.html
index daa5fead8..218da280c 100755
--- a/dogtag/tps-ui/shared/cgi-bin/home/Enroll.html
+++ b/dogtag/tps-ui/shared/cgi-bin/home/Enroll.html
@@ -30,7 +30,7 @@
 <table width="100%" class="logobar">
   <tr>
     <td>
-<img alt="" src="/home/logo.jpg">
+<img alt="" src="/pki/esc/home/logo.jpg">
     </td>
     <td>
       <p class="headerText">Smartcard Enrollment</p>
diff --git a/dogtag/tps-ui/shared/cgi-bin/so/Enroll.html b/dogtag/tps-ui/shared/cgi-bin/so/Enroll.html
index c35a53008..3d2fa6daa 100755
--- a/dogtag/tps-ui/shared/cgi-bin/so/Enroll.html
+++ b/dogtag/tps-ui/shared/cgi-bin/so/Enroll.html
@@ -81,7 +81,7 @@ function UserOnCOOLKeyStatusUpdate(data)
 <table width="100%" class="logobar">
   <tr>
     <td>
-<!--<img alt="" src="/esc/so/images/logo.gif"> -->
+<!--<img alt="" src="/pki/esc/so/images/logo.gif"> -->
     </td>
     <td align = "center">
       <p class="headerText">Security Officer Enrollment</p>
@@ -123,7 +123,7 @@ function UserOnCOOLKeyStatusUpdate(data)
     </table>
     <br>
     <div id="ajax-pb" style="display:none;">
-       <img src="/esc/so/images/indicator.gif">
+       <img src="/pki/esc/so/images/indicator.gif">
        <h2 id="progress" name="progress" value="0%" ></h2>
     </table>
     </div>
diff --git a/dogtag/tps-ui/shared/cgi-bin/sow/enroll.html b/dogtag/tps-ui/shared/cgi-bin/sow/enroll.html
index 673035aeb..7bc377ffe 100755
--- a/dogtag/tps-ui/shared/cgi-bin/sow/enroll.html
+++ b/dogtag/tps-ui/shared/cgi-bin/sow/enroll.html
@@ -243,7 +243,7 @@ function onUserKeyUp(e)
       <tr>
 <td>
 <div id="ajax-pb" style="display:none;">
-  <img src="/esc/sow/images/indicator.gif">
+  <img src="/pki/esc/sow/images/indicator.gif">
   <h2 id="progress" name="progress" value="0%" ></h2>
   </table>
 
diff --git a/dogtag/tps-ui/shared/cgi-bin/sow/enroll_temp.html b/dogtag/tps-ui/shared/cgi-bin/sow/enroll_temp.html
index caa83fa19..3f2b31ce6 100755
--- a/dogtag/tps-ui/shared/cgi-bin/sow/enroll_temp.html
+++ b/dogtag/tps-ui/shared/cgi-bin/sow/enroll_temp.html
@@ -216,7 +216,7 @@ function toggleButton(id, i)
       <tr>
 <td>
 <div id="ajax-pb" style="display:none;">
-  <img src="/esc/sow/images/indicator.gif">
+  <img src="/pki/esc/sow/images/indicator.gif">
   <h2 id="progress" name="progress" value="0%" ></h2>
 </div>
 </td>
diff --git a/dogtag/tps-ui/shared/cgi-bin/sow/format.html b/dogtag/tps-ui/shared/cgi-bin/sow/format.html
index 372737c7f..3af35589b 100755
--- a/dogtag/tps-ui/shared/cgi-bin/sow/format.html
+++ b/dogtag/tps-ui/shared/cgi-bin/sow/format.html
@@ -221,7 +221,7 @@ function toggleButton(id, i)
       <tr>
 <td>
 <div id="ajax-pb" style="display:none;">
-  <img src="/esc/sow/images/indicator.gif">
+  <img src="/pki/esc/sow/images/indicator.gif">
   <h2 id="progress" name="progress" value="0%" ></h2>
 </div>
 </td>
diff --git a/dogtag/tps-ui/shared/cgi-bin/sow/formatso.html b/dogtag/tps-ui/shared/cgi-bin/sow/formatso.html
index 89038b4d1..d09666c5a 100755
--- a/dogtag/tps-ui/shared/cgi-bin/sow/formatso.html
+++ b/dogtag/tps-ui/shared/cgi-bin/sow/formatso.html
@@ -171,7 +171,7 @@ function toggleButton(id, i)
       <tr>
 <td>
 <div id="ajax-pb" style="display:none;">
-  <img src="/esc/sow/images/indicator.gif">
+  <img src="/pki/esc/sow/images/indicator.gif">
   <h2 id="progress" name="progress" value="0%" ></h2>
 </div>
 </td>
diff --git a/dogtag/tps-ui/shared/cgi-bin/sow/seturl.html b/dogtag/tps-ui/shared/cgi-bin/sow/seturl.html
index 3a25380b1..966ab7a1b 100755
--- a/dogtag/tps-ui/shared/cgi-bin/sow/seturl.html
+++ b/dogtag/tps-ui/shared/cgi-bin/sow/seturl.html
@@ -159,7 +159,7 @@ function toggleButton(id, i)
       <tr>
 <td>
 <div id="ajax-pb" style="display:none;">
-  <img src="/esc/sow/images/indicator.gif">
+  <img src="/pki/esc/sow/images/indicator.gif">
   <h2 id="progress" name="progress" value="0%" ></h2>
 </div>
 </td>
diff --git a/dogtag/tps-ui/shared/docroot/esc/AdminEsc.html b/dogtag/tps-ui/shared/docroot/esc/AdminEsc.html
index 4b2e0ba3b..3fd72c4c8 100755
--- a/dogtag/tps-ui/shared/docroot/esc/AdminEsc.html
+++ b/dogtag/tps-ui/shared/docroot/esc/AdminEsc.html
@@ -28,7 +28,7 @@
 <table width="100%">
   <tr>
     <td>
-<img src="../images/logo.gif">     </td>
+<img src="/pki/esc/images/logo.gif">     </td>
     <td>
       <p class="headerText"><a href="esc.cgi?screenname=">Enterprise Security Client</a></p>
     </td>
diff --git a/dogtag/tps-ui/shared/docroot/esc/AdvancePopup.html b/dogtag/tps-ui/shared/docroot/esc/AdvancePopup.html
index ba2767509..c91889044 100755
--- a/dogtag/tps-ui/shared/docroot/esc/AdvancePopup.html
+++ b/dogtag/tps-ui/shared/docroot/esc/AdvancePopup.html
@@ -1634,7 +1634,7 @@ function refresh()
 <table width="100%">
   <tr>
     <td>
-<img src="../images/logo.gif">     </td>
+<img src="/pki/esc/images/logo.gif">     </td>
     <td>
       <p class="headerText"><a href="esc.cgi?screenname=">Enterprise Security Client</a></p>
     </td>
diff --git a/dogtag/tps-ui/shared/docroot/esc/EnrollPopup.html b/dogtag/tps-ui/shared/docroot/esc/EnrollPopup.html
index fe3b0fdd0..ead7db355 100755
--- a/dogtag/tps-ui/shared/docroot/esc/EnrollPopup.html
+++ b/dogtag/tps-ui/shared/docroot/esc/EnrollPopup.html
@@ -1643,7 +1643,7 @@ function refresh()
 <table width="100%">
   <tr>
     <td>
-<img src="../images/logo.gif">
+<img src="/pki/esc/images/logo.gif">
     </td>
     <td>
       <p class="headerText"><a href="esc.cgi?screenname=">Enterprise Security Client</a></p>
diff --git a/dogtag/tps-ui/shared/docroot/esc/GenericAuth.html b/dogtag/tps-ui/shared/docroot/esc/GenericAuth.html
index 7891a0cc3..dc8b88e3f 100755
--- a/dogtag/tps-ui/shared/docroot/esc/GenericAuth.html
+++ b/dogtag/tps-ui/shared/docroot/esc/GenericAuth.html
@@ -20,7 +20,7 @@
 <style>
 
 body {
-background: #ffffff url(../images/bg.jpg) repeat-x;
+background: #ffffff url(/pki/esc/images/bg.jpg) repeat-x;
         font-family: arial;
         font-size: 7pt;
 
diff --git a/dogtag/tps-ui/shared/docroot/esc/SettingsEsc.html b/dogtag/tps-ui/shared/docroot/esc/SettingsEsc.html
index 328df5792..0340ee64c 100755
--- a/dogtag/tps-ui/shared/docroot/esc/SettingsEsc.html
+++ b/dogtag/tps-ui/shared/docroot/esc/SettingsEsc.html
@@ -383,7 +383,7 @@ function CreateTableRow(table, keyType, keyID, isAvailable, label, isSecured)
   if (! isAvailable)
     a.style.visibility = "hidden";
   var img = document.createElement("img");
-  img.setAttribute("src", "../images/NetKey-Small.gif");
+  img.setAttribute("src", "/pki/esc/images/NetKey-Small.gif");
   a.appendChild(img);
   cell.appendChild(a);
 
@@ -413,7 +413,7 @@ function CreateTableRow(table, keyType, keyID, isAvailable, label, isSecured)
   cell = InsertCell(row);
   cell.setAttribute("align", "center");
   img = document.createElement("img");
-  img.setAttribute("src", "../images/PadLock.gif");
+  img.setAttribute("src", "/pki/esc/images/PadLock.gif");
   if (!isSecured)
   img.style.visibility = "hidden";
   cell.appendChild(img);
@@ -691,7 +691,7 @@ function OnCOOLKeyStateChange(keyType, keyID, keyState, data)
 <table width="100%">
   <tr>
     <td>
-<img src="../images/logo.gif">     </td>
+<img src="/pki/esc/images/logo.gif">     </td>
     <td>
       <p class="headerText"><a href="esc.cgi?screenname=">Enterprise Security Client</a></p>
     </td>
diff --git a/dogtag/tps-ui/shared/docroot/esc/TokenManager.html b/dogtag/tps-ui/shared/docroot/esc/TokenManager.html
index 8538316d4..fcd6beec9 100755
--- a/dogtag/tps-ui/shared/docroot/esc/TokenManager.html
+++ b/dogtag/tps-ui/shared/docroot/esc/TokenManager.html
@@ -1639,7 +1639,7 @@ function refresh()
 <table width="100%">
   <tr>
     <td>
-<img src="../images/logo.gif">     </td>
+<img src="/pki/esc/images/logo.gif">     </td>
     <td>
       <p class="headerText"><a href="esc.cgi?screenname=">Enterprise Security Client</a></p>
     </td>
diff --git a/dogtag/tps-ui/shared/docroot/esc/demo/EnrollSuccess.html b/dogtag/tps-ui/shared/docroot/esc/demo/EnrollSuccess.html
index bcd3e34d0..2a9d2b386 100644
--- a/dogtag/tps-ui/shared/docroot/esc/demo/EnrollSuccess.html
+++ b/dogtag/tps-ui/shared/docroot/esc/demo/EnrollSuccess.html
@@ -26,7 +26,7 @@
 <body  leftmargin="0" topmargin="0" marginwidth="0" marginheight="0">
 <table width="100%" border="0" cellspacing="0" cellpadding="0" class="logobar">
   <tr> 
-    <td bgcolor="#000000">&nbsp;&nbsp;&nbsp;<img src="/demo/logo.jpg" width="250" height="50"></td>
+    <td bgcolor="#000000">&nbsp;&nbsp;&nbsp;<img src="/pki/esc/demo/logo.jpg" width="250" height="50"></td>
   </tr>
 </table>
 
diff --git a/dogtag/tps-ui/shared/docroot/esc/demo/GenericAuth.html b/dogtag/tps-ui/shared/docroot/esc/demo/GenericAuth.html
index 38ccd3262..dad83a001 100755
--- a/dogtag/tps-ui/shared/docroot/esc/demo/GenericAuth.html
+++ b/dogtag/tps-ui/shared/docroot/esc/demo/GenericAuth.html
@@ -21,7 +21,7 @@
 <style>
 
 body {
-background: #ffffff url(../images/bg.jpg) repeat-x;
+background: #ffffff url(/pki/esc/images/bg.jpg) repeat-x;
         font-family: arial;
         font-size: 7pt;
 
diff --git a/dogtag/tps-ui/shared/docroot/esc/home/EnrollSuccess.html b/dogtag/tps-ui/shared/docroot/esc/home/EnrollSuccess.html
index 0148daba9..fbe8d241f 100644
--- a/dogtag/tps-ui/shared/docroot/esc/home/EnrollSuccess.html
+++ b/dogtag/tps-ui/shared/docroot/esc/home/EnrollSuccess.html
@@ -26,7 +26,7 @@
 <body  leftmargin="0" topmargin="0" marginwidth="0" marginheight="0">
 <table width="100%" border="0" cellspacing="0" cellpadding="0" class="logobar">
   <tr> 
-    <td bgcolor="#000000">&nbsp;&nbsp;&nbsp;<img src="/esc/home/logo.jpg" width="250" height="50"></td>
+    <td bgcolor="#000000">&nbsp;&nbsp;&nbsp;<img src="/pki/esc/home/logo.jpg" width="250" height="50"></td>
   </tr>
 </table>
 
diff --git a/dogtag/tps-ui/shared/docroot/esc/home/GenericAuth.html b/dogtag/tps-ui/shared/docroot/esc/home/GenericAuth.html
index 9b28a1145..219f9a6ad 100755
--- a/dogtag/tps-ui/shared/docroot/esc/home/GenericAuth.html
+++ b/dogtag/tps-ui/shared/docroot/esc/home/GenericAuth.html
@@ -22,7 +22,7 @@
 <style>
 
 body {
-background: #ffffff url(../images/bg.jpg) repeat-x;
+background: #ffffff url(/pki/esc/images/bg.jpg) repeat-x;
         font-family: arial;
         font-size: 7pt;
 
diff --git a/dogtag/tps-ui/shared/docroot/esc/so/EnrollSuccess.html b/dogtag/tps-ui/shared/docroot/esc/so/EnrollSuccess.html
index aa2cd7907..9ed0cebee 100644
--- a/dogtag/tps-ui/shared/docroot/esc/so/EnrollSuccess.html
+++ b/dogtag/tps-ui/shared/docroot/esc/so/EnrollSuccess.html
@@ -26,7 +26,7 @@
 <body  leftmargin="0" topmargin="0" marginwidth="0" marginheight="0">
 <div id="header">
   <div id="logo">
-      <center><h3><!--<img align=bottom src="/esc/sow/images/logo.gif">-->Security Officer Station</h3></center>
+      <center><h3><!--<img align=bottom src="/pki/esc/sow/images/logo.gif">-->Security Officer Station</h3></center>
   </div>
 </div>
 
diff --git a/dogtag/tps-ui/shared/docroot/esc/so/GenericAuth.html b/dogtag/tps-ui/shared/docroot/esc/so/GenericAuth.html
index 9b28a1145..219f9a6ad 100755
--- a/dogtag/tps-ui/shared/docroot/esc/so/GenericAuth.html
+++ b/dogtag/tps-ui/shared/docroot/esc/so/GenericAuth.html
@@ -22,7 +22,7 @@
 <style>
 
 body {
-background: #ffffff url(../images/bg.jpg) repeat-x;
+background: #ffffff url(/pki/esc/images/bg.jpg) repeat-x;
         font-family: arial;
         font-size: 7pt;
 
diff --git a/dogtag/tps-ui/shared/docroot/esc/sow/EnrollSuccess.html b/dogtag/tps-ui/shared/docroot/esc/sow/EnrollSuccess.html
index 544cb2fb9..478819213 100644
--- a/dogtag/tps-ui/shared/docroot/esc/sow/EnrollSuccess.html
+++ b/dogtag/tps-ui/shared/docroot/esc/sow/EnrollSuccess.html
@@ -29,7 +29,7 @@
 
 <div id="header">
   <div id="logo">
-      <center><h3><!--<img align=bottom src="/esc/sow/images/logo.gif">-->Security Officer Station</h3></center>
+      <center><h3><!--<img align=bottom src="/pki/esc/sow/images/logo.gif">-->Security Officer Station</h3></center>
   </div>
 </div>
 
diff --git a/dogtag/tps-ui/shared/docroot/esc/sow/GenericAuth.html b/dogtag/tps-ui/shared/docroot/esc/sow/GenericAuth.html
index 9b28a1145..219f9a6ad 100755
--- a/dogtag/tps-ui/shared/docroot/esc/sow/GenericAuth.html
+++ b/dogtag/tps-ui/shared/docroot/esc/sow/GenericAuth.html
@@ -22,7 +22,7 @@
 <style>
 
 body {
-background: #ffffff url(../images/bg.jpg) repeat-x;
+background: #ffffff url(/pki/esc/images/bg.jpg) repeat-x;
         font-family: arial;
         font-size: 7pt;
 
diff --git a/dogtag/tps-ui/shared/docroot/esc/style.css b/dogtag/tps-ui/shared/docroot/esc/style.css
index 83098a440..90a1358df 100755
--- a/dogtag/tps-ui/shared/docroot/esc/style.css
+++ b/dogtag/tps-ui/shared/docroot/esc/style.css
@@ -18,7 +18,7 @@
  */
 
 body {
-background: #ffffff url(../images/bg.jpg) repeat-x;
+background: #ffffff url(/pki/esc/images/bg.jpg) repeat-x;
         font-family: arial;
         font-size: 7p