Bugzilla Bug #472597 - Disable policy code,UI

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

43 files changed, 609 insertions, 816 deletions

diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/admin/GenUnexpectedError.template b/pki/dogtag/ca-ui/shared/webapps/ca/admin/GenUnexpectedError.template
index c69aaad1f..eb62f4206 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/admin/GenUnexpectedError.template
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/admin/GenUnexpectedError.template
@@ -29,7 +29,7 @@ CS Processing Error
 Problem Processing Your Request
 </font>
 
-<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/ca/agent/graphics/hr.gif" >
+<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/ca/admin/graphics/hr.gif" >
   <tr>
     <td>&nbsp;</td>
   </tr>
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/admin/ca/EnrollSuccess.template b/pki/dogtag/ca-ui/shared/webapps/ca/admin/ca/EnrollSuccess.template
index 8c4c29cb7..d0e5af3dd 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/admin/ca/EnrollSuccess.template
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/admin/ca/EnrollSuccess.template
@@ -53,15 +53,13 @@ function toHex(number)
 
 document.writeln('Congratulations a certificate has been issued and ' +
 'the administrator now has Certificate Manager Agent privileges.' +
-'You can now go to '+
-'<a href="' + result.fixed.scheme + '://' + result.fixed.host +
-':' + result.fixed.port+ '/ca/agent/ca">' + 'the agent page</a>' +
+'  You can now go to the <b>Agent Services</b> page' +
 ' to process any pending requests.');
 
 document.writeln('<P>');
 document.writeln('Issued Certificates: </font>');
 document.writeln('<P>');
-document.writeln('<table border="0" cellspacing="0" cellpadding="0" background="/ca/agent/graphics/hr.gif" width="100%">');
+document.writeln('<table border="0" cellspacing="0" cellpadding="0" background="/ca/admin/graphics/hr.gif" width="100%">');
 document.writeln('  <tr> ');
 document.writeln('    <td>&nbsp;</td>');
 document.writeln('  </tr>');
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/admin/ca/adminEnroll.html b/pki/dogtag/ca-ui/shared/webapps/ca/admin/ca/adminEnroll.html
index 43c4379c5..a1307f9a1 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/admin/ca/adminEnroll.html
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/admin/ca/adminEnroll.html
@@ -21,9 +21,9 @@
 <TITLE>Admin Enrollment form.</TITLE>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <SCRIPT LANGUAGE="JavaScript"></SCRIPT>
-<script LANGUAGE="JavaScript" SRC="/ca/agent/cms-funcs.js"></script>
-<SCRIPT LANGUAGE="JavaScript" SRC="/ca/agent/helpfun.js"></SCRIPT>
-<SCRIPT LANGUAGE="JavaScript" SRC="/ca/ee/dynamicVars.js"></SCRIPT>
+<script LANGUAGE="JavaScript" SRC="/ca/admin/cms-funcs.js"></script>
+<SCRIPT LANGUAGE="JavaScript" SRC="/ca/admin/helpfun.js"></SCRIPT>
+<SCRIPT LANGUAGE="JavaScript" SRC="/ca/admin/dynamicVars.js"></SCRIPT>
 
 
 <SCRIPT>
@@ -293,7 +293,7 @@ Administrator/Agent Certificate Enrollment<br>
   again, or to enroll other users, please see the documentation.
   </font>
 
-<table border="0" cellspacing="0" cellpadding="2" background=/ca/agent/graphics/hr.gif" width="100%">
+<table border="0" cellspacing="0" cellpadding="2" background=/ca/admin/graphics/hr.gif" width="100%">
   <tr> 
     <td>&nbsp;</td>
   </tr>
@@ -311,7 +311,7 @@ Administrator/Agent Certificate Enrollment<br>
   </tr>
 </table>
 
-<table border="0" cellspacing="0" cellpadding="0" background=/ca/agent/graphics/hr.gif" width="100%">
+<table border="0" cellspacing="0" cellpadding="0" background=/ca/admin/graphics/hr.gif" width="100%">
   <tr> 
     <td>&nbsp;</td>
   </tr>
@@ -655,7 +655,7 @@ renderValidityInfo();
 
   <tr> 
     <td valign="TOP" colspan="2"> 
-      <table border="0" width="100%" cellspacing="0" cellpadding="6" bgcolor="#cccccc" background=/ca/agent/graphics/gray90.gif">
+      <table border="0" width="100%" cellspacing="0" cellpadding="6" bgcolor="#cccccc" background=/ca/admin/graphics/gray90.gif">
         <tr> 
           <td> 
             <div align="RIGHT">
@@ -689,9 +689,9 @@ renderValidityInfo();
 </script>
 
             <input type="hidden" name="subject" value="" >
-			<img src=/ca/agent/graphics/spacer.gif" width="6" height="6"> 
+			<img src=/ca/admin/graphics/spacer.gif" width="6" height="6"> 
 			<input type="reset" value="Reset" name="reset" width="72">
