diff options
| author | mharmsen <mharmsen@c9f7a03b-bd48-0410-a16d-cbbf54688b0b> | 2009-03-25 23:50:06 +0000 |
|---|---|---|
| committer | mharmsen <mharmsen@c9f7a03b-bd48-0410-a16d-cbbf54688b0b> | 2009-03-25 23:50:06 +0000 |
| commit | 295dea6c9bcad4972b7f18a8c69f7cee0da55566 (patch) | |
| tree | 8d3f92cfdb7f3bd60b0462d16748d25e3ffe3053 | |
| parent | 065204b1034b572e4c032406774001900445c403 (diff) | |
| download | pki-295dea6c9bcad4972b7f18a8c69f7cee0da55566.tar.gz pki-295dea6c9bcad4972b7f18a8c69f7cee0da55566.tar.xz pki-295dea6c9bcad4972b7f18a8c69f7cee0da55566.zip | |
Bugzilla Bug #488388 - copyright notices - remove from UI
Bugzilla Bug #440543 - CA's web-services page needs improvements
git-svn-id: svn+ssh://svn.fedorahosted.org/svn/pki/trunk@329 c9f7a03b-bd48-0410-a16d-cbbf54688b0b
139 files changed, 697 insertions, 678 deletions
diff --git a/pki/dogtag/ca-ui/dogtag-pki-ca-ui.spec b/pki/dogtag/ca-ui/dogtag-pki-ca-ui.spec index 5b74b878c..697203b23 100644 --- a/pki/dogtag/ca-ui/dogtag-pki-ca-ui.spec +++ b/pki/dogtag/ca-ui/dogtag-pki-ca-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 9 +%define base_release 10 %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-10 +- Bugzilla Bug #488388 - copyright notices - remove from UI +- Bugzilla Bug #440543 - CA's web-services page needs improvements * Fri Jan 30 2009 Ade Lee <alee@redhat.com> 1.0.0-9 - Bugzilla Bug #460582 - add UTF-8 support * Wed Jan 28 2009 Christina Fu <cfu@redhat.com> 1.0.0-8 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 e9b54739e..d26fc8cee 100644 --- a/pki/dogtag/ca-ui/shared/webapps/ca/agent/header.template +++ b/pki/dogtag/ca-ui/shared/webapps/ca/agent/header.template @@ -23,22 +23,15 @@ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> </head> -<body bgcolor="#CCCCCC" link="#FFFFFF" vlink="#FFFFFF" alink="#CCCCFF"> -<table border="0" width="100%" cellspacing="0" cellpadding="0" bgcolor="#666699"> +<body onResize=location.reload() bgcolor="#CCCCCC" link="#FFFFFF" vlink="#FFFFFF" alink="#CCCCFF"> +<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></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="/ca/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"> 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 73abb8ae7..fdaede80f 100644 --- a/pki/dogtag/ca-ui/shared/webapps/ca/agent/index.template +++ b/pki/dogtag/ca-ui/shared/webapps/ca/agent/index.template @@ -25,17 +25,16 @@ <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="/ca/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> @@ -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/ca-ui/shared/webapps/ca/agent/ports.template b/pki/dogtag/ca-ui/shared/webapps/ca/agent/ports.template index d34cde630..025b54389 100644 --- a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ports.template +++ b/pki/dogtag/ca-ui/shared/webapps/ca/agent/ports.template @@ -25,17 +25,16 @@ <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="/ca/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> @@ -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/ca-ui/shared/webapps/ca/ee/ca/index.html b/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/index.html index d45c6b601..360acd5bd 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 @@ -306,26 +306,21 @@ function reloadTabs(tabnum) function loadTabs() { with (top.tabsf.document) { - writeln('<body onresize="top.doResize();" bgcolor="#9999cc" link="#FFFFFF" vlink="#FFFFFF" alink="#CCCCFF">'); + writeln('<body onresize="top.doResize();" bgcolor="#4f52b5" link="#FFFFFF" vlink="#FFFFFF" alink="#CCCCFF">'); - writeln('<table border=0 width="100%" cellspacing="0" cellpadding="0" bgcolor="#9999CC">'); + writeln('<table border=0 width="100%" cellspacing="0" cellpadding="0" bgcolor="#4f52b5">'); writeln('<tr><td>'); - writeln('<table border=0 cellspacing=0 cellpadding=0 width="100%" >'); - writeln('<tr><td>'); - writeln('<table border=0 cellspacing=12 cellpadding=0 width="100%">'); + writeln('<table border=0 cellspacing=12 cellpadding=0>'); writeln('<tr>'); - writeln('<td><font size="-1" face="PrimaSans BT, Verdana, sans-serif" color="white">Dogtag<font color="#cccccc" 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>'); - writeln('<td></td>'); + writeln('<td><img src="/ca/admin/console/img/logo_header.gif"></td>'); + writeln('<td> </td>'); if (subsystemname == 'ca') { - writeln('<td width=350 align=right><font size="+1" face="PrimaSans BT, Verdana, sans-serif" color="white"><b>Certificate Manager</b></font></td>'); - } - else { - writeln('<td width=350><font size="+1" face="PrimaSans BT, Verdana, sans-serif" color="white"><b>Registration Manager</b></font></td>'); + writeln('<td><font size="+1" face="PrimaSans BT, Verdana, sans-serif" color="white"><b>Dogtag<sup><font color="#cccccc" size="-2">®</font></sup> Certificate Manager</b></font></td>'); + } else { + writeln('<td><font size="+1" face="PrimaSans BT, Verdana, sans-serif" color="white"><b><b>Dogtag<sup><font color="#cccccc" size="-2">®</font></sup> Registration Manager</b></font></td>'); } writeln('</tr>'); writeln('</table>'); - writeln('</td></tr>'); - writeln('</table>'); writeln('<table border=0 cellspacing="0" cellpadding="0">'); writeln('<tr>'); diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/securitydomainlogin.template b/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/securitydomainlogin.template index 92e7f4530..62c9cfa60 100644 --- a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/securitydomainlogin.template +++ b/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/securitydomainlogin.template @@ -30,7 +30,10 @@ <div id="wrap"> <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" 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="/ca/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> diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/sendCookie.template b/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/sendCookie.template index 784cc7eab..96053b7fd 100644 --- a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/sendCookie.template +++ b/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/sendCookie.template @@ -27,7 +27,10 @@ <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" 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="/ca/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> @@ -88,7 +91,6 @@ document.write('<form name="cookieForm" method="post" action="'+result.header.ur </form> </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> </body> diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/tabs.html b/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/tabs.html index 7bf156b61..5ed1018d6 100644 --- a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/tabs.html +++ b/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/tabs.html @@ -25,7 +25,7 @@ <SCRIPT LANGUAGE="JavaScript" SRC="/ca/ee/cms-funcs.js"> </SCRIPT> </head> -<body bgcolor="#9999cc" onresize="top.doResize();"> +<body bgcolor="#4f52b5" onresize="top.doResize();"> <script lang="javascript"> <!--// top.loadTabs(); diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/services.template b/pki/dogtag/ca-ui/shared/webapps/ca/services.template index 4489b17de..b1a2acee4 100644 --- a/pki/dogtag/ca-ui/shared/webapps/ca/services.template +++ b/pki/dogtag/ca-ui/shared/webapps/ca/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> diff --git a/pki/dogtag/common-ui/dogtag-pki-common-ui.spec b/pki/dogtag/common-ui/dogtag-pki-common-ui.spec index 7755e628c..3d7919b60 100644 --- a/pki/dogtag/common-ui/dogtag-pki-common-ui.spec +++ b/pki/dogtag/common-ui/dogtag-pki-common-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 11 +%define base_release 12 %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-12 +- Bugzilla Bug #488388 - copyright notices - remove from UI +- Bugzilla Bug #440543 - CA's web-services page needs improvements * Wed Mar 4 2009 Matthew Harmsen <mharmsen@redhat.com> 1.0.0-11 - Bugzilla Bug #440344 - Installation page should tell admins to use "service", not "/etc/init.d" on Linux diff --git a/pki/dogtag/common-ui/shared/admin/console/config/footer.vm b/pki/dogtag/common-ui/shared/admin/console/config/footer.vm index 109f44a86..a596e45b1 100644 --- a/pki/dogtag/common-ui/shared/admin/console/config/footer.vm +++ b/pki/dogtag/common-ui/shared/admin/console/config/footer.vm @@ -16,5 +16,4 @@ All rights reserved. --- END COPYRIGHT BLOCK --- --> <div id="footer"> - Copyright © 2002-06 Red Hat, Inc. All rights reserved. <a href="http://www.redhat.com/">http://www.redhat.com</a> </div> diff --git a/pki/dogtag/common-ui/shared/admin/console/config/header.vm b/pki/dogtag/common-ui/shared/admin/console/config/header.vm index e94ae4e06..7966ba745 100644 --- a/pki/dogtag/common-ui/shared/admin/console/config/header.vm +++ b/pki/dogtag/common-ui/shared/admin/console/config/header.vm @@ -16,7 +16,10 @@ All rights reserved. --- END COPYRIGHT BLOCK --- --> <div id="header"> - <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" width="37" height="31" id="Logo" /></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="../img/logo_header.gif" alt="Dogtag" id="myLogo" /></a> + <div id="headerpaddedtitle"> + <a href="/" title="Dogtag Network homepage">Dogtag<sup><font size="-2">®</font></sup> Certificate System</a> + </div> <div id="account"> </div> </div> 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 d02b11756..f537379ff 100644 --- a/pki/dogtag/common-ui/shared/admin/console/config/securitydomainloginpanel.vm +++ b/pki/dogtag/common-ui/shared/admin/console/config/securitydomainloginpanel.vm @@ -31,7 +31,10 @@ <div id="wrap"> <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" width="37" height="31" id="Logo" /></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="/ca/admin/console/img/logo_header.gif" alt="Dogtag" id="Logo" /></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> diff --git a/pki/dogtag/common-ui/shared/admin/console/css/pki-360.css b/pki/dogtag/common-ui/shared/admin/console/css/pki-360.css index 56667ac97..8f5858749 100644 --- a/pki/dogtag/common-ui/shared/admin/console/css/pki-360.css +++ b/pki/dogtag/common-ui/shared/admin/console/css/pki-360.css @@ -1,7 +1,7 @@ /* --- BEGIN COPYRIGHT BLOCK --- * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either + * License as published by the Free Software Foundation. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -85,15 +85,35 @@ a:visited { search areas */ #header { height: 31px; /* changed height added bottom margin */ - margin-bottom: 10px; + margin-top: 10px; + margin-bottom: 20px; } +#headertitle { + height: 31px; /* same as header */ + margin-top: 10px; /* same as header */ + margin-right: 100px; /* "myLogo" margin-left + "logo_header.gif" */ + margin-bottom: 20px; /* same as header */ + font-size: large; + font-weight: bold; + } + +#headerpaddedtitle { + height: 31px; /* same as header */ + margin-top: 10px; /* same as header */ + margin-bottom: 20px; /* same as header */ + font-size: large; + font-weight: bold; + padding-left: 115px; /* "myLogo" margin-left + + "logo_header.gif" + 15px */ + } + img#myLogo { float: left; margin-left: 15px; } -img#rhnLogo { +img#pkiLogo { float: left; } @@ -341,7 +361,7 @@ h1 { margin-top: 0; } -/* existing RHN STYLES - modded - these need to be inserted carefully */ +/* existing PKI STYLES - modded - these need to be inserted carefully */ .sidebar { padding-right: 15px; @@ -377,7 +397,7 @@ th { } -/* -- YOUR RHN stuff -- */ +/* -- YOUR PKI stuff -- */ table.half-table { background: #b4b19a url(/img/table_corner_tr.gif) 100% 0 no-repeat; padding: 0px; @@ -388,11 +408,11 @@ table.half-table { background-color: #fff; } -table.your-rhn table.half-table td { +table.your-pki table.half-table td { padding: 2px 8px; } -table.your-rhn table.full-table td { +table.your-pki table.full-table td { padding-left: 4px; padding-right: 4px; padding-top: 4px; @@ -547,37 +567,37 @@ tr.table-tree-odd + tr.table-tree-odd td { margin-top: 64px; } -h1#rhn_welcome { - background-image: url(/img/rhn_welcome.gif); +h1#pki_welcome { + background-image: url(/img/pki_welcome.gif); background-position: 0 0; background-repeat: no-repeat; padding-bottom: 5px; height: 20px; } -h1#rhn_welcome2 { - background-image: url(/img/rhn_welcome2.gif); +h1#pki_welcome2 { + background-image: url(/img/pki_welcome2.gif); background-position: 0 0; background-repeat: no-repeat; height: 37px; } -h1#rhn_welcome3 { - background-image: url(/img/rhn_welcome3.gif); +h1#pki_welcome3 { + background-image: url(/img/pki_welcome3.gif); background-position: 0 0; background-repeat: no-repeat; height: 40px; } -h1#rhn_welcome span { +h1#pki_welcome span { display: none; } -h1#rhn_welcome2 span { +h1#pki_welcome2 span { display: none; } -h1#rhn_welcome3 span { +h1#pki_welcome3 span { display: none; } @@ -802,7 +822,7 @@ div.contentnav-row2 div.bottom { background-image: url(/img/corner_mainnav_bottom_chopped.png); background-position: bottom right; background-repeat: no-repeat; - background-color: #c00; + background-color: #4f52b5; } #mainNav { @@ -856,7 +876,7 @@ div.contentnav-row2 div.bottom { #mainNav li#mainFirst-active, #mainNav li#main-active, #mainNav li#mainLast-active { - background-color: #800000; + background-color: #000080; } diff --git a/pki/dogtag/common-ui/shared/admin/console/css/pki-base.css b/pki/dogtag/common-ui/shared/admin/console/css/pki-base.css index 507addbb5..85c426bff 100644 --- a/pki/dogtag/common-ui/shared/admin/console/css/pki-base.css +++ b/pki/dogtag/common-ui/shared/admin/console/css/pki-base.css @@ -1,7 +1,7 @@ /* --- BEGIN COPYRIGHT BLOCK --- * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either + * License as published by the Free Software Foundation. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -22,7 +22,7 @@ @import url("pki-360.css"); /* The following styles are for ALL browsers, including Netscape - Navigator 4.x. Put more detailed CSS in rhn.css. */ + Navigator 4.x. Put more detailed CSS in pki.css. */ /* from rob byers */ diff --git a/pki/dogtag/common-ui/shared/admin/console/css/pki.css b/pki/dogtag/common-ui/shared/admin/console/css/pki.css index 3bb0f15db..4380598a1 100644 --- a/pki/dogtag/common-ui/shared/admin/console/css/pki.css +++ b/pki/dogtag/common-ui/shared/admin/console/css/pki.css @@ -1,7 +1,7 @@ /* --- BEGIN COPYRIGHT BLOCK --- * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either + * License as published by the Free Software Foundation. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -718,11 +718,11 @@ span.no-details { width: 100%; } -div.rhn-embedded-help { +div.pki-embedded-help { padding: 6px 20px 6px 20px; } -.rhn-embedded-help-NAVHEADER th { +.pki-embedded-help-NAVHEADER th { margin-top: 0; padding-bottom: 1em; font-size: 20px; @@ -732,11 +732,11 @@ div.rhn-embedded-help { text-align: left; } -.rhn-embedded-help-NAVHEADER td { +.pki-embedded-help-NAVHEADER td { padding: 0 2em; } -.rhn-embedded-help-TOC { +.pki-embedded-help-TOC { padding: 0 4em; } diff --git a/pki/dogtag/common-ui/shared/admin/console/img/logo_header.gif b/pki/dogtag/common-ui/shared/admin/console/img/logo_header.gif Binary files differindex 2d1ea5579..573482227 100644 --- a/pki/dogtag/common-ui/shared/admin/console/img/logo_header.gif +++ b/pki/dogtag/common-ui/shared/admin/console/img/logo_header.gif diff --git a/pki/dogtag/common-ui/shared/admin/console/js/misc.js b/pki/dogtag/common-ui/shared/admin/console/js/misc.js index 40d9fd0a3..8be644a52 100644 --- a/pki/dogtag/common-ui/shared/admin/console/js/misc.js +++ b/pki/dogtag/common-ui/shared/admin/console/js/misc.js @@ -1,7 +1,7 @@ // --- BEGIN COPYRIGHT BLOCK --- // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public -// License as published by the Free Software Foundation; either +// License as published by the Free Software Foundation. // // This library is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/pki/dogtag/kra-ui/dogtag-pki-kra-ui.spec b/pki/dogtag/kra-ui/dogtag-pki-kra-ui.spec index 052822d7f..1d4ed55cd 100644 --- a/pki/dogtag/kra-ui/dogtag-pki-kra-ui.spec +++ b/pki/dogtag/kra-ui/dogtag-pki-kra-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 5 +%define base_release 6 %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-6 +- Bugzilla Bug #488388 - copyright notices - remove from UI +- Bugzilla Bug #440543 - CA's web-services page needs improvements * Fri Jan 30 2009 Ade Lee <alee@redhat.com> 1.0.0-5 - Bugzilla Bug #460582 - add UTF-8 support * Fri Nov 28 2008 Matthew Harmsen <mharmsen@redhat.com> 1.0.0-4 diff --git a/pki/dogtag/kra-ui/shared/webapps/kra/GenUnexpectedError.template b/pki/dogtag/kra-ui/shared/webapps/kra/GenUnexpectedError.template index c69aaad1f..9d2248d4c 100644 --- a/pki/dogtag/kra-ui/shared/webapps/kra/GenUnexpectedError.template +++ b/pki/dogtag/kra-ui/shared/webapps/kra/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="/kra/agent/graphics/hr.gif" > <tr> <td> </td> </tr> diff --git a/pki/dogtag/kra-ui/shared/webapps/kra/agent/GenError.template b/pki/dogtag/kra-ui/shared/webapps/kra/agent/GenError.template index f0cca1ea8..cab2c0167 100644 --- a/pki/dogtag/kra-ui/shared/webapps/kra/agent/GenError.template +++ b/pki/dogtag/kra-ui/shared/webapps/kra/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="/kra/agent/graphics/hr.gif" > <tr> <td> </td> </tr> diff --git a/pki/dogtag/kra-ui/shared/webapps/kra/agent/GenUnexpectedError.template b/pki/dogtag/kra-ui/shared/webapps/kra/agent/GenUnexpectedError.template index c69aaad1f..9d2248d4c 100644 --- a/pki/dogtag/kra-ui/shared/webapps/kra/agent/GenUnexpectedError.template +++ b/pki/dogtag/kra-ui/shared/webapps/kra/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="/kra/agent/graphics/hr.gif" > <tr> <td> </td> </tr> 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 d8d8c60a9..1c66def33 100644 --- a/pki/dogtag/kra-ui/shared/webapps/kra/agent/header.template +++ b/pki/dogtag/kra-ui/shared/webapps/kra/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="/kra/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="/kra/agent/graphics/spacer.gif" width="12" height="21"></td> -<SCRIPT LANGUAGE="JavaScript"> + <td><img src="/kra/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="/kra/agent/graphics/lgLeftTab.gif" width="13" height="21"></td>'); + document.write('<td><img src="/kra/agent/graphics/lgLeftTab.gif" width="13" height="21"><\/td>'); document.write('<td bgcolor="#cccccc" nowrap>'); } else { - document.write('<td><img src="/kra/agent/graphics/dgLeftTab.gif" width="13" height="21"></td>'); + document.write('<td><img src="/kra/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="/kra/agent/graphics/lgRightTab.gif" width="16" height="21"></td>'); + document.write('<td><img src="/kra/agent/graphics/lgRightTab.gif" width="16" height="21" alt=""><\/td>'); } else { - document.write('<td><img src="/kra/agent/graphics/dgRightTab.gif" width="16" height="21"></td>'); + document.write('<td><img src="/kra/agent/graphics/dgRightTab.gif" width="16" height="21" alt=""><\/td>'); } } </SCRIPT> 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 4995377d7..d1340df73 100644 --- a/pki/dogtag/kra-ui/shared/webapps/kra/agent/index.template +++ b/pki/dogtag/kra-ui/shared/webapps/kra/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="/kra/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/kra-ui/shared/webapps/kra/agent/kra/top.html b/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/top.html index 579eaff1a..5e7a2a40e 100644 --- a/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/top.html +++ b/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/top.html @@ -27,11 +27,11 @@ <tr> <td><img src="/graphics/spacer.gif" width="12" height="21"></td> <td><img src="/graphics/dgLeftTab.gif" width="13" height="21"></td> - <td bgcolor="#999999" nowrap><font size="-1" face="PrimaSans BT, Verdana, sans-serif"><a href="../ca/index.html" target="_top">Certificate + <td bgcolor="#999999" nowrap><font size="-1" face="PrimaSans BT, Verdana, sans-serif"><a href="../kra/index.html" target="_top">Certificate Service</a><b></b></font></td> <td><img src="/graphics/dgRightTab.gif" width="16" height="21"></td> <td><img src="/graphics/dgLeftTab.gif" width="13" height="21"></td> - <td bgcolor="#999999" nowrap><font size="-1" face="PrimaSans BT, Verdana, sans-serif"><a href="../ra/index.html" target="_top">Registration + <td bgcolor="#999999" nowrap><font size="-1" face="PrimaSans BT, Verdana, sans-serif"><a href="../kra/index.html" target="_top">Registration Service </a></font></td> <td><img src="/graphics/dgRightTab.gif" width="16" height="21"></td> <td><img src="/graphics/lgLeftTab.gif" width="13" height="21"></td> diff --git a/pki/dogtag/kra-ui/shared/webapps/kra/services.template b/pki/dogtag/kra-ui/shared/webapps/kra/services.template index 4489b17de..b078b4d80 100644 --- a/pki/dogtag/kra-ui/shared/webapps/kra/services.template +++ b/pki/dogtag/kra-ui/shared/webapps/kra/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> diff --git a/pki/dogtag/ocsp-ui/dogtag-pki-ocsp-ui.spec b/pki/dogtag/ocsp-ui/dogtag-pki-ocsp-ui.spec index cb31be5ca..ea4756120 100644 --- a/pki/dogtag/ocsp-ui/dogtag-pki-ocsp-ui.spec +++ b/pki/dogtag/ocsp-ui/dogtag-pki-ocsp-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 4 +%define base_release 5 %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-5 +- Bugzilla Bug #488388 - copyright notices - remove from UI +- Bugzilla Bug #440543 - CA's web-services page needs improvements * Fri Jan 30 2009 Ade Lee <alee@redhat.com> 1.0.0-4 - Bugzilla Bug #460582 - add UTF-8 support * Fri Nov 28 2008 Matthew Harmsen <mharmsen@redhat.com> 1.0.0-3 diff --git a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/GenUnexpectedError.template b/pki/dogtag/ocsp-ui/shared/webapps/ocsp/GenUnexpectedError.template index c69aaad1f..a69fa515a 100644 --- a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/GenUnexpectedError.template +++ b/pki/dogtag/ocsp-ui/shared/webapps/ocsp/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="/ocsp/agent/graphics/hr.gif" > <tr> <td> </td> </tr> diff --git a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/GenError.template b/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/GenError.template index f0cca1ea8..128d5b319 100644 --- a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/GenError.template +++ b/pki/dogtag/ocsp-ui/shared/webapps/ocsp/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="/ocsp/agent/graphics/hr.gif" > <tr> <td> </td> </tr> diff --git a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/GenUnexpectedError.template b/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/GenUnexpectedError.template index c69aaad1f..a69fa515a 100644 --- a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/GenUnexpectedError.template +++ b/pki/dogtag/ocsp-ui/shared/webapps/ocsp/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="/ocsp/agent/graphics/hr.gif" > <tr> <td> </td> </tr> 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 4396a67bb..ad32ded3a 100644 --- a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/header.template +++ b/pki/dogtag/ocsp-ui/shared/webapps/ocsp/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="/ocsp/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="/ocsp/agent/graphics/spacer.gif" width="12" height="21"></td> -<SCRIPT LANGUAGE="JavaScript"> + <td><img src="/ocsp/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="/ocsp/agent/graphics/lgLeftTab.gif" width="13" height="21"></td>'); + document.write('<td><img src="/ocsp/agent/graphics/lgLeftTab.gif" width="13" height="21"><\/td>'); document.write('<td bgcolor="#cccccc" nowrap>'); } else { - document.write('<td><img src="/ocsp/agent/graphics/dgLeftTab.gif" width="13" height="21"></td>'); + document.write('<td><img src="/ocsp/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="/ocsp/agent/graphics/lgRightTab.gif" width="16" height="21"></td>'); + document.write('<td><img src="/ocsp/agent/graphics/lgRightTab.gif" width="16" height="21" alt=""><\/td>'); } else { - document.write('<td><img src="/ocsp/agent/graphics/dgRightTab.gif" width="16" height="21"></td>'); + document.write('<td><img src="/ocsp/agent/graphics/dgRightTab.gif" width="16" height="21" alt=""><\/td>'); } } </SCRIPT> 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 4995377d7..04103516b 100644 --- a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/index.template +++ b/pki/dogtag/ocsp-ui/shared/webapps/ocsp/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="/ocsp/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/ocsp-ui/shared/webapps/ocsp/agent/ports.template b/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ports.template index d2bd028aa..48d7aab1b 100644 --- a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ports.template +++ b/pki/dogtag/ocsp-ui/shared/webapps/ocsp/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="/ocsp/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="/ocsp/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/ocsp-ui/shared/webapps/ocsp/services.template b/pki/dogtag/ocsp-ui/shared/webapps/ocsp/services.template index 4489b17de..b1a2acee4 100644 --- a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/services.template +++ b/pki/dogtag/ocsp-ui/shared/webapps/ocsp/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> diff --git a/pki/dogtag/ra-ui/dogtag-pki-ra-ui.spec b/pki/dogtag/ra-ui/dogtag-pki-ra-ui.spec index ebc29d85c..80b656fb9 100644 --- a/pki/dogtag/ra-ui/dogtag-pki-ra-ui.spec +++ b/pki/dogtag/ra-ui/dogtag-pki-ra-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 8 +%define base_release 9 %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-9 +- Bugzilla Bug #488388 - copyright notices - remove from UI +- Bugzilla Bug #440543 - CA's web-services page needs improvements * Wed Mar 4 2009 Matthew Harmsen <mharmsen@redhat.com> 1.0.0-8 - Bugzilla Bug #440344 - Installation page should tell admins to use "service", not "/etc/init.d" on Linux diff --git a/pki/dogtag/ra-ui/shared/docroot/css/pki-360.css b/pki/dogtag/ra-ui/shared/docroot/css/pki-360.css index 28e2d55b7..8f5858749 100644 --- a/pki/dogtag/ra-ui/shared/docroot/css/pki-360.css +++ b/pki/dogtag/ra-ui/shared/docroot/css/pki-360.css @@ -1,3 +1,23 @@ +/* --- BEGIN COPYRIGHT BLOCK --- + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation. + * + * This library 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; 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 --- + */ + /* color scheme: @@ -65,9 +85,29 @@ a:visited { search areas */ #header { height: 31px; /* changed height added bottom margin */ - margin-bottom: 10px; + margin-top: 10px; + margin-bottom: 20px; } +#headertitle { + height: 31px; /* same as header */ + margin-top: 10px; /* same as header */ + margin-right: 100px; /* "myLogo" margin-left + "logo_header.gif" */ + margin-bottom: 20px; /* same as header */ + font-size: large; + font-weight: bold; + } + +#headerpaddedtitle { + height: 31px; /* same as header */ + margin-top: 10px; /* same as header */ + margin-bottom: 20px; /* same as header */ + font-size: large; + font-weight: bold; + padding-left: 115px; /* "myLogo" margin-left + + "logo_header.gif" + 15px */ + } + img#myLogo { float: left; margin-left: 15px; @@ -782,7 +822,7 @@ div.contentnav-row2 div.bottom { background-image: url(/img/corner_mainnav_bottom_chopped.png); background-position: bottom right; background-repeat: no-repeat; - background-color: #c00; + background-color: #4f52b5; } #mainNav { @@ -836,7 +876,7 @@ div.contentnav-row2 div.bottom { #mainNav li#mainFirst-active, #mainNav li#main-active, #mainNav li#mainLast-active { - background-color: #800000; + background-color: #000080; } diff --git a/pki/dogtag/ra-ui/shared/docroot/css/pki-base.css b/pki/dogtag/ra-ui/shared/docroot/css/pki-base.css index 8df1389d3..85c426bff 100644 --- a/pki/dogtag/ra-ui/shared/docroot/css/pki-base.css +++ b/pki/dogtag/ra-ui/shared/docroot/css/pki-base.css @@ -1,3 +1,23 @@ +/* --- BEGIN COPYRIGHT BLOCK --- + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation. + * + * This library 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; 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 --- + */ + @import url("pki.css"); @import url("pki-360.css"); diff --git a/pki/dogtag/ra-ui/shared/docroot/css/pki.css b/pki/dogtag/ra-ui/shared/docroot/css/pki.css index 2a5a15f67..4380598a1 100644 --- a/pki/dogtag/ra-ui/shared/docroot/css/pki.css +++ b/pki/dogtag/ra-ui/shared/docroot/css/pki.css @@ -1,3 +1,23 @@ +/* --- BEGIN COPYRIGHT BLOCK --- + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation. + * + * This library 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; 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 --- + */ + /* This file is for more detailed compliance (basically any browser "better" than NN 4.x */ diff --git a/pki/dogtag/ra-ui/shared/docroot/footer.vm b/pki/dogtag/ra-ui/shared/docroot/footer.vm index 8c41a0224..a596e45b1 100644 --- a/pki/dogtag/ra-ui/shared/docroot/footer.vm +++ b/pki/dogtag/ra-ui/shared/docroot/footer.vm @@ -16,5 +16,4 @@ All rights reserved. --- END COPYRIGHT BLOCK --- --> <div id="footer"> - Copyright © 2002-07 Red Hat, Inc. All rights reserved. <a href="http://www.redhat.com/">http://www.redhat.com</a> </div> diff --git a/pki/dogtag/ra-ui/shared/docroot/header.vm b/pki/dogtag/ra-ui/shared/docroot/header.vm index 2990a39a3..ba30d830b 100644 --- a/pki/dogtag/ra-ui/shared/docroot/header.vm +++ b/pki/dogtag/ra-ui/shared/docroot/header.vm @@ -16,7 +16,10 @@ All rights reserved. --- END COPYRIGHT BLOCK --- --> <div id="header"> - <a href="http://pki.fedoraproject.org" title="Visit pki.fedoraproject.org for more information"><img src="/images/logo_header.gif" alt="Dogtag" width="37" height="31" id="myLogo" /></a><a href="/" title="Dogtag homepage">Dogtag Certificate System</a> + <a href="http://pki.fedoraproject.org" title="Visit pki.fedoraproject.org for more information"><img src="/images/logo_header.gif" alt="Dogtag" id="myLogo" /></a> + <div id="headerpaddedtitle"> + <a href="/" title="Dogtag homepage">Dogtag<sup><font size="-2">®</font></sup> Certificate System</a> + </div> <div id="account"> <dl><dt><span></span></dt><dd></dd></dl> </div> diff --git a/pki/dogtag/ra-ui/shared/docroot/images/logo_header.gif b/pki/dogtag/ra-ui/shared/docroot/images/logo_header.gif Binary files differindex 20f74410e..573482227 100644 --- a/pki/dogtag/ra-ui/shared/docroot/images/logo_header.gif +++ b/pki/dogtag/ra-ui/shared/docroot/images/logo_header.gif diff --git a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/footer.vm b/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/footer.vm index bca378ff4..22d7213ba 100644 --- a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/footer.vm +++ b/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/footer.vm @@ -17,5 +17,4 @@ --- END COPYRIGHT BLOCK --- --> <div id="footer"> - Copyright © 2002-06 Red Hat, Inc. All rights reserved. <a href="http://www.redhat.com/">http://www.redhat.com</a> </div> diff --git a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/header.vm b/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/header.vm index 106d2b3c2..d4cea30c2 100644 --- a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/header.vm +++ b/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/header.vm @@ -17,7 +17,10 @@ --- END COPYRIGHT BLOCK --- --> <div id="header"> - <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" 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="../img/logo_header.gif" alt="Dogtag" id="myLogo" /></a> + <div id="headerpaddedtitle"> + <a href="/" title="Dogtag Network homepage">Dogtag<sup><font size="-2">®</font></sup> Certificate System</a> + </div> <div id="account"> </div> </div> diff --git a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/securitydomainloginpanel.vm b/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/securitydomainloginpanel.vm index 75f8135ec..5f4083291 100644 --- a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/securitydomainloginpanel.vm +++ b/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/securitydomainloginpanel.vm @@ -31,7 +31,10 @@ <div id="wrap"> <div id="header"> - <a href="http://pki.fedoraproject.org/" title="Visit pki.fedoraproject.org for more information about Dogtag"><img src="/ca/admin/console/img/logo_header.gif" alt="Dogtag" width="37" height="31" id="myLogo" /></a><a href="/" title="Dogtag">Dogtag Certificate System</a> + <a href="http://pki.fedoraproject.org/" title="Visit pki.fedoraproject.org for more information about Dogtag"><img src="/ca/admin/console/img/logo_header.gif" alt="Dogtag" id="myLogo" /></a> + <div id="headertitle"> + <a href="/" title="Dogtag">Dogtag<sup><font size="-2">®</font></sup> Certificate System</a> + </div> <div id="account"> <dl><dt><span></span></dt><dd></dd></dl> </div> diff --git a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/img/badge.png b/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/img/badge.png Binary files differnew file mode 100644 index 000000000..5fe0223b5 --- /dev/null +++ b/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/img/badge.png diff --git a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/img/idkey.png b/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/img/idkey.png Binary files differnew file mode 100644 index 000000000..3e27d2d05 --- /dev/null +++ b/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/img/idkey.png diff --git a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/img/lock.png b/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/img/lock.png Binary files differnew file mode 100644 index 000000000..56be3b755 --- /dev/null +++ b/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/img/lock.png diff --git a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/img/logo_header.gif b/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/img/logo_header.gif Binary files differindex 20f74410e..573482227 100644 --- a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/img/logo_header.gif +++ b/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/img/logo_header.gif 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> diff --git a/pki/dogtag/tps-ui/build.xml b/pki/dogtag/tps-ui/build.xml index 8874336bc..c61d2dc98 100644 --- a/pki/dogtag/tps-ui/build.xml +++ b/pki/dogtag/tps-ui/build.xml @@ -1,7 +1,7 @@ <!-- ### BEGIN COPYRIGHT BLOCK ### This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either + License as published by the Free Software Foundation. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/pki/dogtag/tps-ui/build_dogtag b/pki/dogtag/tps-ui/build_dogtag index a363d387c..c2448dc85 100755 --- a/pki/dogtag/tps-ui/build_dogtag +++ b/pki/dogtag/tps-ui/build_dogtag @@ -2,7 +2,7 @@ # BEGIN COPYRIGHT BLOCK # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either +# License as published by the Free Software Foundation. # # This library is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/pki/dogtag/tps-ui/dogtag-pki-tps-ui.spec b/pki/dogtag/tps-ui/dogtag-pki-tps-ui.spec index 5e12be945..7a451ec63 100644 --- a/pki/dogtag/tps-ui/dogtag-pki-tps-ui.spec +++ b/pki/dogtag/tps-ui/dogtag-pki-tps-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 13 +%define base_release 14 %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-14 +- Bugzilla Bug #488388 - copyright notices - remove from UI +- Bugzilla Bug #440543 - CA's web-services page needs improvements * Tue Mar 24 2009 Ade Lee <alee@redhat.com> 1.0.0-13 - Bugzilla 490452 support for signed audit in UI * Tue Mar 17 2009 Ade Lee <alee@redhat.com> 1.0.0-12 diff --git a/pki/dogtag/tps-ui/shared/cgi-bin/demo/Enroll.html b/pki/dogtag/tps-ui/shared/cgi-bin/demo/Enroll.html index 79d5a30f1..703a44b90 100755 --- a/pki/dogtag/tps-ui/shared/cgi-bin/demo/Enroll.html +++ b/pki/dogtag/tps-ui/shared/cgi-bin/demo/Enroll.html @@ -1,7 +1,7 @@ <!-- --- BEGIN COPYRIGHT BLOCK --- This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either + License as published by the Free Software Foundation. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/pki/dogtag/tps-ui/shared/cgi-bin/home/Enroll.html b/pki/dogtag/tps-ui/shared/cgi-bin/home/Enroll.html index 0d2f2735f..52a8033b3 100755 --- a/pki/dogtag/tps-ui/shared/cgi-bin/home/Enroll.html +++ b/pki/dogtag/tps-ui/shared/cgi-bin/home/Enroll.html @@ -1,7 +1,7 @@ <!-- --- BEGIN COPYRIGHT BLOCK --- This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either + License as published by the Free Software Foundation. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/pki/dogtag/tps-ui/shared/cgi-bin/so/Enroll.html b/pki/dogtag/tps-ui/shared/cgi-bin/so/Enroll.html index bd56efe45..4711f5456 100755 --- a/pki/dogtag/tps-ui/shared/cgi-bin/so/Enroll.html +++ b/pki/dogtag/tps-ui/shared/cgi-bin/so/Enroll.html @@ -1,7 +1,7 @@ <!-- --- BEGIN COPYRIGHT BLOCK --- This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either + License as published by the Free Software Foundation. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/pki/dogtag/tps-ui/shared/cgi-bin/sow/cfg.pl b/pki/dogtag/tps-ui/shared/cgi-bin/sow/cfg.pl index 6902ec9e3..fc36386c7 100755 --- a/pki/dogtag/tps-ui/shared/cgi-bin/sow/cfg.pl +++ b/pki/dogtag/tps-ui/shared/cgi-bin/sow/cfg.pl @@ -3,7 +3,7 @@ # --- BEGIN COPYRIGHT BLOCK --- # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either +# License as published by the Free Software Foundation. # # This library is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/pki/dogtag/tps-ui/shared/cgi-bin/sow/enroll.html b/pki/dogtag/tps-ui/shared/cgi-bin/sow/enroll.html index 0686e0ddf..909c3644d 100755 --- a/pki/dogtag/tps-ui/shared/cgi-bin/sow/enroll.html +++ b/pki/dogtag/tps-ui/shared/cgi-bin/sow/enroll.html @@ -1,7 +1,7 @@ <!-- --- BEGIN COPYRIGHT BLOCK --- This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either + License as published by the Free Software Foundation. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/pki/dogtag/tps-ui/shared/cgi-bin/sow/enroll_temp.html b/pki/dogtag/tps-ui/shared/cgi-bin/sow/enroll_temp.html index 8b472b9b6..02faf7d4c 100755 --- a/pki/dogtag/tps-ui/shared/cgi-bin/sow/enroll_temp.html +++ b/pki/dogtag/tps-ui/shared/cgi-bin/sow/enroll_temp.html @@ -1,7 +1,7 @@ <!-- --- BEGIN COPYRIGHT BLOCK --- This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either + License as published by the Free Software Foundation. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/pki/dogtag/tps-ui/shared/cgi-bin/sow/format.html b/pki/dogtag/tps-ui/shared/cgi-bin/sow/format.html index 7b8d58637..391ddf53e 100755 --- a/pki/dogtag/tps-ui/shared/cgi-bin/sow/format.html +++ b/pki/dogtag/tps-ui/shared/cgi-bin/sow/format.html @@ -1,7 +1,7 @@ <!-- --- BEGIN COPYRIGHT BLOCK --- This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either + License as published by the Free Software Foundation. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/pki/dogtag/tps-ui/shared/cgi-bin/sow/formatso.html b/pki/dogtag/tps-ui/shared/cgi-bin/sow/formatso.html index d029c0a65..579aa31fb 100755 --- a/pki/dogtag/tps-ui/shared/cgi-bin/sow/formatso.html +++ b/pki/dogtag/tps-ui/shared/cgi-bin/sow/formatso.html @@ -1,7 +1,7 @@ <!-- --- BEGIN COPYRIGHT BLOCK --- This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either + License as published by the Free Software Foundation. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/pki/dogtag/tps-ui/shared/cgi-bin/sow/main.html b/pki/dogtag/tps-ui/shared/cgi-bin/sow/main.html index 9eb499428..7d2eb1e55 100755 --- a/pki/dogtag/tps-ui/shared/cgi-bin/sow/main.html +++ b/pki/dogtag/tps-ui/shared/cgi-bin/sow/main.html @@ -1,7 +1,7 @@ <!-- --- BEGIN COPYRIGHT BLOCK --- This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either + License as published by the Free Software Foundation. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/pki/dogtag/tps-ui/shared/cgi-bin/sow/noaccess.html b/pki/dogtag/tps-ui/shared/cgi-bin/sow/noaccess.html index 1a315019b..62d76749c 100755 --- a/pki/dogtag/tps-ui/shared/cgi-bin/sow/noaccess.html +++ b/pki/dogtag/tps-ui/shared/cgi-bin/sow/noaccess.html @@ -1,7 +1,7 @@ <!-- --- BEGIN COPYRIGHT BLOCK --- This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either + License as published by the Free Software Foundation. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/pki/dogtag/tps-ui/shared/cgi-bin/sow/read.html b/pki/dogtag/tps-ui/shared/cgi-bin/sow/read.html index 7f369f303..c0f8b92e6 100755 --- a/pki/dogtag/tps-ui/shared/cgi-bin/sow/read.html +++ b/pki/dogtag/tps-ui/shared/cgi-bin/sow/read.html @@ -1,7 +1,7 @@ <!-- --- BEGIN COPYRIGHT BLOCK --- This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either + License as published by the Free Software Foundation. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/pki/dogtag/tps-ui/shared/cgi-bin/sow/read_temp.html b/pki/dogtag/tps-ui/shared/cgi-bin/sow/read_temp.html index c011cd7ee..3fcf91a4e 100755 --- a/pki/dogtag/tps-ui/shared/cgi-bin/sow/read_temp.html +++ b/pki/dogtag/tps-ui/shared/cgi-bin/sow/read_temp.html @@ -1,7 +1,7 @@ <!-- --- BEGIN COPYRIGHT BLOCK --- This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either + License as published by the Free Software Foundation. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/pki/dogtag/tps-ui/shared/cgi-bin/sow/search.html b/pki/dogtag/tps-ui/shared/cgi-bin/sow/search.html index 9cf2a697e..c88f50030 100755 --- a/pki/dogtag/tps-ui/shared/cgi-bin/sow/search.html +++ b/pki/dogtag/tps-ui/shared/cgi-bin/sow/search.html @@ -1,7 +1,7 @@ <!-- --- BEGIN COPYRIGHT BLOCK --- This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either + License as published by the Free Software Foundation. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/pki/dogtag/tps-ui/shared/cgi-bin/sow/search_temp.html b/pki/dogtag/tps-ui/shared/cgi-bin/sow/search_temp.html index 2f8f0d619..9cb51404d 100755 --- a/pki/dogtag/tps-ui/shared/cgi-bin/sow/search_temp.html +++ b/pki/dogtag/tps-ui/shared/cgi-bin/sow/search_temp.html @@ -1,7 +1,7 @@ <!-- --- BEGIN COPYRIGHT BLOCK --- This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either + License as published by the Free Software Foundation. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/pki/dogtag/tps-ui/shared/cgi-bin/sow/seturl.html b/pki/dogtag/tps-ui/shared/cgi-bin/sow/seturl.html index 4cec98229..520b05c4d 100755 --- a/pki/dogtag/tps-ui/shared/cgi-bin/sow/seturl.html +++ b/pki/dogtag/tps-ui/shared/cgi-bin/sow/seturl.html @@ -1,7 +1,7 @@ <!-- --- BEGIN COPYRIGHT BLOCK --- This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either + License as published by the Free Software Foundation. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/pki/dogtag/tps-ui/shared/cgi-bin/sow/welcome.html b/pki/dogtag/tps-ui/shared/cgi-bin/sow/welcome.html index 9e5587469..6af2b4d8f 100755 --- a/pki/dogtag/tps-ui/shared/cgi-bin/sow/welcome.html +++ b/pki/dogtag/tps-ui/shared/cgi-bin/sow/welcome.html @@ -1,7 +1,7 @@ <!-- --- BEGIN COPYRIGHT BLOCK --- This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either + License as published by the Free Software Foundation. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/pki/dogtag/tps-ui/shared/docroot/css/pki-360.css b/pki/dogtag/tps-ui/shared/docroot/css/pki-360.css index ac94e691b..8f5858749 100644 --- a/pki/dogtag/tps-ui/shared/docroot/css/pki-360.css +++ b/pki/dogtag/tps-ui/shared/docroot/css/pki-360.css @@ -1,18 +1,18 @@ /* --- BEGIN COPYRIGHT BLOCK --- * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * + * License as published by the Free Software Foundation. + * * This library 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 * Lesser General Public License for more details. - * + * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301 USA - * + * Boston, MA 02110-1301 USA + * * Copyright (C) 2007 Red Hat, Inc. * All rights reserved. * --- END COPYRIGHT BLOCK --- @@ -85,9 +85,29 @@ a:visited { search areas */ #header { height: 31px; /* changed height added bottom margin */ - margin-bottom: 10px; + margin-top: 10px; + margin-bottom: 20px; } +#headertitle { + height: 31px; /* same as header */ + margin-top: 10px; /* same as header */ + margin-right: 100px; /* "myLogo" margin-left + "logo_header.gif" */ + margin-bottom: 20px; /* same as header */ + font-size: large; + font-weight: bold; + } + +#headerpaddedtitle { + height: 31px; /* same as header */ + margin-top: 10px; /* same as header */ + margin-bottom: 20px; /* same as header */ + font-size: large; + font-weight: bold; + padding-left: 115px; /* "myLogo" margin-left + + "logo_header.gif" + 15px */ + } + img#myLogo { float: left; margin-left: 15px; @@ -802,7 +822,7 @@ div.contentnav-row2 div.bottom { background-image: url(/img/corner_mainnav_bottom_chopped.png); background-position: bottom right; background-repeat: no-repeat; - background-color: #c00; + background-color: #4f52b5; } #mainNav { @@ -856,7 +876,7 @@ div.contentnav-row2 div.bottom { #mainNav li#mainFirst-active, #mainNav li#main-active, #mainNav li#mainLast-active { - background-color: #800000; + background-color: #000080; } diff --git a/pki/dogtag/tps-ui/shared/docroot/css/pki-base.css b/pki/dogtag/tps-ui/shared/docroot/css/pki-base.css index f752e84b1..85c426bff 100644 --- a/pki/dogtag/tps-ui/shared/docroot/css/pki-base.css +++ b/pki/dogtag/tps-ui/shared/docroot/css/pki-base.css @@ -1,18 +1,18 @@ /* --- BEGIN COPYRIGHT BLOCK --- * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * + * License as published by the Free Software Foundation. + * * This library 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 * Lesser General Public License for more details. - * + * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301 USA - * + * Boston, MA 02110-1301 USA + * * Copyright (C) 2007 Red Hat, Inc. * All rights reserved. * --- END COPYRIGHT BLOCK --- diff --git a/pki/dogtag/tps-ui/shared/docroot/css/pki.css b/pki/dogtag/tps-ui/shared/docroot/css/pki.css index 39461f35f..4380598a1 100644 --- a/pki/dogtag/tps-ui/shared/docroot/css/pki.css +++ b/pki/dogtag/tps-ui/shared/docroot/css/pki.css @@ -1,18 +1,18 @@ /* --- BEGIN COPYRIGHT BLOCK --- * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * + * License as published by the Free Software Foundation. + * * This library 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 * Lesser General Public License for more details. - * + * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301 USA - * + * Boston, MA 02110-1301 USA + * * Copyright (C) 2007 Red Hat, Inc. * All rights reserved. * --- END COPYRIGHT BLOCK --- diff --git a/pki/dogtag/tps-ui/shared/docroot/esc/AdminEsc.html b/pki/dogtag/tps-ui/shared/docroot/esc/AdminEsc.html index 997de8e54..d7a6b4c94 100755 --- a/pki/dogtag/tps-ui/shared/docroot/esc/AdminEsc.html +++ b/pki/dogtag/tps-ui/shared/docroot/esc/AdminEsc.html @@ -1,7 +1,7 @@ <!-- --- BEGIN COPYRIGHT BLOCK --- This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either + License as published by the Free Software Foundation. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/pki/dogtag/tps-ui/shared/docroot/esc/AdvancePopup.html b/pki/dogtag/tps-ui/shared/docroot/esc/AdvancePopup.html index c2698d45e..f80ba49e1 100755 --- a/pki/dogtag/tps-ui/shared/docroot/esc/AdvancePopup.html +++ b/pki/dogtag/tps-ui/shared/docroot/esc/AdvancePopup.html @@ -1,7 +1,7 @@ <!-- --- BEGIN COPYRIGHT BLOCK --- This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either + License as published by the Free Software Foundation. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/pki/dogtag/tps-ui/shared/docroot/esc/EnrollPopup.html b/pki/dogtag/tps-ui/shared/docroot/esc/EnrollPopup.html index 46cd6d450..80907fa27 100755 --- a/pki/dogtag/tps-ui/shared/docroot/esc/EnrollPopup.html +++ b/pki/dogtag/tps-ui/shared/docroot/esc/EnrollPopup.html @@ -1,7 +1,7 @@ <!-- --- BEGIN COPYRIGHT BLOCK --- This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either + License as published by the Free Software Foundation. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/pki/dogtag/tps-ui/shared/docroot/esc/GenericAuth.html b/pki/dogtag/tps-ui/shared/docroot/esc/GenericAuth.html index 0e857c5da..402667b1e 100755 --- a/pki/dogtag/tps-ui/shared/docroot/esc/GenericAuth.html +++ b/pki/dogtag/tps-ui/shared/docroot/esc/GenericAuth.html @@ -1,7 +1,7 @@ <!-- --- BEGIN COPYRIGHT BLOCK --- This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either + License as published by the Free Software Foundation. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/pki/dogtag/tps-ui/shared/docroot/esc/SettingsEsc.html b/pki/dogtag/tps-ui/shared/docroot/esc/SettingsEsc.html index 9ffeb69a3..6072fd2a6 100755 --- a/pki/dogtag/tps-ui/shared/docroot/esc/SettingsEsc.html +++ b/pki/dogtag/tps-ui/shared/docroot/esc/SettingsEsc.html @@ -1,7 +1,7 @@ <!-- --- BEGIN COPYRIGHT BLOCK --- This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either + License as published by the Free Software Foundation. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/pki/dogtag/tps-ui/shared/docroot/esc/TokenManager.html b/pki/dogtag/tps-ui/shared/docroot/esc/TokenManager.html index 2f28889ef..921d3801e 100755 --- a/pki/dogtag/tps-ui/shared/docroot/esc/TokenManager.html +++ b/pki/dogtag/tps-ui/shared/docroot/esc/TokenManager.html @@ -1,7 +1,7 @@ <!-- --- BEGIN COPYRIGHT BLOCK --- This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either + License as published by the Free Software Foundation. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/pki/dogtag/tps-ui/shared/docroot/esc/TokenPin.html b/pki/dogtag/tps-ui/shared/docroot/esc/TokenPin.html index c73d6f108..f3d70cbee 100755 --- a/pki/dogtag/tps-ui/shared/docroot/esc/TokenPin.html +++ b/pki/dogtag/tps-ui/shared/docroot/esc/TokenPin.html @@ -1,7 +1,7 @@ <!-- --- BEGIN COPYRIGHT BLOCK --- This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either + License as published by the Free Software Foundation. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/pki/dogtag/tps-ui/shared/docroot/esc/demo/EnrollSuccess.html b/pki/dogtag/tps-ui/shared/docroot/esc/demo/EnrollSuccess.html index c266efef4..062749a36 100644 --- a/pki/dogtag/tps-ui/shared/docroot/esc/demo/EnrollSuccess.html +++ b/pki/dogtag/tps-ui/shared/docroot/esc/demo/EnrollSuccess.html @@ -1,7 +1,7 @@ <!-- --- BEGIN COPYRIGHT BLOCK --- This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either + License as published by the Free Software Foundation. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/pki/dogtag/tps-ui/shared/docroot/esc/demo/GenericAuth.html b/pki/dogtag/tps-ui/shared/docroot/esc/demo/GenericAuth.html index 7c3189a10..1abcc0efc 100755 --- a/pki/dogtag/tps-ui/shared/docroot/esc/demo/GenericAuth.html +++ b/pki/dogtag/tps-ui/shared/docroot/esc/demo/GenericAuth.html @@ -1,7 +1,7 @@ <!-- --- BEGIN COPYRIGHT BLOCK --- This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either + License as published by the Free Software Foundation. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/pki/dogtag/tps-ui/shared/docroot/esc/demo/style.css b/pki/dogtag/tps-ui/shared/docroot/esc/demo/style.css index e9d7d9bf7..3f5cf22c8 100755 --- a/pki/dogtag/tps-ui/shared/docroot/esc/demo/style.css +++ b/pki/dogtag/tps-ui/shared/docroot/esc/demo/style.css @@ -1,7 +1,7 @@ /* --- BEGIN COPYRIGHT BLOCK --- * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either + * License as published by the Free Software Foundation. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/pki/dogtag/tps-ui/shared/docroot/esc/demo/util.js b/pki/dogtag/tps-ui/shared/docroot/esc/demo/util.js index 82ef1d9cd..47baa2d92 100755 --- a/pki/dogtag/tps-ui/shared/docroot/esc/demo/util.js +++ b/pki/dogtag/tps-ui/shared/docroot/esc/demo/util.js @@ -1,7 +1,7 @@ // --- BEGIN COPYRIGHT BLOCK --- // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public -// License as published by the Free Software Foundation; either +// License as published by the Free Software Foundation. // // This library is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/pki/dogtag/tps-ui/shared/docroot/esc/home/EnrollSuccess.html b/pki/dogtag/tps-ui/shared/docroot/esc/home/EnrollSuccess.html index 5c53f3338..748a0e3b9 100644 --- a/pki/dogtag/tps-ui/shared/docroot/esc/home/EnrollSuccess.html +++ b/pki/dogtag/tps-ui/shared/docroot/esc/home/EnrollSuccess.html @@ -1,7 +1,7 @@ <!-- --- BEGIN COPYRIGHT BLOCK --- This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either + License as published by the Free Software Foundation. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/pki/dogtag/tps-ui/shared/docroot/esc/home/GenericAuth.html b/pki/dogtag/tps-ui/shared/docroot/esc/home/GenericAuth.html index 5660a7c50..1ca89a9c7 100755 --- a/pki/dogtag/tps-ui/shared/docroot/esc/home/GenericAuth.html +++ b/pki/dogtag/tps-ui/shared/docroot/esc/home/GenericAuth.html @@ -1,7 +1,7 @@ <!-- --- BEGIN COPYRIGHT BLOCK --- This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either + License as published by the Free Software Foundation. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/pki/dogtag/tps-ui/shared/docroot/esc/home/style.css b/pki/dogtag/tps-ui/shared/docroot/esc/home/style.css index e9d7d9bf7..3f5cf22c8 100755 --- a/pki/dogtag/tps-ui/shared/docroot/esc/home/style.css +++ b/pki/dogtag/tps-ui/shared/docroot/esc/home/style.css @@ -1,7 +1,7 @@ /* --- BEGIN COPYRIGHT BLOCK --- * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either + * License as published by the Free Software Foundation. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/pki/dogtag/tps-ui/shared/docroot/esc/home/util.js b/pki/dogtag/tps-ui/shared/docroot/esc/home/util.js index a4d4396b3..4775cd9be 100755 --- a/pki/dogtag/tps-ui/shared/docroot/esc/home/util.js +++ b/pki/dogtag/tps-ui/shared/docroot/esc/home/util.js @@ -1,7 +1,7 @@ // --- BEGIN COPYRIGHT BLOCK --- // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public -// License as published by the Free Software Foundation; either +// License as published by the Free Software Foundation. // // This library is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/pki/dogtag/tps-ui/shared/docroot/esc/so/EnrollSuccess.html b/pki/dogtag/tps-ui/shared/docroot/esc/so/EnrollSuccess.html index f6c71c6b9..be17772a8 100644 --- a/pki/dogtag/tps-ui/shared/docroot/esc/so/EnrollSuccess.html +++ b/pki/dogtag/tps-ui/shared/docroot/esc/so/EnrollSuccess.html @@ -1,7 +1,7 @@ <!-- --- BEGIN COPYRIGHT BLOCK --- This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either + License as published by the Free Software Foundation. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/pki/dogtag/tps-ui/shared/docroot/esc/so/GenericAuth.html b/pki/dogtag/tps-ui/shared/docroot/esc/so/GenericAuth.html index 5660a7c50..1ca89a9c7 100755 --- a/pki/dogtag/tps-ui/shared/docroot/esc/so/GenericAuth.html +++ b/pki/dogtag/tps-ui/shared/docroot/esc/so/GenericAuth.html @@ -1,7 +1,7 @@ <!-- --- BEGIN COPYRIGHT BLOCK --- This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either + License as published by the Free Software Foundation. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/pki/dogtag/tps-ui/shared/docroot/esc/so/style.css b/pki/dogtag/tps-ui/shared/docroot/esc/so/style.css index e9d7d9bf7..3f5cf22c8 100755 --- a/pki/dogtag/tps-ui/shared/docroot/esc/so/style.css +++ b/pki/dogtag/tps-ui/shared/docroot/esc/so/style.css @@ -1,7 +1,7 @@ /* --- BEGIN COPYRIGHT BLOCK --- * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either + * License as published by the Free Software Foundation. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/pki/dogtag/tps-ui/shared/docroot/esc/so/util.js b/pki/dogtag/tps-ui/shared/docroot/esc/so/util.js index 561d1b8bc..fc0a7a001 100755 --- a/pki/dogtag/tps-ui/shared/docroot/esc/so/util.js +++ b/pki/dogtag/tps-ui/shared/docroot/esc/so/util.js @@ -1,7 +1,7 @@ // --- BEGIN COPYRIGHT BLOCK --- // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public -// License as published by the Free Software Foundation; either +// License as published by the Free Software Foundation. // // This library is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/pki/dogtag/tps-ui/shared/docroot/esc/sow/EnrollSuccess.html b/pki/dogtag/tps-ui/shared/docroot/esc/sow/EnrollSuccess.html index 73db7d464..2ec6a4579 100644 --- a/pki/dogtag/tps-ui/shared/docroot/esc/sow/EnrollSuccess.html +++ b/pki/dogtag/tps-ui/shared/docroot/esc/sow/EnrollSuccess.html @@ -1,7 +1,7 @@ <!-- --- BEGIN COPYRIGHT BLOCK --- This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either + License as published by the Free Software Foundation. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/pki/dogtag/tps-ui/shared/docroot/esc/sow/GenericAuth.html b/pki/dogtag/tps-ui/shared/docroot/esc/sow/GenericAuth.html index 5660a7c50..1ca89a9c7 100755 --- a/pki/dogtag/tps-ui/shared/docroot/esc/sow/GenericAuth.html +++ b/pki/dogtag/tps-ui/shared/docroot/esc/sow/GenericAuth.html @@ -1,7 +1,7 @@ <!-- --- BEGIN COPYRIGHT BLOCK --- This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either + License as published by the Free Software Foundation. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/pki/dogtag/tps-ui/shared/docroot/esc/sow/style.css b/pki/dogtag/tps-ui/shared/docroot/esc/sow/style.css index e9d7d9bf7..3f5cf22c8 100755 --- a/pki/dogtag/tps-ui/shared/docroot/esc/sow/style.css +++ b/pki/dogtag/tps-ui/shared/docroot/esc/sow/style.css @@ -1,7 +1,7 @@ /* --- BEGIN COPYRIGHT BLOCK --- * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either + * License as published by the Free Software Foundation. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/pki/dogtag/tps-ui/shared/docroot/esc/sow/util.js b/pki/dogtag/tps-ui/shared/docroot/esc/sow/util.js index 2d502762e..a1973c7be 100755 --- a/pki/dogtag/tps-ui/shared/docroot/esc/sow/util.js +++ b/pki/dogtag/tps-ui/shared/docroot/esc/sow/util.js @@ -1,7 +1,7 @@ // --- BEGIN COPYRIGHT BLOCK --- // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public -// License as published by the Free Software Foundation; either +// License as published by the Free Software Foundation. // // This library is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/pki/dogtag/tps-ui/shared/docroot/esc/style.css b/pki/dogtag/tps-ui/shared/docroot/esc/style.css index f85d18ee2..8b78014c1 100755 --- a/pki/dogtag/tps-ui/shared/docroot/esc/style.css +++ b/pki/dogtag/tps-ui/shared/docroot/esc/style.css @@ -1,7 +1,7 @@ /* --- BEGIN COPYRIGHT BLOCK --- * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either + * License as published by the Free Software Foundation. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/pki/dogtag/tps-ui/shared/docroot/tokendb/addResults.template b/pki/dogtag/tps-ui/shared/docroot/tokendb/addResults.template index 0f154827a..234ba1022 100644 --- a/pki/dogtag/tps-ui/shared/docroot/tokendb/addResults.template +++ b/pki/dogtag/tps-ui/shared/docroot/tokendb/addResults.template @@ -1,7 +1,7 @@ <!-- --- BEGIN COPYRIGHT BLOCK --- This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either + License as published by the Free Software Foundation. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -22,18 +22,18 @@ <HEAD> <TITLE>TPS</Title> </HEAD> -<table border="0" width="100%" cellspacing="0" cellpadding="6"> - <tr bgcolor="#666699"> - <td width=25%> - <table border="0" cellspacing="0" cellpadding="6"> + +<table border="0" width="100%" cellspacing="0" cellpadding="0" bgcolor="#000080"> + <tr> + <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="/tps/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> TPS Services</b></font></td> </tr> </table> </td> - <td align=right width=65% nowrap><font size="+1" face="PrimaSans BT, Verdana, sans-serif" color="white">TPS Services</font></td> - <td width="10%"> </td> </tr> </table> <p> diff --git a/pki/dogtag/tps-ui/shared/docroot/tokendb/auditAdmin.template b/pki/dogtag/tps-ui/shared/docroot/tokendb/auditAdmin.template index bfad303fd..098a4882a 100644 --- a/pki/dogtag/tps-ui/shared/docroot/tokendb/auditAdmin.template +++ b/pki/dogtag/tps-ui/shared/docroot/tokendb/auditAdmin.template @@ -23,18 +23,17 @@ <TITLE>TPS</Title> </HEAD> -<table border="0" width="100%" cellspacing="0" cellpadding="6"> - <tr bgcolor="#666699"> - <td width=25%> - <table border="0" cellspacing="0" cellpadding="6"> +<table border="0" width="100%" cellspacing="0" cellpadding="0" bgcolor="#000080"> + <tr> + <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="/tps/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> TPS Services</b></font></td> </tr> </table> </td> - <td align=right width=65% nowrap><font size="+1" face="PrimaSans BT, Verdana, sans-serif" color="white">TPS Services</font></td> - <td width="10%"> </td> </tr> </table> <p> diff --git a/pki/dogtag/tps-ui/shared/docroot/tokendb/delete.template b/pki/dogtag/tps-ui/shared/docroot/tokendb/delete.template index 1a48d9018..b2726b5e3 100644 --- a/pki/dogtag/tps-ui/shared/docroot/tokendb/delete.template +++ b/pki/dogtag/tps-ui/shared/docroot/tokendb/delete.template @@ -1,7 +1,7 @@ <!-- --- BEGIN COPYRIGHT BLOCK --- This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either + License as published by the Free Software Foundation. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -23,18 +23,17 @@ <TITLE>TPS</Title> </HEAD> -<table border="0" width="100%" cellspacing="0" cellpadding="6"> - <tr bgcolor="#666699"> - <td width=25%> - <table border="0" cellspacing="0" cellpadding="6"> +<table border="0" width="100%" cellspacing="0" cellpadding="0" bgcolor="#000080"> + <tr> + <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="/tps/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> TPS Services</b></font></td> </tr> </table> </td> - <td align=right width=65% nowrap><font size="+1" face="PrimaSans BT, Verdana, sans-serif" color="white">TPS Services</font></td> - <td width="10%"> </td> </tr> </table> <p> diff --git a/pki/dogtag/tps-ui/shared/docroot/tokendb/deleteResults.template b/pki/dogtag/tps-ui/shared/docroot/tokendb/deleteResults.template index 20945aedb..5611d1480 100644 --- a/pki/dogtag/tps-ui/shared/docroot/tokendb/deleteResults.template +++ b/pki/dogtag/tps-ui/shared/docroot/tokendb/deleteResults.template @@ -1,7 +1,7 @@ <!-- --- BEGIN COPYRIGHT BLOCK --- This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either + License as published by the Free Software Foundation. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -23,18 +23,17 @@ <TITLE>TPS</Title> </HEAD> -<table border="0" width="100%" cellspacing="0" cellpadding="6"> - <tr bgcolor="#666699"> - <td width=25%> - <table border="0" cellspacing="0" cellpadding="6"> +<table border="0" width="100%" cellspacing="0" cellpadding="0" bgcolor="#000080"> + <tr> + <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="/tps/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> TPS Services</b></font></td> </tr> </table> </td> - <td align=right width=65% nowrap><font size="+1" face="PrimaSans BT, Verdana, sans-serif" color="white">TPS Services</font></td> - <td width="10%"> </td> </tr> </table> <p> diff --git a/pki/dogtag/tps-ui/shared/docroot/tokendb/doToken.template b/pki/dogtag/tps-ui/shared/docroot/tokendb/doToken.template index 432c008e6..afcde8866 100644 --- a/pki/dogtag/tps-ui/shared/docroot/tokendb/doToken.template +++ b/pki/dogtag/tps-ui/shared/docroot/tokendb/doToken.template @@ -1,7 +1,7 @@ <!-- --- BEGIN COPYRIGHT BLOCK --- This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either + License as published by the Free Software Foundation. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -23,18 +23,17 @@ <TITLE>TPS</Title> </HEAD> -<table border="0" width="100%" cellspacing="0" cellpadding="6"> - <tr bgcolor="#666699"> - <td width=25%> - <table border="0" cellspacing="0" cellpadding="6"> +<table border="0" width="100%" cellspacing="0" cellpadding="0" bgcolor="#000080"> + <tr> + <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="/tps/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> TPS Services</b></font></td> </tr> </table> </td> - <td align=right width=65% nowrap><font size="+1" face="PrimaSans BT, Verdana, sans-serif" color="white">TPS Services</font></td> - <td width="10%"> </td> </tr> </table> <p> diff --git a/pki/dogtag/tps-ui/shared/docroot/tokendb/doTokenConfirm.template b/pki/dogtag/tps-ui/shared/docroot/tokendb/doTokenConfirm.template index 065334896..4272970f9 100644 --- a/pki/dogtag/tps-ui/shared/docroot/tokendb/doTokenConfirm.template +++ b/pki/dogtag/tps-ui/shared/docroot/tokendb/doTokenConfirm.template @@ -1,7 +1,7 @@ <!-- --- BEGIN COPYRIGHT BLOCK --- This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either + License as published by the Free Software Foundation. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -23,18 +23,17 @@ <TITLE>TPS</Title> </HEAD> -<table border="0" width="100%" cellspacing="0" cellpadding="6"> - <tr bgcolor="#666699"> - <td width=25%> - <table border="0" cellspacing="0" cellpadding="6"> +<table border="0" width="100%" cellspacing="0" cellpadding="0" bgcolor="#000080"> + <tr> + <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="/tps/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> TPS Services</b></font></td> </tr> </table> </td> - <td align=right width=65% nowrap><font size="+1" face="PrimaSans BT, Verdana, sans-serif" color="white">TPS Services</font></td> - <td width="10%"> </td> </tr> </table> <p> diff --git a/pki/dogtag/tps-ui/shared/docroot/tokendb/edit.template b/pki/dogtag/tps-ui/shared/docroot/tokendb/edit.template index 165467717..609972d47 100644 --- a/pki/dogtag/tps-ui/shared/docroot/tokendb/edit.template +++ b/pki/dogtag/tps-ui/shared/docroot/tokendb/edit.template @@ -1,7 +1,7 @@ <!-- --- BEGIN COPYRIGHT BLOCK --- This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either + License as published by the Free Software Foundation. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -23,18 +23,17 @@ <TITLE>TPS</Title> </HEAD> -<table border="0" width="100%" cellspacing="0" cellpadding="6"> - <tr bgcolor="#666699"> - <td width=25%> - <table border="0" cellspacing="0" cellpadding="6"> +<table border="0" width="100%" cellspacing="0" cellpadding="0" bgcolor="#000080"> + <tr> + <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="/tps/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> TPS Services</b></font></td> </tr> </table> </td> - <td align=right width=65% nowrap><font size="+1" face="PrimaSans BT, Verdana, sans-serif" color="white">TPS Services</font></td> - <td width="10%"> </td> </tr> </table> <p> diff --git a/pki/dogtag/tps-ui/shared/docroot/tokendb/editResults.template b/pki/dogtag/tps-ui/shared/docroot/tokendb/editResults.template index f0f52b701..9ae3615e0 100644 --- a/pki/dogtag/tps-ui/shared/docroot/tokendb/editResults.template +++ b/pki/dogtag/tps-ui/shared/docroot/tokendb/editResults.template @@ -1,7 +1,7 @@ <!-- --- BEGIN COPYRIGHT BLOCK --- This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either + License as published by the Free Software Foundation. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -23,18 +23,17 @@ <TITLE>TPS</Title> </HEAD> -<table border="0" width="100%" cellspacing="0" cellpadding="6"> - <tr bgcolor="#666699"> - <td width=25%> - <table border="0" cellspacing="0" cellpadding="6"> +<table border="0" width="100%" cellspacing="0" cellpadding="0" bgcolor="#000080"> + <tr> + <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="/tps/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> TPS Services</b></font></td> </tr> </table> </td> - <td align=right width=65% nowrap><font size="+1" face="PrimaSans BT, Verdana, sans-serif" color="white">TPS Services</font></td> - <td width="10%"> </td> </tr> </table> <p> diff --git a/pki/dogtag/tps-ui/shared/docroot/tokendb/editUser.template b/pki/dogtag/tps-ui/shared/docroot/tokendb/editUser.template index a05825b6e..941a6959e 100644 --- a/pki/dogtag/tps-ui/shared/docroot/tokendb/editUser.template +++ b/pki/dogtag/tps-ui/shared/docroot/tokendb/editUser.template @@ -1,7 +1,7 @@ <!-- --- BEGIN COPYRIGHT BLOCK --- This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either + License as published by the Free Software Foundation. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -23,18 +23,17 @@ <TITLE>TPS</Title> </HEAD> -<table border="0" width="100%" cellspacing="0" cellpadding="6"> - <tr bgcolor="#666699"> - <td width=25%> - <table border="0" cellspacing="0" cellpadding="6"> +<table border="0" width="100%" cellspacing="0" cellpadding="0" bgcolor="#000080"> + <tr> + <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="/tps/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> TPS Services</b></font></td> </tr> </table> </td> - <td align=right width=65% nowrap><font size="+1" face="PrimaSans BT, Verdana, sans-serif" color="white">TPS Services</font></td> - <td width="10%"> </td> </tr> </table> <p> diff --git a/pki/dogtag/tps-ui/shared/docroot/tokendb/error.template b/pki/dogtag/tps-ui/shared/docroot/tokendb/error.template index e0bfcb22b..6a4ad8852 100644 --- a/pki/dogtag/tps-ui/shared/docroot/tokendb/error.template +++ b/pki/dogtag/tps-ui/shared/docroot/tokendb/error.template @@ -1,7 +1,7 @@ <!-- --- BEGIN COPYRIGHT BLOCK --- This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either + License as published by the Free Software Foundation. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -23,18 +23,17 @@ <TITLE>TPS</Title> </HEAD> -<table border="0" width="100%" cellspacing="0" cellpadding="6"> - <tr bgcolor="#666699"> - <td width=25%> - <table border="0" cellspacing="0" cellpadding="6"> +<table border="0" width="100%" cellspacing="0" cellpadding="0" bgcolor="#000080"> + <tr> + <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="/tps/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> TPS Services</b></font></td> </tr> </table> </td> - <td align=right width=65% nowrap><font size="+1" face="PrimaSans BT, Verdana, sans-serif" color="white">TPS Services</font></td> - <td width="10%"> </td> </tr> </table> <p> diff --git a/pki/dogtag/tps-ui/shared/docroot/tokendb/index.template b/pki/dogtag/tps-ui/shared/docroot/tokendb/index.template index 6c5299a4f..340a44ac7 100644 --- a/pki/dogtag/tps-ui/shared/docroot/tokendb/index.template +++ b/pki/dogtag/tps-ui/shared/docroot/tokendb/index.template @@ -1,7 +1,7 @@ <!-- --- BEGIN COPYRIGHT BLOCK --- This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either + License as published by the Free Software Foundation. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -22,18 +22,18 @@ <HEAD> <TITLE>TPS</Title> </HEAD> -<table border="0" width="100%" cellspacing="0" cellpadding="6"> - <tr bgcolor="#666699"> - <td width=25%> - <table border="0" cellspacing="0" cellpadding="6"> + +<table border="0" width="100%" cellspacing="0" cellpadding="0" bgcolor="#000080"> + <tr> + <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="/tps/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> TPS Services</b></font></td> </tr> </table> </td> - <td align=right width=65% nowrap><font size="+1" face="PrimaSans BT, Verdana, sans-serif" color="white">TPS Services</font></td> - <td width="10%"> </td> </tr> </table> <p> diff --git a/pki/dogtag/tps-ui/shared/docroot/tokendb/indexAdmin.template b/pki/dogtag/tps-ui/shared/docroot/tokendb/indexAdmin.template index 61eb5b88f..97fa592c7 100644 --- a/pki/dogtag/tps-ui/shared/docroot/tokendb/indexAdmin.template +++ b/pki/dogtag/tps-ui/shared/docroot/tokendb/indexAdmin.template @@ -1,7 +1,7 @@ <!-- --- BEGIN COPYRIGHT BLOCK --- This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either + License as published by the Free Software Foundation. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -22,18 +22,18 @@ <HEAD> <TITLE>TPS</Title> </HEAD> -<table border="0" width="100%" cellspacing="0" cellpadding="6"> - <tr bgcolor="#666699"> - <td width=25%> - <table border="0" cellspacing="0" cellpadding="6"> + +<table border="0" width="100%" cellspacing="0" cellpadding="0" bgcolor="#000080"> + <tr> + <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="/tps/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> TPS Services</b></font></td> </tr> </table> </td> - <td align=right width=65% nowrap><font size="+1" face="PrimaSans BT, Verdana, sans-serif" color="white">TPS Services</font></td> - <td width="10%"> </td> </tr> </table> <p> diff --git a/pki/dogtag/tps-ui/shared/docroot/tokendb/indexOperator.template b/pki/dogtag/tps-ui/shared/docroot/tokendb/indexOperator.template index 838f8038d..85781b1c1 100644 --- a/pki/dogtag/tps-ui/shared/docroot/tokendb/indexOperator.template +++ b/pki/dogtag/tps-ui/shared/docroot/tokendb/indexOperator.template @@ -1,7 +1,7 @@ <!-- --- BEGIN COPYRIGHT BLOCK --- This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either + License as published by the Free Software Foundation. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -22,18 +22,18 @@ <HEAD> <TITLE>TPS</Title> </HEAD> -<table border="0" width="100%" cellspacing="0" cellpadding="6"> - <tr bgcolor="#666699"> - <td width=25%> - <table border="0" cellspacing="0" cellpadding="6"> + +<table border="0" width="100%" cellspacing="0" cellpadding="0" bgcolor="#000080"> + <tr> + <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="/tps/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> TPS Services</b></font></td> </tr> </table> </td> - <td align=right width=65% nowrap><font size="+1" face="PrimaSans BT, Verdana, sans-serif" color="white">TPS Services</font></td> - <td width="10%"> </td> </tr> </table> <p> diff --git a/pki/dogtag/tps-ui/shared/docroot/tokendb/new.template b/pki/dogtag/tps-ui/shared/docroot/tokendb/new.template index a429ce5ad..150a2a305 100644 --- a/pki/dogtag/tps-ui/shared/docroot/tokendb/new.template +++ b/pki/dogtag/tps-ui/shared/docroot/tokendb/new.template @@ -1,7 +1,7 @@ <!-- --- BEGIN COPYRIGHT BLOCK --- This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either + License as published by the Free Software Foundation. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -23,18 +23,17 @@ <TITLE>TPS</Title> </HEAD> -<table border="0" width="100%" cellspacing="0" cellpadding="6"> - <tr bgcolor="#666699"> - <td width=25%> - <table border="0" cellspacing="0" cellpadding="6"> +<table border="0" width="100%" cellspacing="0" cellpadding="0" bgcolor="#000080"> + <tr> + <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="/tps/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> TPS Services</b></font></td> </tr> </table> </td> - <td align=right width=65% nowrap><font size="+1" face="PrimaSans BT, Verdana, sans-serif" color="white">TPS Services</font></td> - <td width="10%"> </td> </tr> </table> <p> diff --git a/pki/dogtag/tps-ui/shared/docroot/tokendb/newUser.template b/pki/dogtag/tps-ui/shared/docroot/tokendb/newUser.template index f434ba388..4c5161149 100644 --- a/pki/dogtag/tps-ui/shared/docroot/tokendb/newUser.template +++ b/pki/dogtag/tps-ui/shared/docroot/tokendb/newUser.template @@ -1,7 +1,7 @@ <!-- --- BEGIN COPYRIGHT BLOCK --- This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either + License as published by the Free Software Foundation. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -23,18 +23,17 @@ <TITLE>TPS</Title> </HEAD> -<table border="0" width="100%" cellspacing="0" cellpadding="6"> - <tr bgcolor="#666699"> - <td width=25%> - <table border="0" cellspacing="0" cellpadding="6"> +<table border="0" width="100%" cellspacing="0" cellpadding="0" bgcolor="#000080"> + <tr> + <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="/tps/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> TPS Services</b></font></td> </tr> </table> </td> - <td align=right width=65% nowrap><font size="+1" face="PrimaSans BT, Verdana, sans-serif" color="white">TPS Services</font></td> - <td width="10%"> </td> </tr> </table> <p> diff --git a/pki/dogtag/tps-ui/shared/docroot/tokendb/revoke.template b/pki/dogtag/tps-ui/shared/docroot/tokendb/revoke.template index 5b498b7eb..995a2a72e 100644 --- a/pki/dogtag/tps-ui/shared/docroot/tokendb/revoke.template +++ b/pki/dogtag/tps-ui/shared/docroot/tokendb/revoke.template @@ -1,7 +1,7 @@ <!-- --- BEGIN COPYRIGHT BLOCK --- This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either + License as published by the Free Software Foundation. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -23,18 +23,17 @@ <TITLE>TPS</Title> </HEAD> -<table border="0" width="100%" cellspacing="0" cellpadding="6"> - <tr bgcolor="#666699"> - <td width=25%> - <table border="0" cellspacing="0" cellpadding="6"> +<table border="0" width="100%" cellspacing="0" cellpadding="0" bgcolor="#000080"> + <tr> + <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="/tps/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> TPS Services</b></font></td> </tr> </table> </td> - <td align=right width=65% nowrap><font size="+1" face="PrimaSans BT, Verdana, sans-serif" color="white">TPS Services</font></td> - <td width="10%"> </td> </tr> </table> <p> diff --git a/pki/dogtag/tps-ui/shared/docroot/tokendb/search.template b/pki/dogtag/tps-ui/shared/docroot/tokendb/search.template index b433429d3..4645ff598 100644 --- a/pki/dogtag/tps-ui/shared/docroot/tokendb/search.template +++ b/pki/dogtag/tps-ui/shared/docroot/tokendb/search.template @@ -1,7 +1,7 @@ <!-- --- BEGIN COPYRIGHT BLOCK --- This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either + License as published by the Free Software Foundation. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -23,18 +23,17 @@ <TITLE>TPS</Title> </HEAD> -<table border="0" width="100%" cellspacing="0" cellpadding="6"> - <tr bgcolor="#666699"> - <td width=25%> - <table border="0" cellspacing="0" cellpadding="6"> +<table border="0" width="100%" cellspacing="0" cellpadding="0" bgcolor="#000080"> + <tr> + <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="/tps/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> TPS Services</b></font></td> </tr> </table> </td> - <td align=right width=65% nowrap><font size="+1" face="PrimaSans BT, Verdana, sans-serif" color="white">TPS Services</font></td> - <td width="10%"> </td> </tr> </table> <p> diff --git a/pki/dogtag/tps-ui/shared/docroot/tokendb/searchActivity.template b/pki/dogtag/tps-ui/shared/docroot/tokendb/searchActivity.template index 1057c5ec2..72c7f2d81 100644 --- a/pki/dogtag/tps-ui/shared/docroot/tokendb/searchActivity.template +++ b/pki/dogtag/tps-ui/shared/docroot/tokendb/searchActivity.template @@ -1,7 +1,7 @@ <!-- --- BEGIN COPYRIGHT BLOCK --- This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either + License as published by the Free Software Foundation. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -23,18 +23,17 @@ <TITLE>TPS</Title> </HEAD> -<table border="0" width="100%" cellspacing="0" cellpadding="6"> - <tr bgcolor="#666699"> - <td width=25%> - <table border="0" cellspacing="0" cellpadding="6"> +<table border="0" width="100%" cellspacing="0" cellpadding="0" bgcolor="#000080"> + <tr> + <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="/tps/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> TPS Services</b></font></td> </tr> </table> </td> - <td align=right width=65% nowrap><font size="+1" face="PrimaSans BT, Verdana, sans-serif" color="white">TPS Services</font></td> - <td width="10%"> </td> </tr> </table> <p> diff --git a/pki/dogtag/tps-ui/shared/docroot/tokendb/searchActivityAdmin.template b/pki/dogtag/tps-ui/shared/docroot/tokendb/searchActivityAdmin.template index f503595ab..0ed15f4c1 100644 --- a/pki/dogtag/tps-ui/shared/docroot/tokendb/searchActivityAdmin.template +++ b/pki/dogtag/tps-ui/shared/docroot/tokendb/searchActivityAdmin.template @@ -1,7 +1,7 @@ <!-- --- BEGIN COPYRIGHT BLOCK --- This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either + License as published by the Free Software Foundation. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -23,18 +23,17 @@ <TITLE>TPS</Title> </HEAD> -<table border="0" width="100%" cellspacing="0" cellpadding="6"> - <tr bgcolor="#666699"> - <td width=25%> - <table border="0" cellspacing="0" cellpadding="6"> +<table border="0" width="100%" cellspacing="0" cellpadding="0" bgcolor="#000080"> + <tr> + <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="/tps/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> TPS Services</b></font></td> </tr> </table> </td> - <td align=right width=65% nowrap><font size="+1" face="PrimaSans BT, Verdana, sans-serif" color="white">TPS Services</font></td> - <td width="10%"> </td> </tr> </table> <p> diff --git a/pki/dogtag/tps-ui/shared/docroot/tokendb/searchActivityAdminResults.template b/pki/dogtag/tps-ui/shared/docroot/tokendb/searchActivityAdminResults.template index 8befb9730..5d04a4e69 100644 --- a/pki/dogtag/tps-ui/shared/docroot/tokendb/searchActivityAdminResults.template +++ b/pki/dogtag/tps-ui/shared/docroot/tokendb/searchActivityAdminResults.template @@ -1,7 +1,7 @@ <!-- --- BEGIN COPYRIGHT BLOCK --- This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either + License as published by the Free Software Foundation. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -23,18 +23,17 @@ <TITLE>TPS</Title> </HEAD> -<table border="0" width="100%" cellspacing="0" cellpadding="6"> - <tr bgcolor="#666699"> - <td width=25%> - <table border="0" cellspacing="0" cellpadding="6"> +<table border="0" width="100%" cellspacing="0" cellpadding="0" bgcolor="#000080"> + <tr> + <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="/tps/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> TPS Services</b></font></td> </tr> </table> </td> - <td align=right width=65% nowrap><font size="+1" face="PrimaSans BT, Verdana, sans-serif" color="white">TPS Services</font></td> - <td width="10%"> </td> </tr> </table> <p> diff --git a/pki/dogtag/tps-ui/shared/docroot/tokendb/searchActivityResults.template b/pki/dogtag/tps-ui/shared/docroot/tokendb/searchActivityResults.template index 750dc9e50..f4f112361 100644 --- a/pki/dogtag/tps-ui/shared/docroot/tokendb/searchActivityResults.template +++ b/pki/dogtag/tps-ui/shared/docroot/tokendb/searchActivityResults.template @@ -1,7 +1,7 @@ <!-- --- BEGIN COPYRIGHT BLOCK --- This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either + License as published by the Free Software Foundation. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -23,18 +23,17 @@ <TITLE>TPS</Title> </HEAD> -<table border="0" width="100%" cellspacing="0" cellpadding="6"> - <tr bgcolor="#666699"> - <td width=25%> - <table border="0" cellspacing="0" cellpadding="6"> +<table border="0" width="100%" cellspacing="0" cellpadding="0" bgcolor="#000080"> + <tr> + <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="/tps/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> TPS Services</b></font></td> </tr> </table> </td> - <td align=right width=65% nowrap><font size="+1" face="PrimaSans BT, Verdana, sans-serif" color="white">TPS Services</font></td> - <td width="10%"> </td> </tr> </table> <p> diff --git a/pki/dogtag/tps-ui/shared/docroot/tokendb/searchAdmin.template b/pki/dogtag/tps-ui/shared/docroot/tokendb/searchAdmin.template index 29cbff70c..0262a6efe 100644 --- a/pki/dogtag/tps-ui/shared/docroot/tokendb/searchAdmin.template +++ b/pki/dogtag/tps-ui/shared/docroot/tokendb/searchAdmin.template @@ -1,7 +1,7 @@ <!-- --- BEGIN COPYRIGHT BLOCK --- This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either + License as published by the Free Software Foundation. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -23,18 +23,17 @@ <TITLE>TPS</Title> </HEAD> -<table border="0" width="100%" cellspacing="0" cellpadding="6"> - <tr bgcolor="#666699"> - <td width=25%> - <table border="0" cellspacing="0" cellpadding="6"> +<table border="0" width="100%" cellspacing="0" cellpadding="0" bgcolor="#000080"> + <tr> + <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="/tps/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> TPS Services</b></font></td> </tr> </table> </td> - <td align=right width=65% nowrap><font size="+1" face="PrimaSans BT, Verdana, sans-serif" color="white">TPS Services</font></td> - <td width="10%"> </td> </tr> </table> <p> diff --git a/pki/dogtag/tps-ui/shared/docroot/tokendb/searchAdminResults.template b/pki/dogtag/tps-ui/shared/docroot/tokendb/searchAdminResults.template index 7f0c8364f..929ff0e57 100644 --- a/pki/dogtag/tps-ui/shared/docroot/tokendb/searchAdminResults.template +++ b/pki/dogtag/tps-ui/shared/docroot/tokendb/searchAdminResults.template @@ -1,7 +1,7 @@ <!-- --- BEGIN COPYRIGHT BLOCK --- This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either + License as published by the Free Software Foundation. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -23,18 +23,17 @@ <TITLE>TPS</Title> </HEAD> -<table border="0" width="100%" cellspacing="0" cellpadding="6"> - <tr bgcolor="#666699"> - <td width=25%> - <table border="0" cellspacing="0" cellpadding="6"> +<table border="0" width="100%" cellspacing="0" cellpadding="0" bgcolor="#000080"> + <tr> + <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="/tps/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> TPS Services</b></font></td> </tr> </table> </td> - <td align=right width=65% nowrap><font size="+1" face="PrimaSans BT, Verdana, sans-serif" color="white">TPS Services</font></td> - <td width="10%"> </td> </tr> </table> <p> diff --git a/pki/dogtag/tps-ui/shared/docroot/tokendb/searchCertificate.template b/pki/dogtag/tps-ui/shared/docroot/tokendb/searchCertificate.template index 668b1a8d7..aca1406d8 100644 --- a/pki/dogtag/tps-ui/shared/docroot/tokendb/searchCertificate.template +++ b/pki/dogtag/tps-ui/shared/docroot/tokendb/searchCertificate.template @@ -1,7 +1,7 @@ <!-- --- BEGIN COPYRIGHT BLOCK --- This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either + License as published by the Free Software Foundation. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -23,18 +23,17 @@ <TITLE>TPS</Title> </HEAD> -<table border="0" width="100%" cellspacing="0" cellpadding="6"> - <tr bgcolor="#666699"> - <td width=25%> - <table border="0" cellspacing="0" cellpadding="6"> +<table border="0" width="100%" cellspacing="0" cellpadding="0" bgcolor="#000080"> + <tr> + <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="/tps/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> TPS Services</b></font></td> </tr> </table> </td> - <td align=right width=65% nowrap><font size="+1" face="PrimaSans BT, Verdana, sans-serif" color="white">TPS Services</font></td> - <td width="10%"> </td> </tr> </table> <p> diff --git a/pki/dogtag/tps-ui/shared/docroot/tokendb/searchCertificateResults.template b/pki/dogtag/tps-ui/shared/docroot/tokendb/searchCertificateResults.template index d57bb2c19..fadf84688 100644 --- a/pki/dogtag/tps-ui/shared/docroot/tokendb/searchCertificateResults.template +++ b/pki/dogtag/tps-ui/shared/docroot/tokendb/searchCertificateResults.template @@ -1,7 +1,7 @@ <!-- --- BEGIN COPYRIGHT BLOCK --- This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either + License as published by the Free Software Foundation. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -23,18 +23,17 @@ <TITLE>TPS</Title> </HEAD> -<table border="0" width="100%" cellspacing="0" cellpadding="6"> - <tr bgcolor="#666699"> - <td width=25%> - <table border="0" cellspacing="0" cellpadding="6"> +<table border="0" width="100%" cellspacing="0" cellpadding="0" bgcolor="#000080"> + <tr> + <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="/tps/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> TPS Services</b></font></td> </tr> </table> </td> - <td align=right width=65% nowrap><font size="+1" face="PrimaSans BT, Verdana, sans-serif" color="white">TPS Services</font></td> - <td width="10%"> </td> </tr> </table> <p> diff --git a/pki/dogtag/tps-ui/shared/docroot/tokendb/searchResults.template b/pki/dogtag/tps-ui/shared/docroot/tokendb/searchResults.template index 17218dbb6..bb10755bb 100644 --- a/pki/dogtag/tps-ui/shared/docroot/tokendb/searchResults.template +++ b/pki/dogtag/tps-ui/shared/docroot/tokendb/searchResults.template @@ -1,7 +1,7 @@ <!-- --- BEGIN COPYRIGHT BLOCK --- This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either + License as published by the Free Software Foundation. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -23,18 +23,17 @@ <TITLE>TPS</Title> </HEAD> -<table border="0" width="100%" cellspacing="0" cellpadding="6"> - <tr bgcolor="#666699"> - <td width=25%> - <table border="0" cellspacing="0" cellpadding="6"> +<table border="0" width="100%" cellspacing="0" cellpadding="0" bgcolor="#000080"> + <tr> + <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="/tps/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> TPS Services</b></font></td> </tr> </table> </td> - <td align=right width=65% nowrap><font size="+1" face="PrimaSans BT, Verdana, sans-serif" color="white">TPS Services</font></td> - <td width="10%"> </td> </tr> </table> <p> diff --git a/pki/dogtag/tps-ui/shared/docroot/tokendb/searchUser.template b/pki/dogtag/tps-ui/shared/docroot/tokendb/searchUser.template index 77aa9dd4f..ce1ec3c50 100644 --- a/pki/dogtag/tps-ui/shared/docroot/tokendb/searchUser.template +++ b/pki/dogtag/tps-ui/shared/docroot/tokendb/searchUser.template @@ -1,7 +1,7 @@ <!-- --- BEGIN COPYRIGHT BLOCK --- This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either + License as published by the Free Software Foundation. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -23,18 +23,17 @@ <TITLE>TPS</Title> </HEAD> -<table border="0" width="100%" cellspacing="0" cellpadding="6"> - <tr bgcolor="#666699"> - <td width=25%> - <table border="0" cellspacing="0" cellpadding="6"> +<table border="0" width="100%" cellspacing="0" cellpadding="0" bgcolor="#000080"> + <tr> + <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="/tps/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> TPS Services</b></font></td> </tr> </table> </td> - <td align=right width=65% nowrap><font size="+1" face="PrimaSans BT, Verdana, sans-serif" color="white">TPS Services</font></td> - <td width="10%"> </td> </tr> </table> <p> diff --git a/pki/dogtag/tps-ui/shared/docroot/tokendb/searchUserResults.template b/pki/dogtag/tps-ui/shared/docroot/tokendb/searchUserResults.template index ec3007d8d..ac0fa0c56 100644 --- a/pki/dogtag/tps-ui/shared/docroot/tokendb/searchUserResults.template +++ b/pki/dogtag/tps-ui/shared/docroot/tokendb/searchUserResults.template @@ -1,7 +1,7 @@ <!-- --- BEGIN COPYRIGHT BLOCK --- This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either + License as published by the Free Software Foundation. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -23,18 +23,17 @@ <TITLE>TPS</Title> </HEAD> -<table border="0" width="100%" cellspacing="0" cellpadding="6"> - <tr bgcolor="#666699"> - <td width=25%> - <table border="0" cellspacing="0" cellpadding="6"> +<table border="0" width="100%" cellspacing="0" cellpadding="0" bgcolor="#000080"> + <tr> + <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="/tps/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> TPS Services</b></font></td> </tr> </table> </td> - <td align=right width=65% nowrap><font size="+1" face="PrimaSans BT, Verdana, sans-serif" color="white">TPS Services</font></td> - <td width="10%"> </td> </tr> </table> <p> diff --git a/pki/dogtag/tps-ui/shared/docroot/tokendb/show.template b/pki/dogtag/tps-ui/shared/docroot/tokendb/show.template index 8b9c3b71b..9f0533162 100644 --- a/pki/dogtag/tps-ui/shared/docroot/tokendb/show.template +++ b/pki/dogtag/tps-ui/shared/docroot/tokendb/show.template @@ -1,7 +1,7 @@ <!-- --- BEGIN COPYRIGHT BLOCK --- This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either + License as published by the Free Software Foundation. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -23,18 +23,17 @@ <TITLE>TPS</Title> </HEAD> -<table border="0" width="100%" cellspacing="0" cellpadding="6"> - <tr bgcolor="#666699"> - <td width=25%> - <table border="0" cellspacing="0" cellpadding="6"> +<table border="0" width="100%" cellspacing="0" cellpadding="0" bgcolor="#000080"> + <tr> + <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="/tps/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> TPS Services</b></font></td> </tr> </table> </td> - <td align=right width=65% nowrap><font size="+1" face="PrimaSans BT, Verdana, sans-serif" color="white">TPS Services</font></td> - <td width="10%"> </td> </tr> </table> <p> diff --git a/pki/dogtag/tps-ui/shared/docroot/tokendb/showAdmin.template b/pki/dogtag/tps-ui/shared/docroot/tokendb/showAdmin.template index d50dd6b0e..5c4803863 100644 --- a/pki/dogtag/tps-ui/shared/docroot/tokendb/showAdmin.template +++ b/pki/dogtag/tps-ui/shared/docroot/tokendb/showAdmin.template @@ -1,7 +1,7 @@ <!-- --- BEGIN COPYRIGHT BLOCK --- This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either + License as published by the Free Software Foundation. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -23,18 +23,17 @@ <TITLE>TPS</Title> </HEAD> -<table border="0" width="100%" cellspacing="0" cellpadding="6"> - <tr bgcolor="#666699"> - <td width=25%> - <table border="0" cellspacing="0" cellpadding="6"> +<table border="0" width="100%" cellspacing="0" cellpadding="0" bgcolor="#000080"> + <tr> + <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="/tps/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> TPS Services</b></font></td> </tr> </table> </td> - <td align=right width=65% nowrap><font size="+1" face="PrimaSans BT, Verdana, sans-serif" color="white">TPS Services</font></td> - <td width="10%"> </td> </tr> </table> <p> diff --git a/pki/dogtag/tps-ui/shared/docroot/tokendb/showCert.template b/pki/dogtag/tps-ui/shared/docroot/tokendb/showCert.template index 33d3d50b9..cb6191763 100644 --- a/pki/dogtag/tps-ui/shared/docroot/tokendb/showCert.template +++ b/pki/dogtag/tps-ui/shared/docroot/tokendb/showCert.template @@ -1,7 +1,7 @@ <!-- --- BEGIN COPYRIGHT BLOCK --- This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either + License as published by the Free Software Foundation. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -23,18 +23,17 @@ <TITLE>TPS</Title> </HEAD> -<table border="0" width="100%" cellspacing="0" cellpadding="6"> - <tr bgcolor="#666699"> - <td width=25%> - <table border="0" cellspacing="0" cellpadding="6"> +<table border="0" width="100%" cellspacing="0" cellpadding="0" bgcolor="#000080"> + <tr> + <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="/tps/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> TPS Services</b></font></td> </tr> </table> </td> - <td align=right width=65% nowrap><font size="+1" face="PrimaSans BT, Verdana, sans-serif" color="white">TPS Services</font></td> - <td width="10%"> </td> </tr> </table> <p> diff --git a/pki/dogtag/tps-ui/shared/docroot/tokendb/userDelete.template b/pki/dogtag/tps-ui/shared/docroot/tokendb/userDelete.template index 18c30f76f..4416dfc12 100755 --- a/pki/dogtag/tps-ui/shared/docroot/tokendb/userDelete.template +++ b/pki/dogtag/tps-ui/shared/docroot/tokendb/userDelete.template @@ -1,7 +1,7 @@ <!-- --- BEGIN COPYRIGHT BLOCK --- This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either + License as published by the Free Software Foundation. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -23,18 +23,17 @@ <TITLE>TPS</Title> </HEAD> -<table border="0" width="100%" cellspacing="0" cellpadding="6"> - <tr bgcolor="#666699"> - <td width=25%> - <table border="0" cellspacing="0" cellpadding="6"> +<table border="0" width="100%" cellspacing="0" cellpadding="0" bgcolor="#000080"> + <tr> + <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="/tps/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> TPS Services</b></font></td> </tr> </table> </td> - <td align=right width=65% nowrap><font size="+1" face="PrimaSans BT, Verdana, sans-serif" color="white">TPS Services</font></td> - <td width="10%"> </td> </tr> </table> <p> diff --git a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/footer.vm b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/footer.vm index 711d8f33f..413f93737 100644 --- a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/footer.vm +++ b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/footer.vm @@ -17,5 +17,4 @@ All rights reserved. --- END COPYRIGHT BLOCK --- --> <div id="footer"> - Copyright © 2002-06 Red Hat, Inc. All rights reserved. <a href="http://www.redhat.com/">http://www.redhat.com</a> </div> diff --git a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/header.vm b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/header.vm index f6245ace2..e8b46928a 100644 --- a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/header.vm +++ b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/header.vm @@ -17,7 +17,10 @@ All rights reserved. --- END COPYRIGHT BLOCK --- --> <div id="header"> - <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" 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="../img/logo_header.gif" alt="Dogtag" id="myLogo" /></a> + <div id="headerpaddedtitle"> + <a href="/" title="Dogtag Network homepage">Dogtag<sup><font size="-2">®</font></sup> Certificate System</a> + </div> <div id="account"> </div> </div> diff --git a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/securitydomainloginpanel.vm b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/securitydomainloginpanel.vm index 015ba1a84..a9fef571d 100644 --- a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/securitydomainloginpanel.vm +++ b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/securitydomainloginpanel.vm @@ -31,7 +31,10 @@ <div id="wrap"> <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" 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="/ca/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> diff --git a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/img/logo_header.gif b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/img/logo_header.gif Binary files differindex 20f74410e..573482227 100644 --- a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/img/logo_header.gif +++ b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/img/logo_header.gif diff --git a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/js/misc.js b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/js/misc.js index da7899be2..626086ba4 100644 --- a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/js/misc.js +++ b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/js/misc.js @@ -1,7 +1,7 @@ // --- BEGIN COPYRIGHT BLOCK --- // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public -// License as published by the Free Software Foundation; either +// License as published by the Free Software Foundation. // // This library is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of |
