You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by wo...@apache.org on 2007/09/10 07:40:50 UTC
svn commit: r574139 - in
/portals/jetspeed-2/trunk/jetspeed-portal-resources/src/main/resources/webapp:
WEB-INF/templates/layout/html/columns/
WEB-INF/templates/layout/html/maximized/
WEB-INF/templates/layout/html/tcolumns/ decorations/layout/blueocean...
Author: woonsan
Date: Sun Sep 9 22:40:49 2007
New Revision: 574139
URL: http://svn.apache.org/viewvc?rev=574139&view=rev
Log:
[JS2-764] There are much DOCTYPE directives in every result page of portal
The problem can be found when a page contains multiple layouts. (That is, when there are inner layout fragments.)
Only theme header templates such as header.vm may have DocType declaration, and DocType declaration should be removed in the layout templates.
Removed the declarations from the layout templates and added to theme header templates.
Modified:
portals/jetspeed-2/trunk/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/templates/layout/html/columns/layout.vm
portals/jetspeed-2/trunk/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/templates/layout/html/maximized/layout.vm
portals/jetspeed-2/trunk/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/templates/layout/html/tcolumns/layout.vm
portals/jetspeed-2/trunk/jetspeed-portal-resources/src/main/resources/webapp/decorations/layout/blueocean/header.vm
portals/jetspeed-2/trunk/jetspeed-portal-resources/src/main/resources/webapp/decorations/layout/sunflower/header.vm
portals/jetspeed-2/trunk/jetspeed-portal-resources/src/main/resources/webapp/decorations/layout/thesolution/header.vm
portals/jetspeed-2/trunk/jetspeed-portal-resources/src/main/resources/webapp/decorations/layout/tigris/header.jsp
portals/jetspeed-2/trunk/jetspeed-portal-resources/src/main/resources/webapp/decorations/layout/tigris/header.vm
Modified: portals/jetspeed-2/trunk/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/templates/layout/html/columns/layout.vm
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/templates/layout/html/columns/layout.vm?rev=574139&r1=574138&r2=574139&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/templates/layout/html/columns/layout.vm (original)
+++ portals/jetspeed-2/trunk/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/templates/layout/html/columns/layout.vm Sun Sep 9 22:40:49 2007
@@ -1,4 +1,3 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
#*
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
Modified: portals/jetspeed-2/trunk/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/templates/layout/html/maximized/layout.vm
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/templates/layout/html/maximized/layout.vm?rev=574139&r1=574138&r2=574139&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/templates/layout/html/maximized/layout.vm (original)
+++ portals/jetspeed-2/trunk/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/templates/layout/html/maximized/layout.vm Sun Sep 9 22:40:49 2007
@@ -1,4 +1,3 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
#*
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
Modified: portals/jetspeed-2/trunk/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/templates/layout/html/tcolumns/layout.vm
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/templates/layout/html/tcolumns/layout.vm?rev=574139&r1=574138&r2=574139&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/templates/layout/html/tcolumns/layout.vm (original)
+++ portals/jetspeed-2/trunk/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/templates/layout/html/tcolumns/layout.vm Sun Sep 9 22:40:49 2007
@@ -1,4 +1,3 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
#*
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
Modified: portals/jetspeed-2/trunk/jetspeed-portal-resources/src/main/resources/webapp/decorations/layout/blueocean/header.vm
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/jetspeed-portal-resources/src/main/resources/webapp/decorations/layout/blueocean/header.vm?rev=574139&r1=574138&r2=574139&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/jetspeed-portal-resources/src/main/resources/webapp/decorations/layout/blueocean/header.vm (original)
+++ portals/jetspeed-2/trunk/jetspeed-portal-resources/src/main/resources/webapp/decorations/layout/blueocean/header.vm Sun Sep 9 22:40:49 2007
@@ -1,9 +1,9 @@
#*
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements. See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements. See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
@@ -34,6 +34,7 @@
#set($portalFilter = $JS2RequestContext.getRequestAttribute("org.apache.jetspeed.login.filter.PortalFilter"))
+<!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">
<head>
#includeHeaderResource()
Modified: portals/jetspeed-2/trunk/jetspeed-portal-resources/src/main/resources/webapp/decorations/layout/sunflower/header.vm
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/jetspeed-portal-resources/src/main/resources/webapp/decorations/layout/sunflower/header.vm?rev=574139&r1=574138&r2=574139&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/jetspeed-portal-resources/src/main/resources/webapp/decorations/layout/sunflower/header.vm (original)
+++ portals/jetspeed-2/trunk/jetspeed-portal-resources/src/main/resources/webapp/decorations/layout/sunflower/header.vm Sun Sep 9 22:40:49 2007
@@ -30,6 +30,7 @@
#* Add all template constants to the current context *#
#defineNavigationConstants()
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html>
<head>
#includeHeaderResource()
Modified: portals/jetspeed-2/trunk/jetspeed-portal-resources/src/main/resources/webapp/decorations/layout/thesolution/header.vm
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/jetspeed-portal-resources/src/main/resources/webapp/decorations/layout/thesolution/header.vm?rev=574139&r1=574138&r2=574139&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/jetspeed-portal-resources/src/main/resources/webapp/decorations/layout/thesolution/header.vm (original)
+++ portals/jetspeed-2/trunk/jetspeed-portal-resources/src/main/resources/webapp/decorations/layout/thesolution/header.vm Sun Sep 9 22:40:49 2007
@@ -30,6 +30,7 @@
#* Add all template constants to the current context *#
#defineNavigationConstants()
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html>
<head>
#includeHeaderResource()
Modified: portals/jetspeed-2/trunk/jetspeed-portal-resources/src/main/resources/webapp/decorations/layout/tigris/header.jsp
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/jetspeed-portal-resources/src/main/resources/webapp/decorations/layout/tigris/header.jsp?rev=574139&r1=574138&r2=574139&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/jetspeed-portal-resources/src/main/resources/webapp/decorations/layout/tigris/header.jsp (original)
+++ portals/jetspeed-2/trunk/jetspeed-portal-resources/src/main/resources/webapp/decorations/layout/tigris/header.jsp Sun Sep 9 22:40:49 2007
@@ -66,6 +66,7 @@
%>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html>
<head>
Modified: portals/jetspeed-2/trunk/jetspeed-portal-resources/src/main/resources/webapp/decorations/layout/tigris/header.vm
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/jetspeed-portal-resources/src/main/resources/webapp/decorations/layout/tigris/header.vm?rev=574139&r1=574138&r2=574139&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/jetspeed-portal-resources/src/main/resources/webapp/decorations/layout/tigris/header.vm (original)
+++ portals/jetspeed-2/trunk/jetspeed-portal-resources/src/main/resources/webapp/decorations/layout/tigris/header.vm Sun Sep 9 22:40:49 2007
@@ -1,9 +1,9 @@
#*
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements. See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements. See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
@@ -24,6 +24,7 @@
#* Add all template constants to the current context *#
#defineNavigationConstants()
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html>
<head>
#includeHeaderResource()
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org