Author: sshyrkov
Date: Thu Sep 20 19:08:59 2007
New Revision: 18582
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18582&repname=
=3Djahia
Log:
Fix cosmetic errors with content type and charset
Modified:
branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/errors/error_400=
.jsp
branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/errors/error_403=
.jsp
branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/errors/error_403=
_forbidden.jsp
branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/errors/error_404=
.jsp
branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/errors/error_503=
.jsp
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/errors/err=
or_400.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/webapp/jsp/jahia/errors/error_400.jsp&rev=3D18582&repname=
=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/errors/error_400=
.jsp (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/errors/error_400=
.jsp Thu Sep 20 19:08:59 2007
@@ -14,7 +14,7 @@
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. =
See the License for the specific language governing permissions and =
limitations under the License.
---%><%@ page language =3D "java" %><?xml version=3D"1.0" encoding=3D"iso-8=
859-1"?>
+--%><%@ page language =3D "java" contentType=3D"text/html; charset=3DUTF-8=
"%><?xml version=3D"1.0" encoding=3D"UTF-8"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www=
.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns=3D"http://www.w3.org/1999/xhtml";>
<head>
@@ -22,7 +22,7 @@
<%@ page import =3D "org.jahia.bin.Jahia" %>
<%@ taglib uri=3D"JahiaLib" prefix=3D"jahia" %>
<title><jahia:engineResourceBundle resourceName=3D"org.jahia.bin.Jahia=
ErrorDisplay.jahiaError.label"/></title>
- <meta http-equiv=3D"Content-Type" content=3D"text/html; charset=3D"UTF=
-8"/>
+ <meta http-equiv=3D"Content-Type" content=3D"text/html; charset=3DUTF-=
8"/>
<link rel=3D"stylesheet" href=3D"<jahia:serverHttpPath/>/jsp/jahia/eng=
ines/css/error.css" type=3D"text/css"/>
</head>
=
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/errors/err=
or_403.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/webapp/jsp/jahia/errors/error_403.jsp&rev=3D18582&repname=
=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/errors/error_403=
.jsp (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/errors/error_403=
.jsp Thu Sep 20 19:08:59 2007
@@ -15,7 +15,7 @@
See the License for the specific language governing permissions and =
limitations under the License.
--%>
-<[EMAIL PROTECTED] language=3D"java"%>
+<[EMAIL PROTECTED] language=3D"java" contentType=3D"text/html;
charset=3DUTF-8"%><?xm=
l version=3D"1.0" encoding=3D"UTF-8"?>
<[EMAIL PROTECTED] import=3D"org.jahia.exceptions.JahiaInvalidModeException"%>
<[EMAIL PROTECTED] import=3D"java.text.MessageFormat"%>
<[EMAIL PROTECTED] import=3D"org.jahia.resourcebundle.JahiaResourceBundle"%>
@@ -25,7 +25,7 @@
<[EMAIL PROTECTED] import=3D"org.jahia.services.usermanager.JahiaUser" %>
<[EMAIL PROTECTED] import=3D"org.jahia.data.JahiaData"%>
<[EMAIL PROTECTED] uri=3D"JahiaLib" prefix=3D"jahia" %>
-<?xml version=3D"1.0" encoding=3D"iso-8859-1"?><%
+<%
=
final String cpath =3D Jahia.getContextPath();
final String spath =3D Jahia.getServletPath();
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/errors/err=
or_403_forbidden.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/webapp/jsp/jahia/errors/error_403_forbidden.jsp&rev=3D1858=
2&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/errors/error_403=
_forbidden.jsp (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/errors/error_403=
_forbidden.jsp Thu Sep 20 19:08:59 2007
@@ -14,8 +14,7 @@
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. =
See the License for the specific language governing permissions and =
limitations under the License.
---%>
-<[EMAIL PROTECTED] language=3D"java"%>
+--%><[EMAIL PROTECTED] language=3D"java" contentType=3D"text/html;
charset=3DUTF-8"%>=
<?xml version=3D"1.0" encoding=3D"UTF-8"?>
<[EMAIL PROTECTED] import=3D"org.jahia.exceptions.JahiaInvalidModeException"%>
<[EMAIL PROTECTED] import=3D"java.text.MessageFormat"%>
<[EMAIL PROTECTED] import=3D"org.jahia.resourcebundle.JahiaResourceBundle"%>
@@ -25,7 +24,7 @@
<[EMAIL PROTECTED] import=3D"org.jahia.services.usermanager.JahiaUser" %>
<[EMAIL PROTECTED] import=3D"org.jahia.data.JahiaData"%>
<[EMAIL PROTECTED] uri=3D"JahiaLib" prefix=3D"jahia" %>
-<?xml version=3D"1.0" encoding=3D"iso-8859-1"?><%
+<%
=
final String cpath =3D Jahia.getContextPath();
final String spath =3D Jahia.getServletPath();
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/errors/err=
or_404.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/webapp/jsp/jahia/errors/error_404.jsp&rev=3D18582&repname=
=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/errors/error_404=
.jsp (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/errors/error_404=
.jsp Thu Sep 20 19:08:59 2007
@@ -14,7 +14,7 @@
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. =
See the License for the specific language governing permissions and =
limitations under the License.
---%><%@ page language =3D "java" %><?xml version=3D"1.0" encoding=3D"iso-8=
859-1"?>
+--%><[EMAIL PROTECTED] language=3D"java" contentType=3D"text/html;
charset=3DUTF-8"%>=
<?xml version=3D"1.0" encoding=3D"UTF-8"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www=
.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns=3D"http://www.w3.org/1999/xhtml";>
<head>
@@ -22,7 +22,7 @@
<%@ page import =3D "org.jahia.bin.Jahia" %>
<%@ taglib uri=3D"JahiaLib" prefix=3D"jahia" %>
<title><jahia:engineResourceBundle resourceName=3D"org.jahia.bin.Jahia=
ErrorDisplay.httpNotFound.label"/></title>
- <meta http-equiv=3D"Content-Type" content=3D"text/html; charset=3D"UTF=
-8"/>
+ <meta http-equiv=3D"Content-Type" content=3D"text/html; charset=3DUTF-=
8"/>
<link rel=3D"stylesheet" href=3D"<jahia:serverHttpPath/>/jsp/jahia/eng=
ines/css/error.css" type=3D"text/css"/>
<script language=3D"JavaScript" type=3D"text/JavaScript">
<!--
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/errors/err=
or_503.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/webapp/jsp/jahia/errors/error_503.jsp&rev=3D18582&repname=
=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/errors/error_503=
.jsp (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/errors/error_503=
.jsp Thu Sep 20 19:08:59 2007
@@ -14,8 +14,7 @@
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. =
See the License for the specific language governing permissions and =
limitations under the License.
---%>
-<%@ page language =3D "java" %>
+--%><[EMAIL PROTECTED] language=3D"java" contentType=3D"text/html;
charset=3DUTF-8"%>=
<?xml version=3D"1.0" encoding=3D"UTF-8"?>
<%@ page import=3D"java.util.*" %>
<%@ page import=3D"org.jahia.bin.Jahia" %>
<%@ page import=3D"org.jahia.exceptions.JahiaServerOverloadedException"%>
@@ -25,7 +24,6 @@
<%@ page import=3D"org.jahia.exceptions.JahiaException"%>
<%@ taglib uri=3D"JahiaLib" prefix=3D"jahia" %>
<%@ taglib uri=3D"/WEB-INF/etc/struts/struts-logic" prefix=3D"logic" %>
-<?xml version=3D"1.0" encoding=3D"iso-8859-1"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www=
.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns=3D"http://www.w3.org/1999/xhtml";>
<% =
@@ -44,7 +42,7 @@
boolean isGetMethod =3D "GET".equals(request.getMethod());
%>
<head>
- <meta http-equiv=3D"Content-Type" content=3D"text/html; charset=3D"UTF=
-8"/>
+ <meta http-equiv=3D"Content-Type" content=3D"text/html; charset=3DUTF-=
8"/>
<script language=3D"javascript" src=3D"<%=3Drequest.getContextPath()%>=
/jsp/jahia/errors/error_include.js" type=3D"text/JavaScript"></script>
<link rel=3D"stylesheet" href=3D"<jahia:serverHttpPath/>/jsp/jahia/eng=
ines/css/error.css" type=3D"text/css"/>
<%if (isGetMethod && isDuringFirstRequest && timeInSeconds > 0) { %>
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
