From 295dea6c9bcad4972b7f18a8c69f7cee0da55566 Mon Sep 17 00:00:00 2001
From: mharmsen <mharmsen@c9f7a03b-bd48-0410-a16d-cbbf54688b0b>
Date: Wed, 25 Mar 2009 23:50:06 +0000
Subject: 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
---
 pki/dogtag/common-ui/dogtag-pki-common-ui.spec     |   5 +-
 .../shared/admin/console/config/footer.vm          |   1 -
 .../shared/admin/console/config/header.vm          |   5 +-
 .../console/config/securitydomainloginpanel.vm     |   5 +-
 .../common-ui/shared/admin/console/css/pki-360.css |  56 ++++++++++++++-------
 .../shared/admin/console/css/pki-base.css          |   4 +-
 .../common-ui/shared/admin/console/css/pki.css     |  10 ++--
 .../shared/admin/console/img/logo_header.gif       | Bin 2866 -> 5833 bytes
 .../common-ui/shared/admin/console/js/misc.js      |   2 +-
 9 files changed, 58 insertions(+), 30 deletions(-)

(limited to 'pki/dogtag/common-ui')

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 &#169; 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">&reg;</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">&reg;</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
index 2d1ea5579..573482227 100644
Binary files a/pki/dogtag/common-ui/shared/admin/console/img/logo_header.gif and b/pki/dogtag/common-ui/shared/admin/console/img/logo_header.gif differ
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
-- 
cgit