summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorvakwetu <vakwetu@c9f7a03b-bd48-0410-a16d-cbbf54688b0b>2010-11-24 17:19:22 +0000
committervakwetu <vakwetu@c9f7a03b-bd48-0410-a16d-cbbf54688b0b>2010-11-24 17:19:22 +0000
commit5698af1a1da5cde0f22123bd159aaeb0b0689dd4 (patch)
tree1514012337239924a71aae075da99521f7d313d3
parent5b0a67e97e403b9529b0aeb1f28a34fcafd4c564 (diff)
downloadpki-5698af1a1da5cde0f22123bd159aaeb0b0689dd4.tar.gz
pki-5698af1a1da5cde0f22123bd159aaeb0b0689dd4.tar.xz
pki-5698af1a1da5cde0f22123bd159aaeb0b0689dd4.zip
Bugzilla BZ 653576 - tomcat5 does not always run filters on servlets as expected
git-svn-id: svn+ssh://svn.fedorahosted.org/svn/pki/trunk@1586 c9f7a03b-bd48-0410-a16d-cbbf54688b0b
-rwxr-xr-xpki/dogtag/ca-ui/shared/webapps/ca/404.html6
-rwxr-xr-xpki/dogtag/ca-ui/shared/webapps/ca/500.html6
-rw-r--r--pki/dogtag/ca-ui/shared/webapps/ca/admin/ca/securitydomainlogin.template2
-rw-r--r--pki/dogtag/ca-ui/shared/webapps/ca/admin/ca/sendCookie.template6
-rw-r--r--pki/dogtag/ca-ui/shared/webapps/ca/services.template6
-rw-r--r--pki/dogtag/common-ui/shared/admin/console/config/config_addhsm.vm2
-rw-r--r--pki/dogtag/common-ui/shared/admin/console/config/config_clone.vm2
-rw-r--r--pki/dogtag/common-ui/shared/admin/console/config/config_db.vm2
-rw-r--r--pki/dogtag/common-ui/shared/admin/console/config/config_hsm.vm2
-rw-r--r--pki/dogtag/common-ui/shared/admin/console/config/config_join.vm2
-rw-r--r--pki/dogtag/common-ui/shared/admin/console/config/config_rootca.vm2
-rw-r--r--pki/dogtag/common-ui/shared/admin/console/config/login.vm2
-rw-r--r--pki/dogtag/common-ui/shared/admin/console/config/securitydomainloginpanel.vm2
-rw-r--r--pki/dogtag/common-ui/shared/admin/console/config/wizard.vm2
-rw-r--r--pki/dogtag/common-ui/shared/css/pki-360.css (renamed from pki/dogtag/common-ui/shared/admin/console/css/pki-360.css)0
-rw-r--r--pki/dogtag/common-ui/shared/css/pki-base.css (renamed from pki/dogtag/common-ui/shared/admin/console/css/pki-base.css)0
-rw-r--r--pki/dogtag/common-ui/shared/css/pki.css (renamed from pki/dogtag/common-ui/shared/admin/console/css/pki.css)0
-rw-r--r--pki/dogtag/common-ui/shared/img/favicon.icobin0 -> 601 bytes
-rw-r--r--pki/dogtag/common-ui/shared/img/logo_header.gifbin0 -> 5833 bytes
-rwxr-xr-xpki/dogtag/kra-ui/shared/webapps/kra/404.html6
-rwxr-xr-xpki/dogtag/kra-ui/shared/webapps/kra/500.html6
-rw-r--r--pki/dogtag/kra-ui/shared/webapps/kra/services.template6
-rwxr-xr-xpki/dogtag/ocsp-ui/shared/webapps/ocsp/404.html6
-rwxr-xr-xpki/dogtag/ocsp-ui/shared/webapps/ocsp/500.html6
-rw-r--r--pki/dogtag/ocsp-ui/shared/webapps/ocsp/services.template6
-rwxr-xr-xpki/dogtag/tks-ui/shared/webapps/tks/404.html6
-rwxr-xr-xpki/dogtag/tks-ui/shared/webapps/tks/500.html6
-rw-r--r--pki/dogtag/tks-ui/shared/webapps/tks/services.template6
28 files changed, 49 insertions, 49 deletions
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/404.html b/pki/dogtag/ca-ui/shared/webapps/ca/404.html
index 6da3b4833..bd04559aa 100755
--- a/pki/dogtag/ca-ui/shared/webapps/ca/404.html
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/404.html
@@ -34,7 +34,7 @@ document.write('//');
document.write(hostname);
document.write(':');
document.write(port);
-document.write('/ca/admin/console/img/favicon.ico');
+document.write('/ca/img/favicon.ico');
document.write('" />');
document.write('<link rel="stylesheet" href="');
document.write(protocol);
@@ -42,7 +42,7 @@ document.write('//');
document.write(hostname);
document.write(':');
document.write(port);
-document.write('/ca/admin/console/css/pki-base.css');
+document.write('/ca/css/pki-base.css');
document.write('" type="text/css" />');
document.write('<META http-equiv=Content-Type content="text/html; charset=UTF-8">');
</script>
@@ -57,7 +57,7 @@ document.write('//');
document.write(hostname);
document.write(':');
document.write(port);
-document.write('/ca/admin/console/img/logo_header.gif');
+document.write('/ca/img/logo_header.gif');
document.write('" alt="Dogtag" id="myLogo" /></a>');
</script>
<div id="headertitle">
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/500.html b/pki/dogtag/ca-ui/shared/webapps/ca/500.html
index 535aa422f..a775341e5 100755
--- a/pki/dogtag/ca-ui/shared/webapps/ca/500.html
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/500.html
@@ -34,7 +34,7 @@ document.write('//');
document.write(hostname);
document.write(':');
document.write(port);
-document.write('/ca/admin/console/img/favicon.ico');
+document.write('/ca/img/favicon.ico');
document.write('" />');
document.write('<link rel="stylesheet" href="');
document.write(protocol);
@@ -42,7 +42,7 @@ document.write('//');
document.write(hostname);
document.write(':');
document.write(port);
-document.write('/ca/admin/console/css/pki-base.css');
+document.write('/ca/css/pki-base.css');
document.write('" type="text/css" />');
document.write('<META http-equiv=Content-Type content="text/html; charset=UTF-8">');
</script>
@@ -57,7 +57,7 @@ document.write('//');
document.write(hostname);
document.write(':');
document.write(port);
-document.write('/ca/admin/console/img/logo_header.gif');
+document.write('/ca/img/logo_header.gif');
document.write('" alt="Dogtag" id="myLogo" /></a>');
</script>
<div id="headertitle">
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/admin/ca/securitydomainlogin.template b/pki/dogtag/ca-ui/shared/webapps/ca/admin/ca/securitydomainlogin.template
index 840a16d89..7d61a8602 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/admin/ca/securitydomainlogin.template
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/admin/ca/securitydomainlogin.template
@@ -23,7 +23,7 @@
<title>CA Admin Security Domain Login</title>
<link rel="shortcut icon" href="/ca/admin/console/img/favicon.ico" />
- <link rel="stylesheet" href="/ca/admin/console/css/rhn-base.css" type="text/css" />
+ <link rel="stylesheet" href="/ca/css/pki-base.css" type="text/css" />
<META http-equiv=Content-Type content="text/html; charset=UTF-8">
</head>
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/admin/ca/sendCookie.template b/pki/dogtag/ca-ui/shared/webapps/ca/admin/ca/sendCookie.template
index a9a0a83e5..8f2e62e4d 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/admin/ca/sendCookie.template
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/admin/ca/sendCookie.template
@@ -19,15 +19,15 @@
<html>
<CMS_TEMPLATE>
<title>CA Admin Send Cookie</title>
- <link rel="shortcut icon" href="/ca/admin/console/img/favicon.ico" />
- <link rel="stylesheet" href="/ca/admin/console/css/rhn-base.css" type="text/css" />
+ <link rel="shortcut icon" href="/ca/img/favicon.ico" />
+ <link rel="stylesheet" href="/ca/css/rhn-base.css" type="text/css" />
<META http-equiv=Content-Type content="text/html; charset=UTF-8">
</head>
<body bgcolor="#FFFFFF" link="#666699" vlink="#666699" alink="#333366" onLoad="document.cookieForm.submit()">
<div id="header">
- <a href="http://pki.fedoraproject.org/" title="Visit pki.fedoraproject.org for more information about Dogtag products and services"><img src="/ca/admin/console/img/logo_header.gif" alt="Dogtag" id="myLogo" /></a>
+ <a href="http://pki.fedoraproject.org/" title="Visit pki.fedoraproject.org for more information about Dogtag products and services"><img src="/ca/img/logo_header.gif" alt="Dogtag" id="myLogo" /></a>
<div id="headertitle">
<a href="/" title="Dogtag Network homepage">Dogtag<sup><font size="-2">&reg;</font></sup> Certificate System</a>
</div>
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/services.template b/pki/dogtag/ca-ui/shared/webapps/ca/services.template
index f567d6dc7..c3238e7cd 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/services.template
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/services.template
@@ -19,15 +19,15 @@
<html>
<CMS_TEMPLATE>
<title>CA Services</title>
- <link rel="shortcut icon" href="admin/console/img/favicon.ico" />
- <link rel="stylesheet" href="admin/console/css/pki-base.css" type="text/css" />
+ <link rel="shortcut icon" href="img/favicon.ico" />
+ <link rel="stylesheet" href="css/pki-base.css" type="text/css" />
<META http-equiv=Content-Type content="text/html; charset=UTF-8">
</head>
<body bgcolor="#FFFFFF" link="#666699" vlink="#666699" alink="#333366">
<div id="header">
- <a href="http://pki.fedoraproject.org/" title="Visit pki.fedoraproject.org for more information about Dogtag products and services"><img src="admin/console/img/logo_header.gif" alt="Dogtag" id="myLogo" /></a>
+ <a href="http://pki.fedoraproject.org/" title="Visit pki.fedoraproject.org for more information about Dogtag products and services"><img src="img/logo_header.gif" alt="Dogtag" id="myLogo" /></a>
<div id="headertitle">
<a href="/" title="Dogtag Network homepage">Dogtag<sup><font size="-2">&reg;</font></sup> Certificate System</a>
</div>
diff --git a/pki/dogtag/common-ui/shared/admin/console/config/config_addhsm.vm b/pki/dogtag/common-ui/shared/admin/console/config/config_addhsm.vm
index b210cf136..c10f6c18e 100644
--- a/pki/dogtag/common-ui/shared/admin/console/config/config_addhsm.vm
+++ b/pki/dogtag/common-ui/shared/admin/console/config/config_addhsm.vm
@@ -32,7 +32,7 @@
</SCRIPT>
<link rel="shortcut icon" href="../img/favicon.ico" />
- <link rel="stylesheet" href="../css/pki-base.css" type="text/css" />
+ <link rel="stylesheet" href="../../../css/pki-base.css" type="text/css" />
</head>
diff --git a/pki/dogtag/common-ui/shared/admin/console/config/config_clone.vm b/pki/dogtag/common-ui/shared/admin/console/config/config_clone.vm
index efbda6af9..521836050 100644
--- a/pki/dogtag/common-ui/shared/admin/console/config/config_clone.vm
+++ b/pki/dogtag/common-ui/shared/admin/console/config/config_clone.vm
@@ -24,7 +24,7 @@
<title>Dogtag Certificate System</title>
<link rel="shortcut icon" href="../img/favicon.ico" />
- <link rel="stylesheet" href="../css/pki-base.css" type="text/css" />
+ <link rel="stylesheet" href="../../../css/pki-base.css" type="text/css" />
</head>
diff --git a/pki/dogtag/common-ui/shared/admin/console/config/config_db.vm b/pki/dogtag/common-ui/shared/admin/console/config/config_db.vm
index 3d49771f3..b53c5d9ef 100644
--- a/pki/dogtag/common-ui/shared/admin/console/config/config_db.vm
+++ b/pki/dogtag/common-ui/shared/admin/console/config/config_db.vm
@@ -34,7 +34,7 @@
</SCRIPT>
<link rel="shortcut icon" href="../img/favicon.ico" />
- <link rel="stylesheet" href="../css/pki-base.css" type="text/css" />
+ <link rel="stylesheet" href="../../../css/pki-base.css" type="text/css" />
</head>
diff --git a/pki/dogtag/common-ui/shared/admin/console/config/config_hsm.vm b/pki/dogtag/common-ui/shared/admin/console/config/config_hsm.vm
index 283d86b0e..5aa3ebc7b 100644
--- a/pki/dogtag/common-ui/shared/admin/console/config/config_hsm.vm
+++ b/pki/dogtag/common-ui/shared/admin/console/config/config_hsm.vm
@@ -32,7 +32,7 @@
</SCRIPT>
<link rel="shortcut icon" href="../img/favicon.ico" />
- <link rel="stylesheet" href="../css/pki-base.css" type="text/css" />
+ <link rel="stylesheet" href="../../../css/pki-base.css" type="text/css" />
</head>
diff --git a/pki/dogtag/common-ui/shared/admin/console/config/config_join.vm b/pki/dogtag/common-ui/shared/admin/console/config/config_join.vm
index 0fbf9d77d..e79720a0e 100644
--- a/pki/dogtag/common-ui/shared/admin/console/config/config_join.vm
+++ b/pki/dogtag/common-ui/shared/admin/console/config/config_join.vm
@@ -24,7 +24,7 @@
<title>Dogtag Certificate System</title>
<link rel="shortcut icon" href="../img/favicon.ico" />
- <link rel="stylesheet" href="../css/pki-base.css" type="text/css" />
+ <link rel="stylesheet" href="../../../css/pki-base.css" type="text/css" />
</head>
<SCRIPT LANGUAGE="JavaScript">
diff --git a/pki/dogtag/common-ui/shared/admin/console/config/config_rootca.vm b/pki/dogtag/common-ui/shared/admin/console/config/config_rootca.vm
index 44856a52c..9647cfd32 100644
--- a/pki/dogtag/common-ui/shared/admin/console/config/config_rootca.vm
+++ b/pki/dogtag/common-ui/shared/admin/console/config/config_rootca.vm
@@ -24,7 +24,7 @@
<title>Dogtag Certificate System</title>
<link rel="shortcut icon" href="../img/favicon.ico" />
- <link rel="stylesheet" href="../css/pki-base.css" type="text/css" />
+ <link rel="stylesheet" href="../../../css/pki-base.css" type="text/css" />
</head>
<SCRIPT LANGUAGE="JavaScript">
diff --git a/pki/dogtag/common-ui/shared/admin/console/config/login.vm b/pki/dogtag/common-ui/shared/admin/console/config/login.vm
index 576133f4e..98a7c5bf5 100644
--- a/pki/dogtag/common-ui/shared/admin/console/config/login.vm
+++ b/pki/dogtag/common-ui/shared/admin/console/config/login.vm
@@ -24,7 +24,7 @@
<title>Dogtag Certificate System</title>
<link rel="shortcut icon" href="../img/favicon.ico" />
- <link rel="stylesheet" href="../css/pki-base.css" type="text/css" />
+ <link rel="stylesheet" href="../../../css/pki-base.css" type="text/css" />
</head>
diff --git a/pki/dogtag/common-ui/shared/admin/console/config/securitydomainloginpanel.vm b/pki/dogtag/common-ui/shared/admin/console/config/securitydomainloginpanel.vm
index 591e859f2..d3c5e901b 100644
--- a/pki/dogtag/common-ui/shared/admin/console/config/securitydomainloginpanel.vm
+++ b/pki/dogtag/common-ui/shared/admin/console/config/securitydomainloginpanel.vm
@@ -24,7 +24,7 @@
<title>Dogtag Certificate System</title>
<link rel="shortcut icon" href="/ca/admin/console/img/favicon.ico" />
- <link rel="stylesheet" href="/ca/admin/console/css/pki-base.css" type="text/css" />
+ <link rel="stylesheet" href="/ca/css/pki-base.css" type="text/css" />
<META http-equiv=Content-Type content="text/html; charset=UTF-8">
</head>
diff --git a/pki/dogtag/common-ui/shared/admin/console/config/wizard.vm b/pki/dogtag/common-ui/shared/admin/console/config/wizard.vm
index 7d9dacbf1..22574a970 100644
--- a/pki/dogtag/common-ui/shared/admin/console/config/wizard.vm
+++ b/pki/dogtag/common-ui/shared/admin/console/config/wizard.vm
@@ -24,7 +24,7 @@
<title>Dogtag Certificate System</title>
<link rel="shortcut icon" href="../img/favicon.ico" />
- <link rel="stylesheet" href="../css/pki-base.css" type="text/css" />
+ <link rel="stylesheet" href="../../../css/pki-base.css" type="text/css" />
<META http-equiv=Content-Type content="text/html; charset=UTF-8">
diff --git a/pki/dogtag/common-ui/shared/admin/console/css/pki-360.css b/pki/dogtag/common-ui/shared/css/pki-360.css
index bdcd7ed3b..bdcd7ed3b 100644
--- a/pki/dogtag/common-ui/shared/admin/console/css/pki-360.css
+++ b/pki/dogtag/common-ui/shared/css/pki-360.css
diff --git a/pki/dogtag/common-ui/shared/admin/console/css/pki-base.css b/pki/dogtag/common-ui/shared/css/pki-base.css
index 1892b75dc..1892b75dc 100644
--- a/pki/dogtag/common-ui/shared/admin/console/css/pki-base.css
+++ b/pki/dogtag/common-ui/shared/css/pki-base.css
diff --git a/pki/dogtag/common-ui/shared/admin/console/css/pki.css b/pki/dogtag/common-ui/shared/css/pki.css
index 8149eccf4..8149eccf4 100644
--- a/pki/dogtag/common-ui/shared/admin/console/css/pki.css
+++ b/pki/dogtag/common-ui/shared/css/pki.css
diff --git a/pki/dogtag/common-ui/shared/img/favicon.ico b/pki/dogtag/common-ui/shared/img/favicon.ico
new file mode 100644
index 000000000..efc1d33f4
--- /dev/null
+++ b/pki/dogtag/common-ui/shared/img/favicon.ico
Binary files differ
diff --git a/pki/dogtag/common-ui/shared/img/logo_header.gif b/pki/dogtag/common-ui/shared/img/logo_header.gif
new file mode 100644
index 000000000..573482227
--- /dev/null
+++ b/pki/dogtag/common-ui/shared/img/logo_header.gif
Binary files differ
diff --git a/pki/dogtag/kra-ui/shared/webapps/kra/404.html b/pki/dogtag/kra-ui/shared/webapps/kra/404.html
index 10eb1624a..2e7e59cdd 100755
--- a/pki/dogtag/kra-ui/shared/webapps/kra/404.html
+++ b/pki/dogtag/kra-ui/shared/webapps/kra/404.html
@@ -34,7 +34,7 @@ document.write('//');
document.write(hostname);
document.write(':');
document.write(port);
-document.write('/kra/admin/console/img/favicon.ico');
+document.write('/kra/img/favicon.ico');
document.write('" />');
document.write('<link rel="stylesheet" href="');
document.write(protocol);
@@ -42,7 +42,7 @@ document.write('//');
document.write(hostname);
document.write(':');
document.write(port);
-document.write('/kra/admin/console/css/pki-base.css');
+document.write('/kra/css/pki-base.css');
document.write('" type="text/css" />');
document.write('<META http-equiv=Content-Type content="text/html; charset=UTF-8">');
</script>
@@ -57,7 +57,7 @@ document.write('//');
document.write(hostname);
document.write(':');
document.write(port);
-document.write('/kra/admin/console/img/logo_header.gif');
+document.write('/kra/img/logo_header.gif');
document.write('" alt="Dogtag" id="myLogo" /></a>');
</script>
<div id="headertitle">
diff --git a/pki/dogtag/kra-ui/shared/webapps/kra/500.html b/pki/dogtag/kra-ui/shared/webapps/kra/500.html
index dcce0e1b3..224cec1c8 100755
--- a/pki/dogtag/kra-ui/shared/webapps/kra/500.html
+++ b/pki/dogtag/kra-ui/shared/webapps/kra/500.html
@@ -34,7 +34,7 @@ document.write('//');
document.write(hostname);
document.write(':');
document.write(port);
-document.write('/kra/admin/console/img/favicon.ico');
+document.write('/kra/img/favicon.ico');
document.write('" />');
document.write('<link rel="stylesheet" href="');
document.write(protocol);
@@ -42,7 +42,7 @@ document.write('//');
document.write(hostname);
document.write(':');
document.write(port);
-document.write('/kra/admin/console/css/pki-base.css');
+document.write('/kra/css/pki-base.css');
document.write('" type="text/css" />');
document.write('<META http-equiv=Content-Type content="text/html; charset=UTF-8">');
</script>
@@ -57,7 +57,7 @@ document.write('//');
document.write(hostname);
document.write(':');
document.write(port);
-document.write('/kra/admin/console/img/logo_header.gif');
+document.write('/kra/img/logo_header.gif');
document.write('" alt="Dogtag" id="myLogo" /></a>');
</script>
<div id="headertitle">
diff --git a/pki/dogtag/kra-ui/shared/webapps/kra/services.template b/pki/dogtag/kra-ui/shared/webapps/kra/services.template
index c7a83c941..e28887b70 100644
--- a/pki/dogtag/kra-ui/shared/webapps/kra/services.template
+++ b/pki/dogtag/kra-ui/shared/webapps/kra/services.template
@@ -19,15 +19,15 @@
<html>
<CMS_TEMPLATE>
<title>DRM Services</title>
- <link rel="shortcut icon" href="admin/console/img/favicon.ico" />
- <link rel="stylesheet" href="admin/console/css/pki-base.css" type="text/css" />
+ <link rel="shortcut icon" href="img/favicon.ico" />
+ <link rel="stylesheet" href="css/pki-base.css" type="text/css" />
<META http-equiv=Content-Type content="text/html; charset=UTF-8">
</head>
<body bgcolor="#FFFFFF" link="#666699" vlink="#666699" alink="#333366">
<div id="header">
- <a href="http://pki.fedoraproject.org/" title="Visit pki.fedoraproject.org for more information about Dogtag products and services"><img src="admin/console/img/logo_header.gif" alt="Dogtag" id="myLogo" /></a>
+ <a href="http://pki.fedoraproject.org/" title="Visit pki.fedoraproject.org for more information about Dogtag products and services"><img src="img/logo_header.gif" alt="Dogtag" id="myLogo" /></a>
<div id="headertitle">
<a href="/" title="Dogtag Network homepage">Dogtag<sup><font size="-2">&reg;</font></sup> Certificate System</a>
</div>
diff --git a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/404.html b/pki/dogtag/ocsp-ui/shared/webapps/ocsp/404.html
index e062ecdd8..a337de323 100755
--- a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/404.html
+++ b/pki/dogtag/ocsp-ui/shared/webapps/ocsp/404.html
@@ -34,7 +34,7 @@ document.write('//');
document.write(hostname);
document.write(':');
document.write(port);
-document.write('/ocsp/admin/console/img/favicon.ico');
+document.write('/ocsp/img/favicon.ico');
document.write('" />');
document.write('<link rel="stylesheet" href="');
document.write(protocol);
@@ -42,7 +42,7 @@ document.write('//');
document.write(hostname);
document.write(':');
document.write(port);
-document.write('/ocsp/admin/console/css/pki-base.css');
+document.write('/ocsp/css/pki-base.css');
document.write('" type="text/css" />');
document.write('<META http-equiv=Content-Type content="text/html; charset=UTF-8">');
</script>
@@ -57,7 +57,7 @@ document.write('//');
document.write(hostname);
document.write(':');
document.write(port);
-document.write('/ocsp/admin/console/img/logo_header.gif');
+document.write('/ocsp/img/logo_header.gif');
document.write('" alt="Dogtag" id="myLogo" /></a>');
</script>
<div id="headertitle">
diff --git a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/500.html b/pki/dogtag/ocsp-ui/shared/webapps/ocsp/500.html
index b012a7e9b..1e7fbb43a 100755
--- a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/500.html
+++ b/pki/dogtag/ocsp-ui/shared/webapps/ocsp/500.html
@@ -34,7 +34,7 @@ document.write('//');
document.write(hostname);
document.write(':');
document.write(port);
-document.write('/ocsp/admin/console/img/favicon.ico');
+document.write('/ocsp/img/favicon.ico');
document.write('" />');
document.write('<link rel="stylesheet" href="');
document.write(protocol);
@@ -42,7 +42,7 @@ document.write('//');
document.write(hostname);
document.write(':');
document.write(port);
-document.write('/ocsp/admin/console/css/pki-base.css');
+document.write('/ocsp/css/pki-base.css');
document.write('" type="text/css" />');
document.write('<META http-equiv=Content-Type content="text/html; charset=UTF-8">');
</script>
@@ -57,7 +57,7 @@ document.write('//');
document.write(hostname);
document.write(':');
document.write(port);
-document.write('/ocsp/admin/console/img/logo_header.gif');
+document.write('/ocsp/img/logo_header.gif');
document.write('" alt="Dogtag" id="myLogo" /></a>');
</script>
<div id="headertitle">
diff --git a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/services.template b/pki/dogtag/ocsp-ui/shared/webapps/ocsp/services.template
index cda3e7330..74783cd3b 100644
--- a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/services.template
+++ b/pki/dogtag/ocsp-ui/shared/webapps/ocsp/services.template
@@ -19,15 +19,15 @@
<html>
<CMS_TEMPLATE>
<title>OCSP Services</title>
- <link rel="shortcut icon" href="admin/console/img/favicon.ico" />
- <link rel="stylesheet" href="admin/console/css/pki-base.css" type="text/css" />
+ <link rel="shortcut icon" href="img/favicon.ico" />
+ <link rel="stylesheet" href="css/pki-base.css" type="text/css" />
<META http-equiv=Content-Type content="text/html; charset=UTF-8">
</head>
<body bgcolor="#FFFFFF" link="#666699" vlink="#666699" alink="#333366">
<div id="header">
- <a href="http://pki.fedoraproject.org/" title="Visit pki.fedoraproject.org for more information about Dogtag products and services"><img src="admin/console/img/logo_header.gif" alt="Dogtag" id="myLogo" /></a>
+ <a href="http://pki.fedoraproject.org/" title="Visit pki.fedoraproject.org for more information about Dogtag products and services"><img src="img/logo_header.gif" alt="Dogtag" id="myLogo" /></a>
<div id="headertitle">
<a href="/" title="Dogtag Network homepage">Dogtag<sup><font size="-2">&reg;</font></sup> Certificate System</a>
</div>
diff --git a/pki/dogtag/tks-ui/shared/webapps/tks/404.html b/pki/dogtag/tks-ui/shared/webapps/tks/404.html
index f6fc24a77..2fc48f1c0 100755
--- a/pki/dogtag/tks-ui/shared/webapps/tks/404.html
+++ b/pki/dogtag/tks-ui/shared/webapps/tks/404.html
@@ -34,7 +34,7 @@ document.write('//');
document.write(hostname);
document.write(':');
document.write(port);
-document.write('/tks/admin/console/img/favicon.ico');
+document.write('/tks/img/favicon.ico');
document.write('" />');
document.write('<link rel="stylesheet" href="');
document.write(protocol);
@@ -42,7 +42,7 @@ document.write('//');
document.write(hostname);
document.write(':');
document.write(port);
-document.write('/tks/admin/console/css/pki-base.css');
+document.write('/tks/css/pki-base.css');
document.write('" type="text/css" />');
document.write('<META http-equiv=Content-Type content="text/html; charset=UTF-8">');
</script>
@@ -57,7 +57,7 @@ document.write('//');
document.write(hostname);
document.write(':');
document.write(port);
-document.write('/tks/admin/console/img/logo_header.gif');
+document.write('/tks/img/logo_header.gif');
document.write('" alt="Dogtag" id="myLogo" /></a>');
</script>
<div id="headertitle">
diff --git a/pki/dogtag/tks-ui/shared/webapps/tks/500.html b/pki/dogtag/tks-ui/shared/webapps/tks/500.html
index a82cbeab2..88829b9bd 100755
--- a/pki/dogtag/tks-ui/shared/webapps/tks/500.html
+++ b/pki/dogtag/tks-ui/shared/webapps/tks/500.html
@@ -34,7 +34,7 @@ document.write('//');
document.write(hostname);
document.write(':');
document.write(port);
-document.write('/tks/admin/console/img/favicon.ico');
+document.write('/tks/img/favicon.ico');
document.write('" />');
document.write('<link rel="stylesheet" href="');
document.write(protocol);
@@ -42,7 +42,7 @@ document.write('//');
document.write(hostname);
document.write(':');
document.write(port);
-document.write('/tks/admin/console/css/pki-base.css');
+document.write('/tks/css/pki-base.css');
document.write('" type="text/css" />');
document.write('<META http-equiv=Content-Type content="text/html; charset=UTF-8">');
</script>
@@ -57,7 +57,7 @@ document.write('//');
document.write(hostname);
document.write(':');
document.write(port);
-document.write('/tks/admin/console/img/logo_header.gif');
+document.write('/tks/img/logo_header.gif');
document.write('" alt="Dogtag" id="myLogo" /></a>');
</script>
<div id="headertitle">
diff --git a/pki/dogtag/tks-ui/shared/webapps/tks/services.template b/pki/dogtag/tks-ui/shared/webapps/tks/services.template
index 022c4c87d..be72e2cdc 100644
--- a/pki/dogtag/tks-ui/shared/webapps/tks/services.template
+++ b/pki/dogtag/tks-ui/shared/webapps/tks/services.template
@@ -19,15 +19,15 @@
<html>
<CMS_TEMPLATE>
<title>TKS Services</title>
- <link rel="shortcut icon" href="admin/console/img/favicon.ico" />
- <link rel="stylesheet" href="admin/console/css/pki-base.css" type="text/css" />
+ <link rel="shortcut icon" href="img/favicon.ico" />
+ <link rel="stylesheet" href="css/pki-base.css" type="text/css" />
<META http-equiv=Content-Type content="text/html; charset=UTF-8">
</head>
<body bgcolor="#FFFFFF" link="#666699" vlink="#666699" alink="#333366">
<div id="header">
- <a href="http://pki.fedoraproject.org/" title="Visit pki.fedoraproject.org for more information about Dogtag products and services"><img src="admin/console/img/logo_header.gif" alt="Dogtag" id="myLogo" /></a>
+ <a href="http://pki.fedoraproject.org/" title="Visit pki.fedoraproject.org for more information about Dogtag products and services"><img src="img/logo_header.gif" alt="Dogtag" id="myLogo" /></a>
<div id="headertitle">
<a href="/" title="Dogtag Network homepage">Dogtag<sup><font size="-2">&reg;</font></sup> Certificate System</a>
</div>