[Pki-devel] [PATCH] 587 Parameterized CA templates.
Endi Sukma Dewata
edewata at redhat.com
Thu Apr 23 02:11:45 UTC 2015
https://fedorahosted.org/pki/ticket/1296
--
Endi S. Dewata
-------------- next part --------------
From 81907527886abfb1bd531a7ac44017e4443e1486 Mon Sep 17 00:00:00 2001
From: "Endi S. Dewata" <edewata at redhat.com>
Date: Wed, 22 Apr 2015 21:16:20 -0400
Subject: [PATCH] Parameterized CA templates.
https://fedorahosted.org/pki/ticket/1296
---
base/ca/shared/webapps/ca/404.html | 39 ++++++++++++++++------
base/ca/shared/webapps/ca/500.html | 39 ++++++++++++++++------
.../ca/admin/ca/securitydomainlogin.template | 30 +++++++++++++++--
.../shared/webapps/ca/admin/ca/sendCookie.template | 30 +++++++++++++++--
base/ca/shared/webapps/ca/agent/index.template | 25 ++++++++++++--
base/ca/shared/webapps/ca/agent/ports.template | 25 ++++++++++++--
dogtag/common-ui/shared/ca/404.properties | 2 ++
dogtag/common-ui/shared/ca/500.properties | 2 ++
.../ca/admin/ca/securitydomainlogin.properties | 2 ++
.../shared/ca/admin/ca/sendCookie.properties | 2 ++
dogtag/common-ui/shared/ca/agent/index.properties | 2 ++
dogtag/common-ui/shared/ca/agent/ports.properties | 2 ++
12 files changed, 169 insertions(+), 31 deletions(-)
create mode 100644 dogtag/common-ui/shared/ca/404.properties
create mode 100644 dogtag/common-ui/shared/ca/500.properties
create mode 100644 dogtag/common-ui/shared/ca/admin/ca/securitydomainlogin.properties
create mode 100644 dogtag/common-ui/shared/ca/admin/ca/sendCookie.properties
create mode 100644 dogtag/common-ui/shared/ca/agent/index.properties
create mode 100644 dogtag/common-ui/shared/ca/agent/ports.properties
diff --git a/base/ca/shared/webapps/ca/404.html b/base/ca/shared/webapps/ca/404.html
index 27d18979bbe3055c099edb8f24836aeaf01b16f2..6115d9db1b7cab17cf278c0b6236751055b4db7e 100755
--- a/base/ca/shared/webapps/ca/404.html
+++ b/base/ca/shared/webapps/ca/404.html
@@ -25,6 +25,27 @@ var port = location.port;
</script>
<head>
+<script type="text/javascript" language="JavaScript" src="/pki/js/jquery.js"></script>
+<script type="text/javascript" language="JavaScript" src="/pki/js/jquery.i18n.properties.js"></script>
+
+<script type="text/javascript" language="JavaScript">
+$(function() {
+ $.i18n.properties({
+ name: '404',
+ language: ' ', // suppress potential 404's due to .i18n.browserLang()
+ path: '/pki/',
+ mode: 'map',
+ callback: function() {
+ var key;
+ for (key in $.i18n.map) {
+ var message = $.i18n.prop(key);
+ $('span.message[name='+key+']').html(message);
+ }
+ }
+ });
+});
+</script>
+
<title>CA 404 Error!</title>
<!-- always expand ALL relative paths -->
<script language=javascript>
@@ -50,18 +71,14 @@ document.write('<META http-equiv=Content-Type content="text/html; charset=UTF-8"
<body bgcolor="#FFFFFF" link="#666699" vlink="#666699" alink="#333366">
<div id="header">
<!-- always expand ALL relative paths -->
-<script language=javascript>
-document.write('<a href="http://pki.fedoraproject.org/" title="Visit pki.fedoraproject.org for more information about Dogtag products and services"><img src="');
-document.write(protocol);
-document.write('//');
-document.write(hostname);
-document.write(':');
-document.write(port);
-document.write('/pki/images/logo_header.gif');
-document.write('" alt="Dogtag" id="myLogo" /></a>');
-</script>
+<span class="message" name="logo">
+<a href="http://pki.fedoraproject.org/" title="Visit pki.fedoraproject.org for more information about Certificate System products and services">
+<img src="/pki/images/logo_header.gif" alt="Certificate System" id="myLogo" /></a>
+</span>
<div id="headertitle">
- <a href="/" title="Dogtag Network homepage">Dogtag<sup><font size="-2">®</font></sup> Certificate System</a>
+ <span class="message" name="title">
+ <a href="/" title="Certificate System">Certificate System</a>
+ </span>
</div>
<div id="account">
<dl><dt><span></span></dt><dd></dd></dl>
diff --git a/base/ca/shared/webapps/ca/500.html b/base/ca/shared/webapps/ca/500.html
index 7a336c165d901f769c2fba9df5dac25145250d16..f0e43918c3e3213bc97628854c386d4cf42c8d66 100755
--- a/base/ca/shared/webapps/ca/500.html
+++ b/base/ca/shared/webapps/ca/500.html
@@ -25,6 +25,27 @@ var port = location.port;
</script>
<head>
+<script type="text/javascript" language="JavaScript" src="/pki/js/jquery.js"></script>
+<script type="text/javascript" language="JavaScript" src="/pki/js/jquery.i18n.properties.js"></script>
+
+<script type="text/javascript" language="JavaScript">
+$(function() {
+ $.i18n.properties({
+ name: '500',
+ language: ' ', // suppress potential 404's due to .i18n.browserLang()
+ path: '/pki/',
+ mode: 'map',
+ callback: function() {
+ var key;
+ for (key in $.i18n.map) {
+ var message = $.i18n.prop(key);
+ $('span.message[name='+key+']').html(message);
+ }
+ }
+ });
+});
+</script>
+
<title>CA 500 Error!</title>
<!-- always expand ALL relative paths -->
<script language=javascript>
@@ -50,18 +71,14 @@ document.write('<META http-equiv=Content-Type content="text/html; charset=UTF-8"
<body bgcolor="#FFFFFF" link="#666699" vlink="#666699" alink="#333366">
<div id="header">
<!-- always expand ALL relative paths -->
-<script language=javascript>
-document.write('<a href="http://pki.fedoraproject.org/" title="Visit pki.fedoraproject.org for more information about Dogtag products and services"><img src="');
-document.write(protocol);
-document.write('//');
-document.write(hostname);
-document.write(':');
-document.write(port);
-document.write('/pki/images/logo_header.gif');
-document.write('" alt="Dogtag" id="myLogo" /></a>');
-</script>
+<span class="message" name="logo">
+<a href="http://pki.fedoraproject.org/" title="Visit pki.fedoraproject.org for more information about Certificate System products and services">
+<img src="/pki/images/logo_header.gif" alt="Certificate System" id="myLogo" /></a>
+</span>
<div id="headertitle">
- <a href="/" title="Dogtag Network homepage">Dogtag<sup><font size="-2">®</font></sup> Certificate System</a>
+ <span class="message" name="title">
+ <a href="/" title="Certificate System">Certificate System</a>
+ </span>
</div>
<div id="account">
<dl><dt><span></span></dt><dd></dd></dl>
diff --git a/base/ca/shared/webapps/ca/admin/ca/securitydomainlogin.template b/base/ca/shared/webapps/ca/admin/ca/securitydomainlogin.template
index c6aee1d80bcbabc2fdc2b369cef2ec6dc84aa68e..3ea7cb2b4756ff2314bf9702a57b08be3e803bcf 100644
--- a/base/ca/shared/webapps/ca/admin/ca/securitydomainlogin.template
+++ b/base/ca/shared/webapps/ca/admin/ca/securitydomainlogin.template
@@ -19,7 +19,27 @@
<html>
<CMS_TEMPLATE>
<head>
-
+<script type="text/javascript" language="JavaScript" src="/pki/js/jquery.js"></script>
+<script type="text/javascript" language="JavaScript" src="/pki/js/jquery.i18n.properties.js"></script>
+
+<script type="text/javascript" language="JavaScript">
+$(function() {
+ $.i18n.properties({
+ name: 'securitydomainlogin',
+ language: ' ', // suppress potential 404's due to .i18n.browserLang()
+ path: '/pki/ca/admin/ca/',
+ mode: 'map',
+ callback: function() {
+ var key;
+ for (key in $.i18n.map) {
+ var message = $.i18n.prop(key);
+ $('span.message[name='+key+']').html(message);
+ }
+ }
+ });
+});
+</script>
+
<title>CA Admin Security Domain Login</title>
<link rel="shortcut icon" href="/pki/images/favicon.ico" />
@@ -30,9 +50,13 @@
<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="/pki/images/logo_header.gif" alt="Dogtag" id="myLogo" /></a>
+ <span class="message" name="logo">
+ <a href="http://pki.fedoraproject.org/" title="Visit pki.fedoraproject.org for more information about Certificate System products and services"><img src="/pki/images/logo_header.gif" alt="Certificate System" id="myLogo" /></a>
+ </span>
<div id="headertitle">
- <a href="/" title="Dogtag Network homepage">Dogtag<sup><font size="-2">®</font></sup> Certificate System</a>
+ <span class="message" name="title">
+ <a href="/" title="Certificate System">Certificate System</a>
+ </span>
</div>
<div id="account">
<dl><dt><span></span></dt><dd></dd></dl>
diff --git a/base/ca/shared/webapps/ca/admin/ca/sendCookie.template b/base/ca/shared/webapps/ca/admin/ca/sendCookie.template
index 4e0821063a79dd3ad7c19b541a7c7fb5abed9408..e086cf8dd93f567c89149c5882ad39cac0c98eb3 100644
--- a/base/ca/shared/webapps/ca/admin/ca/sendCookie.template
+++ b/base/ca/shared/webapps/ca/admin/ca/sendCookie.template
@@ -17,6 +17,28 @@
--- END COPYRIGHT BLOCK --- -->
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html>
+<head>
+<script type="text/javascript" language="JavaScript" src="/pki/js/jquery.js"></script>
+<script type="text/javascript" language="JavaScript" src="/pki/js/jquery.i18n.properties.js"></script>
+
+<script type="text/javascript" language="JavaScript">
+$(function() {
+ $.i18n.properties({
+ name: 'sendCookie',
+ language: ' ', // suppress potential 404's due to .i18n.browserLang()
+ path: '/pki/ca/admin/ca/',
+ mode: 'map',
+ callback: function() {
+ var key;
+ for (key in $.i18n.map) {
+ var message = $.i18n.prop(key);
+ $('span.message[name='+key+']').html(message);
+ }
+ }
+ });
+});
+</script>
+
<CMS_TEMPLATE>
<title>CA Admin Send Cookie</title>
<link rel="shortcut icon" href="/pki/images/favicon.ico" />
@@ -27,9 +49,13 @@
<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="/pki/images/logo_header.gif" alt="Dogtag" id="myLogo" /></a>
+ <span class="message" name="logo">
+ <a href="http://pki.fedoraproject.org/" title="Visit pki.fedoraproject.org for more information about Certificate System products and services"><img src="/pki/images/logo_header.gif" alt="Certificate System" id="myLogo" /></a>
+ </span>
<div id="headertitle">
- <a href="/" title="Dogtag Network homepage">Dogtag<sup><font size="-2">®</font></sup> Certificate System</a>
+ <span class="message" name="title">
+ <a href="/" title="Certificate System">Certificate System</a>
+ </span>
</div>
<div id="account">
<dl><dt><span></span></dt><dd></dd></dl>
diff --git a/base/ca/shared/webapps/ca/agent/index.template b/base/ca/shared/webapps/ca/agent/index.template
index 246e6eb8e0228f12dde1e28e29e2df54e2287df3..bc2eb9ff05afaa52f9a3e59a2c76b1e6a46bf6b0 100644
--- a/base/ca/shared/webapps/ca/agent/index.template
+++ b/base/ca/shared/webapps/ca/agent/index.template
@@ -18,6 +18,27 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html>
<head>
+<script type="text/javascript" language="JavaScript" src="/pki/js/jquery.js"></script>
+<script type="text/javascript" language="JavaScript" src="/pki/js/jquery.i18n.properties.js"></script>
+
+<script type="text/javascript" language="JavaScript">
+$(function() {
+ $.i18n.properties({
+ name: 'index',
+ language: ' ', // suppress potential 404's due to .i18n.browserLang()
+ path: '/pki/ca/agent/',
+ mode: 'map',
+ callback: function() {
+ var key;
+ for (key in $.i18n.map) {
+ var message = $.i18n.prop(key);
+ $('span.message[name='+key+']').html(message);
+ }
+ }
+ });
+});
+</script>
+
<CMS_TEMPLATE>
<title>CA Agent</title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
@@ -30,9 +51,9 @@
<td>
<table border="0" cellspacing="12" cellpadding="0">
<tr>
- <td><img src="/pki/images/logo_header.gif"></td>
+ <td><span class="message" name="logo"><img src="/pki/images/logo_header.gif"></span></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>
+ <td><span class="message" name="title"><font size="+1" face="PrimaSans BT, Verdana, sans-serif" color="white"><b>Agent Services</b></font></span></td>
</tr>
</table>
</td>
diff --git a/base/ca/shared/webapps/ca/agent/ports.template b/base/ca/shared/webapps/ca/agent/ports.template
index adf1c5a80a20178a4d5551867506593fff63ca36..a8efaf7a50bad85e5594ba4ee3779d3903a2d09a 100644
--- a/base/ca/shared/webapps/ca/agent/ports.template
+++ b/base/ca/shared/webapps/ca/agent/ports.template
@@ -18,6 +18,27 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html>
<head>
+<script type="text/javascript" language="JavaScript" src="/pki/js/jquery.js"></script>
+<script type="text/javascript" language="JavaScript" src="/pki/js/jquery.i18n.properties.js"></script>
+
+<script type="text/javascript" language="JavaScript">
+$(function() {
+ $.i18n.properties({
+ name: 'ports',
+ language: ' ', // suppress potential 404's due to .i18n.browserLang()
+ path: '/pki/ca/agent/',
+ mode: 'map',
+ callback: function() {
+ var key;
+ for (key in $.i18n.map) {
+ var message = $.i18n.prop(key);
+ $('span.message[name='+key+']').html(message);
+ }
+ }
+ });
+});
+</script>
+
<CMS_TEMPLATE>
<title>CA Agent Ports</title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
@@ -30,9 +51,9 @@
<td>
<table border="0" cellspacing="12" cellpadding="0">
<tr>
- <td><img src="/pki/images/logo_header.gif"></td>
+ <td><span class="message" name="logo"><img src="/pki/images/logo_header.gif"></span></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>
+ <td><span class="message" name="title"><font size="+1" face="PrimaSans BT, Verdana, sans-serif" color="white"><b>Services Summary</b></font></span></td>
</tr>
</table>
</td>
diff --git a/dogtag/common-ui/shared/ca/404.properties b/dogtag/common-ui/shared/ca/404.properties
new file mode 100644
index 0000000000000000000000000000000000000000..e9a1b34da6dfd39763e02aa2756ae5ad52ebfe55
--- /dev/null
+++ b/dogtag/common-ui/shared/ca/404.properties
@@ -0,0 +1,2 @@
+logo = <a href="http://pki.fedoraproject.org/" title="Visit pki.fedoraproject.org for more information about Dogtag products and services"><img src="/pki/images/logo_header.gif" alt="Dogtag" id="myLogo" /></a>
+title = <a href="/" title="Dogtag Network homepage">Dogtag<sup><font size="-2">®</font></sup> Certificate System</a>
diff --git a/dogtag/common-ui/shared/ca/500.properties b/dogtag/common-ui/shared/ca/500.properties
new file mode 100644
index 0000000000000000000000000000000000000000..e9a1b34da6dfd39763e02aa2756ae5ad52ebfe55
--- /dev/null
+++ b/dogtag/common-ui/shared/ca/500.properties
@@ -0,0 +1,2 @@
+logo = <a href="http://pki.fedoraproject.org/" title="Visit pki.fedoraproject.org for more information about Dogtag products and services"><img src="/pki/images/logo_header.gif" alt="Dogtag" id="myLogo" /></a>
+title = <a href="/" title="Dogtag Network homepage">Dogtag<sup><font size="-2">®</font></sup> Certificate System</a>
diff --git a/dogtag/common-ui/shared/ca/admin/ca/securitydomainlogin.properties b/dogtag/common-ui/shared/ca/admin/ca/securitydomainlogin.properties
new file mode 100644
index 0000000000000000000000000000000000000000..e9a1b34da6dfd39763e02aa2756ae5ad52ebfe55
--- /dev/null
+++ b/dogtag/common-ui/shared/ca/admin/ca/securitydomainlogin.properties
@@ -0,0 +1,2 @@
+logo = <a href="http://pki.fedoraproject.org/" title="Visit pki.fedoraproject.org for more information about Dogtag products and services"><img src="/pki/images/logo_header.gif" alt="Dogtag" id="myLogo" /></a>
+title = <a href="/" title="Dogtag Network homepage">Dogtag<sup><font size="-2">®</font></sup> Certificate System</a>
diff --git a/dogtag/common-ui/shared/ca/admin/ca/sendCookie.properties b/dogtag/common-ui/shared/ca/admin/ca/sendCookie.properties
new file mode 100644
index 0000000000000000000000000000000000000000..e9a1b34da6dfd39763e02aa2756ae5ad52ebfe55
--- /dev/null
+++ b/dogtag/common-ui/shared/ca/admin/ca/sendCookie.properties
@@ -0,0 +1,2 @@
+logo = <a href="http://pki.fedoraproject.org/" title="Visit pki.fedoraproject.org for more information about Dogtag products and services"><img src="/pki/images/logo_header.gif" alt="Dogtag" id="myLogo" /></a>
+title = <a href="/" title="Dogtag Network homepage">Dogtag<sup><font size="-2">®</font></sup> Certificate System</a>
diff --git a/dogtag/common-ui/shared/ca/agent/index.properties b/dogtag/common-ui/shared/ca/agent/index.properties
new file mode 100644
index 0000000000000000000000000000000000000000..17e5ce96bb29cb0126eff0d4bf80be3721a79798
--- /dev/null
+++ b/dogtag/common-ui/shared/ca/agent/index.properties
@@ -0,0 +1,2 @@
+logo = <img src="/pki/images/logo_header.gif">
+title = <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>
diff --git a/dogtag/common-ui/shared/ca/agent/ports.properties b/dogtag/common-ui/shared/ca/agent/ports.properties
new file mode 100644
index 0000000000000000000000000000000000000000..ca891f965352b16f97c1d9949bd27448381c628f
--- /dev/null
+++ b/dogtag/common-ui/shared/ca/agent/ports.properties
@@ -0,0 +1,2 @@
+logo = <img src="/pki/images/logo_header.gif">
+title = <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>
--
1.9.3
More information about the Pki-devel
mailing list