-			<img src=/ca/agent/graphics/spacer.gif" width="9" height="6"> 
+			<img src=/ca/admin/graphics/spacer.gif" width="9" height="6"> 
 			<input type="button" value="Help" onclick=
 				 "help('http://www.redhat.com/docs/manuals/cert-system#Administrator/Agent Certificate Enrollment')" 
 				 name="button" width="72">
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/admin/cms-funcs.js b/pki/dogtag/ca-ui/shared/webapps/ca/admin/cms-funcs.js
new file mode 100644
index 000000000..c8ffd51c7
--- /dev/null
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/admin/cms-funcs.js
@@ -0,0 +1,538 @@
+// --- BEGIN COPYRIGHT BLOCK ---
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; version 2 of the License.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License along
+// with this program; if not, write to the Free Software Foundation, Inc.,
+// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+//
+// Copyright (C) 2007 Red Hat, Inc.
+// All rights reserved.
+// --- END COPYRIGHT BLOCK ---
+
+//<!--
+
+
+function checkClientTime()
+{
+   var speed;
+   var server_date = new Date(serverdate); 
+   var client_date = new Date();
+   var zone = client_date.getTimezoneOffset(); 
+   var timediff = 0;
+
+   var serverutc = server_date.getTime();
+   var clientutc = client_date.getTime();
+
+   var offset = clientutc - serverutc;
+   if (offset >0) { 
+      speed = 'fast'; 
+      } else { 
+	  speed = 'slow'; 
+   } 
+   timediff = Math.round(Math.abs(offset/1000/60)); 
+
+    if (timediff > 10) { 
+       msg = 'Your computer\'s clock is '+ timediff+ ' minutes '+ speed  +
+             '\n\nYou may encounter problems using your certificate\n' +
+			 'as your clock is set incorrectly.\n\n' +
+			 'According to the server, the time is:\n  ' + server_date +
+			 '\n\nPlease correct your clock before proceeding with enrollment'+
+             '\n\nYour timezone is set to ' + (-zone/60) +' hours relative to GMT.\n' +
+			 'If you change your timezone, you may need to restart your browser\n'+
+             'before continuing.';
+			 alert(msg);
+			 return false;
+       }
+	return true;
+}
+
+
+
+
+function doubleQuotes(componentName)
+{
+    for (i=0; i < componentName.length; i++) {
+        if (componentName.charAt(i) == '"') {
+            return true;
+        }
+    }
+    return false;
+}
+
+function escapeDNComponent(str)
+{
+    var outStr = "";
+    var escapeValue = false;
+
+    // Do we need to escape any characters
+    for (i=0; i < str.length; i++) {
+        c = str.charAt(i);
+        if (c == ',' || c == '=' || c == '+' || c == '<' ||
+            c == '>' || c == '#' || c == ';' || c == '\r' ||
+            c == '\n') {
+            escapeValue = true;
+            break;
+        }
+    }
+
+    if (escapeValue == true) {
+        outStr += '"';
+        outStr += str;
+        outStr += '"';
+    } else {
+        outStr += str;
+    }
+    return outStr;
+}
+
+function formulateDN(form, distinguishedName)
+{
+    // Note: The alerts about double quotes are here to avoid
+    // problems with the code dealing with quoting and escaping in the
+    // Netscape Directory Server 1.0 implementation.
+    with (form) {
+        distinguishedName.value = '';
+	if (form.E != null) {
+	    if (E.value != '') {
+		if (doubleQuotes(E.value) == true) {
+		    alert('Double quotes are not allowed in the E-mail field');
+		    E.value = '';
+		    E.focus();
+		    return;
+		}
+		if (distinguishedName.value != '') distinguishedName.value += ', ';
+		distinguishedName.value += 'E=' + escapeDNComponent(E.value);
+	    }
+	}
+	if (form.CN!= null) {
+	    if (CN.value != '') {
+		if (doubleQuotes(CN.value) == true) {
+		    alert('Double quotes are not allowed in Common Name field');
+		    CN.value = '';
+		    CN.focus();
+		    return;
+		}
+		if (distinguishedName.value != '') distinguishedName.value += ', ';
+		distinguishedName.value += 'CN=' + escapeDNComponent(CN.value);
+	    }
+        }
+	if (form.UID1 != null) {
+	    if (UID1.value != '') {
+		if (doubleQuotes(UID1.value) == true) {
+		    alert('Double quotes are not allowed in the user id field');
+		    UID1.value = '';
+		    UID1.focus();
+		    return;
+		}
+		if (distinguishedName.value != '') distinguishedName.value += ', ';
+		distinguishedName.value += 'UID=' + escapeDNComponent(UID1.value);
+	    }
+        }
+	if (form.OU != null) {
+	    if (OU.value != '') {
+		if (doubleQuotes(OU.value) == true) {
+		    alert('Double quotes are not allowed in Org Unit field');
+		    OU.value = '';
+		    OU.focus();
+		    return;
+		}
+		if (distinguishedName.value != '') distinguishedName.value += ', ';
+		distinguishedName.value += 'OU=' + escapeDNComponent(OU.value);
+	    }  
+        }
+	if (form.O != null) {
+	    if (O.value != '') {
+		if (doubleQuotes(O.value) == true) {
+		    alert('Double quotes are not allowed in Organization field.');
+		    O.value = '';
+		    O.focus();
+		    return;
+		}
+		if (distinguishedName.value != '') distinguishedName.value += ', ';
+		distinguishedName.value += 'O=' + escapeDNComponent(O.value);
+	    }  
+	}
+	if (form.L != null) {
+	    if (L.value != '') {
+		if (doubleQuotes(L.value) == true) {
+		    alert('Double quotes are not allowed in Locality field.');
+		    L.value = '';
+		    L.focus();
+		    return;
+		}
+		if (distinguishedName.value != '') distinguishedName.value += ', ';
+		distinguishedName.value += 'L=' + escapeDNComponent(L.value);
+	    }
+	}
+	if (form.ST != null) {
+	    if (ST.value != '') {
+		if (doubleQuotes(ST.value) == true) {
+		    alert('Double quotes are not allowed in State field.');
+		    ST.value = '';
+		    ST.focus();
+		    return;
+		}
+		if (distinguishedName.value != '') distinguishedName.value += ', ';
+		distinguishedName.value += 'ST=' + escapeDNComponent(ST.value);
+	    }
+	}
+	if (form.C != null) {
+	    if (C.value != '') {
+		if (doubleQuotes(C.value) == true) {
+		    alert('Double quotes are not allowed in Country field.');
+		    C.value = '';
+		    C.focus();
+		    return;
+		}
+		if (distinguishedName.value != '') distinguishedName.value += ', ';
+		distinguishedName.value += 'C=' + escapeDNComponent(C.value);
+	    }
+	}
+    }
+}
+
+function isValidIssuerDN(form)
+{
+    // Note: The check here is to avoid a bug in Netscape Navigator 3.0 and 3.01
+    // that are triggered on formation of the nickname on import of a CA cert if
+    // that cert does not contain an OU or O component.
+    if ((form.OU.value == '') && (form.O.value == '')) {
+        alert("You must enter an Organization Unit or an Organization.");
+        return false;
+    } else {
+        return true;
+    }
+}
+
+function isValidAdminDN(form)
+{
+    // Note: The check here is to avoid a bug in Netscape Navigator 3.0 and 3.01
+    // that are triggered on formation of the nickname on import of a personal cert if
+    // that cert does not contain a common name.
+
+    if (form.CN.value == '') {
+        alert("You must enter a Common Name.");
+        return false;
+    } else {
+        return true;
+    }
+}
+
+function isValidCSR(form)
+{
+    // Note: the checks here are of mixed origin.  Some are required for Navigator
+    // and Communicator.  The CSR field checks are to avoid server side rejection of the
+    // submission.  These checks can be split up to be different for different types of
+    // certificates.
+    
+    formulateDN(form, form.subject);
+	// DEBUG 
+	//alert(form.subject);
+
+    with (form) {
+		if (email != null) {
+	   		if (E.value == "" && email.checked) {
+              alert("E-mail certificates must include an E-mail address.");
+	      return false;
+	   }
+        }
+        if (CN.value == "") {
+            alert("You must supply your name for the certificate.");
+            return false;
+        }
+	return true;
+    }
+}
+
+function isNumber(string, radix) {
+  var i = 0; 
+  var legalDigits;
+  if (radix == null || radix == 10) {
+     legalDigits = "0123456789";
+  } else if (radix == 16) {
+     legalDigits = "0123456789abcdefABCDEF:";
+  } else {
+     return false;
+  }
+  for(; i < string.length; ++i) {
+     if (string.charAt(i) != ' ')
+     	break;
+  }
+  if (string.charAt(i) == '+' || string.charAt(i) == '-' ) {
+     ++i;
+  }
+  if (radix == 16 && i < string.length - 2 &&
+      string.charAt(i) == '0' &&
+      (string.charAt(i+1) == 'x' || string.charAt(i+1) == 'X') &&
+      legalDigits.indexOf(string.charAt(i+2)) != -1) {
+	i += 3;
+  }
+  for(; i < string.length; ++i) {
+     if (legalDigits.indexOf(string.charAt(i)) == -1)
+     	break;
+  }
+  for(; i < string.length; ++i) {
+     if (string.charAt(i) != ' ')
+     	return false;
+  }
+  return true;
+}
+
+function dateForm(name)
+{
+	var i;
+	document.write('<FORM NAME=\"'+ name +'\">');
+	document.write('<SELECT NAME=\"day\"><OPTION VALUE=0> ');
+	for (i=1; i <=31; ++i)
+		document.write('<OPTION VALUE='+i+'>'+i);
+	document.write('</SELECT>');
+	document.write('<SELECT NAME=\"month\">'+
+		'<OPTION VALUE=13> '+
+		'<OPTION VALUE=0>January'+
+		'<OPTION VALUE=1>February'+
+		'<OPTION VALUE=2>March'+
+		'<OPTION VALUE=3>April'+
+		'<OPTION VALUE=4>May'+
+		'<OPTION VALUE=5>June'+
+		'<OPTION VALUE=6>July'+
+		'<OPTION VALUE=7>August'+
+		'<OPTION VALUE=8>September'+
+		'<OPTION VALUE=9>October'+
+		'<OPTION VALUE=10>November'+
+		'<OPTION VALUE=11>December'+
+		'</SELECT>'
+	);
+	
+	document.write('<SELECT NAME=\"year\"><OPTION VALUE=0> ');
+	for (i=1996; i <=2006; ++i)
+		document.write('<OPTION VALUE='+i+'>'+i);
+	document.write('</SELECT>');
+	document.write('</FORM>');
+}
+
+function dateIsEmpty(form)
+{
+     return form.day.selectedIndex == 0  && 
+            form.month.selectedIndex == 0 &&
+	    form.year.selectedIndex == 0;
+}
+ 
+
+function convertDate(form, fieldName)
+{
+     var date;
+     var day = form.day.options[form.day.selectedIndex].value;
+     var month = form.month.options[form.month.selectedIndex].value;
+     var year = form.year.options[form.year.selectedIndex].value;
+     date = new Date(year,month,day);
+
+     // see if normalization was required
+     if (date.getMonth() != month || date.getDate() != day ) {
+        alert(fieldName + " is invalid");
+	return null;
+     }
+     else 
+     	return Math.round(date.getTime() / 1000);
+}
+
+function daysToSeconds(days){
+    return 3600 * 24 * days;
+}
+ 
+// encloses value in double quotes preceding all embedded double quotes with \
+function escapeValue(value)
+{
+    var result;
+    var fromIndex = 0, toIndex = 0;
+
+    // kludgy work-around for indexOf JavaScript bug on empty string
+    if (value == "")
+        return '\"\"';
+    
+    result = '\"';
+    while ((toIndex = value.indexOf('\"',fromIndex)) != -1) {
+    	result += value.substring(fromIndex,toIndex);
+     	result += '\\"';
+	fromIndex = toIndex + 1;
+    }
+    result += value.substring(fromIndex,value.length);
+    result += '\"';
+    return result;
+}
+
+// encloses value in double quotes preceding all embedded double quotes and 
+// backslashes with backslash
+function escapeValueJSString(value)
+{
+    var result = "";
+
+    // Do we need to escape any characters
+    for (i=0; i < value.length; i++) {
+        c = value.charAt(i);
+        if (c == '\\' | c == '"') {
+			result += '\\';
+        }
+		result += c;
+    }
+    return '\"' + result + '\"';
+}
+
+function escapeValueRfc1779(value)
+{
+    var result = "";
+
+    // Do we need to escape any characters
+    for (i=0; i < value.length; i++) {
+        c = value.charAt(i);
+        if (c == ',' || c == '=' || c == '+' || c == '<' ||
+            c == '>' || c == '#' || c == ';' || c == '\r' ||
+            c == '\n' || c == '\\' | c == '"') {
+			result += '\\';
+        }
+		result += c;
+    }
+    return result;
+}
+
+// helper function to construct name component(pattern)
+function makeComponent(list,tag,value,asPattern)
+{
+   var last = list.length;
+   if (asPattern) { 
+   	list[last] = (value == "") ? "*" : (tag+"="+escapeValueRfc1779(value));
+   }
+   else if (value != "")
+   	list[last] = tag+"="+escapeValueRfc1779(value);
+}
+
+// If asPattern is false formulates the RFC 1779 format subject name 
+// from the component parts skipping all components with blank values,
+// otherwise builds RFC 1779-like matching pattern from components
+function computeNameCriterion(form)
+{
+    var asPattern = form.match[1].checked;
+    var result = new Array;
+
+    with (form) {
+	// The order of clauses here determines how components are ordered
+	// in the name sent in the client's request.  A site may wish to
+	// re-order the clauses here if their conventions produce names
+	// with components in a different order.
+    	makeComponent(result,"E",E.value,asPattern);
+    	makeComponent(result,"CN",CN.value,asPattern);
+    	makeComponent(result,"UID",UID.value,asPattern);
+    	makeComponent(result,"OU",OU.value,asPattern);
+    	makeComponent(result,"O",O.value,asPattern);
+   	makeComponent(result,"L",L.value,asPattern);
+    	makeComponent(result,"ST",ST.value,asPattern);
+	makeComponent(result,"C",C.value,asPattern);
+    }
+    if (result.length == 0)
+    	return asPattern ? "0 == 0" : "0 == 1";
+    else 
+        return "subject" + ( asPattern ? " ~= " : " == ") +
+    				escapeValue(result.join(', '));
+}
+
+function booleanCrit(crit,radioArg)
+{
+    for (var i = 0; i < radioArg.length; ++i ){
+       if( radioArg[i].checked ) {
+          if (radioArg[i].value.length != 0) {
+	     crit[crit.length] = radioArg[i].name + " == " + radioArg[i].value;
+          }
+	  return;
+       }
+    }
+}
+
+function isHTTPEscapeChar(c)
+{
+    if (c == '%' || c == '#' || c == '+' || c == '=' || c == '\n' ||
+        c == '\r' || c == '\t' || c == ';' || c == '&' ||
+        c == '>') {
+        return true;
+    }
+
+    return false;
+}
+
+function produceHTTPEscapedString(inString)
+{
+    table = new Object();
+    table["%"] = "25";
+    table["#"] = "23";
+    table["+"] = "2B";
+    table["="] = "3D";
+    table["\n"] = "0A";
+    table["\r"] = "0D";
+    table["\t"] = "09";
+    table[";"] = "3B";
+    table["&"] = "26";
+    table[">"] = "3E";
+
+    outString = "";
+
+    for (i=0; i < inString.length; i++) {
+        if (inString.charAt(i) == ' ') {
+            outString += '+';
+        } else {
+            if (isHTTPEscapeChar(inString.charAt(i))) {
+                outString += "%" + table[inString.substring(i, i+1)];
+            } else {
+                outString += inString.charAt(i);
+            }
+        }
+    }
+
+    return outString;
+}
+
+// strips (optional) spaces and 0[xX] prefix at the beginning of s
+function stripPrefix(s)
+{
+  var i;
+  for(i = 0; i < s.length - 1; ++i) {
+     if (s.charAt(i) != ' ' )
+	break;
+  }
+  if (s.charAt(i) == '0' && (s.charAt(i+1) == 'x' || s.charAt(i+1) == 'X')) {
+	return s.substring(i+2,s.length);
+  } else {
+  	return  s.substring(i,s.length);;
+  }
+}
+
+// removes colons from value and returns the result
+// used as helper to convert colon-separated hexadecimal numbers
+// to regular numbers
+function removeColons(value)
+{
+    var result = "";
+
+    for (i=0; i < value.length; i++) {
+        c = value.charAt(i);
+        if (c != ':' ){
+		result += c;
+        }
+    }
+    return result;
+}
+
+function navMajorVersion()
+{
+    return parseInt(navigator.appVersion.substring(0, navigator.appVersion.indexOf(".")));
+}
+//-->
+
+
+
+
+
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/admin/graphics/gray90.gif b/pki/dogtag/ca-ui/shared/webapps/ca/admin/graphics/gray90.gif
new file mode 100644
index 000000000..c6f811102
--- /dev/null
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/admin/graphics/gray90.gif
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/admin/graphics/hr.gif b/pki/dogtag/ca-ui/shared/webapps/ca/admin/graphics/hr.gif
new file mode 100644
index 000000000..14f8acf92
--- /dev/null
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/admin/graphics/hr.gif
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/admin/graphics/spacer.gif b/pki/dogtag/ca-ui/shared/webapps/ca/admin/graphics/spacer.gif
new file mode 100644
index 000000000..13acffe53
--- /dev/null
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/admin/graphics/spacer.gif
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/admin/helpfun.js b/pki/dogtag/ca-ui/shared/webapps/ca/admin/helpfun.js
new file mode 100644
index 000000000..14a80bb95
--- /dev/null
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/admin/helpfun.js
@@ -0,0 +1,35 @@
+// --- BEGIN COPYRIGHT BLOCK ---
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; version 2 of the License.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License along
+// with this program; if not, write to the Free Software Foundation, Inc.,
+// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+//
+// Copyright (C) 2007 Red Hat, Inc.
+// All rights reserved.
+// --- END COPYRIGHT BLOCK ---
+
+function help(helptopic) { 
+
+     var HelpWin=window.open("","MyWin", "toolbar=no,directories=no,menubar=no,status=no,scrollbars=yes,resizable=yes,width=500,height=500"); 
+
+     HelpWin.location = helptopic;
+     HelpWin.focus();
+
+}
+
+function helpstatus(helpline) {
+
+     window.status = helpline;
+
+     return true;
+
+}
+
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/adminEnroll.html b/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/adminEnroll.html
deleted file mode 100644
index 13e9ac761..000000000
--- a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/adminEnroll.html
+++ /dev/null
@@ -1,778 +0,0 @@
-<!-- --- BEGIN COPYRIGHT BLOCK ---
-     This program is free software; you can redistribute it and/or modify
-     it under the terms of the GNU General Public License as published by
-     the Free Software Foundation; version 2 of the License.
-
-     This program is distributed in the hope that it will be useful,
-     but WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-     GNU General Public License for more details.
-
-     You should have received a copy of the GNU General Public License along
-     with this program; if not, write to the Free Software Foundation, Inc.,
-     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-     Copyright (C) 2007 Red Hat, Inc.
-     All rights reserved.
-     --- END COPYRIGHT BLOCK --- -->
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<TITLE>Admin Enrollment form.</TITLE>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<script type="text/javascript" SRC="/ca/agent/cms-funcs.js"></script>
-<SCRIPT type="text/javascript" SRC="/ca/agent/helpfun.js"></SCRIPT>
-<SCRIPT type="text/javascript" SRC="/ca/ee/dynamicVars.js"></SCRIPT>
-
-
-<SCRIPT>
-<!--
-function navMajorVersion() 
-{
-    return parseInt(navigator.appVersion.substring(0, navigator.appVersion.indexOf(".")));
-}
-
-function updateUid(f)
-{
-   if (f.uid.value != '') {
-     f.UID1.value = f.uid.value;
-   }
-   formulateDN(f, f.subject);
-}
-
-var crmfObject;
-function validate(form)
-{
-    if (!checkValidity())
-        return false;
-
-    with (form) {
-        if (uid.value == "") {
-            alert("You must supply your uid");
-            return false;
-        }
-        if (pwd.value == "") {
-			alert("You must supply your password");
-            return false;
-        }
-
-	if (isValidCSR(form) == false) {
-		//alert(' is not valid csr');
-		return false;
-	}
-
-        var keyGenAlg = "rsa-ex";
-        // var kraTranCert = "MIICDjCCAXegAwIBAgICAfMwDQYJKoZIhvcNAQEEBQAwdzELMAkGA1UEBhMCVVMxLDAqBgNVBAoTI05ldHNjYXBlIENvbW11bmljYXRpb25zIENvcnBvcmF0aW9uMREwDwYDVQQLEwhIYXJkY29yZTEnMCUGA1UEAxMeSGFyZGNvcmUgQ2VydGlmaWNhdGUgU2VydmVyIElJMB4XDTk4MTExOTIzNDIxOVoXDTk5MDUxODIzNDIxOVowLjELMAkGA1UEBhMCVVMxETAPBgNVBAoTCG5ldHNjYXBlMQwwCgYDVQQDEwNLUmEwXDANBgkqhkiG9w0BAQEFAANLADBIAkEArrbDiYUI5SCdlCKKa0bEBn1m83kX6bdhytRYNkd/HB95Bp85SRadmdJV+0O/yMxjYAtGCFrmcqEZ4sh2YSov6wIDAQABozYwNDARBglghkgBhvhCAQEEBAMCAEAwHwYDVR0jBBgwFoAUl7FtsrYCFlQMl9fjMm3LnN/u3oAwDQYJKoZIhvcNAQEEBQADgYEApvzcUsVIOstaoYSiWb4+aMVH6s1jiJlr5iVHnOKzfsYxPVdUw6uz04AT8N+1KIarMTKxHPzGAFSLicKLEv4HG4vh6llc86uzRzWpUqqVHg/eKN5A8Jyg56D4DkNr/XEJ7QdKesAp13dk5H5qvHelkSPLYYdMXNwNWPVZKgnWrWg=";
-        // var keyGenAlg = "rsa-ex";
-
-		var keylen=512;
-
-        // generate keys for cartman.
-        if (navigator.appName == "Netscape" && 
-			 typeof(crypto.version) != "undefined") {
-			certNickname.value = subject.value;
-        	crmfObject = crypto.generateCRMFRequest(
-				subject.value,
-               	"regToken", "authenticator", 
-				null,
-                "setCRMFRequest();", 
-                keylen, null, "rsa-dual-use");
-        }
-        return true;
-    }
-}
-
-function setCRMFRequest()
-{
-	with (document.forms[0]) {
-		CRMFRequest.value = crmfObject.request;
-		//alert(crmfObject.request);
-		submit();
-	}
-}
-
-//-->
-</SCRIPT>
-</head>
-
-<OBJECT
-	classid="clsid:127698e4-e730-4e5c-a2b1-21490a70c8a1"
-	CODEBASE="/xenroll.dll"
-	id=Enroll    >
-</OBJECT>
-
-
-<SCRIPT LANGUAGE=VBS>
-<!--
-Function escapeDNComponent(comp)
-		escapeDNComponent = comp
-End Function
-
-Function doubleQuotes(comp)
-		doubleQuotes = False
-End Function
-
-Function formulateDN(a,b)
-		Dim dn
-		Dim TheForm
-		Set TheForm = Document.ReqForm
-
-		dn = Empty
-
-		If (TheForm.C.Value <> Empty) Then
-			If doubleQuotes(TheForm.C.Value) = True Then
-				MsgBox "Double quotes are not allowed in the Country field"
-				Exit Function
-			End If
-			If (dn <> Empty) Then
-				dn = dn & ","
-			End If
-			dn = dn & "C=" & escapeDNComponent(TheForm.C.Value)
-		End If
-
-		If (TheForm.O.Value <> Empty) Then
-			If doubleQuotes(TheForm.O.Value) = True Then
-				MsgBox "Double quotes are not allowed in the Organiztion field"
-				Exit Function
-			End If
-			If (dn <> Empty) Then
-				dn = dn & ","
-			End If
-			dn = dn & "O=" & escapeDNComponent(TheForm.O.Value)
-		End If
-
-		If (TheForm.OU.Value <> Empty) Then
-			If doubleQuotes(TheForm.OU.Value) = True Then
-				MsgBox "Double quotes are not allowed in the Org Unit field"
-				Exit Function
-			End If
-			If (dn <> Empty) Then
-				dn = dn & ","
-			End If
-			dn = dn & "OU=" & escapeDNComponent(TheForm.OU.Value)
-		End If
-
-		If (TheForm.UID1.Value <> Empty) Then
-			If doubleQuotes(TheForm.UID1.Value) = True Then
-				MsgBox "Double quotes are not allowed in the uid field"
-				Exit Function
-			End If
-			If (dn <> Empty) Then
-				dn = dn & ","
-			End If
-			dn = dn & "0.9.2342.19200300.100.1.1=" & escapeDNComponent(TheForm.UID1.Value)
-		End If
-
-		If (TheForm.CN.Value <> Empty) Then
-			If doubleQuotes(TheForm.CN.Value) = True Then
-				MsgBox "Double quotes are not allowed in the Common Name field"
-				Exit Function
-			End If
-			If (dn <> Empty) Then
-				dn = dn & ","
-			End If
-			dn = dn & "CN=" & escapeDNComponent(TheForm.CN.Value)
-		End If
-
-		If (TheForm.E.Value <> Empty) Then
-			If doubleQuotes(TheForm.E.Value) = True Then
-				MsgBox "Double quotes are not allowed in the eMail field"
-				Exit Function
-			End If
-			If (dn <> Empty) Then
-				dn = dn & ","
-			End If
-			dn = dn & "E=" & escapeDNComponent(TheForm.E.Value)
-		End If
-
-
-		formulateDN = dn
-End Function
-
-Sub Send_OnClick
-  Dim TheForm
-  Dim szName
-  Set TheForm = Document.ReqForm
-
-
-  ' Do a few sanity checks
-  If (TheForm.uid.Value = Empty) Then 
-    ret = MsgBox("You must supply your Directory uid for certificate enrollment", 0, "MSIE Certificate Request")
-	Exit Sub
-  End If
-
-  If (TheForm.pwd.Value = Empty) Then
-	ret = MsgBox("You must supply your Directory password for certificate enrollment", 0, "MSIE Certificate Request")
-	Exit Sub
-  End If
-
-
-  ' Contruct the X500 distinguished name
-  szName = formulateDN("","")
-
-  On Error Resume Next
-  Enroll.HashAlgorithm = "MD5"
-  Enroll.KeySpec = 1
-  Enroll.GenKeyFlags = 1        ' key exportable
-
-   ' Pick the provider that is selected
-   set options = TheForm.all.cryptprovider.options
-   index = options.selectedIndex
-   Enroll.providerType = options(index).value
-   Enroll.providerName = options(index).text
-
-  szCertReq = Enroll.createPKCS10(szName, "1.3.6.1.5.5.7.3.2")
-  theError = Err.Number
-  On Error Goto 0
-  '
-  ' If the user has cancelled things the we simply ignore whatever
-  ' they were doing ... need to think what should be done here
-  '
-  If (szCertReq = Empty AND theError = 0) Then
-    Exit Sub
-  End If
-
-  If (szCertReq = Empty OR theError <> 0) Then
-    '
-    ' There was an error in the key pair generation. The error value
-    ' is found in the variable 'theError' which we snarfed above before
-    ' we did the 'On Error Goto 0' which cleared it again.
-    '
-    sz = "The error '" & Hex(theError) & "' occurred." & chr(13) & chr(10) & "Your credentials could not be generated."
-    result = MsgBox(sz, 0, "Credentials Enrollment")
-    Exit Sub
-  End If
-
-  TheForm.pkcs10Request.Value = szCertReq
-  TheForm.Submit
-  Exit Sub
-
-End Sub
--->
-</SCRIPT>
-
-<body bgcolor="#FFFFFF" onload=checkClientTime()>
-
-<script type="text/javascript">
-//<!--
-	if (navigator.appName == "Netscape" && 
-		navMajorVersion() <= 3) {
-        document.writeln(
-		'<form name="ReqForm" method="post" action="adminEnroll">');
-	} else
-	if (navigator.appName == "Netscape" && 
-		typeof(crypto.version) != "undefined") {
-        document.writeln(
-		'<form name="ReqForm" method="post" action="adminEnroll">');
-	} else {
-        document.writeln(
-			'<form name="ReqForm" method="post" action="adminEnroll" '+
-			'onSubmit="return validate(document.forms[0])">');
-	}
-//-->
-</script>
-
-<font size="+1" face="PrimaSans BT, Verdana, Arial, Helvetica, sans-serif">
-Administrator/Agent Certificate Enrollment<br>
-</font><br>
-  <font size="-1" face="PrimaSans BT, Verdana, Arial, Helvetica, sans-serif"> 
-  To access the Agent Services pages and approve requests for certificates,
-  you must have a personal client SSL certificate so that Certificate
-  System can authenticate your identity. You must also
-  be designated as an agent, or privileged user.
-  <p>
-  Use this form to request this first personal certificate to be issued
-  by the system. When you submit the form, the certificate is issued
-  immediately and returned to you. The system also adds you 
-  automatically to the list of agents. You must import the new
-  certificate into your browser before you can access the Agent Services
-  pages.
-  <p>
-  <b>After you submit this form, it is automatically disabled.</b> To enroll
-  again, or to enroll other users, please see the documentation.
-  </font>
-
-<table border="0" cellspacing="0" cellpadding="2" background=/ca/agent/graphics/hr.gif" width="100%">
-  <tr> 
-    <td>&nbsp;</td>
-  </tr>
-</table>
-
-<table border="0" cellspacing="2" cellpadding="2">
-  <tr valign="TOP"> 
-    <td><font size="-1" face="PrimaSans BT, Verdana, sans-serif">
-	  <b>Important:</b> 
-    </font></td>
-    <td><font size="-1" face="PrimaSans BT, Verdana, sans-serif">
-      Be sure to request your certificate on the same computer
-      on which you plan to use the certificate.
-	</font></td>
-  </tr>
-</table>
-
-<table border="0" cellspacing="0" cellpadding="0" background=/ca/agent/graphics/hr.gif" width="100%">
-  <tr> 
-    <td>&nbsp;</td>
-  </tr>
-</table>
-
-<table border="0" width="100%" cellspacing="2" cellpadding="2">
-  <tr> 
-    <td colspan="2" valign="TOP">
-      <font size="-1" face="PrimaSans BT, Verdana, Arial, Helvetica, sans-serif">
-	    <b>Authentication Information</b><br>
-        Enter the user ID and password for the administrator/agent.
-    </td>
-  </tr>
-  <tr> 
-    <td align="RIGHT"> 
-      <font size="-1" face="PrimaSans BT, Verdana, Arial, Helvetica, sans-serif">
-      User ID:</font>
-    </td>
-    <td valign="TOP"> 
-      <input type="TEXT" name="uid" size="30" onchange="updateUid(this.form)">
-    </td>
-  </tr>
-  <tr> 
-    <td align="RIGHT"> 
-      <font size="-1" face="PrimaSans BT, Verdana, Arial, Helvetica, sans-serif">
-      Password:</font> 
-    </td>
-    <td valign="TOP"> 
-      <input type="PASSWORD" name="pwd" AutoComplete=off size="30">
-    </td>
-  </tr>
-
-  <tr>
-    <td VALIGN=TOP COLSPAN="2">
-      <font size="-1" face="PrimaSans BT, Verdana, Arial, Helvetica, sans-serif">
-        <b>Subject Name</b><br>
-        Enter values for the DN components you want to have in your certificate.
-      </font>
-    </td>
-  </tr>
-
-  <tr>
-    <td align=right>
-      <font size="-1" face="PrimaSans BT, Verdana, Arial, Helvetica, sans-serif">
-        Full name:
-      </font>
-    </td>
-    <td VALIGN=TOP>
-      <input type="HIDDEN" name="csrRequestorName">
-      <input type="TEXT" name="CN" value="CS Administrator" size="30" onchange="formulateDN(this.form, this.form.subject)">
-    </td>
-  </tr>
-
-  <tr>
-    <td ALIGN=RIGHT>
-      <font size="-1" face="PrimaSans BT, Verdana, Arial, Helvetica, sans-serif">
-        Login name:
-      </font>
-    </td>
-    <td VALIGN=TOP>
-      <input type="TEXT" name="UID1" size="30" onchange="formulateDN(this.form, this.form.subject)">
-    </td>
-  </tr>
-
-  <tr>
-    <td ALIGN=RIGHT>
-      <font size="-1" face="PrimaSans BT, Verdana, Arial, Helvetica, sans-serif">
-        Email address:
-      </font>
-    </td>
-    <td>
-      <input type="TEXT" name="E" size="30" onchange="formulateDN(this.form, this.form.subject)">
-    </td>
-  </tr>
-
-  <tr>
-    <td ALIGN=RIGHT>
-      <font size="-1" face="PrimaSans BT, Verdana, Arial, Helvetica, sans-serif">
-        Organization unit:
-      </font>
-    </td>
-    <td>
-      <input type="TEXT" name="OU" size="30" onchange="formulateDN(this.form, this.form.subject)">
-    </td>
-  </tr>
-
-  <tr>
-    <td ALIGN=RIGHT>
-      <font size="-1" face="PrimaSans BT, Verdana, Arial, Helvetica, sans-serif">
-        Organization:
-      </font>
-    </td>
-    <td>
-      <input type="TEXT" name="O" size="30" onchange="formulateDN(this.form, this.form.subject)">
-    </td>
-  </tr>
-
-  <tr>
-    <td ALIGN=RIGHT>
-      <font size="-1" face="PrimaSans BT, Verdana, Arial, Helvetica, sans-serif">
-        Country:
-      </font>
-    </td>
-    <td>
-      <input type="TEXT" name="C" value="US" size=2 maxlength=2 onchange="formulateDN(this.form, this.form.subject)">
-    </td>
-  </tr>
-
-  <tr>
-    <td></td>
-
-    <td>
-      <!-- for Netscape Certificate Type Extension -->
-      <input type="HIDDEN" value="false" name="email">
-      <input type="HIDDEN" value="true" name="ssl_client">
-      <!-- for Key Usage Extension -->
-      <input type="HIDDEN" name="digital_signature" value=true>
-    </td>
-  </tr>
-
-<script lang=javascript>
-<!--
-function renderSelectionWithNames(name, from, to, selected, names)
-{
-    document.writeln('<SELECT NAME="'+name+'" onChange="checkValidity()">');
-    for (var i = from; i < to; i++) {
-        if (i == selected) {
-            document.writeln('<OPTION VALUE='+i+' SELECTED>'+names[i]);
-        } else {
-            document.writeln('<OPTION VALUE='+i+'>'+names[i]);
-        }
-    }
-    document.writeln('</SELECT>');
-}
-
-function renderSelection(name, from, to, selected)
-{
-    document.writeln('<SELECT NAME="'+name+'" onChange="checkValidity()">');
-    for (var i = from; i < to; i++) {
-        if (i == selected) {
-            document.writeln('<OPTION VALUE='+i+' SELECTED>'+i);
-        } else {
-            document.writeln('<OPTION VALUE='+i+'>'+i);
-        }
-    }
-    document.writeln('</SELECT>');
-}
-
-function renderValidityInfo()
-{
-    document.writeln('<tr><td valign="top" colspan="2">');
-    document.writeln('<font size="-1" face="PrimaSans BT, Verdana, sans-serif">');
-    document.writeln('<b>Validity</b><br>');
-    document.writeln('Set certificate validity period by selecting dates,');
-    document.writeln('for which certificate is not valid before and not valid after.');
-    document.writeln('</font></td></tr>');
-
-    var months = new Array("January", "February", "March", "April",
-                           "May", "June", "July", "August",
-                           "September", "October", "November", "December");
-
-    var startDay = new Date(serverdate);
-    var year = startDay.getFullYear();
-    var time1 = startDay.getTime();
-    var time2 = time1 + 31536000000;  // 1 Year (365 days)
-    var endDay = new Date(time2);
-
-
-    document.writeln('<tr><td align="right">'+
-                     '<font size="-1" face="PrimaSans BT, Verdana, sans-serif">'+
-                     'Not valid before:</font></td>');
-    document.writeln('<td valign="top">');
-
-    renderSelection("fromDay", 1, 32, startDay.getDate());
-    renderSelectionWithNames("fromMonth", 0, months.length, startDay.getMonth(), months);
-    renderSelection("fromYear", year-2, year+10, year);
-    document.writeln('&nbsp;&nbsp;');
-    renderSelection("fromHour", 0, 24, startDay.getHours());
-    renderSelection("fromMinute", 0, 60, startDay.getMinutes());
-    renderSelection("fromSecond", 0, 60, startDay.getSeconds());
-    document.writeln('</td></tr>');
-
-
-    document.writeln('<tr><td align="right">'+
-                     '<font size="-1" face="PrimaSans BT, Verdana, sans-serif">'+
-                     'Not valid after:</font></td>');
-    document.writeln('<td valign="top">');
-
-    renderSelection("toDay", 1, 32, endDay.getDate());
-    renderSelectionWithNames("toMonth", 0, months.length, endDay.getMonth(), months);
-    renderSelection("toYear", year-2, year+10, endDay.getFullYear());
-    document.writeln('&nbsp;&nbsp;');
-    renderSelection("toHour", 0, 24, endDay.getHours());
-    renderSelection("toMinute", 0, 60, endDay.getMinutes());
-    renderSelection("toSecond", 0, 60, endDay.getSeconds());
-    document.writeln('</td></tr>');
-
-    document.writeln('<tr><td valign="top" colspan="2">');
-    document.writeln('<input type="HIDDEN" name="notValidBefore" value="">');
-    document.writeln('<input type="HIDDEN" name="notValidAfter" value="">');
-    document.writeln('</td></tr>');
-
-    document.forms[0].notValidBefore.value = time1;
-    document.forms[0].notValidAfter.value = time2;
-}
-
-function checkValidity()
-{
-    var i;
-    var fromDate;
-    i = document.forms[0].fromDay.selectedIndex;
-    var day = document.forms[0].fromDay.options[i].value;
-    i = document.forms[0].fromMonth.selectedIndex;
-    var month = document.forms[0].fromMonth.options[i].value;
-    i = document.forms[0].fromYear.selectedIndex;
-    var year = document.forms[0].fromYear.options[i].value;
-    i = document.forms[0].fromHour.selectedIndex;
-    var hour = document.forms[0].fromHour.options[i].value;
-    i = document.forms[0].fromMinute.selectedIndex;
-    var minute = document.forms[0].fromMinute.options[i].value;
-    i = document.forms[0].fromSecond.selectedIndex;
-    var second = document.forms[0].fromSecond.options[i].value;
-
-    fromDate = new Date(year,month,day,hour,minute,second);
-    if (fromDate.getMonth() != month || fromDate.getDate() != day || year == 0) {
-        alert((++month)+"/"+day+"/"+year+" is invalid");
-        return false;
-    }
-    var fromTime = fromDate.getTime();
-
-    var toDate;
-    i = document.forms[0].toDay.selectedIndex;
-    day = document.forms[0].toDay.options[i].value;
-    i = document.forms[0].toMonth.selectedIndex;
-    month = document.forms[0].toMonth.options[i].value;
-    i = document.forms[0].toYear.selectedIndex;
-    year = document.forms[0].toYear.options[i].value;
-    i = document.forms[0].toHour.selectedIndex;
-    hour = document.forms[0].toHour.options[i].value;
-    i = document.forms[0].toMinute.selectedIndex;
-    minute = document.forms[0].toMinute.options[i].value;
-    i = document.forms[0].toSecond.selectedIndex;
-    second = document.forms[0].toSecond.options[i].value;
-
-    toDate = new Date(year,month,day,hour,minute,second);
-    if (toDate.getMonth() != month || toDate.getDate() != day || year == 0) {
-        alert((++month)+"/"+day+"/"+year+" is invalid");
-        return false;
-    }
-    var toTime = toDate.getTime();
-
-
-    if (fromTime > toTime) {
-        alert("NOT VALID AFTER date should not be earlier than NOT VALID BEFORE date.");
-        return false;
-    }
-
-    document.forms[0].notValidBefore.value = fromTime;
-    document.forms[0].notValidAfter.value = toTime;
-
-    return true;
-}
-
-renderValidityInfo();
-//-->
-</script>
-
-  <tr> 
-    <td valign="TOP" colspan="2">
-	  <font size="-1" face="PrimaSans BT, Verdana, Arial, Helvetica, sans-serif">
-        <b>User's Key Information</b><br>
-        When your submit this form, the browser generates a private and 
-        public key. The browser retains the private key and submits the 
-        public key along with your request for a certificate. 
-        The public key becomes part of your certificate. <P>
-<script lang=javascript>
-<!--
-		if (navigator.appName == 'Netscape' && navMajorVersion() <= 3) {
-			document.writeln('Select the length of the key to generate. '+
-				'The longer the key length, the greater the strength. ');
-		} else
-		if (navigator.appName == 'Netscape' && typeof(crypto.version) == "undefined") {
-			document.writeln('Select the length of the key to generate. '+
-				'The longer the key length, the greater the strength. ');
-		}
-        if (navigator.appName == "Microsoft Internet Explorer") {
-              document.writeln(
-                  '<font size=-1 face="PrimaSans BT, Verdana, Arial, Helvetica, sans-serif">');
-                  document.writeln('Cryptographic Provider:');
-                  document.writeln('</font>');
-           document.writeln('<SELECT NAME=\"cryptprovider\"></SELECT>');
-                }
-//-->
-</script>
-      </font>
-    </td>
-  </tr>
-  <tr> 
-<script lang=javascript>
-<!--
-        if (navigator.appName == "Netscape") {
-			if (navMajorVersion() <= 3) {
-    			document.write('<td align="right">');
-	      		document.write('<font size="-1" '+
-		    		'face="PrimaSans BT, Verdana, Arial, Helvetica, sans-serif">');
-			    document.write('Key Length:');
-			    document.write('</font>');
-			    document.write('</td>');
-				document.write('<td>');
-                document.write('<KEYGEN name="subjectKeyGenInfo">');
-				document.write('</td>');
-			} else
-			if (typeof(crypto.version) == "undefined") {
-                //alert('not cartman');
-    			document.write('<td align="right">');
-	      		document.write('<font size="-1" '+
-		    		'face="PrimaSans BT, Verdana, Arial, Helvetica, sans-serif">');
-			    document.write('Key Length:');
-			    document.write('</font>');
-			    document.write('</td>');
-				document.write('<td>');
-                document.write('<KEYGEN name="subjectKeyGenInfo">');
-				document.write('</td>');
-        	} 
-			else {
-                //alert('cartman');
-				//document.write('<td>');
-                //document.writeln('<SELECT NAME=\"keyLength\">');
-                //document.writeln('<OPTION VALUE=512>512 bits');
-                //document.writeln('<OPTION VALUE=768>768 bits');
-                //document.writeln('<OPTION VALUE=1024>1024 bits');
-                //document.writeln('</SELECT>');
-				//document.write('</td>');
-			}
-        }
-//-->
-</script>
-
-    </td>
-  </tr>
-
-  <tr> 
-    <td valign="TOP" colspan="2"> 
-      <table border="0" width="100%" cellspacing="0" cellpadding="6" bgcolor="#cccccc" background=/ca/agent/graphics/gray90.gif">
-        <tr> 
-          <td> 
-            <div align="RIGHT">
-<script lang=javascript>
-<!--
-        		if (navigator.appName == "Netscape" && 
-			 		navMajorVersion() <= 3) {
-					document.writeln(
-						'<input type="submit" value="Submit" '+
-						'name="submit" width="72">');
-				} else
-        		if (navigator.appName == "Netscape" && 
-			 		typeof(crypto.version) == "undefined") {
-					document.writeln(
-						'<input type="submit" value="Submit" '+
-						'name="submit" width="72">');
-				}
-				else if (navigator.appName == "Microsoft Internet Explorer") {
-					document.writeln(
-						'<input type="submit" value="Submit" '+
-						'name="Send" width="72">');
-				}
-				else {
-					// alert('cartman');
-					document.writeln(
-						'<input type="button" value="Submit" '+
-						'name="submitbutton" '+
-						'onclick="validate(form)" width="72">');
-        		}
-//-->
-</script>
-
-            <input type="hidden" name="subject" value="" >
-			<img src=/ca/agent/graphics/spacer.gif" width="6" height="6"> 
-			<input type="reset" value="Reset" name="reset" width="72">
-			<img src=/ca/agent/graphics/spacer.gif" width="9" height="6"> 
-			<input type="button" value="Help" onclick=
-				 "help('http://www.redhat.com/docs/manuals/cert-system#Administrator/Agent Certificate Enrollment')" 
-				 name="button" width="72">
-			<input type="hidden" name="certType" value="client">
-
-<script lang=javascript>
-<!--
-				if (navigator.appName == 'Netscape') {
-					if (navMajorVersion() < 4 ||
-						typeof(crypto.version) == "undefined") {
-						document.write(
-					 	'<input type="hidden" name="importCert" value="off">');
-					} 
-					else {
-						document.write(
-					 	'<input type="hidden" name="CRMFRequest" value="">');
-						document.write(
-					 	'<input type="hidden" name="cmmfResponse" value="on">');
-						document.write(
-					 	'<input type="hidden" name="certNickname" value="">');
-					}
-				}
-				else {
-					// IE 
-					document.write(
-					 '<input type="hidden" name="pkcs10Request" value="">');
-				}
-//-->
-</script>
-            </div>
-          </td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-</table>
-</form>
-<SCRIPT LANGUAGE=VBS>
-<!--
-
-FindProviders
-
-Function FindProviders
-        Dim i, j
-        Dim providers()
-        i = 0
-        j = 1
-        Dim el
-        Dim temp
-        Dim first
-        Dim TheForm
-        Set TheForm = document.ReqForm
-        On Error Resume Next
-        first = 0
-
-        Do While True
-        temp = ""
-        Enroll.providerType = j
-        temp = Enroll.enumProviders(i,0)
-        If Len(temp) = 0 Then
-        If j < 1 Then
-          j = j + 1
-          i = 0
-        Else
-          Exit Do
-        End If
-        Else
-        set el = document.createElement("OPTION")
-        el.text = temp
-        el.value = j
-        TheForm.cryptprovider.add(el)
-        If first = 0  Then
-          first = 1
-          TheForm.cryptprovider.selectedIndex = 0
-        End If
-        i = i + 1
-        End If
-        Loop
-
-End Function
-
--->
-</SCRIPT>
-</body>
-</html>
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/index.html b/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/index.html
index f975b045d..ea83e18c0 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/index.html
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/index.html
@@ -20,7 +20,7 @@
 <head>
 <title>Certificate Authority</title>
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link rel="shortcut icon" href="/ca/admin/console/img/favicon.ico" />
+<link rel="shortcut icon" href="/ca/agent/graphics/favicon.ico" />
 </head>
 
 <frameset rows="105,1*" frameborder="NO" border="0" cols="*"> 
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/processReq.template b/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/processReq.template
index 302b9e4c0..9d98c9d01 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/processReq.template
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/processReq.template
@@ -24,7 +24,7 @@
 
 <SCRIPT type="text/javascript" SRC="/ca/agent/funcs.js"></SCRIPT>
 <SCRIPT type="text/javascript" SRC="/ca/agent/helpfun.js"></SCRIPT>
