Author: shinsuke
Date: Tue May 16 05:33:27 2006
New Revision: 406923
URL: http://svn.apache.org/viewcvs?rev=406923&view=rev
Log:
fixed some xhtml spec issues.
Modified:
portals/jetspeed-2/trunk/src/webapp/WEB-INF/templates/layout/html/columns/layout.vm
portals/jetspeed-2/trunk/src/webapp/WEB-INF/templates/layout/html/maximized/layout.vm
portals/jetspeed-2/trunk/src/webapp/WEB-INF/templates/layout/html/solo/layout.vm
portals/jetspeed-2/trunk/src/webapp/WEB-INF/templates/layout/html/tcolumns/layout.vm
portals/jetspeed-2/trunk/src/webapp/decorations/layout/blueocean/header.vm
Modified:
portals/jetspeed-2/trunk/src/webapp/WEB-INF/templates/layout/html/columns/layout.vm
URL:
http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/webapp/WEB-INF/templates/layout/html/columns/layout.vm?rev=406923&r1=406922&r2=406923&view=diff
==============================================================================
---
portals/jetspeed-2/trunk/src/webapp/WEB-INF/templates/layout/html/columns/layout.vm
(original)
+++
portals/jetspeed-2/trunk/src/webapp/WEB-INF/templates/layout/html/columns/layout.vm
Tue May 16 05:33:27 2006
@@ -1,3 +1,4 @@
+<?xml version="1.0"
#if($response.characterEncoding)encoding="$response.characterEncoding"#end?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
#*
Copyright 2004 The Apache Software Foundation
Modified:
portals/jetspeed-2/trunk/src/webapp/WEB-INF/templates/layout/html/maximized/layout.vm
URL:
http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/webapp/WEB-INF/templates/layout/html/maximized/layout.vm?rev=406923&r1=406922&r2=406923&view=diff
==============================================================================
---
portals/jetspeed-2/trunk/src/webapp/WEB-INF/templates/layout/html/maximized/layout.vm
(original)
+++
portals/jetspeed-2/trunk/src/webapp/WEB-INF/templates/layout/html/maximized/layout.vm
Tue May 16 05:33:27 2006
@@ -1,3 +1,4 @@
+<?xml version="1.0"
#if($response.characterEncoding)encoding="$response.characterEncoding"#end?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
#*
Copyright 2004 The Apache Software Foundation
Modified:
portals/jetspeed-2/trunk/src/webapp/WEB-INF/templates/layout/html/solo/layout.vm
URL:
http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/webapp/WEB-INF/templates/layout/html/solo/layout.vm?rev=406923&r1=406922&r2=406923&view=diff
==============================================================================
---
portals/jetspeed-2/trunk/src/webapp/WEB-INF/templates/layout/html/solo/layout.vm
(original)
+++
portals/jetspeed-2/trunk/src/webapp/WEB-INF/templates/layout/html/solo/layout.vm
Tue May 16 05:33:27 2006
@@ -1,3 +1,4 @@
+<?xml version="1.0"
#if($response.characterEncoding)encoding="$response.characterEncoding"#end?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
#*
Copyright 2004 The Apache Software Foundation
@@ -23,24 +24,25 @@
#set($f = $request.getAttribute("org.apache.jetspeed.maximized.Fragment"))
#set($decorator = $myPage.getDefaultDecorator($f.getType()))
-<html>
- <head>
- <base href="#BaseHref()">
- <meta http-equiv="Content-type" content="#ContentType()" />
- <meta http-equiv="Content-style-type" content="text/css" />
- #includeJavaScriptForHead()
-
- #IncludeStylesheets()
-
- #includeHeaderResource()
-
- <title>$!jetspeed.getTitle($jetspeed.getCurrentPortletEntity(), $f)</title>
-
- <meta name="version" content="#SiteVersionTag()">
- <meta name="keywords" content="" />
- <meta name="description" content="#PageDescription()" />
- </head>
- <body class="#PageBaseCSSClass()">
+<html>
+ <head>
+ <base href="#BaseHref()"/>
+ <meta http-equiv="Content-type" content="#ContentType()" />
+ <meta http-equiv="Content-style-type" content="text/css" />
+ <meta http-equiv="Content-Script-Type" content="text/javascript" />
+ #includeJavaScriptForHead()
+
+ #IncludeStylesheets()
+
+ #includeHeaderResource()
+
+ <title>$!jetspeed.getTitle($jetspeed.getCurrentPortletEntity(), $f)</title>
+
+ <meta name="version" content="#SiteVersionTag()"/>
+ <meta name="keywords" content="" />
+ <meta name="description" content="#PageDescription()" />
+ </head>
+ <body class="#PageBaseCSSClass()">
## get the decorated Portlet content
<div id="$renderResponse.namespace" class="portal-layout-solo">
Modified:
portals/jetspeed-2/trunk/src/webapp/WEB-INF/templates/layout/html/tcolumns/layout.vm
URL:
http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/webapp/WEB-INF/templates/layout/html/tcolumns/layout.vm?rev=406923&r1=406922&r2=406923&view=diff
==============================================================================
---
portals/jetspeed-2/trunk/src/webapp/WEB-INF/templates/layout/html/tcolumns/layout.vm
(original)
+++
portals/jetspeed-2/trunk/src/webapp/WEB-INF/templates/layout/html/tcolumns/layout.vm
Tue May 16 05:33:27 2006
@@ -1,19 +1,20 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
-#*
-Copyright 2004 The Apache Software Foundation
-
-Licensed 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
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-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.
-*#
+<?xml version="1.0"
#if($response.characterEncoding)encoding="$response.characterEncoding"#end?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
+#*
+Copyright 2004 The Apache Software Foundation
+
+Licensed 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
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+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.
+*#
#set($theme = $request.getAttribute("org.apache.jetspeed.theme"))
#set($sizes = $jetspeed.columnSizes)
#set($myPage = $jetspeed.page)
@@ -50,7 +51,7 @@
#set($columnLayout = $renderRequest.getAttribute("columnLayout"))
#set($decorationFactory = $renderRequest.getAttribute("decorationFactory"))
#set($rc =
$renderRequest.getAttribute("org.apache.jetspeed.request.RequestContext"))
-
+
<div id="$renderResponse.namespace" class="${layoutClass}
${layoutClass}-${layoutType}">
<table width="100%" cellspacing="0" cellpadding="0" >
#if($editing)
@@ -130,34 +131,34 @@
#set ($dcnt = 0)
#getBoolProperty($allowChangePortletDecorator $rootDecorator
"allow.change.portlet.decorator" true)
#end
-
- <tr>
- #set ($sizeIndex = 0)
- #foreach($column in $columnLayout.columns)
- #if ($sizes)
- #if ($sizeIndex < $sizes.size())
- <td valign='top' width='$sizes.get($sizeIndex)'/>
- #else
- <td valign="top">
- #end
- #else
- <td valign="top">
- #end
- #set ($sizeIndex = $sizeIndex + 1)
- <table width="100%" class="portal-layout-column
portal-layout-column-${layoutType}-${sizeIndex}">
- #foreach($f in $column)
- <tr>
- <td width="100%">
- #set($coords =
$columnLayout.getCoordinate($f))
- #set($col = $coords.x)
- #set($lastRow = $columnLayout.getLastRowNumber($col))
- #set($row = $coords.y)
+
+ <tr>
+ #set ($sizeIndex = 0)
+ #foreach($column in $columnLayout.columns)
+ #if ($sizes)
+ #if ($sizeIndex < $sizes.size())
+ <td valign='top' width='$sizes.get($sizeIndex)'/>
+ #else
+ <td valign="top">
+ #end
+ #else
+ <td valign="top">
+ #end
+ #set ($sizeIndex = $sizeIndex + 1)
+ <table width="100%" class="portal-layout-column
portal-layout-column-${layoutType}-${sizeIndex}">
+ #foreach($f in $column)
+ <tr>
+ <td width="100%">
+ #set($coords =
$columnLayout.getCoordinate($f))
+ #set($col = $coords.x)
+ #set($lastRow = $columnLayout.getLastRowNumber($col))
+ #set($row = $coords.y)
#if($editing)
- <div id="$f.id">
- <div style="position:relative; top:10px; left:0;
width:100%; height:100%">
- <div id="$f.id_toolBox" class="portlet-edit-bar">
- <table cellpadding="0" cellspacing="0">
- <tr>
+ <div id="$f.id">
+ <div style="position:relative; top:10px; left:0;
width:100%; height:100%">
+ <div id="$f.id_toolBox" class="portlet-edit-bar">
+ <table cellpadding="0" cellspacing="0">
+ <tr>
<td valign="top">
#set ($dcnt = $dcnt + 1)
@@ -208,34 +209,34 @@
#end
</form>
</td>
- </tr>
- </table>
- </div>
+ </tr>
+ </table>
+ </div>
#end
-
- ## get the decorated Portlet content
- $jetspeed.setCurrentFragment($f)
- #if($f.type == "portlet")
- #parse($f.decoration.template)
- #else
- $f.renderedContent
- #end
-
- #if($editing)
- </div>
- </div>
- #end
-
- </td>
- </tr>
- #end
- </table>
- </td>
- #end
- </tr>
-</table>
-</div>
-
+
+ ## get the decorated Portlet content
+ $jetspeed.setCurrentFragment($f)
+ #if($f.type == "portlet")
+ #parse($f.decoration.template)
+ #else
+ $f.renderedContent
+ #end
+
+ #if($editing)
+ </div>
+ </div>
+ #end
+
+ </td>
+ </tr>
+ #end
+ </table>
+ </td>
+ #end
+ </tr>
+</table>
+</div>
+
#if ($isRoot)
<form name='portletform' action="" method="post">
<input type='hidden' name='portlets'/>
Modified:
portals/jetspeed-2/trunk/src/webapp/decorations/layout/blueocean/header.vm
URL:
http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/webapp/decorations/layout/blueocean/header.vm?rev=406923&r1=406922&r2=406923&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/decorations/layout/blueocean/header.vm
(original)
+++ portals/jetspeed-2/trunk/src/webapp/decorations/layout/blueocean/header.vm
Tue May 16 05:33:27 2006
@@ -33,23 +33,24 @@
#set($portalFilter =
$JS2RequestContext.getRequestAttribute("org.apache.jetspeed.login.filter.PortalFilter"))
-<html>
+<html xmlns="http://www.w3.org/1999/xhtml";>
<head>
## include header resources immdiately after head and before base is reset
to the portal
## web application context path root; this implies that header resources
can not reliably
## employ relative urls to locate content
#includeHeaderResource()
- <base href="#BaseHref()">
+ <base href="#BaseHref()" />
<meta http-equiv="Content-type" content="#ContentType()" />
<meta http-equiv="Content-style-type" content="text/css" />
+ <meta http-equiv="Content-Script-Type" content="text/javascript" />
#includeJavaScriptForHead()
#IncludeStylesheets()
<title>#PageTitle()</title>
- <meta name="version" content="#SiteVersionTag()">
+ <meta name="version" content="#SiteVersionTag()" />
<meta name="keywords" content="" />
<meta name="description" content="#PageDescription()" />
</head>
@@ -63,7 +64,7 @@
<tr>
<td>
<div class="logo">
- <img src="#GetPageResource('images/logo.gif')" alt="Logo"
border="0"/>
+ <img src="#GetPageResource('images/logo.gif')" alt="Logo"
border="0" />
</div>
</td>
<td>
@@ -77,10 +78,10 @@
<span class="button"><a
href="#BaseHref()login/logout">$messages.getString("portal.loginform.logout")</a></span>
</div>
#else
- <form name="loginform" method="POST">
- <div>$messages.getString("portal.loginform.username") <input
type="text" size="10" name="org.apache.jetspeed.login.username" value=""></div>
- <div>$messages.getString("portal.loginform.password") <input
type="password" size="10" name="org.apache.jetspeed.login.password"></div>
- <div class="action"><span class="button"><a href="#"
onclick="document.loginform.submit();return
false;">$messages.getString("portal.loginform.login")</a></span></div>
+ <form name="loginform" method="post">
+ <div>$messages.getString("portal.loginform.username") <input
type="text" size="10" name="org.apache.jetspeed.login.username" value=""
/></div>
+ <div>$messages.getString("portal.loginform.password") <input
type="password" size="10" name="org.apache.jetspeed.login.password" /></div>
+ <div class="action"><span class="button"><a href="#"
onclick="document.loginform.submit();return false;"
onkeypress="document.loginform.submit();return
false;">$messages.getString("portal.loginform.login")</a></span></div>
#if($errorcode == 2) ## ERROR_INVALID_PASSWORD
<div>$messages.getString("portal.loginform.error.invalid_password")</div>
#end
@@ -95,7 +96,7 @@
<!-- Powered By -->
<div id="poweredby">
- <img src="#GetPageResource('images/poweredby.gif')" border="0"/>
+ <img src="#GetPageResource('images/poweredby.gif')" alt="Powerd by"
border="0" />
</div>
<!-- Top Tabs Menu -->
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
