diff options
Diffstat (limited to 'pki/dogtag/tks-ui')
8 files changed, 50 insertions, 77 deletions
diff --git a/pki/dogtag/tks-ui/dogtag-pki-tks-ui.spec b/pki/dogtag/tks-ui/dogtag-pki-tks-ui.spec index 420835870..d2ff69a1d 100644 --- a/pki/dogtag/tks-ui/dogtag-pki-tks-ui.spec +++ b/pki/dogtag/tks-ui/dogtag-pki-tks-ui.spec @@ -34,7 +34,7 @@ ## Package Header Definitions %define base_name %{base_ui_prefix}-%{base_prefix}-%{base_component} %define base_version 1.0.0 -%define base_release 3 +%define base_release 4 %define base_group System Environment/Base %define base_vendor Red Hat, Inc. %define base_license GPLv2 with exceptions @@ -222,6 +222,9 @@ rm -rf ${RPM_BUILD_ROOT} ############################################################################### %changelog +* Tue Mar 24 2009 Matthew Harmsen <mharmsen@redhat.com> 1.0.0-4 +- Bugzilla Bug #488388 - copyright notices - remove from UI +- Bugzilla Bug #440543 - CA's web-services page needs improvements * Fri Nov 28 2008 Matthew Harmsen <mharmsen@redhat.com> 1.0.0-3 - Bugzilla Bug #445402 - changed "linux"/"fedora" to "dogtag"; changed "pki-svn.fedora.redhat.com" to "pki.fedoraproject.org" diff --git a/pki/dogtag/tks-ui/shared/webapps/tks/GenUnexpectedError.template b/pki/dogtag/tks-ui/shared/webapps/tks/GenUnexpectedError.template index c69aaad1f..a8b9415df 100644 --- a/pki/dogtag/tks-ui/shared/webapps/tks/GenUnexpectedError.template +++ b/pki/dogtag/tks-ui/shared/webapps/tks/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="/tks/agent/graphics/hr.gif" > <tr> <td> </td> </tr> diff --git a/pki/dogtag/tks-ui/shared/webapps/tks/agent/GenError.template b/pki/dogtag/tks-ui/shared/webapps/tks/agent/GenError.template index f0cca1ea8..d82f790f9 100644 --- a/pki/dogtag/tks-ui/shared/webapps/tks/agent/GenError.template +++ b/pki/dogtag/tks-ui/shared/webapps/tks/agent/GenError.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="/tks/agent/graphics/hr.gif" > <tr> <td> </td> </tr> diff --git a/pki/dogtag/tks-ui/shared/webapps/tks/agent/GenUnexpectedError.template b/pki/dogtag/tks-ui/shared/webapps/tks/agent/GenUnexpectedError.template index c69aaad1f..a8b9415df 100644 --- a/pki/dogtag/tks-ui/shared/webapps/tks/agent/GenUnexpectedError.template +++ b/pki/dogtag/tks-ui/shared/webapps/tks/agent/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="/tks/agent/graphics/hr.gif" > <tr> <td> </td> </tr> 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 3ef2d8416..ae8f7a90b 100644 --- a/pki/dogtag/tks-ui/shared/webapps/tks/agent/header.template +++ b/pki/dogtag/tks-ui/shared/webapps/tks/agent/header.template @@ -17,40 +17,33 @@ --- END COPYRIGHT BLOCK --- --> <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> <html> -<CMS_TEMPLATE> <head> +<CMS_TEMPLATE> <title>Header</title> -<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> +<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> </head> <body onResize=location.reload() bgcolor="#CCCCCC" link="#FFFFFF" vlink="#FFFFFF" alink="#CCCCFF"> -<table border="0" width="100%" cellspacing="0" cellpadding="0" bgcolor="#666699"> +<table border="0" width="100%" cellspacing="0" cellpadding="0" bgcolor="#000080"> <tr> <td> - <table border="0" cellspacing="0" cellpadding="0"> - <tr> - <td> - <table border="0" cellspacing="12" cellpadding="0" width="100%"> - <tr> - <td><font size="-1" face="PrimaSans BT, Verdana, sans-serif" color="white">Dogtag<font color="#999999" size="-2">®</font><b><br> - Certificate<br>System</b></font><font size="+1" face="PrimaSans BT, Verdana, sans-serif" color="white"><b></b></font></td> - <td></td> - <td><font size="+1" face="PrimaSans BT, Verdana, sans-serif" color="white">Agent Services</font> </td> - </tr> - </table> - </td> + <table border="0" cellspacing="12" cellpadding="0"> + <tr> + <td><img src="/tks/admin/console/img/logo_header.gif"></td> + <td> </td> + <td><font size="+1" face="PrimaSans BT, Verdana, sans-serif" color="white"><b>Dogtag<sup><font color="#999999" size="-2">®</font></sup> Agent Services</b></font></td> </tr> </table> <table border="0" cellspacing="0" cellpadding="0"> <tr> - <td><img src="/tks/agent/graphics/spacer.gif" width="12" height="21"></td> -<SCRIPT LANGUAGE="JavaScript"> + <td><img src="/tks/agent/graphics/spacer.gif" alt="" width="12" height="21"></td> +<SCRIPT type="text/javascript"> for (var i = 0; i < result.recordSet.length; ++i) { if (result.recordSet[i].id == header.selected) { - document.write('<td><img src="/tks/agent/graphics/lgLeftTab.gif" width="13" height="21"></td>'); + document.write('<td><img src="/tks/agent/graphics/lgLeftTab.gif" width="13" height="21"><\/td>'); document.write('<td bgcolor="#cccccc" nowrap>'); } else { - document.write('<td><img src="/tks/agent/graphics/dgLeftTab.gif" width="13" height="21"></td>'); + document.write('<td><img src="/tks/agent/graphics/dgLeftTab.gif" width="13" height="21"><\/td>'); document.write('<td bgcolor="#999999" nowrap>'); } document.write('<font size="-1" face="PrimaSans BT, Verdana, sans-serif">'); @@ -64,18 +57,18 @@ type = "Registration Manager"; } if (result.recordSet[i].id == header.selected) { - document.write('<b>' + type + '</b>'); + document.write('<b>' + type + '<\/b>'); } else { document.write('<a href="../' + result.recordSet[i].id + '/index.html" target="_top">' + - type + '</a>'); + type + '<\/a>'); } - document.write('</font></td>'); + document.write('<\/font><\/td>'); if (result.recordSet[i].id == header.selected) { - document.write('<td><img src="/tks/agent/graphics/lgRightTab.gif" width="16" height="21"></td>'); + document.write('<td><img src="/tks/agent/graphics/lgRightTab.gif" width="16" height="21" alt=""><\/td>'); } else { - document.write('<td><img src="/tks/agent/graphics/dgRightTab.gif" width="16" height="21"></td>'); + document.write('<td><img src="/tks/agent/graphics/dgRightTab.gif" width="16" height="21" alt=""><\/td>'); } } </SCRIPT> 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 4995377d7..c87d0d9f3 100644 --- a/pki/dogtag/tks-ui/shared/webapps/tks/agent/index.template +++ b/pki/dogtag/tks-ui/shared/webapps/tks/agent/index.template @@ -17,25 +17,24 @@ --- END COPYRIGHT BLOCK --- --> <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> <html> -<CMS_TEMPLATE> <head> +<CMS_TEMPLATE> <title>Index</title> -<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> +<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> </head> <body bgcolor="#FFFFFF" link="#666699" vlink="#666699" alink="#333366"> <table border="0" width="100%" cellspacing="0" cellpadding="6"> - <tr bgcolor="#666699"> - <td width=25%> - <table border="0" cellspacing="0" cellpadding="6"> + <tr bgcolor="#000080"> + <td> + <table border="0" cellspacing="12" cellpadding="0"> <tr> - <td nowrap><font size="-1" face="PrimaSans BT, Verdana, sans-serif" color="white">Dogtag<b>®<br> - Certificate<br>System</b></font> </td> + <td><img src="/tks/admin/console/img/logo_header.gif"></td> + <td> </td> + <td><font size="+1" face="PrimaSans BT, Verdana, sans-serif" color="white"><b>Dogtag<sup><font color="#999999" size="-2">®</font></sup> Agent Services</b></font></td> </tr> </table> </td> - <td width=65% nowrap><font size="+1" face="PrimaSans BT, Verdana, sans-serif" color="white">Agent Services</font></td> - <td width="10%"> </td> </tr> <tr valign="TOP"> <td> </td> @@ -45,7 +44,7 @@ <td> </td> <td> </td> </tr> -<SCRIPT LANGUAGE="JavaScript"> +<SCRIPT type="text/javascript"> function displayError() { document.write("<center><h2><b>" + @@ -134,14 +133,6 @@ document.write('</table>'); document.write('</td>'); document.write('<td> </td>'); document.write('</tr>'); -document.write('<tr valign="TOP">'); -document.write('<td> </td>'); -document.write('<td><font size="-1" face="PrimaSans BT, Verdana, sans-serif">'); -document.write('© 2001 Sun Microsystems, Inc. Used by permission. © 2005 Red Hat, Inc.. All rights reserved.'); -document.write('</font></td>'); -document.write('<td> </td>'); -document.write('</tr>'); - </SCRIPT> </table> 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 d2bd028aa..580bdf645 100644 --- a/pki/dogtag/tks-ui/shared/webapps/tks/agent/ports.template +++ b/pki/dogtag/tks-ui/shared/webapps/tks/agent/ports.template @@ -17,25 +17,24 @@ --- END COPYRIGHT BLOCK --- --> <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> <html> -<CMS_TEMPLATE> <head> +<CMS_TEMPLATE> <title>Index</title> -<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> +<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> </head> <body bgcolor="#FFFFFF" link="#666699" vlink="#666699" alink="#333366"> <table border="0" width="100%" cellspacing="0" cellpadding="6"> - <tr bgcolor="#666699"> - <td width=25%> - <table border="0" cellspacing="0" cellpadding="6"> + <tr bgcolor="#000080"> + <td> + <table border="0" cellspacing="12" cellpadding="0"> <tr> - <td nowrap><font size="-1" face="PrimaSans BT, Verdana, sans-serif" color="white">Dogtag<b>®<br> - Certificate<br>System</b></font> </td> + <td><img src="/tks/admin/console/img/logo_header.gif"></td> + <td> </td> + <td><font size="+1" face="PrimaSans BT, Verdana, sans-serif" color="white"><b>Dogtag<sup><font color="#999999" size="-2">®</font></sup> Services Summary</b></font></td> </tr> </table> </td> - <td width=65% nowrap><font size="+1" face="PrimaSans BT, Verdana, sans-serif" color="white">Services Summary</font></td> - <td width="10%"> </td> </tr> <tr valign="TOP"> <td> </td> @@ -45,7 +44,7 @@ <td> </td> <td> </td> </tr> -<SCRIPT LANGUAGE="JavaScript"> +<SCRIPT type="text/javascript"> function displayError() { document.write("<center><h2><b>" + @@ -86,7 +85,7 @@ if (result.header.errorDetails != null) { continue; document.write('<tr valign="TOP">'); document.write('<td>'); - document.write('<img src="/ca/agent/graphics/goto-tall.gif" width="10" height="15"> </td>'); + document.write('<img src="/tks/agent/graphics/goto-tall.gif" width="10" height="15"> </td>'); document.write('<td>'); document.write('<font face="PrimaSans BT, Verdana, sans-serif">'); document.write('<a href="'); @@ -117,14 +116,6 @@ if (result.header.errorDetails != null) { </td> <td> </td> </tr> - <tr valign="TOP"> - <td> </td> - <td><font size="-1" face="PrimaSans BT, Verdana, sans-serif"> - © 2001 Sun Microsystems, Inc. Used by permission. - © 2005 Red Hat, Inc.. All rights reserved. - </font></td> - <td> </td> - </tr> </table> </body> </html> diff --git a/pki/dogtag/tks-ui/shared/webapps/tks/services.template b/pki/dogtag/tks-ui/shared/webapps/tks/services.template index 4489b17de..b1a2acee4 100644 --- a/pki/dogtag/tks-ui/shared/webapps/tks/services.template +++ b/pki/dogtag/tks-ui/shared/webapps/tks/services.template @@ -27,7 +27,10 @@ <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" width="37" height="31" id="myLogo" /></a><a href="/" title="Dogtag Network homepage">Dogtag Certificate System</a> + <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> + <div id="headertitle"> + <a href="/" title="Dogtag Network homepage">Dogtag<sup><font size="-2">®</font></sup> Certificate System</a> + </div> <div id="account"> <dl><dt><span></span></dt><dd></dd></dl> </div> @@ -35,14 +38,8 @@ <div id="mainNavOuter"> <div id="mainNav"> - <div id="mainNavInner"> - - -<ul> -<li id="mainFirst-active">Certificate System</li> -</ul> - + </div><!-- end mainNavInner --> </div><!-- end mainNav --> </div><!-- end mainNavOuter --> @@ -103,9 +100,7 @@ for (var i=0; i<result.recordSet.length; ++i) { </tr> </table> </center> - <div id="footer"> - Copyright © 2002-06 Red Hat, Inc. All rights reserved. <a href="http://www.redhat.com/">http://www.redhat.com</a> - </div> - +<div id="footer"> +</div> </body> </html> |