-<SCRIPT type="text/javascript" SRC="/ca/ee/dynamicVars.js"></SCRIPT>
+<SCRIPT type="text/javascript" SRC="/ca/agent/dynamicVars.js"></SCRIPT>
 
 <CMS_TEMPLATE>
 
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/graphics/favicon.ico b/pki/dogtag/ca-ui/shared/webapps/ca/agent/graphics/favicon.ico
new file mode 100644
index 000000000..efc1d33f4
--- /dev/null
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/agent/graphics/favicon.ico
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/graphics/logo_header.gif b/pki/dogtag/ca-ui/shared/webapps/ca/agent/graphics/logo_header.gif
new file mode 100644
index 000000000..573482227
--- /dev/null
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/agent/graphics/logo_header.gif
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/header.template b/pki/dogtag/ca-ui/shared/webapps/ca/agent/header.template
index d26fc8cee..dfe7061f1 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/agent/header.template
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/agent/header.template
@@ -29,7 +29,7 @@
     <td> 
       <table border="0" cellspacing="12" cellpadding="0">
         <tr>
-          <td><img src="/ca/admin/console/img/logo_header.gif"></td>
+          <td><img src="/ca/agent/graphics/logo_header.gif"></td>
           <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
           <td><font size="+1" face="PrimaSans BT, Verdana, sans-serif" color="white"><b>Dogtag<sup><font color="#999999" size="-2">&reg;</font></sup> Agent Services</b></font></td>
         </tr>
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/index.html b/pki/dogtag/ca-ui/shared/webapps/ca/agent/index.html
index 486bb4748..8302f4d4a 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/agent/index.html
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/agent/index.html
@@ -17,5 +17,5 @@
      --- END COPYRIGHT BLOCK --- -->
 <HTML>
 <meta http-equiv="Refresh" content="0;URL=/index">
