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

13 files changed, 95 insertions, 8 deletions

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 &#169; 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">&reg;</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
index 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 &#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/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">&reg;</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">&reg;</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
new 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
new 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
new 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
index 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