summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormharmsen <mharmsen@c9f7a03b-bd48-0410-a16d-cbbf54688b0b>2009-03-26 02:32:39 +0000
committermharmsen <mharmsen@c9f7a03b-bd48-0410-a16d-cbbf54688b0b>2009-03-26 02:32:39 +0000
commit5ac6e0eec2250c62f578bf8451cea6feae40911d (patch)
tree0ff740c6ce663de8c433569f6d902852cb34b86c
parent295dea6c9bcad4972b7f18a8c69f7cee0da55566 (diff)
downloadpki-5ac6e0eec2250c62f578bf8451cea6feae40911d.tar.gz
pki-5ac6e0eec2250c62f578bf8451cea6feae40911d.tar.xz
pki-5ac6e0eec2250c62f578bf8451cea6feae40911d.zip
Bugzilla Bug #488388 - copyright notices - remove from UI (CAVEAT fixes)
git-svn-id: svn+ssh://svn.fedorahosted.org/svn/pki/trunk@330 c9f7a03b-bd48-0410-a16d-cbbf54688b0b
-rw-r--r--pki/dogtag/ca-ui/shared/webapps/ca/services.template2
-rw-r--r--pki/dogtag/common-ui/shared/admin/console/config/securitydomainloginpanel.vm4
-rw-r--r--pki/dogtag/kra-ui/shared/webapps/kra/services.template2
-rw-r--r--pki/dogtag/ocsp-ui/shared/webapps/ocsp/services.template2
-rw-r--r--pki/dogtag/ra-ui/shared/docroot/admin/group/add_new.vm8
-rw-r--r--pki/dogtag/ra-ui/shared/docroot/admin/group/index.vm8
-rw-r--r--pki/dogtag/ra-ui/shared/docroot/admin/group/read.vm8
-rw-r--r--pki/dogtag/ra-ui/shared/docroot/admin/index.vm18
-rw-r--r--pki/dogtag/ra-ui/shared/docroot/admin/user/add_new.vm8
-rw-r--r--pki/dogtag/ra-ui/shared/docroot/admin/user/index.vm8
-rw-r--r--pki/dogtag/ra-ui/shared/docroot/admin/user/read.vm8
-rw-r--r--pki/dogtag/ra-ui/shared/docroot/agent/cert/index.vm8
-rw-r--r--pki/dogtag/ra-ui/shared/docroot/agent/cert/read.vm8
-rw-r--r--pki/dogtag/ra-ui/shared/docroot/agent/cert/revoke.vm8
-rw-r--r--pki/dogtag/ra-ui/shared/docroot/agent/cert/submit.vm8
-rw-r--r--pki/dogtag/ra-ui/shared/docroot/agent/error.vm8
-rw-r--r--pki/dogtag/ra-ui/shared/docroot/agent/index.vm10
-rw-r--r--pki/dogtag/ra-ui/shared/docroot/agent/request/index.vm8
-rw-r--r--pki/dogtag/ra-ui/shared/docroot/agent/request/op.vm8
-rw-r--r--pki/dogtag/ra-ui/shared/docroot/agent/request/read.vm8
-rw-r--r--pki/dogtag/ra-ui/shared/docroot/ee/agent/enroll.vm8
-rw-r--r--pki/dogtag/ra-ui/shared/docroot/ee/agent/index.vm8
-rw-r--r--pki/dogtag/ra-ui/shared/docroot/ee/agent/new.vm8
-rw-r--r--pki/dogtag/ra-ui/shared/docroot/ee/agent/start.vm8
-rw-r--r--pki/dogtag/ra-ui/shared/docroot/ee/agent/submit.vm8
-rw-r--r--pki/dogtag/ra-ui/shared/docroot/ee/error.vm8
-rw-r--r--pki/dogtag/ra-ui/shared/docroot/ee/index.vm10
-rw-r--r--pki/dogtag/ra-ui/shared/docroot/ee/request/getcert.vm8
-rw-r--r--pki/dogtag/ra-ui/shared/docroot/ee/request/index.vm8
-rw-r--r--pki/dogtag/ra-ui/shared/docroot/ee/request/status.vm8
-rw-r--r--pki/dogtag/ra-ui/shared/docroot/ee/scep/enroll.vm8
-rw-r--r--pki/dogtag/ra-ui/shared/docroot/ee/scep/index.vm8
-rw-r--r--pki/dogtag/ra-ui/shared/docroot/ee/scep/installer.vm8
-rw-r--r--pki/dogtag/ra-ui/shared/docroot/ee/scep/manager.vm8
-rw-r--r--pki/dogtag/ra-ui/shared/docroot/ee/scep/submit.vm8
-rw-r--r--pki/dogtag/ra-ui/shared/docroot/ee/server/admin.vm8
-rw-r--r--pki/dogtag/ra-ui/shared/docroot/ee/server/index.vm8
-rw-r--r--pki/dogtag/ra-ui/shared/docroot/ee/server/submit.vm8
-rw-r--r--pki/dogtag/ra-ui/shared/docroot/ee/user/index.vm8
-rw-r--r--pki/dogtag/ra-ui/shared/docroot/ee/user/renew.vm8
-rw-r--r--pki/dogtag/ra-ui/shared/docroot/ee/user/renewal.vm8
-rw-r--r--pki/dogtag/ra-ui/shared/docroot/ee/user/submit.vm8
-rw-r--r--pki/dogtag/ra-ui/shared/docroot/ee/user/user.vm8
-rw-r--r--pki/dogtag/ra-ui/shared/docroot/header.vm2
-rw-r--r--pki/dogtag/ra-ui/shared/docroot/index.vm10
-rw-r--r--pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/securitydomainloginpanel.vm2
-rw-r--r--pki/dogtag/tks-ui/shared/webapps/tks/services.template2
-rw-r--r--pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/securitydomainloginpanel.vm2
48 files changed, 61 insertions, 293 deletions
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/services.template b/pki/dogtag/ca-ui/shared/webapps/ca/services.template
index b1a2acee4..10667f773 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/services.template
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/services.template
@@ -62,7 +62,7 @@
<font size="+1" face="PrimaSans BT, Verdana, Arial, Helvetica, sans-serif">
-Certificate System Services Page
+Certificate System CA Services Page
</font><br>
<p>
</font>
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 f537379ff..591e859f2 100644
--- a/pki/dogtag/common-ui/shared/admin/console/config/securitydomainloginpanel.vm
+++ b/pki/dogtag/common-ui/shared/admin/console/config/securitydomainloginpanel.vm
@@ -31,8 +31,8 @@
<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" id="Logo" /></a>
- <div id="headertitle">
+ <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="headerpaddedtitle">
<a href="/" title="Dogtag Network homepage">Dogtag<sup><font size="-2">&reg;</font></sup> Certificate System</a>
</div>
<div id="account">
diff --git a/pki/dogtag/kra-ui/shared/webapps/kra/services.template b/pki/dogtag/kra-ui/shared/webapps/kra/services.template
index b078b4d80..fa6109ef7 100644
--- a/pki/dogtag/kra-ui/shared/webapps/kra/services.template
+++ b/pki/dogtag/kra-ui/shared/webapps/kra/services.template
@@ -62,7 +62,7 @@
<font size="+1" face="PrimaSans BT, Verdana, Arial, Helvetica, sans-serif">
-Certificate System Services Page
+Certificate System DRM Services Page
</font><br>
<p>
</font>
diff --git a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/services.template b/pki/dogtag/ocsp-ui/shared/webapps/ocsp/services.template
index b1a2acee4..8e2fd57e8 100644
--- a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/services.template
+++ b/pki/dogtag/ocsp-ui/shared/webapps/ocsp/services.template
@@ -62,7 +62,7 @@
<font size="+1" face="PrimaSans BT, Verdana, Arial, Helvetica, sans-serif">
-Certificate System Services Page
+Certificate System OCSP Services Page
</font><br>
<p>
</font>
diff --git a/pki/dogtag/ra-ui/shared/docroot/admin/group/add_new.vm b/pki/dogtag/ra-ui/shared/docroot/admin/group/add_new.vm
index ddb6ba3a2..135cf47fc 100644
--- a/pki/dogtag/ra-ui/shared/docroot/admin/group/add_new.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/admin/group/add_new.vm
@@ -30,14 +30,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 -->
diff --git a/pki/dogtag/ra-ui/shared/docroot/admin/group/index.vm b/pki/dogtag/ra-ui/shared/docroot/admin/group/index.vm
index a998972a9..b0a84ade9 100644
--- a/pki/dogtag/ra-ui/shared/docroot/admin/group/index.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/admin/group/index.vm
@@ -30,14 +30,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 -->
diff --git a/pki/dogtag/ra-ui/shared/docroot/admin/group/read.vm b/pki/dogtag/ra-ui/shared/docroot/admin/group/read.vm
index db7919440..8cbd0f52f 100644
--- a/pki/dogtag/ra-ui/shared/docroot/admin/group/read.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/admin/group/read.vm
@@ -30,14 +30,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 -->
diff --git a/pki/dogtag/ra-ui/shared/docroot/admin/index.vm b/pki/dogtag/ra-ui/shared/docroot/admin/index.vm
index 849b1d0e9..d4ecf43e6 100644
--- a/pki/dogtag/ra-ui/shared/docroot/admin/index.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/admin/index.vm
@@ -30,14 +30,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 -->
@@ -60,29 +54,37 @@ UID: $uid
<font size="+1" face="PrimaSans BT, Verdana, Arial, Helvetica, sans-serif">
-Administrator Interface
+RA Admin Services
</font><br>
<p>
<center>
<table border="0" cellspacing="0" cellpadding="0">
<tr valign="TOP">
<td>
+<font size=4 face="PrimaSans BT, Verdana, sans-serif">
<li><a href="/admin/user/index.cgi">List Users</a></li>
+</font>
</td>
</tr>
<tr valign="TOP">
<td>
+<font size=4 face="PrimaSans BT, Verdana, sans-serif">
<li><a href="/admin/user/add_new.cgi">Add New User</a></li>
+</font>
</td>
</tr>
<tr valign="TOP">
<td>
+<font size=4 face="PrimaSans BT, Verdana, sans-serif">
<li><a href="/admin/group/index.cgi">List Groups</a></li>
+</font>
</td>
</tr>
<tr valign="TOP">
<td>
+<font size=4 face="PrimaSans BT, Verdana, sans-serif">
<li><a href="/admin/group/add_new.cgi">Add New Group</a></li>
+</font>
</td>
</tr>
</table>
diff --git a/pki/dogtag/ra-ui/shared/docroot/admin/user/add_new.vm b/pki/dogtag/ra-ui/shared/docroot/admin/user/add_new.vm
index 29f06d3be..b34a7e23d 100644
--- a/pki/dogtag/ra-ui/shared/docroot/admin/user/add_new.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/admin/user/add_new.vm
@@ -30,14 +30,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 -->
diff --git a/pki/dogtag/ra-ui/shared/docroot/admin/user/index.vm b/pki/dogtag/ra-ui/shared/docroot/admin/user/index.vm
index a1b46afda..95d8cdfe2 100644
--- a/pki/dogtag/ra-ui/shared/docroot/admin/user/index.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/admin/user/index.vm
@@ -30,14 +30,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 -->
diff --git a/pki/dogtag/ra-ui/shared/docroot/admin/user/read.vm b/pki/dogtag/ra-ui/shared/docroot/admin/user/read.vm
index 64853c669..37220e0a1 100644
--- a/pki/dogtag/ra-ui/shared/docroot/admin/user/read.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/admin/user/read.vm
@@ -30,14 +30,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 -->
diff --git a/pki/dogtag/ra-ui/shared/docroot/agent/cert/index.vm b/pki/dogtag/ra-ui/shared/docroot/agent/cert/index.vm
index a3d4333e7..14f9508b0 100644
--- a/pki/dogtag/ra-ui/shared/docroot/agent/cert/index.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/agent/cert/index.vm
@@ -30,14 +30,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 -->
diff --git a/pki/dogtag/ra-ui/shared/docroot/agent/cert/read.vm b/pki/dogtag/ra-ui/shared/docroot/agent/cert/read.vm
index c92133d7e..7967e2a6e 100644
--- a/pki/dogtag/ra-ui/shared/docroot/agent/cert/read.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/agent/cert/read.vm
@@ -30,14 +30,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 -->
diff --git a/pki/dogtag/ra-ui/shared/docroot/agent/cert/revoke.vm b/pki/dogtag/ra-ui/shared/docroot/agent/cert/revoke.vm
index 1ec24c026..def4b382f 100644
--- a/pki/dogtag/ra-ui/shared/docroot/agent/cert/revoke.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/agent/cert/revoke.vm
@@ -30,14 +30,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 -->
diff --git a/pki/dogtag/ra-ui/shared/docroot/agent/cert/submit.vm b/pki/dogtag/ra-ui/shared/docroot/agent/cert/submit.vm
index 243f2f3a6..89cd4673d 100644
--- a/pki/dogtag/ra-ui/shared/docroot/agent/cert/submit.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/agent/cert/submit.vm
@@ -30,14 +30,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 -->
diff --git a/pki/dogtag/ra-ui/shared/docroot/agent/error.vm b/pki/dogtag/ra-ui/shared/docroot/agent/error.vm
index 342ebc03c..047c632be 100644
--- a/pki/dogtag/ra-ui/shared/docroot/agent/error.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/agent/error.vm
@@ -30,14 +30,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 -->
diff --git a/pki/dogtag/ra-ui/shared/docroot/agent/index.vm b/pki/dogtag/ra-ui/shared/docroot/agent/index.vm
index a0fd902c7..9e2a00a04 100644
--- a/pki/dogtag/ra-ui/shared/docroot/agent/index.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/agent/index.vm
@@ -30,14 +30,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 -->
@@ -60,7 +54,7 @@ UID: $uid
<font size="+1" face="PrimaSans BT, Verdana, Arial, Helvetica, sans-serif">
-Agent Interface
+RA Agent Services
</font><br>
<p>
<center>
diff --git a/pki/dogtag/ra-ui/shared/docroot/agent/request/index.vm b/pki/dogtag/ra-ui/shared/docroot/agent/request/index.vm
index e6d254fc9..8e25373b9 100644
--- a/pki/dogtag/ra-ui/shared/docroot/agent/request/index.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/agent/request/index.vm
@@ -30,14 +30,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 -->
diff --git a/pki/dogtag/ra-ui/shared/docroot/agent/request/op.vm b/pki/dogtag/ra-ui/shared/docroot/agent/request/op.vm
index 804e55d22..5340dd140 100644
--- a/pki/dogtag/ra-ui/shared/docroot/agent/request/op.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/agent/request/op.vm
@@ -30,14 +30,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 -->
diff --git a/pki/dogtag/ra-ui/shared/docroot/agent/request/read.vm b/pki/dogtag/ra-ui/shared/docroot/agent/request/read.vm
index d363c05ec..d769bee71 100644
--- a/pki/dogtag/ra-ui/shared/docroot/agent/request/read.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/agent/request/read.vm
@@ -30,14 +30,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 -->
diff --git a/pki/dogtag/ra-ui/shared/docroot/ee/agent/enroll.vm b/pki/dogtag/ra-ui/shared/docroot/ee/agent/enroll.vm
index 9838e8672..f1c7f1c11 100644
--- a/pki/dogtag/ra-ui/shared/docroot/ee/agent/enroll.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/ee/agent/enroll.vm
@@ -30,14 +30,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 -->
diff --git a/pki/dogtag/ra-ui/shared/docroot/ee/agent/index.vm b/pki/dogtag/ra-ui/shared/docroot/ee/agent/index.vm
index 03eb069bc..a8608eb0a 100644
--- a/pki/dogtag/ra-ui/shared/docroot/ee/agent/index.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/ee/agent/index.vm
@@ -30,14 +30,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 -->
diff --git a/pki/dogtag/ra-ui/shared/docroot/ee/agent/new.vm b/pki/dogtag/ra-ui/shared/docroot/ee/agent/new.vm
index a10526aa4..8ca38533b 100644
--- a/pki/dogtag/ra-ui/shared/docroot/ee/agent/new.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/ee/agent/new.vm
@@ -30,14 +30,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 -->
diff --git a/pki/dogtag/ra-ui/shared/docroot/ee/agent/start.vm b/pki/dogtag/ra-ui/shared/docroot/ee/agent/start.vm
index 898d506cc..5a19e691a 100644
--- a/pki/dogtag/ra-ui/shared/docroot/ee/agent/start.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/ee/agent/start.vm
@@ -30,14 +30,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 -->
diff --git a/pki/dogtag/ra-ui/shared/docroot/ee/agent/submit.vm b/pki/dogtag/ra-ui/shared/docroot/ee/agent/submit.vm
index c5d3dc66d..d20f8cd44 100644
--- a/pki/dogtag/ra-ui/shared/docroot/ee/agent/submit.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/ee/agent/submit.vm
@@ -30,14 +30,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 -->
diff --git a/pki/dogtag/ra-ui/shared/docroot/ee/error.vm b/pki/dogtag/ra-ui/shared/docroot/ee/error.vm
index 7f1e8e4a4..39e14a81f 100644
--- a/pki/dogtag/ra-ui/shared/docroot/ee/error.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/ee/error.vm
@@ -30,14 +30,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 -->
diff --git a/pki/dogtag/ra-ui/shared/docroot/ee/index.vm b/pki/dogtag/ra-ui/shared/docroot/ee/index.vm
index 25d70215a..8870fe74e 100644
--- a/pki/dogtag/ra-ui/shared/docroot/ee/index.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/ee/index.vm
@@ -30,14 +30,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 -->
@@ -60,7 +54,7 @@
<font size="+1" face="PrimaSans BT, Verdana, Arial, Helvetica, sans-serif">
-<a href="/ee/index.cgi">Registration Authority (RA) Services</a>
+RA EE Services
</font><br>
<p>
<center>
diff --git a/pki/dogtag/ra-ui/shared/docroot/ee/request/getcert.vm b/pki/dogtag/ra-ui/shared/docroot/ee/request/getcert.vm
index 4ad801389..f47576144 100644
--- a/pki/dogtag/ra-ui/shared/docroot/ee/request/getcert.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/ee/request/getcert.vm
@@ -30,14 +30,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 -->
diff --git a/pki/dogtag/ra-ui/shared/docroot/ee/request/index.vm b/pki/dogtag/ra-ui/shared/docroot/ee/request/index.vm
index b85dd2251..d6b01267f 100644
--- a/pki/dogtag/ra-ui/shared/docroot/ee/request/index.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/ee/request/index.vm
@@ -30,14 +30,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 -->
diff --git a/pki/dogtag/ra-ui/shared/docroot/ee/request/status.vm b/pki/dogtag/ra-ui/shared/docroot/ee/request/status.vm
index 48c0ff24d..02d650f2c 100644
--- a/pki/dogtag/ra-ui/shared/docroot/ee/request/status.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/ee/request/status.vm
@@ -30,14 +30,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 -->
diff --git a/pki/dogtag/ra-ui/shared/docroot/ee/scep/enroll.vm b/pki/dogtag/ra-ui/shared/docroot/ee/scep/enroll.vm
index 6d28539a4..f46edaa47 100644
--- a/pki/dogtag/ra-ui/shared/docroot/ee/scep/enroll.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/ee/scep/enroll.vm
@@ -30,14 +30,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 -->
diff --git a/pki/dogtag/ra-ui/shared/docroot/ee/scep/index.vm b/pki/dogtag/ra-ui/shared/docroot/ee/scep/index.vm
index c1c1e7b6f..a1bb17a99 100644
--- a/pki/dogtag/ra-ui/shared/docroot/ee/scep/index.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/ee/scep/index.vm
@@ -30,14 +30,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 -->
diff --git a/pki/dogtag/ra-ui/shared/docroot/ee/scep/installer.vm b/pki/dogtag/ra-ui/shared/docroot/ee/scep/installer.vm
index 166abc011..cb94d61eb 100644
--- a/pki/dogtag/ra-ui/shared/docroot/ee/scep/installer.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/ee/scep/installer.vm
@@ -30,14 +30,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 -->
diff --git a/pki/dogtag/ra-ui/shared/docroot/ee/scep/manager.vm b/pki/dogtag/ra-ui/shared/docroot/ee/scep/manager.vm
index bea25ca03..1fa073320 100644
--- a/pki/dogtag/ra-ui/shared/docroot/ee/scep/manager.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/ee/scep/manager.vm
@@ -30,14 +30,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 -->
diff --git a/pki/dogtag/ra-ui/shared/docroot/ee/scep/submit.vm b/pki/dogtag/ra-ui/shared/docroot/ee/scep/submit.vm
index 7b89477d0..62644ed35 100644
--- a/pki/dogtag/ra-ui/shared/docroot/ee/scep/submit.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/ee/scep/submit.vm
@@ -30,14 +30,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 -->
diff --git a/pki/dogtag/ra-ui/shared/docroot/ee/server/admin.vm b/pki/dogtag/ra-ui/shared/docroot/ee/server/admin.vm
index 44a876522..9b7e9bec0 100644
--- a/pki/dogtag/ra-ui/shared/docroot/ee/server/admin.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/ee/server/admin.vm
@@ -30,14 +30,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 -->
diff --git a/pki/dogtag/ra-ui/shared/docroot/ee/server/index.vm b/pki/dogtag/ra-ui/shared/docroot/ee/server/index.vm
index d2c667c93..a63b0f208 100644
--- a/pki/dogtag/ra-ui/shared/docroot/ee/server/index.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/ee/server/index.vm
@@ -30,14 +30,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 -->
diff --git a/pki/dogtag/ra-ui/shared/docroot/ee/server/submit.vm b/pki/dogtag/ra-ui/shared/docroot/ee/server/submit.vm
index 5478e9312..f00c4e78d 100644
--- a/pki/dogtag/ra-ui/shared/docroot/ee/server/submit.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/ee/server/submit.vm
@@ -30,14 +30,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 -->
diff --git a/pki/dogtag/ra-ui/shared/docroot/ee/user/index.vm b/pki/dogtag/ra-ui/shared/docroot/ee/user/index.vm
index 24bcbbd44..b05d20b9a 100644
--- a/pki/dogtag/ra-ui/shared/docroot/ee/user/index.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/ee/user/index.vm
@@ -30,14 +30,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 -->
diff --git a/pki/dogtag/ra-ui/shared/docroot/ee/user/renew.vm b/pki/dogtag/ra-ui/shared/docroot/ee/user/renew.vm
index 48da45ebc..485a0ba2d 100644
--- a/pki/dogtag/ra-ui/shared/docroot/ee/user/renew.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/ee/user/renew.vm
@@ -30,14 +30,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 -->
diff --git a/pki/dogtag/ra-ui/shared/docroot/ee/user/renewal.vm b/pki/dogtag/ra-ui/shared/docroot/ee/user/renewal.vm
index 850b5f6bf..24b419299 100644
--- a/pki/dogtag/ra-ui/shared/docroot/ee/user/renewal.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/ee/user/renewal.vm
@@ -30,14 +30,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 -->
diff --git a/pki/dogtag/ra-ui/shared/docroot/ee/user/submit.vm b/pki/dogtag/ra-ui/shared/docroot/ee/user/submit.vm
index 9eda15286..e216bd76f 100644
--- a/pki/dogtag/ra-ui/shared/docroot/ee/user/submit.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/ee/user/submit.vm
@@ -30,14 +30,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 -->
diff --git a/pki/dogtag/ra-ui/shared/docroot/ee/user/user.vm b/pki/dogtag/ra-ui/shared/docroot/ee/user/user.vm
index 83d9d9517..4bd73c2d4 100644
--- a/pki/dogtag/ra-ui/shared/docroot/ee/user/user.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/ee/user/user.vm
@@ -40,14 +40,8 @@
<div id="mainNavOuter">
<div id="mainNav">
-
<div id="mainNavInner">
-
-
-<ul>
-<li id="mainFirst-active">Certifcate System</li>
-</ul>
-
+
</div><!-- end mainNavInner -->
</div><!-- end mainNav -->
</div><!-- end mainNavOuter -->
diff --git a/pki/dogtag/ra-ui/shared/docroot/header.vm b/pki/dogtag/ra-ui/shared/docroot/header.vm
index ba30d830b..c576a06e9 100644
--- a/pki/dogtag/ra-ui/shared/docroot/header.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/header.vm
@@ -17,7 +17,7 @@
--- 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" id="myLogo" /></a>
- <div id="headerpaddedtitle">
+ <div id="headertitle">
<a href="/" title="Dogtag homepage">Dogtag<sup><font size="-2">&reg;</font></sup> Certificate System</a>
</div>
<div id="account">
diff --git a/pki/dogtag/ra-ui/shared/docroot/index.vm b/pki/dogtag/ra-ui/shared/docroot/index.vm
index 3036d3a0c..40224d660 100644
--- a/pki/dogtag/ra-ui/shared/docroot/index.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/index.vm
@@ -30,14 +30,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 -->
@@ -60,7 +54,7 @@
<font size="+1" face="PrimaSans BT, Verdana, Arial, Helvetica, sans-serif">
-Certificate System Services Page
+Certificate System RA Services Page
</font><br>
<p>
</font>
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 5f4083291..25134303f 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
@@ -32,7 +32,7 @@
<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" id="myLogo" /></a>
- <div id="headertitle">
+ <div id="headerpaddedtitle">
<a href="/" title="Dogtag">Dogtag<sup><font size="-2">&reg;</font></sup> Certificate System</a>
</div>
<div id="account">
diff --git a/pki/dogtag/tks-ui/shared/webapps/tks/services.template b/pki/dogtag/tks-ui/shared/webapps/tks/services.template
index b1a2acee4..fad425472 100644
--- a/pki/dogtag/tks-ui/shared/webapps/tks/services.template
+++ b/pki/dogtag/tks-ui/shared/webapps/tks/services.template
@@ -62,7 +62,7 @@
<font size="+1" face="PrimaSans BT, Verdana, Arial, Helvetica, sans-serif">
-Certificate System Services Page
+Certificate System TKS Services Page
</font><br>
<p>
</font>
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 a9fef571d..72d5a63bc 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
@@ -32,7 +32,7 @@
<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" id="myLogo" /></a>
- <div id="headertitle">
+ <div id="headerpaddedtitle">
<a href="/" title="Dogtag Network homepage">Dogtag<sup><font size="-2">&reg;</font></sup> Certificate System</a>
</div>
<div id="account">