-<link rel="shortcut icon" href="/ca/admin/console/img/favicon.ico" />
+<link rel="shortcut icon" href="/ca/agent/graphics/favicon.ico" />
 </HTML>
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/index.template b/pki/dogtag/ca-ui/shared/webapps/ca/agent/index.template
index fdaede80f..70d65f6f1 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/agent/index.template
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/agent/index.template
@@ -29,7 +29,7 @@
     <td> 
       <table border="0" cellspacing="12" cellpadding="0">
         <tr> 
-          <td><img src="/ca/admin/console/img/logo_header.gif"></td>
+          <td><img src="/ca/agent/graphics/logo_header.gif"></td>
           <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
           <td><font size="+1" face="PrimaSans BT, Verdana, sans-serif" color="white"><b>Dogtag<sup><font color="#999999" size="-2">&reg;</font></sup> Agent Services</b></font></td>
         </tr>
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ports.template b/pki/dogtag/ca-ui/shared/webapps/ca/agent/ports.template
index 025b54389..3b32ed7cc 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ports.template
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/agent/ports.template
@@ -29,7 +29,7 @@
     <td> 
       <table border="0" cellspacing="12" cellpadding="0">
         <tr> 
-          <td><img src="/ca/admin/console/img/logo_header.gif"></td>
+          <td><img src="/ca/agent/graphics/logo_header.gif"></td>
           <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
           <td><font size="+1" face="PrimaSans BT, Verdana, sans-serif" color="white"><b>Dogtag<sup><font color="#999999" size="-2">&reg;</font></sup> Services Summary</b></font></td>
         </tr>
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/index.html b/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/index.html
index 694fe2ee4..09dce41ab 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/index.html
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/index.html
@@ -20,7 +20,7 @@
 <head>
 <title>Certificate System</title>
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link rel="shortcut icon" href="/ca/admin/console/img/favicon.ico" />
+<link rel="shortcut icon" href="/ca/ee/graphics/favicon.ico" />
 <SCRIPT LANGUAGE="JavaScript"></SCRIPT>
 <script lang="javascript" src="/ca/ee/dynamicVars.js"></script>
 <script lang="javascript" src="/ca/ee/cms-funcs.js"></script>
