[embjopr-commits] EMBJOPR SVN: r29 - trunk/core/src/main/webapp.
embjopr-commits at lists.jboss.org
embjopr-commits at lists.jboss.org
Thu Oct 30 11:38:13 EDT 2008
Author: ips
Date: 2008-10-30 11:38:13 -0400 (Thu, 30 Oct 2008)
New Revision: 29
Modified:
trunk/core/src/main/webapp/errorLayout.xhtml
trunk/core/src/main/webapp/index.xhtml
trunk/core/src/main/webapp/layout.xhtml
trunk/core/src/main/webapp/login.xhtml
Log:
specify page encoding using <f:view contentType="text/html; charset=UTF-8"> since we cannot specify it via the xml prolog (thanks to IE6) (see https://jira.jboss.org/jira/browse/EMBJOPR-19)
Modified: trunk/core/src/main/webapp/errorLayout.xhtml
===================================================================
--- trunk/core/src/main/webapp/errorLayout.xhtml 2008-10-30 15:16:06 UTC (rev 28)
+++ trunk/core/src/main/webapp/errorLayout.xhtml 2008-10-30 15:38:13 UTC (rev 29)
@@ -1,24 +1,24 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!--
- ~ Embedded Jopr Project
- ~ Copyright (C) 2006-2008 Red Hat, Inc.
- ~ All rights reserved.
- ~
- ~ This program is free software; you can redistribute it and/or modify
- ~ it under the terms of the GNU Lesser General Public License as
- ~ published by the Free Software Foundation; either version 2.1 of
- ~ the License, or (at your option) any later version.
- ~
- ~ This program is distributed in the hope that it will be useful,
- ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
- ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- ~ Lesser General Public License for more details.
- ~
- ~ You should have received a copy of the GNU Lesser General Public
- ~ License along with this program; if not, write to the Free Software
- ~ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- -->
+<!--
+ ~ Embedded Jopr Project
+ ~ Copyright (C) 2006-2008 Red Hat, Inc.
+ ~ All rights reserved.
+ ~
+ ~ This program is free software; you can redistribute it and/or modify
+ ~ it under the terms of the GNU Lesser General Public License as
+ ~ published by the Free Software Foundation; either version 2.1 of
+ ~ the License, or (at your option) any later version.
+ ~
+ ~ This program is distributed in the hope that it will be useful,
+ ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ ~ Lesser General Public License for more details.
+ ~
+ ~ You should have received a copy of the GNU Lesser General Public
+ ~ License along with this program; if not, write to the Free Software
+ ~ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ -->
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"
xmlns:h="http://java.sun.com/jsf/html"
@@ -26,14 +26,16 @@
xmlns:s="http://jboss.com/products/seam/taglib"
xmlns:ui="http://java.sun.com/jsf/facelets">
<ui:remove>
- <!-- [JBNADM-1352] Set the content type to "text/html" (overriding the default of "application/xhtml+xml") to force
-Firefox and other Gecko-based browsers to render the page in "Almost Standards" (i.e. transitional) mode. -->
+ <!-- Set the content type to "text/html" to ensure "application/xhtml+xml", which would put Firefox and
+ other Gecko-based browsers into XML mode (which requires pages to be well-formed XML), is not used.
+ We also specify the charset/encoding here, since we cannot specify it via the xml prolog, since
+ including an xml prolog causes IE6 to go into the undesirable "quirks mode".
+ (see https://jira.jboss.org/jira/browse/EMBJOPR-19) -->
</ui:remove>
-<f:view contentType="text/html">
+<f:view contentType="text/html; charset=UTF-8">
<head>
<base href="#{navigationAction.baseUrl}" />
- <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"/>
<title>
<ui:insert name="title">#{messages['default.windowTitle']}</ui:insert>
</title>
Modified: trunk/core/src/main/webapp/index.xhtml
===================================================================
--- trunk/core/src/main/webapp/index.xhtml 2008-10-30 15:16:06 UTC (rev 28)
+++ trunk/core/src/main/webapp/index.xhtml 2008-10-30 15:38:13 UTC (rev 29)
@@ -1,31 +1,38 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!--
- ~ Embedded Jopr Project
- ~ Copyright (C) 2006-2008 Red Hat, Inc.
- ~ All rights reserved.
- ~
- ~ This program is free software; you can redistribute it and/or modify
- ~ it under the terms of the GNU Lesser General Public License as
- ~ published by the Free Software Foundation; either version 2.1 of
- ~ the License, or (at your option) any later version.
- ~
- ~ This program is distributed in the hope that it will be useful,
- ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
- ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- ~ Lesser General Public License for more details.
- ~
- ~ You should have received a copy of the GNU Lesser General Public
- ~ License along with this program; if not, write to the Free Software
- ~ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- -->
+<!--
+ ~ Embedded Jopr Project
+ ~ Copyright (C) 2006-2008 Red Hat, Inc.
+ ~ All rights reserved.
+ ~
+ ~ This program is free software; you can redistribute it and/or modify
+ ~ it under the terms of the GNU Lesser General Public License as
+ ~ published by the Free Software Foundation; either version 2.1 of
+ ~ the License, or (at your option) any later version.
+ ~
+ ~ This program is distributed in the hope that it will be useful,
+ ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ ~ Lesser General Public License for more details.
+ ~
+ ~ You should have received a copy of the GNU Lesser General Public
+ ~ License along with this program; if not, write to the Free Software
+ ~ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ -->
<html xmlns="http://www.w3.org/1999/xhtml"
xmlns:h="http://java.sun.com/jsf/html"
xmlns:f="http://java.sun.com/jsf/core"
xmlns:s="http://jboss.com/products/seam/taglib"
xmlns:ui="http://java.sun.com/jsf/facelets">
-<f:view contentType="text/html">
+<ui:remove>
+ <!-- Set the content type to "text/html" to ensure "application/xhtml+xml", which would put Firefox and
+ other Gecko-based browsers into XML mode (which requires pages to be well-formed XML), is not used.
+ We also specify the charset/encoding here, since we cannot specify it via the xml prolog, since
+ including an xml prolog causes IE6 to go into the undesirable "quirks mode".
+ (see https://jira.jboss.org/jira/browse/EMBJOPR-19) -->
+</ui:remove>
+<f:view contentType="text/html; charset=UTF-8">
<head>
<meta http-equiv="Refresh" content="0; URL=secure/summary.seam"/>
Modified: trunk/core/src/main/webapp/layout.xhtml
===================================================================
--- trunk/core/src/main/webapp/layout.xhtml 2008-10-30 15:16:06 UTC (rev 28)
+++ trunk/core/src/main/webapp/layout.xhtml 2008-10-30 15:38:13 UTC (rev 29)
@@ -1,24 +1,24 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!--
- ~ Embedded Jopr Project
- ~ Copyright (C) 2006-2008 Red Hat, Inc.
- ~ All rights reserved.
- ~
- ~ This program is free software; you can redistribute it and/or modify
- ~ it under the terms of the GNU Lesser General Public License as
- ~ published by the Free Software Foundation; either version 2.1 of
- ~ the License, or (at your option) any later version.
- ~
- ~ This program is distributed in the hope that it will be useful,
- ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
- ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- ~ Lesser General Public License for more details.
- ~
- ~ You should have received a copy of the GNU Lesser General Public
- ~ License along with this program; if not, write to the Free Software
- ~ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- -->
+<!--
+ ~ Embedded Jopr Project
+ ~ Copyright (C) 2006-2008 Red Hat, Inc.
+ ~ All rights reserved.
+ ~
+ ~ This program is free software; you can redistribute it and/or modify
+ ~ it under the terms of the GNU Lesser General Public License as
+ ~ published by the Free Software Foundation; either version 2.1 of
+ ~ the License, or (at your option) any later version.
+ ~
+ ~ This program is distributed in the hope that it will be useful,
+ ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ ~ Lesser General Public License for more details.
+ ~
+ ~ You should have received a copy of the GNU Lesser General Public
+ ~ License along with this program; if not, write to the Free Software
+ ~ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ -->
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"
xmlns:h="http://java.sun.com/jsf/html"
@@ -26,19 +26,21 @@
xmlns:s="http://jboss.com/products/seam/taglib"
xmlns:ui="http://java.sun.com/jsf/facelets">
<ui:remove>
- <!-- [JBNADM-1352] Set the content type to "text/html" (overriding the default of "application/xhtml+xml") to force
-Firefox and other Gecko-based browsers to render the page in "Almost Standards" (i.e. transitional) mode. -->
+ <!-- Set the content type to "text/html" to ensure "application/xhtml+xml", which would put Firefox and
+ other Gecko-based browsers into XML mode (which requires pages to be well-formed XML), is not used.
+ We also specify the charset/encoding here, since we cannot specify it via the xml prolog, since
+ including an xml prolog causes IE6 to go into the undesirable "quirks mode".
+ (see https://jira.jboss.org/jira/browse/EMBJOPR-19) -->
</ui:remove>
-<f:view contentType="text/html;charset=UTF-8">
+<f:view contentType="text/html; charset=UTF-8">
<head>
- <base href="#{navigationAction.baseUrl}"/>
- <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"/>
- <title>
- <ui:insert name="title">#{messages['default.windowTitle']}</ui:insert>
- </title>
- <link href="css/console-style.css" rel="stylesheet" type="text/css"/>
- <link href="css/form-style.css" rel="stylesheet" type="text/css"/>
- <script type="text/javascript" src="js/embedded.js"></script>
+ <base href="#{navigationAction.baseUrl}"/>
+ <title>
+ <ui:insert name="title">#{messages['default.windowTitle']}</ui:insert>
+ </title>
+ <link href="css/console-style.css" rel="stylesheet" type="text/css"/>
+ <link href="css/form-style.css" rel="stylesheet" type="text/css"/>
+ <script type="text/javascript" src="js/embedded.js"></script>
<!--[if lt IE 7]>
<style type="text/css" media="screen">
Modified: trunk/core/src/main/webapp/login.xhtml
===================================================================
--- trunk/core/src/main/webapp/login.xhtml 2008-10-30 15:16:06 UTC (rev 28)
+++ trunk/core/src/main/webapp/login.xhtml 2008-10-30 15:38:13 UTC (rev 29)
@@ -1,34 +1,40 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!--
- ~ Embedded Jopr Project
- ~ Copyright (C) 2006-2008 Red Hat, Inc.
- ~ All rights reserved.
- ~
- ~ This program is free software; you can redistribute it and/or modify
- ~ it under the terms of the GNU Lesser General Public License as
- ~ published by the Free Software Foundation; either version 2.1 of
- ~ the License, or (at your option) any later version.
- ~
- ~ This program is distributed in the hope that it will be useful,
- ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
- ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- ~ Lesser General Public License for more details.
- ~
- ~ You should have received a copy of the GNU Lesser General Public
- ~ License along with this program; if not, write to the Free Software
- ~ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- -->
+<!--
+ ~ Embedded Jopr Project
+ ~ Copyright (C) 2006-2008 Red Hat, Inc.
+ ~ All rights reserved.
+ ~
+ ~ This program is free software; you can redistribute it and/or modify
+ ~ it under the terms of the GNU Lesser General Public License as
+ ~ published by the Free Software Foundation; either version 2.1 of
+ ~ the License, or (at your option) any later version.
+ ~
+ ~ This program is distributed in the hope that it will be useful,
+ ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ ~ Lesser General Public License for more details.
+ ~
+ ~ You should have received a copy of the GNU Lesser General Public
+ ~ License along with this program; if not, write to the Free Software
+ ~ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ -->
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"
xmlns:h="http://java.sun.com/jsf/html"
xmlns:f="http://java.sun.com/jsf/core"
xmlns:s="http://jboss.com/products/seam/taglib"
xmlns:ui="http://java.sun.com/jsf/facelets">
-<f:view contentType="text/html;charset=UTF-8">
+<ui:remove>
+ <!-- Set the content type to "text/html" to ensure "application/xhtml+xml", which would put Firefox and
+ other Gecko-based browsers into XML mode (which requires pages to be well-formed XML), is not used.
+ We also specify the charset/encoding here, since we cannot specify it via the xml prolog, since
+ including an xml prolog causes IE6 to go into the undesirable "quirks mode".
+ (see https://jira.jboss.org/jira/browse/EMBJOPR-19) -->
+</ui:remove>
+<f:view contentType="text/html; charset=UTF-8">
<head>
<base href="#{navigationAction.baseUrl}"/>
- <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"/>
<title><ui:insert name="title">#{messages['default.windowTitle']}</ui:insert></title>
<link href="css/console-style.css" rel="stylesheet" type="text/css"/>
</head>
More information about the embjopr-commits
mailing list