diff options
| author | xue <> | 2006-01-03 16:03:33 +0000 |
|---|---|---|
| committer | xue <> | 2006-01-03 16:03:33 +0000 |
| commit | bf00b95810c16471d6acbd8f9f4cc8b2b1530481 (patch) | |
| tree | ba02a9a3281371889c9f8246b5fe0c0f74df3855 /framework | |
| parent | 186e872e8e91bb4ede8c0afb376bfab6e29fa4c4 (diff) | |
Added Error 400 templates. Fixed encoding problems for a few templates.
Diffstat (limited to 'framework')
18 files changed, 196 insertions, 75 deletions
diff --git a/framework/Exceptions/templates/error-fr.html b/framework/Exceptions/templates/error-fr.html index 47b681de..c9c19015 100644 --- a/framework/Exceptions/templates/error-fr.html +++ b/framework/Exceptions/templates/error-fr.html @@ -1,7 +1,8 @@ -<!DOCTYPE html PUBLIC
+<!DOCTYPE html PUBLIC
"-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr">
+<head>
<title>%%ErrorMessage%%</title>
<style type="text/css">
/*<![CDATA[*/
diff --git a/framework/Exceptions/templates/error.html b/framework/Exceptions/templates/error.html index 482da4cd..e1715f4d 100644 --- a/framework/Exceptions/templates/error.html +++ b/framework/Exceptions/templates/error.html @@ -1,32 +1,32 @@ -<!DOCTYPE html PUBLIC - "-//W3C//DTD XHTML 1.0 Transitional//EN" - "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> -<head> -<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> -<title>%%ErrorMessage%%</title> -<style type="text/css"> -/*<![CDATA[*/ -body {font-family:"Verdana";font-weight:normal;color:black;background-color:white;} -h1 { font-family:"Verdana";font-weight:normal;font-size:18pt;color:red } -h2 { font-family:"Verdana";font-weight:normal;font-size:14pt;color:maroon } -h3 {font-family:"Verdana";font-weight:bold;font-size:11pt} -p {font-family:"Verdana";font-weight:normal;color:black;font-size:9pt;margin-top: -5px} -.version {color: gray;font-size:8pt;border-top:1px solid #aaaaaa;} -/*]]>*/ -</style> -</head> -<body> -<h1>Error %%StatusCode%%</h1> -<h2>%%ErrorMessage%%</h2> -<p> -The above error happened when the server was processing your request. -</p> -<p> -If you think this is a server error, please contact the <a href="mailto:%%ServerAdmin%%">webmaster</a>. -</p> -<div class="version"> -%%Time%% %%Version%% -</div> -</body> +<!DOCTYPE html PUBLIC
+ "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+<title>%%ErrorMessage%%</title>
+<style type="text/css">
+/*<![CDATA[*/
+body {font-family:"Verdana";font-weight:normal;color:black;background-color:white;}
+h1 { font-family:"Verdana";font-weight:normal;font-size:18pt;color:red }
+h2 { font-family:"Verdana";font-weight:normal;font-size:14pt;color:maroon }
+h3 {font-family:"Verdana";font-weight:bold;font-size:11pt}
+p {font-family:"Verdana";font-weight:normal;color:black;font-size:9pt;margin-top: -5px}
+.version {color: gray;font-size:8pt;border-top:1px solid #aaaaaa;}
+/*]]>*/
+</style>
+</head>
+<body>
+<h1>Error %%StatusCode%%</h1>
+<h2>%%ErrorMessage%%</h2>
+<p>
+The above error happened when the server was processing your request.
+</p>
+<p>
+If you think this is a server error, please contact the <a href="mailto:%%ServerAdmin%%">webmaster</a>.
+</p>
+<div class="version">
+%%Time%% %%Version%%
+</div>
+</body>
</html>
\ No newline at end of file diff --git a/framework/Exceptions/templates/error400-en.html b/framework/Exceptions/templates/error400-en.html new file mode 100644 index 00000000..629b360d --- /dev/null +++ b/framework/Exceptions/templates/error400-en.html @@ -0,0 +1,33 @@ +<!DOCTYPE html PUBLIC
+ "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+<title>Bad Request</title>
+<style type="text/css">
+/*<![CDATA[*/
+body {font-family:"Verdana";font-weight:normal;color:black;background-color:white;}
+h1 { font-family:"Verdana";font-weight:normal;font-size:18pt;color:red }
+h2 { font-family:"Verdana";font-weight:normal;font-size:14pt;color:maroon }
+h3 {font-family:"Verdana";font-weight:bold;font-size:11pt}
+p {font-family:"Verdana";font-weight:normal;color:black;font-size:9pt;margin-top: -5px}
+.version {color: gray;font-size:8pt;border-top:1px solid #aaaaaa;}
+/*]]>*/
+</style>
+</head>
+<body>
+<h1>Bad Request</h1>
+<h2>%%ErrorMessage%%</h2>
+<p>
+The request could not be understood by the server due to malformed syntax.
+Please do not repeat the request without modifications.
+</p>
+<p>
+If you think this is a server error, please contact the <a href="mailto:%%ServerAdmin%%">webmaster</a>.
+</p>
+<div class="version">
+%%Time%% %%Version%%
+</div>
+</body>
+</html>
\ No newline at end of file diff --git a/framework/Exceptions/templates/error400-zh.html b/framework/Exceptions/templates/error400-zh.html new file mode 100644 index 00000000..08f93118 --- /dev/null +++ b/framework/Exceptions/templates/error400-zh.html @@ -0,0 +1,32 @@ +<!DOCTYPE html PUBLIC
+ "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="zh" lang="zh">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+<title>错误请求</title>
+<style type="text/css">
+/*<![CDATA[*/
+body {font-family:"Verdana";font-weight:normal;color:black;background-color:white;}
+h1 { font-family:"Verdana";font-weight:normal;font-size:18pt;color:red }
+h2 { font-family:"Verdana";font-weight:normal;font-size:14pt;color:maroon }
+h3 {font-family:"Verdana";font-weight:bold;font-size:11pt}
+p {font-family:"Verdana";font-weight:normal;color:black;font-size:9pt;margin-top: -5px}
+.version {color: gray;font-size:8pt;border-top:1px solid #aaaaaa;}
+/*]]>*/
+</style>
+</head>
+<body>
+<h1>错误请求</h1>
+<h2>%%ErrorMessage%%</h2>
+<p>
+服务器无法理解您的请求。请勿重复同样的请求。
+</p>
+<p>
+如果您确认这是服务器错误，请联系<a href="mailto:%%ServerAdmin%%">系统管理员</a>。
+</p>
+<div class="version">
+%%Time%% %%Version%%
+</div>
+</body>
+</html>
\ No newline at end of file diff --git a/framework/Exceptions/templates/error400.html b/framework/Exceptions/templates/error400.html new file mode 100644 index 00000000..629b360d --- /dev/null +++ b/framework/Exceptions/templates/error400.html @@ -0,0 +1,33 @@ +<!DOCTYPE html PUBLIC
+ "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+<title>Bad Request</title>
+<style type="text/css">
+/*<![CDATA[*/
+body {font-family:"Verdana";font-weight:normal;color:black;background-color:white;}
+h1 { font-family:"Verdana";font-weight:normal;font-size:18pt;color:red }
+h2 { font-family:"Verdana";font-weight:normal;font-size:14pt;color:maroon }
+h3 {font-family:"Verdana";font-weight:bold;font-size:11pt}
+p {font-family:"Verdana";font-weight:normal;color:black;font-size:9pt;margin-top: -5px}
+.version {color: gray;font-size:8pt;border-top:1px solid #aaaaaa;}
+/*]]>*/
+</style>
+</head>
+<body>
+<h1>Bad Request</h1>
+<h2>%%ErrorMessage%%</h2>
+<p>
+The request could not be understood by the server due to malformed syntax.
+Please do not repeat the request without modifications.
+</p>
+<p>
+If you think this is a server error, please contact the <a href="mailto:%%ServerAdmin%%">webmaster</a>.
+</p>
+<div class="version">
+%%Time%% %%Version%%
+</div>
+</body>
+</html>
\ No newline at end of file diff --git a/framework/Exceptions/templates/error404-en.html b/framework/Exceptions/templates/error404-en.html index abbc84a6..40862e0e 100644 --- a/framework/Exceptions/templates/error404-en.html +++ b/framework/Exceptions/templates/error404-en.html @@ -1,33 +1,33 @@ -<!DOCTYPE html PUBLIC - "-//W3C//DTD XHTML 1.0 Transitional//EN" - "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> -<head> -<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> -<title>Page Not Found</title> -<style type="text/css"> -/*<![CDATA[*/ -body {font-family:"Verdana";font-weight:normal;color:black;background-color:white;} -h1 { font-family:"Verdana";font-weight:normal;font-size:18pt;color:red } -h2 { font-family:"Verdana";font-weight:normal;font-size:14pt;color:maroon } -h3 {font-family:"Verdana";font-weight:bold;font-size:11pt} -p {font-family:"Verdana";font-weight:normal;color:black;font-size:9pt;margin-top: -5px} -.version {color: gray;font-size:8pt;border-top:1px solid #aaaaaa;} -/*]]>*/ -</style> -</head> -<body> -<h1>%%ErrorMessage%%</h1> -<h2>Error 404</h2> -<p> -The requested URL was not found on this server. -If you entered the URL manually please check your spelling and try again. -</p> -<p> -If you think this is a server error, please contact the <a href="mailto:%%ServerAdmin%%">webmaster</a>. -</p> -<div class="version"> -%%Time%% %%Version%% -</div> -</body> +<!DOCTYPE html PUBLIC
+ "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+<title>Page Not Found</title>
+<style type="text/css">
+/*<![CDATA[*/
+body {font-family:"Verdana";font-weight:normal;color:black;background-color:white;}
+h1 { font-family:"Verdana";font-weight:normal;font-size:18pt;color:red }
+h2 { font-family:"Verdana";font-weight:normal;font-size:14pt;color:maroon }
+h3 {font-family:"Verdana";font-weight:bold;font-size:11pt}
+p {font-family:"Verdana";font-weight:normal;color:black;font-size:9pt;margin-top: -5px}
+.version {color: gray;font-size:8pt;border-top:1px solid #aaaaaa;}
+/*]]>*/
+</style>
+</head>
+<body>
+<h1>%%ErrorMessage%%</h1>
+<h2>Error 404</h2>
+<p>
+The requested URL was not found on this server.
+If you entered the URL manually please check your spelling and try again.
+</p>
+<p>
+If you think this is a server error, please contact the <a href="mailto:%%ServerAdmin%%">webmaster</a>.
+</p>
+<div class="version">
+%%Time%% %%Version%%
+</div>
+</body>
</html>
\ No newline at end of file diff --git a/framework/Exceptions/templates/error404-fr.html b/framework/Exceptions/templates/error404-fr.html index c353d7c1..4a417d71 100644 --- a/framework/Exceptions/templates/error404-fr.html +++ b/framework/Exceptions/templates/error404-fr.html @@ -1,7 +1,8 @@ -<!DOCTYPE html PUBLIC
+<!DOCTYPE html PUBLIC
"-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr">
+<head>
<title>Page Introuvable</title>
<style type="text/css">
/*<![CDATA[*/
diff --git a/framework/Exceptions/templates/error404.html b/framework/Exceptions/templates/error404.html index 1ad3c0ac..40862e0e 100644 --- a/framework/Exceptions/templates/error404.html +++ b/framework/Exceptions/templates/error404.html @@ -1,4 +1,4 @@ -<!DOCTYPE html PUBLIC
+<!DOCTYPE html PUBLIC
"-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
diff --git a/framework/Exceptions/templates/error500-en.html b/framework/Exceptions/templates/error500-en.html index 76427f43..69408d21 100644 --- a/framework/Exceptions/templates/error500-en.html +++ b/framework/Exceptions/templates/error500-en.html @@ -1,4 +1,4 @@ -<!DOCTYPE html PUBLIC
+<!DOCTYPE html PUBLIC
"-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
diff --git a/framework/Exceptions/templates/error500-fr.html b/framework/Exceptions/templates/error500-fr.html index 0454e27d..1c4df1ab 100644 --- a/framework/Exceptions/templates/error500-fr.html +++ b/framework/Exceptions/templates/error500-fr.html @@ -1,7 +1,8 @@ -<!DOCTYPE html PUBLIC
+<!DOCTYPE html PUBLIC
"-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr">
+<head>
<title>Erreur Interne du Serveur</title>
<style type="text/css">
/*<![CDATA[*/
diff --git a/framework/Exceptions/templates/error500.html b/framework/Exceptions/templates/error500.html index 76427f43..69408d21 100644 --- a/framework/Exceptions/templates/error500.html +++ b/framework/Exceptions/templates/error500.html @@ -1,4 +1,4 @@ -<!DOCTYPE html PUBLIC
+<!DOCTYPE html PUBLIC
"-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
diff --git a/framework/Exceptions/templates/error503-en.html b/framework/Exceptions/templates/error503-en.html index 3a5390de..66b8ea06 100644 --- a/framework/Exceptions/templates/error503-en.html +++ b/framework/Exceptions/templates/error503-en.html @@ -1,4 +1,4 @@ -<!DOCTYPE html PUBLIC
+<!DOCTYPE html PUBLIC
"-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
diff --git a/framework/Exceptions/templates/error503-fr.html b/framework/Exceptions/templates/error503-fr.html index ddc7d537..89665255 100644 --- a/framework/Exceptions/templates/error503-fr.html +++ b/framework/Exceptions/templates/error503-fr.html @@ -1,7 +1,8 @@ -<!DOCTYPE html PUBLIC
+<!DOCTYPE html PUBLIC
"-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr">
+<head>
<title>Service Indisponible</title>
<style type="text/css">
/*<![CDATA[*/
diff --git a/framework/Exceptions/templates/error503.html b/framework/Exceptions/templates/error503.html index 3a5390de..66b8ea06 100644 --- a/framework/Exceptions/templates/error503.html +++ b/framework/Exceptions/templates/error503.html @@ -1,4 +1,4 @@ -<!DOCTYPE html PUBLIC
+<!DOCTYPE html PUBLIC
"-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
diff --git a/framework/Exceptions/templates/exception-en.html b/framework/Exceptions/templates/exception-en.html index 2de7f5f1..c087792f 100644 --- a/framework/Exceptions/templates/exception-en.html +++ b/framework/Exceptions/templates/exception-en.html @@ -1,4 +1,4 @@ -<!DOCTYPE html PUBLIC
+<!DOCTYPE html PUBLIC
"-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
diff --git a/framework/Exceptions/templates/exception-fr.html b/framework/Exceptions/templates/exception-fr.html index 002a4583..ee41571c 100644 --- a/framework/Exceptions/templates/exception-fr.html +++ b/framework/Exceptions/templates/exception-fr.html @@ -1,7 +1,8 @@ -<!DOCTYPE html PUBLIC
+<!DOCTYPE html PUBLIC
"-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr">
+<head>
<title>%%ErrorType%%</title>
<style type="text/css">
/*<![CDATA[*/
diff --git a/framework/Exceptions/templates/exception.html b/framework/Exceptions/templates/exception.html index 2de7f5f1..c087792f 100644 --- a/framework/Exceptions/templates/exception.html +++ b/framework/Exceptions/templates/exception.html @@ -1,4 +1,4 @@ -<!DOCTYPE html PUBLIC
+<!DOCTYPE html PUBLIC
"-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
diff --git a/framework/Exceptions/templates/readme.txt b/framework/Exceptions/templates/readme.txt new file mode 100644 index 00000000..635b6688 --- /dev/null +++ b/framework/Exceptions/templates/readme.txt @@ -0,0 +1,18 @@ +This directory contains templates used to display PRADO exception and error messages to end-users.
+
+All error template files follow the following naming convention:
+
+ error<status code>-<language code>.html
+
+where <status code> refers to a HTTP status code used when raising THttpException, and
+<language code> refers to a valid language such as en, zh, fr.
+
+The naming convention for exception template files is similar to that of error template files.
+
+
+CAUTION: When saving a template file, please make sure the file is saved using UTF-8 encoding.
+On Windows, you may use Notepad.exe to accomplish such saving.
+
+
+Qiang Xue
+Jan. 3, 2006
\ No newline at end of file |