@@ -313,7 +313,7 @@ function loadTabs()
 		writeln('<tr><td>');
 		writeln('<table border=0 cellspacing=12 cellpadding=0>');
 		writeln('<tr>');
-		writeln('<td><img src="/ca/admin/console/img/logo_header.gif"></td>');
+		writeln('<td><img src="/ca/ee/graphics/logo_header.gif"></td>');
 		writeln('<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>');
 	if (subsystemname == 'ca') {
 		writeln('<td><font size="+1" face="PrimaSans BT, Verdana, sans-serif" color="white"><b>Dogtag<sup><font color="#cccccc" size="-2">&reg;</font></sup> Certificate Manager</b></font></td>');
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/policyEnrollment/index.html b/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/policyEnrollment/index.html
index 88aece99d..b1f05c723 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/policyEnrollment/index.html
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/policyEnrollment/index.html
@@ -19,7 +19,7 @@
 <head>
 <title>Certificate Management System</title>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<link rel="shortcut icon" href="/ca/admin/console/img/favicon.ico" />
+<link rel="shortcut icon" href="/ca/ee/graphics/favicon.ico" />
 <SCRIPT LANGUAGE="JavaScript"></SCRIPT>
 <script lang="javascript" src="/dynamicVars.js"></script>
 <script lang="javascript" src="/cms-funcs.js"></script>
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/profileEnrollment/index.html b/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/profileEnrollment/index.html
index 4dd364423..5d5eccc6d 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/profileEnrollment/index.html
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/profileEnrollment/index.html
@@ -19,7 +19,7 @@
 <head>
 <title>Certificate Management System</title>
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link rel="shortcut icon" href="/ca/admin/console/img/favicon.ico" />
+<link rel="shortcut icon" href="/ca/ee/graphics/favicon.ico" />
 <SCRIPT LANGUAGE="JavaScript"></SCRIPT>
 <script lang="javascript" src="/dynamicVars.js"></script>
 <script lang="javascript" src="/cms-funcs.js"></script>
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/graphics/favicon.ico b/pki/dogtag/ca-ui/shared/webapps/ca/ee/graphics/favicon.ico
new file mode 100644
index 000000000..efc1d33f4
--- /dev/null
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/ee/graphics/favicon.ico
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/graphics/logo_header.gif b/pki/dogtag/ca-ui/shared/webapps/ca/ee/graphics/logo_header.gif
new file mode 100644
index 000000000..573482227
--- /dev/null
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/ee/graphics/logo_header.gif
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/index.html b/pki/dogtag/ca-ui/shared/webapps/ca/ee/index.html
index 7a407079f..44b6deaaf 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/ee/index.html
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/ee/index.html
@@ -16,7 +16,7 @@
      All rights reserved.
      --- END COPYRIGHT BLOCK --- -->
 <html>
-<link rel="shortcut icon" href="/ca/admin/console/img/favicon.ico" />
+<link rel="shortcut icon" href="/ca/ee/graphics/favicon.ico" />
 <script lang="javascript" src="/ca/ee/dynamicVars.js"></script>
 <script lang="javascript">
   if (subsystemname == 'ca') {
diff --git a/pki/dogtag/kra-ui/shared/webapps/kra/agent/graphics/favicon.ico b/pki/dogtag/kra-ui/shared/webapps/kra/agent/graphics/favicon.ico
new file mode 100644
index 000000000..efc1d33f4
--- /dev/null
+++ b/pki/dogtag/kra-ui/shared/webapps/kra/agent/graphics/favicon.ico
diff --git a/pki/dogtag/kra-ui/shared/webapps/kra/agent/graphics/logo_header.gif b/pki/dogtag/kra-ui/shared/webapps/kra/agent/graphics/logo_header.gif
new file mode 100644
index 000000000..573482227
--- /dev/null
+++ b/pki/dogtag/kra-ui/shared/webapps/kra/agent/graphics/logo_header.gif
diff --git a/pki/dogtag/kra-ui/shared/webapps/kra/agent/header.template b/pki/dogtag/kra-ui/shared/webapps/kra/agent/header.template
index 1c66def33..0de93919a 100644
--- a/pki/dogtag/kra-ui/shared/webapps/kra/agent/header.template
+++ b/pki/dogtag/kra-ui/shared/webapps/kra/agent/header.template
@@ -29,7 +29,7 @@
     <td> 
       <table border="0" cellspacing="12" cellpadding="0">
         <tr>
-          <td><img src="/kra/admin/console/img/logo_header.gif"></td>
+          <td><img src="/kra/agent/graphics/logo_header.gif"></td>
           <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
           <td><font size="+1" face="PrimaSans BT, Verdana, sans-serif" color="white"><b>Dogtag<sup><font color="#999999" size="-2">&reg;</font></sup> Agent Services</b></font></td>
         </tr>
diff --git a/pki/dogtag/kra-ui/shared/webapps/kra/agent/index.html b/pki/dogtag/kra-ui/shared/webapps/kra/agent/index.html
index 66fa15dba..aa8805945 100644
--- a/pki/dogtag/kra-ui/shared/webapps/kra/agent/index.html
+++ b/pki/dogtag/kra-ui/shared/webapps/kra/agent/index.html
@@ -18,5 +18,5 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <HTML>
 <meta http-equiv="Refresh" content="0;URL=/index">
-<link rel="shortcut icon" href="/kra/admin/console/img/favicon.ico" />
+<link rel="shortcut icon" href="/kra/agent/graphics/favicon.ico" />
 </HTML>
diff --git a/pki/dogtag/kra-ui/shared/webapps/kra/agent/index.template b/pki/dogtag/kra-ui/shared/webapps/kra/agent/index.template
index d1340df73..478834955 100644
--- a/pki/dogtag/kra-ui/shared/webapps/kra/agent/index.template
+++ b/pki/dogtag/kra-ui/shared/webapps/kra/agent/index.template
@@ -29,7 +29,7 @@
     <td> 
       <table border="0" cellspacing="12" cellpadding="0">
         <tr> 
-          <td><img src="/kra/admin/console/img/logo_header.gif"></td>
+          <td><img src="/kra/agent/graphics/logo_header.gif"></td>
           <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
           <td><font size="+1" face="PrimaSans BT, Verdana, sans-serif" color="white"><b>Dogtag<sup><font color="#999999" size="-2">&reg;</font></sup> Agent Services</b></font></td>
         </tr>
diff --git a/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/index.html b/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/index.html
index 2dd8842ac..d98d039dc 100644
--- a/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/index.html
+++ b/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/index.html
@@ -3,7 +3,7 @@
 <head>
 <title>Key Recovery Authority</title>
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link rel="shortcut icon" href="/kra/admin/console/img/favicon.ico" />
+<link rel="shortcut icon" href="/kra/agent/graphics/favicon.ico" />
 </head>
 
 <frameset rows="105,1*" frameborder="NO" border="0"> 
diff --git a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/graphics/favicon.ico b/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/graphics/favicon.ico
new file mode 100644
index 000000000..efc1d33f4
--- /dev/null
+++ b/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/graphics/favicon.ico
diff --git a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/graphics/logo_header.gif b/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/graphics/logo_header.gif
new file mode 100644
index 000000000..573482227
--- /dev/null
+++ b/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/graphics/logo_header.gif
diff --git a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/header.template b/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/header.template
index ad32ded3a..4697e78f7 100644
--- a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/header.template
+++ b/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/header.template
@@ -29,7 +29,7 @@
     <td> 
       <table border="0" cellspacing="12" cellpadding="0">
         <tr>
-          <td><img src="/ocsp/admin/console/img/logo_header.gif"></td>
+          <td><img src="/ocsp/agent/graphics/logo_header.gif"></td>
           <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
           <td><font size="+1" face="PrimaSans BT, Verdana, sans-serif" color="white"><b>Dogtag<sup><font color="#999999" size="-2">&reg;</font></sup> Agent Services</b></font></td>
         </tr>
diff --git a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/index.html b/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/index.html
index 6bdb9edc7..5a400ee13 100644
--- a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/index.html
+++ b/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/index.html
@@ -17,5 +17,5 @@
      --- END COPYRIGHT BLOCK --- -->
 <HTML>
 <meta http-equiv="Refresh" content="0;URL=/index">
-<link rel="shortcut icon" href="/ocsp/admin/console/img/favicon.ico" />
+<link rel="shortcut icon" href="/ocsp/agent/graphics/favicon.ico" />
 </HTML>
diff --git a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/index.template b/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/index.template
index 04103516b..ff9d11df6 100644
--- a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/index.template
+++ b/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/index.template
@@ -29,7 +29,7 @@
     <td> 
       <table border="0" cellspacing="12" cellpadding="0">
         <tr> 
-          <td><img src="/ocsp/admin/console/img/logo_header.gif"></td>
+          <td><img src="/ocsp/agent/graphics/logo_header.gif"></td>
           <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
           <td><font size="+1" face="PrimaSans BT, Verdana, sans-serif" color="white"><b>Dogtag<sup><font color="#999999" size="-2">&reg;</font></sup> Agent Services</b></font></td>
         </tr>
diff --git a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/index.html b/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/index.html
index 98722e514..54edf80fa 100644
--- a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/index.html
+++ b/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/index.html
@@ -20,7 +20,7 @@
 <head>
 <title>Online Certificate Status Authority</title>
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link rel="shortcut icon" href="/ocsp/admin/console/img/favicon.ico" />
+<link rel="shortcut icon" href="/ocsp/agent/graphics/favicon.ico" />
 </head>
 
 <frameset rows="105,1*" frameborder="NO" border="0" cols="*"> 
diff --git a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ports.template b/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ports.template
index 48d7aab1b..e7ae222da 100644
--- a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ports.template
+++ b/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ports.template
@@ -29,7 +29,7 @@
     <td> 
       <table border="0" cellspacing="12" cellpadding="0">
         <tr> 
-          <td><img src="/ocsp/admin/console/img/logo_header.gif"></td>
+          <td><img src="/ocsp/agent/graphics/logo_header.gif"></td>
           <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
           <td><font size="+1" face="PrimaSans BT, Verdana, sans-serif" color="white"><b>Dogtag<sup><font color="#999999" size="-2">&reg;</font></sup> Services Summary</b></font></td>
         </tr>
diff --git a/pki/dogtag/tks-ui/shared/webapps/tks/agent/graphics/favicon.ico b/pki/dogtag/tks-ui/shared/webapps/tks/agent/graphics/favicon.ico
new file mode 100644
index 000000000..efc1d33f4
--- /dev/null
+++ b/pki/dogtag/tks-ui/shared/webapps/tks/agent/graphics/favicon.ico
diff --git a/pki/dogtag/tks-ui/shared/webapps/tks/agent/graphics/logo_header.gif b/pki/dogtag/tks-ui/shared/webapps/tks/agent/graphics/logo_header.gif
new file mode 100644
index 000000000..573482227
--- /dev/null
+++ b/pki/dogtag/tks-ui/shared/webapps/tks/agent/graphics/logo_header.gif
diff --git a/pki/dogtag/tks-ui/shared/webapps/tks/agent/header.template b/pki/dogtag/tks-ui/shared/webapps/tks/agent/header.template
index ae8f7a90b..dc92d82ad 100644
--- a/pki/dogtag/tks-ui/shared/webapps/tks/agent/header.template
+++ b/pki/dogtag/tks-ui/shared/webapps/tks/agent/header.template
@@ -29,7 +29,7 @@
     <td> 
       <table border="0" cellspacing="12" cellpadding="0">
         <tr>
-          <td><img src="/tks/admin/console/img/logo_header.gif"></td>
+          <td><img src="/tks/agent/graphics/logo_header.gif"></td>
           <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
           <td><font size="+1" face="PrimaSans BT, Verdana, sans-serif" color="white"><b>Dogtag<sup><font color="#999999" size="-2">&reg;</font></sup> Agent Services</b></font></td>
         </tr>
diff --git a/pki/dogtag/tks-ui/shared/webapps/tks/agent/index.html b/pki/dogtag/tks-ui/shared/webapps/tks/agent/index.html
index 04303060c..ee2cd2e0b 100644
--- a/pki/dogtag/tks-ui/shared/webapps/tks/agent/index.html
+++ b/pki/dogtag/tks-ui/shared/webapps/tks/agent/index.html
@@ -18,5 +18,5 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <HTML>
 <meta http-equiv="Refresh" content="0;URL=/index">
-<link rel="shortcut icon" href="/tks/admin/console/img/favicon.ico" />
+<link rel="shortcut icon" href="/tks/agent/graphics/favicon.ico" />
 </HTML>
diff --git a/pki/dogtag/tks-ui/shared/webapps/tks/agent/index.template b/pki/dogtag/tks-ui/shared/webapps/tks/agent/index.template
index c87d0d9f3..2b9a4d4e3 100644
--- a/pki/dogtag/tks-ui/shared/webapps/tks/agent/index.template
+++ b/pki/dogtag/tks-ui/shared/webapps/tks/agent/index.template
@@ -29,7 +29,7 @@
     <td> 
       <table border="0" cellspacing="12" cellpadding="0">
         <tr> 
-          <td><img src="/tks/admin/console/img/logo_header.gif"></td>
+          <td><img src="/tks/agent/graphics/logo_header.gif"></td>
           <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
           <td><font size="+1" face="PrimaSans BT, Verdana, sans-serif" color="white"><b>Dogtag<sup><font color="#999999" size="-2">&reg;</font></sup> Agent Services</b></font></td>
         </tr>
diff --git a/pki/dogtag/tks-ui/shared/webapps/tks/agent/ports.template b/pki/dogtag/tks-ui/shared/webapps/tks/agent/ports.template
index 580bdf645..6cb99831d 100644
--- a/pki/dogtag/tks-ui/shared/webapps/tks/agent/ports.template
+++ b/pki/dogtag/tks-ui/shared/webapps/tks/agent/ports.template
@@ -29,7 +29,7 @@
     <td> 
       <table border="0" cellspacing="12" cellpadding="0">
         <tr> 
-          <td><img src="/tks/admin/console/img/logo_header.gif"></td>
+          <td><img src="/tks/agent/graphics/logo_header.gif"></td>
           <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
           <td><font size="+1" face="PrimaSans BT, Verdana, sans-serif" color="white"><b>Dogtag<sup><font color="#999999" size="-2">&reg;</font></sup> Services Summary</b></font></td>
         </tr>
diff --git a/pki/dogtag/tks-ui/shared/webapps/tks/agent/tks/index.html b/pki/dogtag/tks-ui/shared/webapps/tks/agent/tks/index.html
index fe544d7e9..aea2145d5 100644
--- a/pki/dogtag/tks-ui/shared/webapps/tks/agent/tks/index.html
+++ b/pki/dogtag/tks-ui/shared/webapps/tks/agent/tks/index.html
@@ -20,7 +20,7 @@
 <head>
   <meta http-equiv="content-type"
  content="text/html; charset=ISO-8859-1">
-  <link rel="shortcut icon" href="/tks/admin/console/img/favicon.ico" />
+  <link rel="shortcut icon" href="/tks/agent/graphics/favicon.ico" />
   <title>index.html</title>
 </head>
 <body>