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 /pki/dogtag/ca-ui | |
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
Diffstat (limited to 'pki/dogtag/ca-ui')
9 files changed, 47 insertions, 74 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> |