From 25f9c45261aafd65477ad526e0b6ad3dca80803a Mon Sep 17 00:00:00 2001 From: wei <> Date: Sat, 10 Dec 2005 11:46:10 +0000 Subject: Update exception templates to be XHTML 1.0 transitional compliant. --- framework/Exceptions/templates/error-fr.html | 17 +++---- framework/Exceptions/templates/error-zh.html | 17 ++++--- framework/Exceptions/templates/error.html | 59 ++++++++++++----------- framework/Exceptions/templates/error404-en.html | 61 +++++++++++++----------- framework/Exceptions/templates/error404-fr.html | 17 +++---- framework/Exceptions/templates/error404-zh.html | 17 ++++--- framework/Exceptions/templates/error404.html | 17 ++++--- framework/Exceptions/templates/error500-en.html | 17 ++++--- framework/Exceptions/templates/error500-fr.html | 17 +++---- framework/Exceptions/templates/error500-zh.html | 17 ++++--- framework/Exceptions/templates/error500.html | 17 ++++--- framework/Exceptions/templates/error503-en.html | 17 ++++--- framework/Exceptions/templates/error503-fr.html | 17 +++---- framework/Exceptions/templates/error503-zh.html | 17 ++++--- framework/Exceptions/templates/error503.html | 17 ++++--- framework/Exceptions/templates/exception-en.html | 19 ++++---- framework/Exceptions/templates/exception-fr.html | 18 +++---- framework/Exceptions/templates/exception-zh.html | 17 ++++--- framework/Exceptions/templates/exception.html | 19 ++++---- 19 files changed, 228 insertions(+), 186 deletions(-) (limited to 'framework/Exceptions/templates') diff --git a/framework/Exceptions/templates/error-fr.html b/framework/Exceptions/templates/error-fr.html index 5546dcdb..47b681de 100644 --- a/framework/Exceptions/templates/error-fr.html +++ b/framework/Exceptions/templates/error-fr.html @@ -1,19 +1,20 @@ - -
- - + +diff --git a/framework/Exceptions/templates/error-zh.html b/framework/Exceptions/templates/error-zh.html index 545f057c..f69d0e49 100644 --- a/framework/Exceptions/templates/error-zh.html +++ b/framework/Exceptions/templates/error-zh.html @@ -1,19 +1,22 @@ - + +
- - +diff --git a/framework/Exceptions/templates/error.html b/framework/Exceptions/templates/error.html index 931f96a3..482da4cd 100644 --- a/framework/Exceptions/templates/error.html +++ b/framework/Exceptions/templates/error.html @@ -1,29 +1,32 @@ - -
- - --The above error happened when the server was processing your request. -
--If you think this is a server error, please contact the webmaster. -
-+The above error happened when the server was processing your request. +
++If you think this is a server error, please contact the webmaster. +
+-The requested URL was not found on this server. -If you entered the URL manually please check your spelling and try again. -
--If you think this is a server error, please contact the webmaster. -
-+The requested URL was not found on this server. +If you entered the URL manually please check your spelling and try again. +
++If you think this is a server error, please contact the webmaster. +
+diff --git a/framework/Exceptions/templates/error404-zh.html b/framework/Exceptions/templates/error404-zh.html index ae5d8275..c834f9b1 100644 --- a/framework/Exceptions/templates/error404-zh.html +++ b/framework/Exceptions/templates/error404-zh.html @@ -1,19 +1,22 @@ - + +
- - +diff --git a/framework/Exceptions/templates/error404.html b/framework/Exceptions/templates/error404.html index 92ac65b1..1ad3c0ac 100644 --- a/framework/Exceptions/templates/error404.html +++ b/framework/Exceptions/templates/error404.html @@ -1,19 +1,22 @@ - + +
- - +diff --git a/framework/Exceptions/templates/error500-en.html b/framework/Exceptions/templates/error500-en.html index 25d4ad92..76427f43 100644 --- a/framework/Exceptions/templates/error500-en.html +++ b/framework/Exceptions/templates/error500-en.html @@ -1,19 +1,22 @@ - + +
- - +diff --git a/framework/Exceptions/templates/error500-fr.html b/framework/Exceptions/templates/error500-fr.html index 804425ef..0454e27d 100644 --- a/framework/Exceptions/templates/error500-fr.html +++ b/framework/Exceptions/templates/error500-fr.html @@ -1,19 +1,20 @@ - -
- - + +diff --git a/framework/Exceptions/templates/error500-zh.html b/framework/Exceptions/templates/error500-zh.html index a10dbba4..d655601f 100644 --- a/framework/Exceptions/templates/error500-zh.html +++ b/framework/Exceptions/templates/error500-zh.html @@ -1,19 +1,22 @@ - + +
- - +diff --git a/framework/Exceptions/templates/error500.html b/framework/Exceptions/templates/error500.html index 25d4ad92..76427f43 100644 --- a/framework/Exceptions/templates/error500.html +++ b/framework/Exceptions/templates/error500.html @@ -1,19 +1,22 @@ - + +
- - +diff --git a/framework/Exceptions/templates/error503-en.html b/framework/Exceptions/templates/error503-en.html index 718dd4ea..3a5390de 100644 --- a/framework/Exceptions/templates/error503-en.html +++ b/framework/Exceptions/templates/error503-en.html @@ -1,19 +1,22 @@ - + +
- - +Our system is currently under maintenance. Please come back later. diff --git a/framework/Exceptions/templates/error503-fr.html b/framework/Exceptions/templates/error503-fr.html index 699114de..ddc7d537 100644 --- a/framework/Exceptions/templates/error503-fr.html +++ b/framework/Exceptions/templates/error503-fr.html @@ -1,19 +1,20 @@ - -
- - + +Le service est actuellement en maintenance et indisponible. Merci de réessayer prochainement. diff --git a/framework/Exceptions/templates/error503-zh.html b/framework/Exceptions/templates/error503-zh.html index 5babac19..b7457d68 100644 --- a/framework/Exceptions/templates/error503-zh.html +++ b/framework/Exceptions/templates/error503-zh.html @@ -1,19 +1,22 @@ - + +
- - +系统维护中,请稍后再来访问。 diff --git a/framework/Exceptions/templates/error503.html b/framework/Exceptions/templates/error503.html index 718dd4ea..3a5390de 100644 --- a/framework/Exceptions/templates/error503.html +++ b/framework/Exceptions/templates/error503.html @@ -1,19 +1,22 @@ - + +
- - +Our system is currently under maintenance. Please come back later. diff --git a/framework/Exceptions/templates/exception-en.html b/framework/Exceptions/templates/exception-en.html index 45fc264c..2de7f5f1 100644 --- a/framework/Exceptions/templates/exception-en.html +++ b/framework/Exceptions/templates/exception-en.html @@ -1,10 +1,13 @@ - + +
- - +%%ErrorMessage%%
-
%%SourceFile%%
%%ErrorMessage%%
-
%%SourceFile%%
%%ErrorMessage%%
diff --git a/framework/Exceptions/templates/exception.html b/framework/Exceptions/templates/exception.html index 45fc264c..2de7f5f1 100644 --- a/framework/Exceptions/templates/exception.html +++ b/framework/Exceptions/templates/exception.html @@ -1,10 +1,13 @@ - + + - - +%%ErrorMessage%%
-
%%SourceFile%%