4:49 p.m.
Author: ips
Date: 2008-10-28 17:49:58 -0400 (Tue, 28 Oct 2008)
New Revision: 26
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:
move XML comment containing copyright header after html tag and surround it w/ a ui:remove
tag (fix for https://jira.jboss.org/jira/browse/EMBJOPR-18)
Modified: trunk/core/src/main/webapp/errorLayout.xhtml
===================================================================
--- trunk/core/src/main/webapp/errorLayout.xhtml 2008-10-27 21:19:38 UTC (rev 25)
+++ trunk/core/src/main/webapp/errorLayout.xhtml 2008-10-28 21:49:58 UTC (rev 26)
@@ -1,4 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0"?>
+<!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"
+ 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">
+<ui:remove>
<!--
~ Embedded Jopr Project
~ Copyright (C) 2006-2008 Red Hat, Inc.
@@ -18,15 +26,7 @@
~ License along with this program; if not, write to the Free Software
~ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-->
-<!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"
- 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"
- >
-
+</ui:remove>
<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. -->
Modified: trunk/core/src/main/webapp/index.xhtml
===================================================================
--- trunk/core/src/main/webapp/index.xhtml 2008-10-27 21:19:38 UTC (rev 25)
+++ trunk/core/src/main/webapp/index.xhtml 2008-10-28 21:49:58 UTC (rev 26)
@@ -1,4 +1,13 @@
<?xml version="1.0"?>
+<!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"
+ 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">
+<ui:remove>
<!--
~ Embedded Jopr Project
~ Copyright (C) 2006-2008 Red Hat, Inc.
@@ -18,17 +27,14 @@
~ 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>
+</ui:remove>
+<f:view contentType="text/html">
<head>
<meta http-equiv="Refresh" content="0;
URL=secure/summary.seam"/>
</head>
+ <body/>
+
</f:view>
</html>
\ No newline at end of file
Modified: trunk/core/src/main/webapp/layout.xhtml
===================================================================
--- trunk/core/src/main/webapp/layout.xhtml 2008-10-27 21:19:38 UTC (rev 25)
+++ trunk/core/src/main/webapp/layout.xhtml 2008-10-28 21:49:58 UTC (rev 26)
@@ -1,4 +1,13 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0"?>
+<!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"
+ 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">
+<ui:remove>
<!--
~ Embedded Jopr Project
~ Copyright (C) 2006-2008 Red Hat, Inc.
@@ -18,19 +27,12 @@
~ License along with this program; if not, write to the Free Software
~ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-->
-<!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"
- 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"
- >
+</ui:remove>
<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. -->
</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"/>
Modified: trunk/core/src/main/webapp/login.xhtml
===================================================================
--- trunk/core/src/main/webapp/login.xhtml 2008-10-27 21:19:38 UTC (rev 25)
+++ trunk/core/src/main/webapp/login.xhtml 2008-10-28 21:49:58 UTC (rev 26)
@@ -1,4 +1,13 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0"?>
+<!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"
+ 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">
+<ui:remove>
<!--
~ Embedded Jopr Project
~ Copyright (C) 2006-2008 Red Hat, Inc.
@@ -18,15 +27,8 @@
~ License along with this program; if not, write to the Free Software
~ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-->
-<!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"
- 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>
+<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"/>
6381
days inactive
6381
days old
embjopr-commits@lists.jboss.org
0 comments
1 participants
participants (1)
-
embjopr-commits＠lists.jboss.org