summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEndi Sukma Dewata <edewata@redhat.com>2012-11-08 16:48:14 -0500
committerEndi Sukma Dewata <edewata@redhat.com>2012-11-11 09:56:31 -0500
commit105ffbd1b5e81c8a27994d5f581eb41b6ed8b952 (patch)
treede7bd485ef1d0d263536703e6125fb9383ff3dd2
parent545b79610df609cdefa58322422dec582bbb0af9 (diff)
downloadpki-105ffbd1b5e81c8a27994d5f581eb41b6ed8b952.zip
pki-105ffbd1b5e81c8a27994d5f581eb41b6ed8b952.tar.gz
pki-105ffbd1b5e81c8a27994d5f581eb41b6ed8b952.tar.xz
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
-rwxr-xr-xbase/setup/pkicreate8
-rw-r--r--dogtag/common-ui/shared/esc/demo/logo.jpg (renamed from dogtag/tps-ui/shared/docroot/esc/demo/logo.jpg)bin429 -> 429 bytes
-rw-r--r--dogtag/common-ui/shared/esc/home/logo.jpg (renamed from dogtag/tps-ui/shared/docroot/esc/home/logo.jpg)bin429 -> 429 bytes
-rwxr-xr-xdogtag/common-ui/shared/esc/images/BannerBackground.gif (renamed from dogtag/tps-ui/shared/docroot/esc/images/BannerBackground.gif)bin335 -> 335 bytes
-rwxr-xr-xdogtag/common-ui/shared/esc/images/CancelButton.gif (renamed from dogtag/tps-ui/shared/docroot/esc/images/CancelButton.gif)bin1337 -> 1337 bytes
-rwxr-xr-xdogtag/common-ui/shared/esc/images/CloseButton.gif (renamed from dogtag/tps-ui/shared/docroot/esc/images/CloseButton.gif)bin1309 -> 1309 bytes
-rwxr-xr-xdogtag/common-ui/shared/esc/images/ContinueButton.gif (renamed from dogtag/tps-ui/shared/docroot/esc/images/ContinueButton.gif)bin1457 -> 1457 bytes
-rwxr-xr-xdogtag/common-ui/shared/esc/images/HelpButton.gif (renamed from dogtag/tps-ui/shared/docroot/esc/images/HelpButton.gif)bin1279 -> 1279 bytes
-rwxr-xr-xdogtag/common-ui/shared/esc/images/NetKey-Small.gif (renamed from dogtag/tps-ui/shared/docroot/esc/images/NetKey-Small.gif)bin135 -> 135 bytes
-rwxr-xr-xdogtag/common-ui/shared/esc/images/NetKeyInsert.gif (renamed from dogtag/tps-ui/shared/docroot/esc/images/NetKeyInsert.gif)bin1622 -> 1622 bytes
-rwxr-xr-xdogtag/common-ui/shared/esc/images/NetKeyLogo.gif (renamed from dogtag/tps-ui/shared/docroot/esc/images/NetKeyLogo.gif)bin426 -> 426 bytes
-rwxr-xr-xdogtag/common-ui/shared/esc/images/NetKeyPair.gif (renamed from dogtag/tps-ui/shared/docroot/esc/images/NetKeyPair.gif)bin1451 -> 1451 bytes
-rwxr-xr-xdogtag/common-ui/shared/esc/images/NetKeyProgress.gif (renamed from dogtag/tps-ui/shared/docroot/esc/images/NetKeyProgress.gif)bin7018 -> 7018 bytes
-rwxr-xr-xdogtag/common-ui/shared/esc/images/NetKeyQuestionMark.gif (renamed from dogtag/tps-ui/shared/docroot/esc/images/NetKeyQuestionMark.gif)bin1707 -> 1707 bytes
-rwxr-xr-xdogtag/common-ui/shared/esc/images/OKButton.gif (renamed from dogtag/tps-ui/shared/docroot/esc/images/OKButton.gif)bin1237 -> 1237 bytes
-rwxr-xr-xdogtag/common-ui/shared/esc/images/PadLock.gif (renamed from dogtag/tps-ui/shared/docroot/esc/images/PadLock.gif)bin136 -> 136 bytes
-rwxr-xr-xdogtag/common-ui/shared/esc/images/PurchaseButton.gif (renamed from dogtag/tps-ui/shared/docroot/esc/images/PurchaseButton.gif)bin1878 -> 1878 bytes
-rwxr-xr-xdogtag/common-ui/shared/esc/images/ReactivateButton.gif (renamed from dogtag/tps-ui/shared/docroot/esc/images/ReactivateButton.gif)bin1482 -> 1482 bytes
-rwxr-xr-xdogtag/common-ui/shared/esc/images/ReleaseButton.gif (renamed from dogtag/tps-ui/shared/docroot/esc/images/ReleaseButton.gif)bin1413 -> 1413 bytes
-rwxr-xr-xdogtag/common-ui/shared/esc/images/SecureButton.gif (renamed from dogtag/tps-ui/shared/docroot/esc/images/SecureButton.gif)bin1340 -> 1340 bytes
-rwxr-xr-xdogtag/common-ui/shared/esc/images/SuspendButton.gif (renamed from dogtag/tps-ui/shared/docroot/esc/images/SuspendButton.gif)bin1425 -> 1425 bytes
-rwxr-xr-xdogtag/common-ui/shared/esc/images/TryAgainButton.gif (renamed from dogtag/tps-ui/shared/docroot/esc/images/TryAgainButton.gif)bin1441 -> 1441 bytes
-rwxr-xr-xdogtag/common-ui/shared/esc/images/bg.jpg (renamed from dogtag/tps-ui/shared/docroot/esc/images/bg.jpg)bin519 -> 519 bytes
-rw-r--r--dogtag/common-ui/shared/esc/images/logo.gif (renamed from dogtag/tps-ui/shared/docroot/esc/images/logo.gif)bin2866 -> 2866 bytes
-rwxr-xr-xdogtag/common-ui/shared/esc/so/images/indicator.gif (renamed from dogtag/tps-ui/shared/docroot/esc/so/images/indicator.gif)bin701 -> 701 bytes
-rwxr-xr-xdogtag/common-ui/shared/esc/so/images/logo.gif (renamed from dogtag/tps-ui/shared/docroot/esc/so/images/logo.gif)bin2866 -> 2866 bytes
-rw-r--r--dogtag/common-ui/shared/esc/so/logo.jpg (renamed from dogtag/tps-ui/shared/docroot/esc/so/logo.jpg)bin429 -> 429 bytes
-rwxr-xr-xdogtag/common-ui/shared/esc/sow/images/indicator.gif (renamed from dogtag/tps-ui/shared/docroot/esc/sow/images/indicator.gif)bin701 -> 701 bytes
-rw-r--r--dogtag/common-ui/shared/esc/sow/images/logo.gif (renamed from dogtag/tps-ui/shared/docroot/esc/sow/images/logo.gif)bin2866 -> 2866 bytes
-rw-r--r--dogtag/common-ui/shared/esc/sow/logo.jpg (renamed from dogtag/tps-ui/shared/docroot/esc/sow/logo.jpg)bin429 -> 429 bytes
-rwxr-xr-xdogtag/tps-ui/shared/cgi-bin/demo/Enroll.html2
-rwxr-xr-xdogtag/tps-ui/shared/cgi-bin/home/Enroll.html2
-rwxr-xr-xdogtag/tps-ui/shared/cgi-bin/so/Enroll.html4
-rwxr-xr-xdogtag/tps-ui/shared/cgi-bin/sow/enroll.html2
-rwxr-xr-xdogtag/tps-ui/shared/cgi-bin/sow/enroll_temp.html2
-rwxr-xr-xdogtag/tps-ui/shared/cgi-bin/sow/format.html2
-rwxr-xr-xdogtag/tps-ui/shared/cgi-bin/sow/formatso.html2
-rwxr-xr-xdogtag/tps-ui/shared/cgi-bin/sow/seturl.html2
-rwxr-xr-xdogtag/tps-ui/shared/docroot/esc/AdminEsc.html2
-rwxr-xr-xdogtag/tps-ui/shared/docroot/esc/AdvancePopup.html2
-rwxr-xr-xdogtag/tps-ui/shared/docroot/esc/EnrollPopup.html2
-rwxr-xr-xdogtag/tps-ui/shared/docroot/esc/GenericAuth.html2
-rwxr-xr-xdogtag/tps-ui/shared/docroot/esc/SettingsEsc.html6
-rwxr-xr-xdogtag/tps-ui/shared/docroot/esc/TokenManager.html2
-rw-r--r--dogtag/tps-ui/shared/docroot/esc/demo/EnrollSuccess.html2
-rwxr-xr-xdogtag/tps-ui/shared/docroot/esc/demo/GenericAuth.html2
-rw-r--r--dogtag/tps-ui/shared/docroot/esc/home/EnrollSuccess.html2
-rwxr-xr-xdogtag/tps-ui/shared/docroot/esc/home/GenericAuth.html2
-rw-r--r--dogtag/tps-ui/shared/docroot/esc/so/EnrollSuccess.html2
-rwxr-xr-xdogtag/tps-ui/shared/docroot/esc/so/GenericAuth.html2
-rw-r--r--dogtag/tps-ui/shared/docroot/esc/sow/EnrollSuccess.html2
-rwxr-xr-xdogtag/tps-ui/shared/docroot/esc/sow/GenericAuth.html2
-rwxr-xr-xdogtag/tps-ui/shared/docroot/esc/style.css2
53 files changed, 34 insertions, 26 deletions
diff --git a/base/setup/pkicreate b/base/setup/pkicreate
index ac037f0..6b503fe 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 7cb31af..7cb31af 100644
--- a/dogtag/tps-ui/shared/docroot/esc/demo/logo.jpg
+++ b/dogtag/common-ui/shared/esc/demo/logo.jpg
Binary files differ
diff --git a/dogtag/tps-ui/shared/docroot/esc/home/logo.jpg b/dogtag/common-ui/shared/esc/home/logo.jpg
index 7cb31af..7cb31af 100644
--- a/dogtag/tps-ui/shared/docroot/esc/home/logo.jpg
+++ b/dogtag/common-ui/shared/esc/home/logo.jpg
Binary files differ
diff --git a/dogtag/tps-ui/shared/docroot/esc/images/BannerBackground.gif b/dogtag/common-ui/shared/esc/images/BannerBackground.gif
index 55d41f6..55d41f6 100755
--- a/dogtag/tps-ui/shared/docroot/esc/images/BannerBackground.gif
+++ b/dogtag/common-ui/shared/esc/images/BannerBackground.gif
Binary files differ
diff --git a/dogtag/tps-ui/shared/docroot/esc/images/CancelButton.gif b/dogtag/common-ui/shared/esc/images/CancelButton.gif
index 5b2f7e5..5b2f7e5 100755
--- a/dogtag/tps-ui/shared/docroot/esc/images/CancelButton.gif
+++ b/dogtag/common-ui/shared/esc/images/CancelButton.gif
Binary files differ
diff --git a/dogtag/tps-ui/shared/docroot/esc/images/CloseButton.gif b/dogtag/common-ui/shared/esc/images/CloseButton.gif
index f0a8230..f0a8230 100755
--- a/dogtag/tps-ui/shared/docroot/esc/images/CloseButton.gif
+++ b/dogtag/common-ui/shared/esc/images/CloseButton.gif
Binary files differ
diff --git a/dogtag/tps-ui/shared/docroot/esc/images/ContinueButton.gif b/dogtag/common-ui/shared/esc/images/ContinueButton.gif
index 3a68672..3a68672 100755
--- a/dogtag/tps-ui/shared/docroot/esc/images/ContinueButton.gif
+++ b/dogtag/common-ui/shared/esc/images/ContinueButton.gif
Binary files differ
diff --git a/dogtag/tps-ui/shared/docroot/esc/images/HelpButton.gif b/dogtag/common-ui/shared/esc/images/HelpButton.gif
index 43e55dc..43e55dc 100755
--- a/dogtag/tps-ui/shared/docroot/esc/images/HelpButton.gif
+++ b/dogtag/common-ui/shared/esc/images/HelpButton.gif
Binary files differ
diff --git a/dogtag/tps-ui/shared/docroot/esc/images/NetKey-Small.gif b/dogtag/common-ui/shared/esc/images/NetKey-Small.gif
index 6fed0d5..6fed0d5 100755
--- a/dogtag/tps-ui/shared/docroot/esc/images/NetKey-Small.gif
+++ b/dogtag/common-ui/shared/esc/images/NetKey-Small.gif
Binary files differ
diff --git a/dogtag/tps-ui/shared/docroot/esc/images/NetKeyInsert.gif b/dogtag/common-ui/shared/esc/images/NetKeyInsert.gif
index 4fb74b2..4fb74b2 100755
--- a/dogtag/tps-ui/shared/docroot/esc/images/NetKeyInsert.gif
+++ b/dogtag/common-ui/shared/esc/images/NetKeyInsert.gif
Binary files differ
diff --git a/dogtag/tps-ui/shared/docroot/esc/images/NetKeyLogo.gif b/dogtag/common-ui/shared/esc/images/NetKeyLogo.gif
index 53af004..53af004 100755
--- a/dogtag/tps-ui/shared/docroot/esc/images/NetKeyLogo.gif
+++ b/dogtag/common-ui/shared/esc/images/NetKeyLogo.gif
Binary files differ
diff --git a/dogtag/tps-ui/shared/docroot/esc/images/NetKeyPair.gif b/dogtag/common-ui/shared/esc/images/NetKeyPair.gif
index b1ff91b..b1ff91b 100755
--- a/dogtag/tps-ui/shared/docroot/esc/images/NetKeyPair.gif
+++ b/dogtag/common-ui/shared/esc/images/NetKeyPair.gif
Binary files differ
diff --git a/dogtag/tps-ui/shared/docroot/esc/images/NetKeyProgress.gif b/dogtag/common-ui/shared/esc/images/NetKeyProgress.gif
index aaadf35..aaadf35 100755
--- a/dogtag/tps-ui/shared/docroot/esc/images/NetKeyProgress.gif
+++ b/dogtag/common-ui/shared/esc/images/NetKeyProgress.gif
Binary files differ
diff --git a/dogtag/tps-ui/shared/docroot/esc/images/NetKeyQuestionMark.gif b/dogtag/common-ui/shared/esc/images/NetKeyQuestionMark.gif
index b12a779..b12a779 100755
--- a/dogtag/tps-ui/shared/docroot/esc/images/NetKeyQuestionMark.gif
+++ b/dogtag/common-ui/shared/esc/images/NetKeyQuestionMark.gif
Binary files differ
diff --git a/dogtag/tps-ui/shared/docroot/esc/images/OKButton.gif b/dogtag/common-ui/shared/esc/images/OKButton.gif
index 64d69e4..64d69e4 100755
--- a/dogtag/tps-ui/shared/docroot/esc/images/OKButton.gif
+++ b/dogtag/common-ui/shared/esc/images/OKButton.gif
Binary files differ
diff --git a/dogtag/tps-ui/shared/docroot/esc/images/PadLock.gif b/dogtag/common-ui/shared/esc/images/PadLock.gif
index 5e4e044..5e4e044 100755
--- a/dogtag/tps-ui/shared/docroot/esc/images/PadLock.gif
+++ b/dogtag/common-ui/shared/esc/images/PadLock.gif
Binary files differ
diff --git a/dogtag/tps-ui/shared/docroot/esc/images/PurchaseButton.gif b/dogtag/common-ui/shared/esc/images/PurchaseButton.gif
index beb0dac..beb0dac 100755
--- a/dogtag/tps-ui/shared/docroot/esc/images/PurchaseButton.gif
+++ b/dogtag/common-ui/shared/esc/images/PurchaseButton.gif
Binary files differ
diff --git a/dogtag/tps-ui/shared/docroot/esc/images/ReactivateButton.gif b/dogtag/common-ui/shared/esc/images/ReactivateButton.gif
index 86de2eb..86de2eb 100755
--- a/dogtag/tps-ui/shared/docroot/esc/images/ReactivateButton.gif
+++ b/dogtag/common-ui/shared/esc/images/ReactivateButton.gif
Binary files differ
diff --git a/dogtag/tps-ui/shared/docroot/esc/images/ReleaseButton.gif b/dogtag/common-ui/shared/esc/images/ReleaseButton.gif
index 7ab79be..7ab79be 100755
--- a/dogtag/tps-ui/shared/docroot/esc/images/ReleaseButton.gif
+++ b/dogtag/common-ui/shared/esc/images/ReleaseButton.gif
Binary files differ
diff --git a/dogtag/tps-ui/shared/docroot/esc/images/SecureButton.gif b/dogtag/common-ui/shared/esc/images/SecureButton.gif
index fc37f2a..fc37f2a 100755
--- a/dogtag/tps-ui/shared/docroot/esc/images/SecureButton.gif
+++ b/dogtag/common-ui/shared/esc/images/SecureButton.gif
Binary files differ
diff --git a/dogtag/tps-ui/shared/docroot/esc/images/SuspendButton.gif b/dogtag/common-ui/shared/esc/images/SuspendButton.gif
index 24ac033..24ac033 100755
--- a/dogtag/tps-ui/shared/docroot/esc/images/SuspendButton.gif
+++ b/dogtag/common-ui/shared/esc/images/SuspendButton.gif
Binary files differ
diff --git a/dogtag/tps-ui/shared/docroot/esc/images/TryAgainButton.gif b/dogtag/common-ui/shared/esc/images/TryAgainButton.gif
index e719346..e719346 100755
--- a/dogtag/tps-ui/shared/docroot/esc/images/TryAgainButton.gif
+++ b/dogtag/common-ui/shared/esc/images/TryAgainButton.gif
Binary files differ
diff --git a/dogtag/tps-ui/shared/docroot/esc/images/bg.jpg b/dogtag/common-ui/shared/esc/images/bg.jpg
index 56a4af0..56a4af0 100755
--- a/dogtag/tps-ui/shared/docroot/esc/images/bg.jpg
+++ b/dogtag/common-ui/shared/esc/images/bg.jpg
Binary files differ
diff --git a/dogtag/tps-ui/shared/docroot/esc/images/logo.gif b/dogtag/common-ui/shared/esc/images/logo.gif
index 2d1ea55..2d1ea55 100644
--- a/dogtag/tps-ui/shared/docroot/esc/images/logo.gif
+++ b/dogtag/common-ui/shared/esc/images/logo.gif
Binary files differ
diff --git a/dogtag/tps-ui/shared/docroot/esc/so/images/indicator.gif b/dogtag/common-ui/shared/esc/so/images/indicator.gif
index 5dafb9c..5dafb9c 100755
--- a/dogtag/tps-ui/shared/docroot/esc/so/images/indicator.gif
+++ b/dogtag/common-ui/shared/esc/so/images/indicator.gif
Binary files differ
diff --git a/dogtag/tps-ui/shared/docroot/esc/so/images/logo.gif b/dogtag/common-ui/shared/esc/so/images/logo.gif
index 2d1ea55..2d1ea55 100755
--- a/dogtag/tps-ui/shared/docroot/esc/so/images/logo.gif
+++ b/dogtag/common-ui/shared/esc/so/images/logo.gif
Binary files differ
diff --git a/dogtag/tps-ui/shared/docroot/esc/so/logo.jpg b/dogtag/common-ui/shared/esc/so/logo.jpg
index 7cb31af..7cb31af 100644
--- a/dogtag/tps-ui/shared/docroot/esc/so/logo.jpg
+++ b/dogtag/common-ui/shared/esc/so/logo.jpg
Binary files differ
diff --git a/dogtag/tps-ui/shared/docroot/esc/sow/images/indicator.gif b/dogtag/common-ui/shared/esc/sow/images/indicator.gif
index 5dafb9c..5dafb9c 100755
--- a/dogtag/tps-ui/shared/docroot/esc/sow/images/indicator.gif
+++ b/dogtag/common-ui/shared/esc/sow/images/indicator.gif
Binary files differ
diff --git a/dogtag/tps-ui/shared/docroot/esc/sow/images/logo.gif b/dogtag/common-ui/shared/esc/sow/images/logo.gif
index 2d1ea55..2d1ea55 100644
--- a/dogtag/tps-ui/shared/docroot/esc/sow/images/logo.gif
+++ b/dogtag/common-ui/shared/esc/sow/images/logo.gif
Binary files differ
diff --git a/dogtag/tps-ui/shared/docroot/esc/sow/logo.jpg b/dogtag/common-ui/shared/esc/sow/logo.jpg
index 7cb31af..7cb31af 100644
--- a/dogtag/tps-ui/shared/docroot/esc/sow/logo.jpg
+++ b/dogtag/common-ui/shared/esc/sow/logo.jpg
Binary files differ
diff --git a/dogtag/tps-ui/shared/cgi-bin/demo/Enroll.html b/dogtag/tps-ui/shared/cgi-bin/demo/Enroll.html
index d366f1a..df00dbe 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 daa5fea..218da28 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 c35a530..3d2fa6d 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 673035a..7bc377f 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 caa83fa..3f2b31c 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 372737c..3af3558 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 89038b4..d09666c 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 3a25380..966ab7a 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 4b2e0ba..3fd72c4 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 ba27675..c918890 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 fe3b0fd..ead7db3 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 7891a0c..dc8b88e 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 328df57..0340ee6 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 8538316..fcd6bee 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 bcd3e34..2a9d2b3 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 38ccd32..dad83a0 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 0148dab..fbe8d24 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 9b28a11..219f9a6 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 aa2cd79..9ed0ceb 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 9b28a11..219f9a6 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 544cb2f..4788192 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 9b28a11..219f9a6 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 83098a4..90a1358 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