portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject svn commit: r725977 [3/48] - in /portals/jetspeed-2/portal/trunk: ./ app-servers/security/jboss/src/java/META-INF/jboss-secsvc/ app-servers/security/jboss/src/java/org/apache/jetspeed/appservers/security/jboss/ applications/jetspeed/src/main/javascript...
Date Fri, 12 Dec 2008 12:07:04 GMT
Modified: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/system/customizer/folder.metadata
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/system/customizer/folder.metadata?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/system/customizer/folder.metadata (original)
+++ portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/system/customizer/folder.metadata Fri Dec 12 04:06:29 2008
@@ -1,23 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
 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
-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.
--->
-<folder hidden="true"
-    xmlns="http://portals.apache.org/jetspeed"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://portals.apache.org/jetspeed http://portals.apache.org/jetspeed-2/2.1/schemas/folder-metadata.xsd">
-  <security-constraints>
-    <security-constraints-ref>AEUV</security-constraints-ref>
-  </security-constraints>
-</folder>
+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.
+-->
+<folder hidden="true"
+    xmlns="http://portals.apache.org/jetspeed"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://portals.apache.org/jetspeed http://portals.apache.org/jetspeed-2/2.1/schemas/folder-metadata.xsd">
+  <security-constraints>
+    <security-constraints-ref>AEUV</security-constraints-ref>
+  </security-constraints>
+</folder>

Propchange: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/system/customizer/folder.metadata
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/system/customizer/portlet-selector.psml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/system/customizer/selector.psml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/system/customizer/selector.psml?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/system/customizer/selector.psml (original)
+++ portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/system/customizer/selector.psml Fri Dec 12 04:06:29 2008
@@ -1,24 +1,24 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
 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
-
-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.
+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.
 -->
-<page id="Selector.psml" hidden="true"
-    xmlns="http://portals.apache.org/jetspeed"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-    xsi:schemaLocation="http://portals.apache.org/jetspeed http://portals.apache.org/jetspeed-2/2.1/schemas/psml.xsd">
+<page id="Selector.psml" hidden="true"
+    xmlns="http://portals.apache.org/jetspeed"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+    xsi:schemaLocation="http://portals.apache.org/jetspeed http://portals.apache.org/jetspeed-2/2.1/schemas/psml.xsd">
     <defaults layout-decorator="tigris" portlet-decorator="tigris"/>
     <title>Selector</title>
     <short-title>Selector</short-title>

Propchange: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/system/customizer/selector.psml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/templates/initTemplatesLayoutCustomizerNormal.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/templates/initTemplatesLayoutNormal.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/templates/layout/html/columns/layout-help.vm
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/templates/layout/html/columns/layout-help.vm?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
Binary files - no diff available.

Propchange: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/templates/layout/html/columns/layout.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/templates/layout/html/solo/layout.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/templates/layout/html/solo/layout.vm
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/templates/layout/html/tcolumns/layout.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/templates/layout/html/tcolumns/layout.properties?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/templates/layout/html/tcolumns/layout.properties (original)
+++ portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/templates/layout/html/tcolumns/layout.properties Fri Dec 12 04:06:29 2008
@@ -3,16 +3,16 @@
 # 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
-# 
-# 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.
-
-id=tcolumns
-template.type=velocity
+# 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.
+
+id=tcolumns
+template.type=velocity
 template.extension=.vm
\ No newline at end of file

Propchange: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/templates/layout/html/tcolumns/layout.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/templates/layout/html/tcolumns/layout.vm
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/templates/layout/positionPortletCustomizer.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/templates/layout/wml/columns/layout.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/templates/layout/wml/columns/layout.vm
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/templates/layout/xhtml-basic/columns/layout-help.vm
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/templates/layout/xhtml-basic/columns/layout-help.vm?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/templates/layout/xhtml-basic/columns/layout-help.vm (original)
+++ portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/templates/layout/xhtml-basic/columns/layout-help.vm Fri Dec 12 04:06:29 2008
@@ -1,67 +1,67 @@
-#*
+#*
 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
-
-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 ($messages = $portletConfig.getResourceBundle($renderRequest.Locale))
-
-<!-- Header: $theme.pageLayoutDecoration.header) Footer: $theme.pageLayoutDecoration.footer -->
-
-#parse($theme.pageLayoutDecoration.header)
-
-<!-- Begin templates/layout/html/columns/layout-help.vm -->
-
-<div id="portlet-help" class="portlet-Jetspeed" >
-<table border="0" cellpadding="0" cellspacing="0" width="100%">
-  <tr>
-    <td class="PContent">
-    <h2>$messages.getString("portal.help.title")</h2>
-    <h3>$messages.getString("portal.page.help.title")</h3>
-    <p><img src="decorations/images/view.gif" alt="view" border="0" /> $messages.getString("portal.page.help.view")</p>
-    <p><img src="decorations/images/help.gif" alt="help" border="0" /> $messages.getString("portal.page.help.help")</p>
-    <p><img src="decorations/images/edit.gif" alt="edit" border="0" /> $messages.getString("portal.page.help.edit")</p>
-    <p><img src="decorations/layout/images/select.gif" alt="select" border="0" />
-       $messages.getString("portal.portlet.help.title")</p>
-    <h3>$messages.getString("portal.help.title")</h3>
-    <p><img src="decorations/images/minimized.gif" alt="minimize" border="0" />
-       $messages.getString("portal.portlet.help.minimize")</p>
-    <p><img src="decorations/images/maximized.gif" alt="maximize" border="0" />
-       $messages.getString("portal.portlet.help.maximize")</p>
-    <p><img src="decorations/images/restore.gif" alt="restore" border="0" />
-       $messages.getString("portal.portlet.help.restore")</p>
-    <p><img src="decorations/images/edit.gif" alt="edit" border="0" />
-       $messages.getString("portal.portlet.help.edit")</p>
-    <p><img src="decorations/images/print.gif" alt="print" border="0" />
-       $messages.getString("portal.portlet.help.print")</p>
-    <h4>$messages.getString("portal.portlet.help.edit.title")</h4>
-    <p><img src="decorations/images/close.gif" alt="close" border="0" />
-       $messages.getString("portal.portlet.help.close")</p>
-    <p><img src="decorations/layout/images/movePortletUp.gif" alt="move up" border="0" />
-       $messages.getString("portal.portlet.help.movePortletUp")</p>
-    <p><img src="decorations/layout/images/movePortletDown.gif" alt="move down" border="0" />
-       $messages.getString("portal.portlet.help.movePortletDown")</p>
-    <p><img src="decorations/layout/images/movePortletLeft.gif" alt="move left" border="0" />
-       $messages.getString("portal.portlet.help.movePortletLeft")</p>
-    <p><img src="decorations/layout/images/movePortletRight.gif" alt="move right" border="0" />
-       $messages.getString("portal.portlet.help.movePortletRight")</p>
-    </td>
-  </tr>
-</table>
-</div>
-
-<!-- End templates/layout/html/columns/layout-help.vm -->
-
-#parse($theme.pageLayoutDecoration.footer)
+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 ($messages = $portletConfig.getResourceBundle($renderRequest.Locale))
+
+<!-- Header: $theme.pageLayoutDecoration.header) Footer: $theme.pageLayoutDecoration.footer -->
+
+#parse($theme.pageLayoutDecoration.header)
+
+<!-- Begin templates/layout/html/columns/layout-help.vm -->
+
+<div id="portlet-help" class="portlet-Jetspeed" >
+<table border="0" cellpadding="0" cellspacing="0" width="100%">
+  <tr>
+    <td class="PContent">
+    <h2>$messages.getString("portal.help.title")</h2>
+    <h3>$messages.getString("portal.page.help.title")</h3>
+    <p><img src="decorations/images/view.gif" alt="view" border="0" /> $messages.getString("portal.page.help.view")</p>
+    <p><img src="decorations/images/help.gif" alt="help" border="0" /> $messages.getString("portal.page.help.help")</p>
+    <p><img src="decorations/images/edit.gif" alt="edit" border="0" /> $messages.getString("portal.page.help.edit")</p>
+    <p><img src="decorations/layout/images/select.gif" alt="select" border="0" />
+       $messages.getString("portal.portlet.help.title")</p>
+    <h3>$messages.getString("portal.help.title")</h3>
+    <p><img src="decorations/images/minimized.gif" alt="minimize" border="0" />
+       $messages.getString("portal.portlet.help.minimize")</p>
+    <p><img src="decorations/images/maximized.gif" alt="maximize" border="0" />
+       $messages.getString("portal.portlet.help.maximize")</p>
+    <p><img src="decorations/images/restore.gif" alt="restore" border="0" />
+       $messages.getString("portal.portlet.help.restore")</p>
+    <p><img src="decorations/images/edit.gif" alt="edit" border="0" />
+       $messages.getString("portal.portlet.help.edit")</p>
+    <p><img src="decorations/images/print.gif" alt="print" border="0" />
+       $messages.getString("portal.portlet.help.print")</p>
+    <h4>$messages.getString("portal.portlet.help.edit.title")</h4>
+    <p><img src="decorations/images/close.gif" alt="close" border="0" />
+       $messages.getString("portal.portlet.help.close")</p>
+    <p><img src="decorations/layout/images/movePortletUp.gif" alt="move up" border="0" />
+       $messages.getString("portal.portlet.help.movePortletUp")</p>
+    <p><img src="decorations/layout/images/movePortletDown.gif" alt="move down" border="0" />
+       $messages.getString("portal.portlet.help.movePortletDown")</p>
+    <p><img src="decorations/layout/images/movePortletLeft.gif" alt="move left" border="0" />
+       $messages.getString("portal.portlet.help.movePortletLeft")</p>
+    <p><img src="decorations/layout/images/movePortletRight.gif" alt="move right" border="0" />
+       $messages.getString("portal.portlet.help.movePortletRight")</p>
+    </td>
+  </tr>
+</table>
+</div>
+
+<!-- End templates/layout/html/columns/layout-help.vm -->
+
+#parse($theme.pageLayoutDecoration.footer)

Propchange: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/templates/layout/xhtml-basic/columns/layout-help.vm
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/templates/layout/xhtml-basic/columns/layout.vm
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/templates/layout/xhtml-basic/maximized/layout.vm
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/templates/templateLayoutCustomizer.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/ajax/portlet_apps.ajax
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/ajax/portlet_apps.ajax?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/ajax/portlet_apps.ajax (original)
+++ portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/ajax/portlet_apps.ajax Fri Dec 12 04:06:29 2008
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 #*
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -15,11 +15,11 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 *#
-<portletApps>
-#foreach($app in $result)
-  <portletApp>
-    <id>$app.id</id>
-    <name>$app.name</name>
-  </portletApp>
-#end
+<portletApps>
+#foreach($app in $result)
+  <portletApp>
+    <id>$app.id</id>
+    <name>$app.name</name>
+  </portletApp>
+#end
 </portletApps>
\ No newline at end of file

Propchange: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/ajax/portlet_apps.ajax
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/ajax/portlet_definitions.ajax
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/ajax/portlet_definitions.ajax?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/ajax/portlet_definitions.ajax (original)
+++ portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/ajax/portlet_definitions.ajax Fri Dec 12 04:06:29 2008
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 #*
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -15,13 +15,13 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 *#
-<portletDefinitions>
-#foreach($portlet in $result.portlets)
-	<portletDefinition>
-		<id>$portlet.uniqueName</id>
-		<name>$portlet.uniqueName</name>
-	</portletDefinition>
-#end
-</portletDefinitions>
-
-
+<portletDefinitions>
+#foreach($portlet in $result.portlets)
+	<portletDefinition>
+		<id>$portlet.uniqueName</id>
+		<name>$portlet.uniqueName</name>
+	</portletDefinition>
+#end
+</portletDefinitions>
+
+

Propchange: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/ajax/portlet_definitions.ajax
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/ajax/portlet_entities.ajax
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/ajax/portlet_entities.ajax?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/ajax/portlet_entities.ajax (original)
+++ portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/ajax/portlet_entities.ajax Fri Dec 12 04:06:29 2008
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 #*
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 *#
-<portletEntities>
-#foreach($entity in $result)
-	<portletEntity>
-		<id>$entity.id</id>
-	</portletEntity>
-#end
+<portletEntities>
+#foreach($entity in $result)
+	<portletEntity>
+		<id>$entity.id</id>
+	</portletEntity>
+#end
 </portletEntities>
\ No newline at end of file

Propchange: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/ajax/portlet_entities.ajax
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/ajax/portlet_entity.ajax
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/ajax/portlet_entity.ajax?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/ajax/portlet_entity.ajax (original)
+++ portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/ajax/portlet_entity.ajax Fri Dec 12 04:06:29 2008
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 #*
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -15,20 +15,20 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 *#
-<portletEntity>
-  <id>$result.id</id>
-
-  #foreach($pref in $result.fragment.preferences())
-   #if($pref.readOnly)
-	#set($readOnly = "true") 
-   #else 
-	#set($readOnly = "false")
-   #end  
-   <preference readOnly="${readOnly}">
-     <name>$pref.name</name>
-   #foreach($value in $pref.valueList)
-	 <value>$value</value>
-   #end
-   </preference>
-  #end
+<portletEntity>
+  <id>$result.id</id>
+
+  #foreach($pref in $result.fragment.preferences())
+   #if($pref.readOnly)
+	#set($readOnly = "true") 
+   #else 
+	#set($readOnly = "false")
+   #end  
+   <preference readOnly="${readOnly}">
+     <name>$pref.name</name>
+   #foreach($value in $pref.valueList)
+	 <value>$value</value>
+   #end
+   </preference>
+  #end
 </portletEntity>
\ No newline at end of file

Propchange: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/ajax/portlet_entity.ajax
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/blueocean/css/PortalAccordionContainer.css
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/blueocean/css/PortalAccordionContainer.css?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/blueocean/css/PortalAccordionContainer.css (original)
+++ portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/blueocean/css/PortalAccordionContainer.css Fri Dec 12 04:06:29 2008
@@ -1,16 +1,16 @@
-/*
+/*
 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
-
-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.
-*/
+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.
+*/

Propchange: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/blueocean/css/PortalAccordionContainer.css
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/blueocean/css/PortalBreadcrumbContainer.css
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/blueocean/css/PortalBreadcrumbContainer.css?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/blueocean/css/PortalBreadcrumbContainer.css (original)
+++ portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/blueocean/css/PortalBreadcrumbContainer.css Fri Dec 12 04:06:29 2008
@@ -1,16 +1,16 @@
-/*
+/*
 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
-
-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.
-*/
+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.
+*/

Propchange: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/blueocean/css/PortalBreadcrumbContainer.css
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/blueocean/css/PortalTabContainer.css
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/blueocean/css/PortalTaskBar.css
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/blueocean/css/PortalTaskBar.css?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/blueocean/css/PortalTaskBar.css (original)
+++ portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/blueocean/css/PortalTaskBar.css Fri Dec 12 04:06:29 2008
@@ -1,74 +1,74 @@
-/*
+/*
 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
-
-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.
-*/
-
-.dojoTaskBarItem {
-    background-image: url(../windowicons/blue-metalic-28.jpg);
-    background-repeat: no-repeat;
-	height: 28px;
-	/*width: 200px;*/
-    overflow: hidden;
-    padding-right: 8px;
-	font-size: 9pt;
-    cursor: pointer;
-}
-.portalTaskBarItemEndCap {
-    background-image: url(../windowicons/blue-metalic-endcap-28.jpg);
-    background-repeat: no-repeat;
-    height: 28px;
-	width: 4px;
-}
-.portalTaskBarItemTable {
-    display: inline;
-    padding: 0px;
-    margin: 0px 2px 6px 2px;
-    /*border-spacing: 0;*/  /* could get rid of cellspacing attribute if IE would support CSS2 better */
-}
-
-
-
-/*
-.dojoTaskBarItem {
-    background-image: url(../windoXXXXXXXXXX/blue-metalic-28.jpg);
-    background-repeat: no-repeat;
-	border: outset 2px;
-	display: inline;
-	margin-right: 5px;
-	cursor: pointer;
-	height: 28px;
-	width: 200px;
-	font-size: 8pt;
-	white-space: nowrap;
-	text-align: center;
-}
-*/
-
-.dojoTaskBarItem img {
-	vertical-align: top;
-	margin-right: 5px;
-	margin-left: 5px;
-    margin-top: 1px;
-    padding-top: 0px;
-	height: 16px;
-	width: 16px;
-}
-
-.dojoTaskBarItem a {
-	color: black;
-	text-decoration: none;
-}
-
-
+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.
+*/
+
+.dojoTaskBarItem {
+    background-image: url(../windowicons/blue-metalic-28.jpg);
+    background-repeat: no-repeat;
+	height: 28px;
+	/*width: 200px;*/
+    overflow: hidden;
+    padding-right: 8px;
+	font-size: 9pt;
+    cursor: pointer;
+}
+.portalTaskBarItemEndCap {
+    background-image: url(../windowicons/blue-metalic-endcap-28.jpg);
+    background-repeat: no-repeat;
+    height: 28px;
+	width: 4px;
+}
+.portalTaskBarItemTable {
+    display: inline;
+    padding: 0px;
+    margin: 0px 2px 6px 2px;
+    /*border-spacing: 0;*/  /* could get rid of cellspacing attribute if IE would support CSS2 better */
+}
+
+
+
+/*
+.dojoTaskBarItem {
+    background-image: url(../windoXXXXXXXXXX/blue-metalic-28.jpg);
+    background-repeat: no-repeat;
+	border: outset 2px;
+	display: inline;
+	margin-right: 5px;
+	cursor: pointer;
+	height: 28px;
+	width: 200px;
+	font-size: 8pt;
+	white-space: nowrap;
+	text-align: center;
+}
+*/
+
+.dojoTaskBarItem img {
+	vertical-align: top;
+	margin-right: 5px;
+	margin-left: 5px;
+    margin-top: 1px;
+    padding-top: 0px;
+	height: 16px;
+	width: 16px;
+}
+
+.dojoTaskBarItem a {
+	color: black;
+	text-decoration: none;
+}
+
+

Propchange: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/blueocean/css/PortalTaskBar.css
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/blueocean/css/desktop.css
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/blueocean/css/portal.css
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/blueocean/css/portal.css?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/blueocean/css/portal.css (original)
+++ portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/blueocean/css/portal.css Fri Dec 12 04:06:29 2008
@@ -1,44 +1,44 @@
-/*
+/*
 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
-
-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.
-*/
-
-/*  begin layout decorator blueocean additions  */
-
-.layout-blueocean #breadcrumbs {
-    margin:0px;
-    padding:3px;
-    position:absolute;
-    top:140px;
-    left:0px;
-    width:100%;
-    height:30px;
-    vertical-align:middle;
-
-    background-color: #ffffff;
-    font-family:Verdana,Helvetica,Arial,sans-serif;
-    voice-family: "\"}\"";
-    voice-family: inherit;
-    font-size: 10pt;
-}
-
-.layout-blueocean #masthead {
-    margin:0px;
-    padding:0px;
-    width:100%;
-    height:175px;
-}
-
-/*  end layout decorator blueocean additions  */
+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.
+*/
+
+/*  begin layout decorator blueocean additions  */
+
+.layout-blueocean #breadcrumbs {
+    margin:0px;
+    padding:3px;
+    position:absolute;
+    top:140px;
+    left:0px;
+    width:100%;
+    height:30px;
+    vertical-align:middle;
+
+    background-color: #ffffff;
+    font-family:Verdana,Helvetica,Arial,sans-serif;
+    voice-family: "\"}\"";
+    voice-family: inherit;
+    font-size: 10pt;
+}
+
+.layout-blueocean #masthead {
+    margin:0px;
+    padding:0px;
+    width:100%;
+    height:175px;
+}
+
+/*  end layout decorator blueocean additions  */

Propchange: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/blueocean/css/portal.css
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/blueocean/decorator-macros.vm
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/blueocean/decorator-macros.vm?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/blueocean/decorator-macros.vm (original)
+++ portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/blueocean/decorator-macros.vm Fri Dec 12 04:06:29 2008
@@ -1,245 +1,245 @@
-#*
-  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
-
-  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.
-*#
-#* define navigation constants *#
-#macro (defineNavigationConstants)
-  #set($LEFT_TO_RIGHT = "LeftToRight")
-  #set($RIGHT_TO_LEFT = "RightToLeft")
-  #set($TOP_TO_BOTTOM = "TopToBottom")
-  #set($BOTTOM_TO_TOP = "BottomToTop")
-  #set($TITLE_FIRST = "TitleFirst")
-  #set($TITLE_LAST = "TitleLast")
-  #set($BREADCRUMBS_STYLE = "BreadcrumbsStyle")
-#end
-
-#* include tabs navigation component *#
-#macro (includeTabsNavigation $_menu $_orientation)
-        <table border="0" cellpadding="0" cellspacing="0">
-          <tr>
-    #foreach($element in $_menu.elements.iterator())
-      #if($element.elementType == "option")
-        #set($tabTitle = $element.getTitle($preferedLocale))
-        #set($tabName = $element.getShortTitle($preferedLocale))
-        #if($_orientation == $LEFT_TO_RIGHT)
-          #if($element.isSelected($site))
-            <td class="LTabLeft" nowrap="true">&nbsp;</td>
-            <td class="LTab" align="center" valign="middle" nowrap="true" title="$!tabTitle">${tabName}</td>
-            <td class="LTabRight"  nowrap="true">&nbsp;</td>
-          #else
-            #set($tabUrl = $jetspeed.getAbsoluteUrl($element.url))
-            <td class="LTabLeftLow"  nowrap="true">&nbsp;</td>
-            <td class="LTabLow" align="center" valign="middle" nowrap="true" title="$!tabTitle"><a href="$tabUrl">${tabName}</a></td>
-            <td class="LTabRightLow"  nowrap="true">&nbsp;</td>
-          #end
-        #end
-      #end
-    #end
-          </tr>
-        </table>
-#end
-
-#* include links navigation component *#
-#macro (includeLinksNavigation $_menu $_orientation $_title $_style $_delimiter)
-  #set($__delimiter = $_delimiter)
-  #if(!$_delimiter || $_delimiter == "")
-    #if($_style != $BREADCRUMBS_STYLE)
-      #set($__delimiter = "&nbsp;")
-    #else
-      #set($__delimiter = "&nbsp;&gt;&gt;&nbsp;")
-    #end
-  #end
-  #set($menuTitle = $_menu.getTitle($preferedLocale))
-  #set($menuName = $_menu.getShortTitle($preferedLocale))
-  
-      <div class="FolderList">
-  #if($_title == $TITLE_FIRST)
-    #if($_orientation == $LEFT_TO_RIGHT)
-		
-        <span title="$!menuTitle">${menuName}&nbsp;</span>
-    #elseif($_orientation == $TOP_TO_BOTTOM)
-		
-        <div class="pagetitle" title="$!menuTitle">${menuName}</div>
-    #end
-  #end
-  #foreach($element in $_menu.elements.iterator())
-    #if($element.elementType == "option")
-      #set($linkTitle = $element.getTitle($preferedLocale))
-      #set($linkName = $element.getShortTitle($preferedLocale))
-      #set($linkUrl = $jetspeed.getAbsoluteUrl($element.url))
-      #if($_style != $BREADCRUMBS_STYLE || $element.type != "page" || $velocityCount < $_menu.elements.size())
-        #if($_orientation == $LEFT_TO_RIGHT)
-			
-        <span>
-        #elseif($_orientation == $TOP_TO_BOTTOM)
-			
-        <div>
-        #end
-        #if($element.type == "page")
-			
-          <a href="$linkUrl" class="LinkPage" title="$!linkTitle">${linkName}</a>
-        #elseif($element.type == "link")
-			
-          <a href="$linkUrl" class="Link" title="$!linkTitle">${linkName}</a>
-        #elseif($element.type == "folder")
-			
-          <a href="$linkUrl" class="LinkFolder" title="$!linkTitle">${linkName}</a>
-        #else
-			
-          <a href="$linkUrl" title="$!linkTitle">${linkName}</a>
-        #end
-        #if($_orientation == $LEFT_TO_RIGHT)
-        ${__delimiter}</span>
-        #elseif($_orientation == $TOP_TO_BOTTOM)
-			
-        </div>
-        #end
-      #else
-        #if($_orientation == $LEFT_TO_RIGHT)
-			
-        <span title="$!linkTitle">${linkName}&nbsp;</span>		
-        #elseif($_orientation == $TOP_TO_BOTTOM)
-			
-        <div title="$!linkTitle">${linkName}</div>
-        #end
-      #end
-    #elseif($element.elementType == "separator")
-      #set($separatorTitle = $element.getTitle($preferedLocale))
-      #set($separatorText = $element.getText($preferedLocale))
-      #if($_orientation == $LEFT_TO_RIGHT)
-		
-        <span title="$!separatorTitle">${separatorText}${__delimiter}</span>              
-      #elseif($_orientation == $TOP_TO_BOTTOM)
-		
-        <div class="pagetitle" title="$!separatorTitle">${separatorText}</div>              
-      #end
-    #end
-  #end
-  #if($_title == $TITLE_LAST)
-    #if($_orientation == $LEFT_TO_RIGHT)
-		
-        <span title="$!menuTitle">${menuName}&nbsp;</span>
-    #elseif($_orientation == $TOP_TO_BOTTOM)
-		
-        <div class="pagetitle" title="$!menuTitle">${menuName}</div>
-    #end
-  #end
-  
-      </div>
-#end
-
-#* include nested menu links navigation component *#
-#macro (includeNestedLinksWithIconNavigation $_menu $_orientation)
-  #set($menuTitle = $_menu.getTitle($preferedLocale))
-  #set($menuName = $_menu.getShortTitle($preferedLocale))
-  #if($menuName)
-              <div class="pagetitle" title="$!menuTitle">${menuName}</div>
-  #end
-              <div>
-  #foreach($element in $_menu.elements.iterator())
-    #if($element.elementType == "option")
-      #set($linkTitle = $element.getTitle($preferedLocale))
-      #set($linkName = $element.getShortTitle($preferedLocale))
-      #set($linkUrl = $jetspeed.getAbsoluteUrl($element.url))
-      #if($element.type == "page")
-                <div><a href="$linkUrl" class="LinkPage" title="$!linkTitle">${linkName}</a></div>
-      #elseif($element.type == "link")
-        #set($linkTarget = $element.target)
-                <div><a href="$linkUrl" target="$linkTarget" class="Link" title="$!linkTitle">${linkName}</a></div>	
-      #elseif($element.type == "folder")
-                <div><a href="$linkUrl" class="LinkFolder" title="$!linkTitle">$linkName</a></div>
-      #end
-    #elseif($element.elementType == "menu")
-      #includeNestedLinksWithIconNavigation($element $_orientation)
-    #elseif($element.elementType == "separator")
-      #set($separatorTitle = $element.getTitle($preferedLocale))
-      #set($separatorText = $element.getText($preferedLocale))
-                  <div class="pagetitle" title="$!separatorTitle">${separatorText}</div>              
-    #end
-  #end
-              </div>
-#end
-
-#* include top level menu links navigation component *#
-#macro (includeLinksWithIconNavigation $_menu $_orientation)
-  #set($rowStarted = false)
-  #set($elementsStarted = false)
-  #foreach($element in $_menu.elements.iterator())
-    #if($element.elementType == "option")
-      #if(!$rowStarted)
-        <tr>
-          <td>
-            <div class="toolgroup">
-              <div class="body">
-                <div class="FolderList">
-      #elseif(!$elementsStarted)
-              <div class="body">
-                <div class="FolderList">
-      #end
-      #set($linkTitle = $element.getTitle($preferedLocale))
-      #set($linkName = $element.getShortTitle($preferedLocale))
-      #set($linkUrl = $jetspeed.getAbsoluteUrl($element.url))
-      #if($element.type == "page")
-                  <div><a href="$linkUrl" class="LinkPage" title="$!linkTitle">${linkName}</a></div>
-      #elseif($element.type == "link")
-        #set($linkTarget = $element.target)
-                  <div><a href="$linkUrl" target="$!linkTarget" class="Link" title="$!linkTitle">${linkName}</a></div>	
-      #elseif($element.type == "folder")
-                  <div><a href="$linkUrl" class="LinkFolder" title="$!linkTitle">$linkName</a></div>
-      #end
-      #set($rowStarted = true)
-      #set($elementsStarted = true)
-    #elseif($element.elementType == "menu")
-      #if(!$rowStarted)
-        <tr>
-          <td>
-            <div class="toolgroup">
-              <div class="body">
-                <div class="FolderList">
-      #elseif(!$elementsStarted)
-              <div class="body">
-                <div class="FolderList">
-      #end
-      #includeNestedLinksWithIconNavigation($element $_orientation)
-      #set($rowStarted = true)
-      #set($elementsStarted = true)
-    #elseif($element.elementType == "separator")
-      #if(!$rowStarted)
-        <tr>
-          <td>
-            <div class="toolgroup">
-      #elseif($elementsStarted)
-                </div>
-              </div>
-      #end
-      #set($separatorTitle = $element.getTitle($preferedLocale))
-      #set($separatorText = $element.getText($preferedLocale))
-              <div class="label">
-                ${separatorText}
-              </div>
-      #set($rowStarted = true)
-      #set($elementsStarted = false)
-    #end
-  #end
-  #if($elementsStarted)
-                </div>
-              </div>
-  #end
-  #if($rowStarted)
-            </div>
-          </td>
-        </tr>
-  #end
-#end
+#*
+  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
+
+  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.
+*#
+#* define navigation constants *#
+#macro (defineNavigationConstants)
+  #set($LEFT_TO_RIGHT = "LeftToRight")
+  #set($RIGHT_TO_LEFT = "RightToLeft")
+  #set($TOP_TO_BOTTOM = "TopToBottom")
+  #set($BOTTOM_TO_TOP = "BottomToTop")
+  #set($TITLE_FIRST = "TitleFirst")
+  #set($TITLE_LAST = "TitleLast")
+  #set($BREADCRUMBS_STYLE = "BreadcrumbsStyle")
+#end
+
+#* include tabs navigation component *#
+#macro (includeTabsNavigation $_menu $_orientation)
+        <table border="0" cellpadding="0" cellspacing="0">
+          <tr>
+    #foreach($element in $_menu.elements.iterator())
+      #if($element.elementType == "option")
+        #set($tabTitle = $element.getTitle($preferedLocale))
+        #set($tabName = $element.getShortTitle($preferedLocale))
+        #if($_orientation == $LEFT_TO_RIGHT)
+          #if($element.isSelected($site))
+            <td class="LTabLeft" nowrap="true">&nbsp;</td>
+            <td class="LTab" align="center" valign="middle" nowrap="true" title="$!tabTitle">${tabName}</td>
+            <td class="LTabRight"  nowrap="true">&nbsp;</td>
+          #else
+            #set($tabUrl = $jetspeed.getAbsoluteUrl($element.url))
+            <td class="LTabLeftLow"  nowrap="true">&nbsp;</td>
+            <td class="LTabLow" align="center" valign="middle" nowrap="true" title="$!tabTitle"><a href="$tabUrl">${tabName}</a></td>
+            <td class="LTabRightLow"  nowrap="true">&nbsp;</td>
+          #end
+        #end
+      #end
+    #end
+          </tr>
+        </table>
+#end
+
+#* include links navigation component *#
+#macro (includeLinksNavigation $_menu $_orientation $_title $_style $_delimiter)
+  #set($__delimiter = $_delimiter)
+  #if(!$_delimiter || $_delimiter == "")
+    #if($_style != $BREADCRUMBS_STYLE)
+      #set($__delimiter = "&nbsp;")
+    #else
+      #set($__delimiter = "&nbsp;&gt;&gt;&nbsp;")
+    #end
+  #end
+  #set($menuTitle = $_menu.getTitle($preferedLocale))
+  #set($menuName = $_menu.getShortTitle($preferedLocale))
+  
+      <div class="FolderList">
+  #if($_title == $TITLE_FIRST)
+    #if($_orientation == $LEFT_TO_RIGHT)
+		
+        <span title="$!menuTitle">${menuName}&nbsp;</span>
+    #elseif($_orientation == $TOP_TO_BOTTOM)
+		
+        <div class="pagetitle" title="$!menuTitle">${menuName}</div>
+    #end
+  #end
+  #foreach($element in $_menu.elements.iterator())
+    #if($element.elementType == "option")
+      #set($linkTitle = $element.getTitle($preferedLocale))
+      #set($linkName = $element.getShortTitle($preferedLocale))
+      #set($linkUrl = $jetspeed.getAbsoluteUrl($element.url))
+      #if($_style != $BREADCRUMBS_STYLE || $element.type != "page" || $velocityCount < $_menu.elements.size())
+        #if($_orientation == $LEFT_TO_RIGHT)
+			
+        <span>
+        #elseif($_orientation == $TOP_TO_BOTTOM)
+			
+        <div>
+        #end
+        #if($element.type == "page")
+			
+          <a href="$linkUrl" class="LinkPage" title="$!linkTitle">${linkName}</a>
+        #elseif($element.type == "link")
+			
+          <a href="$linkUrl" class="Link" title="$!linkTitle">${linkName}</a>
+        #elseif($element.type == "folder")
+			
+          <a href="$linkUrl" class="LinkFolder" title="$!linkTitle">${linkName}</a>
+        #else
+			
+          <a href="$linkUrl" title="$!linkTitle">${linkName}</a>
+        #end
+        #if($_orientation == $LEFT_TO_RIGHT)
+        ${__delimiter}</span>
+        #elseif($_orientation == $TOP_TO_BOTTOM)
+			
+        </div>
+        #end
+      #else
+        #if($_orientation == $LEFT_TO_RIGHT)
+			
+        <span title="$!linkTitle">${linkName}&nbsp;</span>		
+        #elseif($_orientation == $TOP_TO_BOTTOM)
+			
+        <div title="$!linkTitle">${linkName}</div>
+        #end
+      #end
+    #elseif($element.elementType == "separator")
+      #set($separatorTitle = $element.getTitle($preferedLocale))
+      #set($separatorText = $element.getText($preferedLocale))
+      #if($_orientation == $LEFT_TO_RIGHT)
+		
+        <span title="$!separatorTitle">${separatorText}${__delimiter}</span>              
+      #elseif($_orientation == $TOP_TO_BOTTOM)
+		
+        <div class="pagetitle" title="$!separatorTitle">${separatorText}</div>              
+      #end
+    #end
+  #end
+  #if($_title == $TITLE_LAST)
+    #if($_orientation == $LEFT_TO_RIGHT)
+		
+        <span title="$!menuTitle">${menuName}&nbsp;</span>
+    #elseif($_orientation == $TOP_TO_BOTTOM)
+		
+        <div class="pagetitle" title="$!menuTitle">${menuName}</div>
+    #end
+  #end
+  
+      </div>
+#end
+
+#* include nested menu links navigation component *#
+#macro (includeNestedLinksWithIconNavigation $_menu $_orientation)
+  #set($menuTitle = $_menu.getTitle($preferedLocale))
+  #set($menuName = $_menu.getShortTitle($preferedLocale))
+  #if($menuName)
+              <div class="pagetitle" title="$!menuTitle">${menuName}</div>
+  #end
+              <div>
+  #foreach($element in $_menu.elements.iterator())
+    #if($element.elementType == "option")
+      #set($linkTitle = $element.getTitle($preferedLocale))
+      #set($linkName = $element.getShortTitle($preferedLocale))
+      #set($linkUrl = $jetspeed.getAbsoluteUrl($element.url))
+      #if($element.type == "page")
+                <div><a href="$linkUrl" class="LinkPage" title="$!linkTitle">${linkName}</a></div>
+      #elseif($element.type == "link")
+        #set($linkTarget = $element.target)
+                <div><a href="$linkUrl" target="$linkTarget" class="Link" title="$!linkTitle">${linkName}</a></div>	
+      #elseif($element.type == "folder")
+                <div><a href="$linkUrl" class="LinkFolder" title="$!linkTitle">$linkName</a></div>
+      #end
+    #elseif($element.elementType == "menu")
+      #includeNestedLinksWithIconNavigation($element $_orientation)
+    #elseif($element.elementType == "separator")
+      #set($separatorTitle = $element.getTitle($preferedLocale))
+      #set($separatorText = $element.getText($preferedLocale))
+                  <div class="pagetitle" title="$!separatorTitle">${separatorText}</div>              
+    #end
+  #end
+              </div>
+#end
+
+#* include top level menu links navigation component *#
+#macro (includeLinksWithIconNavigation $_menu $_orientation)
+  #set($rowStarted = false)
+  #set($elementsStarted = false)
+  #foreach($element in $_menu.elements.iterator())
+    #if($element.elementType == "option")
+      #if(!$rowStarted)
+        <tr>
+          <td>
+            <div class="toolgroup">
+              <div class="body">
+                <div class="FolderList">
+      #elseif(!$elementsStarted)
+              <div class="body">
+                <div class="FolderList">
+      #end
+      #set($linkTitle = $element.getTitle($preferedLocale))
+      #set($linkName = $element.getShortTitle($preferedLocale))
+      #set($linkUrl = $jetspeed.getAbsoluteUrl($element.url))
+      #if($element.type == "page")
+                  <div><a href="$linkUrl" class="LinkPage" title="$!linkTitle">${linkName}</a></div>
+      #elseif($element.type == "link")
+        #set($linkTarget = $element.target)
+                  <div><a href="$linkUrl" target="$!linkTarget" class="Link" title="$!linkTitle">${linkName}</a></div>	
+      #elseif($element.type == "folder")
+                  <div><a href="$linkUrl" class="LinkFolder" title="$!linkTitle">$linkName</a></div>
+      #end
+      #set($rowStarted = true)
+      #set($elementsStarted = true)
+    #elseif($element.elementType == "menu")
+      #if(!$rowStarted)
+        <tr>
+          <td>
+            <div class="toolgroup">
+              <div class="body">
+                <div class="FolderList">
+      #elseif(!$elementsStarted)
+              <div class="body">
+                <div class="FolderList">
+      #end
+      #includeNestedLinksWithIconNavigation($element $_orientation)
+      #set($rowStarted = true)
+      #set($elementsStarted = true)
+    #elseif($element.elementType == "separator")
+      #if(!$rowStarted)
+        <tr>
+          <td>
+            <div class="toolgroup">
+      #elseif($elementsStarted)
+                </div>
+              </div>
+      #end
+      #set($separatorTitle = $element.getTitle($preferedLocale))
+      #set($separatorText = $element.getText($preferedLocale))
+              <div class="label">
+                ${separatorText}
+              </div>
+      #set($rowStarted = true)
+      #set($elementsStarted = false)
+    #end
+  #end
+  #if($elementsStarted)
+                </div>
+              </div>
+  #end
+  #if($rowStarted)
+            </div>
+          </td>
+        </tr>
+  #end
+#end

Propchange: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/blueocean/decorator-macros.vm
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/blueocean/decoratordesktop.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/blueocean/desktop.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/blueocean/desktop.vm
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/blueocean/desktop_print.jsp
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/blueocean/desktop_print.jsp?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/blueocean/desktop_print.jsp (original)
+++ portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/blueocean/desktop_print.jsp Fri Dec 12 04:06:29 2008
@@ -1,64 +1,64 @@
-<%--
+<%--
 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
-
-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.
---%>
-<%@ page language="java" import="org.apache.jetspeed.desktop.JetspeedDesktopContext" session="true" %>
-<%@ page import="java.util.Enumeration"%>
-<%@ page import="org.apache.jetspeed.request.RequestContext"%>
-<%@ page import="org.apache.jetspeed.Jetspeed" %>
-<%@ page import="org.apache.jetspeed.PortalReservedParameters" %>
-<%@ page import="org.apache.jetspeed.om.page.Fragment" %>
-<%@ page import="org.apache.jetspeed.decoration.Theme" %>
-<%@ page import="org.apache.jetspeed.decoration.Decoration" %>
-<% 
-    JetspeedDesktopContext desktop = (JetspeedDesktopContext)request.getAttribute(JetspeedDesktopContext.DESKTOP_CONTEXT_ATTRIBUTE);
-    RequestContext requestContext = (RequestContext)request.getAttribute(RequestContext.REQUEST_PORTALENV);
-
-    String layoutStyleClass = "layout-" + desktop.getLayoutDecorationName();
-%>
-<html> <!-- .jsp --> <!-- NOTE: do not use strict doctype - see dojo svn log for FloatingPane.js -->
-<head>
-<meta http-equiv="Content-type" content="text/html; charset=UTF-8" />
-<meta http-equiv="Content-style-type" content="text/css" />
-
-<%= desktop.getHeaderResource().getNamedContentForPrefix( "header.dojo" )%>
-
-<%= desktop.getHeaderResource().getContent()%>
-
-<script language="JavaScript" type="text/javascript">
-    function notifyRetrieveAllMenusFinished()
-    {
-        dojo.debug( "window.notifyRetrieveAllMenusFinished" );
-    }
-    dojo.event.connect( jetspeed, "notifyRetrieveAllMenusFinished", "notifyRetrieveAllMenusFinished" );
-</script>
-</head>
-
-<body class="<%= layoutStyleClass %>">
-<!-- Start Jetspeed Page -->
-<div class="<%= layoutStyleClass %>" id="jetspeedPage">
-<table cellpadding="0" cellspacing="0" border="0" width="100%" id="main">
-<tr>
-<td id="jetspeedDesktopCell">
-<!-- Start Jetspeed Desktop -->
-<div class="<%= layoutStyleClass %>" id="jetspeedDesktop"></div>
-<!-- End Jetspeed Desktop -->
-</td>
-</tr>
-</table>
-</div>
-<!-- End Jetspeed Page -->
-</body>
-</html>
+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.
+--%>
+<%@ page language="java" import="org.apache.jetspeed.desktop.JetspeedDesktopContext" session="true" %>
+<%@ page import="java.util.Enumeration"%>
+<%@ page import="org.apache.jetspeed.request.RequestContext"%>
+<%@ page import="org.apache.jetspeed.Jetspeed" %>
+<%@ page import="org.apache.jetspeed.PortalReservedParameters" %>
+<%@ page import="org.apache.jetspeed.om.page.Fragment" %>
+<%@ page import="org.apache.jetspeed.decoration.Theme" %>
+<%@ page import="org.apache.jetspeed.decoration.Decoration" %>
+<% 
+    JetspeedDesktopContext desktop = (JetspeedDesktopContext)request.getAttribute(JetspeedDesktopContext.DESKTOP_CONTEXT_ATTRIBUTE);
+    RequestContext requestContext = (RequestContext)request.getAttribute(RequestContext.REQUEST_PORTALENV);
+
+    String layoutStyleClass = "layout-" + desktop.getLayoutDecorationName();
+%>
+<html> <!-- .jsp --> <!-- NOTE: do not use strict doctype - see dojo svn log for FloatingPane.js -->
+<head>
+<meta http-equiv="Content-type" content="text/html; charset=UTF-8" />
+<meta http-equiv="Content-style-type" content="text/css" />
+
+<%= desktop.getHeaderResource().getNamedContentForPrefix( "header.dojo" )%>
+
+<%= desktop.getHeaderResource().getContent()%>
+
+<script language="JavaScript" type="text/javascript">
+    function notifyRetrieveAllMenusFinished()
+    {
+        dojo.debug( "window.notifyRetrieveAllMenusFinished" );
+    }
+    dojo.event.connect( jetspeed, "notifyRetrieveAllMenusFinished", "notifyRetrieveAllMenusFinished" );
+</script>
+</head>
+
+<body class="<%= layoutStyleClass %>">
+<!-- Start Jetspeed Page -->
+<div class="<%= layoutStyleClass %>" id="jetspeedPage">
+<table cellpadding="0" cellspacing="0" border="0" width="100%" id="main">
+<tr>
+<td id="jetspeedDesktopCell">
+<!-- Start Jetspeed Desktop -->
+<div class="<%= layoutStyleClass %>" id="jetspeedDesktop"></div>
+<!-- End Jetspeed Desktop -->
+</td>
+</tr>
+</table>
+</div>
+<!-- End Jetspeed Page -->
+</body>
+</html>

Propchange: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/blueocean/desktop_print.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/blueocean/desktop_print.vm
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/blueocean/desktop_print.vm?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/blueocean/desktop_print.vm (original)
+++ portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/blueocean/desktop_print.vm Fri Dec 12 04:06:29 2008
@@ -1,50 +1,50 @@
-#*
+#*
 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
-
-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.
-*#
-<html> <!-- .vm --> <!-- NOTE: do not use strict doctype - see dojo svn log for FloatingPane.js -->
-<head>
-<meta http-equiv="Content-type" content="text/html; charset=UTF-8" />
-<meta http-equiv="Content-style-type" content="text/css" />
-
-#desktopIncludeDojoHeaderContent()
-
-#desktopIncludeHeaderContent()
-
-<script language="JavaScript" type="text/javascript">
-    function notifyRetrieveAllMenusFinished()
-    {
-        dojo.debug( "window.notifyRetrieveAllMenusFinished" );
-    }
-    dojo.event.connect( jetspeed, "notifyRetrieveAllMenusFinished", "notifyRetrieveAllMenusFinished" );
-</script>
-</head>
-
-<body class="layout-${jetspeedDesktop.getLayoutDecorationName()}">
-<!-- Start Jetspeed Page -->
-<div class="layout-${jetspeedDesktop.getLayoutDecorationName()}" id="jetspeedPage">
-<table cellpadding="0" cellspacing="0" border="0" width="100%" id="main">
-<tr>
-<td id="jetspeedDesktopCell">
-<!-- Start Jetspeed Desktop -->
-<div class="layout-${jetspeedDesktop.getLayoutDecorationName()}" id="jetspeedDesktop"></div>
-<!-- End Jetspeed Desktop -->
-</td>
-</tr>
-</table>
-</div>
-<!-- End Jetspeed Page -->
-</body>
-</html>
+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.
+*#
+<html> <!-- .vm --> <!-- NOTE: do not use strict doctype - see dojo svn log for FloatingPane.js -->
+<head>
+<meta http-equiv="Content-type" content="text/html; charset=UTF-8" />
+<meta http-equiv="Content-style-type" content="text/css" />
+
+#desktopIncludeDojoHeaderContent()
+
+#desktopIncludeHeaderContent()
+
+<script language="JavaScript" type="text/javascript">
+    function notifyRetrieveAllMenusFinished()
+    {
+        dojo.debug( "window.notifyRetrieveAllMenusFinished" );
+    }
+    dojo.event.connect( jetspeed, "notifyRetrieveAllMenusFinished", "notifyRetrieveAllMenusFinished" );
+</script>
+</head>
+
+<body class="layout-${jetspeedDesktop.getLayoutDecorationName()}">
+<!-- Start Jetspeed Page -->
+<div class="layout-${jetspeedDesktop.getLayoutDecorationName()}" id="jetspeedPage">
+<table cellpadding="0" cellspacing="0" border="0" width="100%" id="main">
+<tr>
+<td id="jetspeedDesktopCell">
+<!-- Start Jetspeed Desktop -->
+<div class="layout-${jetspeedDesktop.getLayoutDecorationName()}" id="jetspeedDesktop"></div>
+<!-- End Jetspeed Desktop -->
+</td>
+</tr>
+</table>
+</div>
+<!-- End Jetspeed Page -->
+</body>
+</html>

Propchange: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/blueocean/desktop_print.vm
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/blueocean/footer.vm
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/blueocean/footer.vm?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/blueocean/footer.vm (original)
+++ portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/blueocean/footer.vm Fri Dec 12 04:06:29 2008
@@ -1,26 +1,26 @@
-#*
+#*
 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
-
-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.
-*#
-
-          </td>
-        </tr>
-      </table> 
-    </div>
-     <p>
-      <img src="#GetPageResource('images/Jetspeed_WhiteOnBlue_pb.jpg')" alt="Jetspeed 2 Powered" border="0" />
-    </p>   
-  </body>
-</html>
+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.
+*#
+
+          </td>
+        </tr>
+      </table> 
+    </div>
+     <p>
+      <img src="#GetPageResource('images/Jetspeed_WhiteOnBlue_pb.jpg')" alt="Jetspeed 2 Powered" border="0" />
+    </p>   
+  </body>
+</html>

Propchange: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/blueocean/footer.vm
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/blueocean/header.vm
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/blueocean/header.vm?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/blueocean/header.vm (original)
+++ portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/blueocean/header.vm Fri Dec 12 04:06:29 2008
@@ -1,162 +1,162 @@
-#*
-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
-
-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.
-*#
-
-#* Add the current layouts configuration values to the context *#
-#defineLayoutObjects()
-
-#* Loads our custom macros *#
-#parse($layoutDecoration.getResource("decorator-macros.vm"))
-
-#* Add all template constants to the current context *#
-#defineNavigationConstants()
-
-#* Username *#
-#set($username = $JS2RequestContext.request.remoteUser)
-
-#* Login Error Code *#
-#set($errorcode = $JS2RequestContext.getSessionAttribute("org.apache.jetspeed.login.errorcode"))
-
-#* check Portal Filter *#
-#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()
-
-    <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="keywords" content="" />
-    <meta name="description" content="#PageDescription()" />
-  </head>
-  <body class="#PageBaseCSSClass()">
-<!--  BEGIN: layout/html/blueocean/decorator.vm -->
-    <div class="#PageBaseCSSClass()">
-
-      <div id="masthead">
-<!-- Banner Content -->
-      <div id="banner">
-        <table>
-          <tr>
-            <td>
-              <div>
-              <img src="#GetPageResource('images/Jetspeed_white_med.png')" alt="Logo" border="0" />
-              </div>
-            </td>
-            <td>
-              <div class="info">
-## For PortalFilter
-#if($portalFilter)
-#if($username)
-                <div>$messages.getString("portal.loginform.username") $username</div>
-                <div class="action">
-                  <span class="button"><a href="#BaseHref()portal/my-account.psml">$messages.getString("portal.loginform.change_password")</a></span>
-                  <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;" 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
-                </form>
-#end
-#end
-              </div>
-            </td>
-          </tr>
-        </table>
-      </div>
-
-<!-- Powered By -->
-      <div id="poweredby">
-        <img src="#GetPageResource('images/poweredby.gif')" alt="Powerd by" border="0" />
-      </div>
-
-<!-- Top Tabs Menu -->
-#set($pagesStandardMenu = $site.getMenu("pages"))
-#if(!$pagesStandardMenu.empty)
-      <div class="tabs">
-#includeTabsNavigation($pagesStandardMenu $LEFT_TO_RIGHT)
-      </div>
-#end
-
-## <!-- Back Navigation -->
-##       <div id="breadcrumbs">
-## #set($backStandardMenu = $site.getMenu("back"))
-## #if(!$backStandardMenu.empty)
-## #includeLinksNavigation($backStandardMenu $LEFT_TO_RIGHT $TITLE_FIRST "" "")
-## #else
-##         &nbsp;
-## #end
-##       </div>
-
-<!-- Breadcrumbs Back Navigation -->
-      <div id="breadcrumbs">
-#set($breadcrumbsStandardMenu = $site.getMenu("breadcrumbs"))
-#if(!$breadcrumbsStandardMenu.empty)
-#includeLinksNavigation($breadcrumbsStandardMenu $LEFT_TO_RIGHT "" $BREADCRUMBS_STYLE "")
-#else
-        &nbsp;
-#end
-     <!-- Page Action Bar -->
-##    <span style="position:absolute;right:5em">$jetspeed.renderPortletEntity("theClock", "j2-admin::DateTimePortlet")</span>
-#if($portalFilter)
-<span style="position:absolute;right:5em"></span>   
-#else
-#if ($request.getUserPrincipal())
-<span style="position:absolute;right:5em"><a href="#BaseHref()login/logout">Logout</a></span>   
-#end 
-#end
-     #PageActionBar()
-
-      </div>
-      </div>
-
-<!-- Content Table -->
-      <table cellpadding="0" cellspacing="0" border="0" width="100%" id="main">
-        <tr>
-
-<!-- Left Navigations Menu Table Data -->
-#set($navigationsStandardMenu = $site.getMenu("navigations"))
-
-#if(!$navigationsStandardMenu.empty)
-          <td valign="top" id="leftcol" >
-            <div id="navcolumn">
-              <table cellpadding="0" cellspacing="4" border="0" width="100%">
-#includeLinksWithIconNavigation($navigationsStandardMenu $TOP_TO_BOTTOM)
-              </table>
-            </div>
-          </td>
-#end
-
-<!-- Content Table Data -->
-          <td nowrap valign="top">
-  
-## $jetspeed.include($jetspeed.currentFragment)
-
-<!--  END: layout/html/blueocean/decorator.vm -->
+#*
+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
+
+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.
+*#
+
+#* Add the current layouts configuration values to the context *#
+#defineLayoutObjects()
+
+#* Loads our custom macros *#
+#parse($layoutDecoration.getResource("decorator-macros.vm"))
+
+#* Add all template constants to the current context *#
+#defineNavigationConstants()
+
+#* Username *#
+#set($username = $JS2RequestContext.request.remoteUser)
+
+#* Login Error Code *#
+#set($errorcode = $JS2RequestContext.getSessionAttribute("org.apache.jetspeed.login.errorcode"))
+
+#* check Portal Filter *#
+#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()
+
+    <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="keywords" content="" />
+    <meta name="description" content="#PageDescription()" />
+  </head>
+  <body class="#PageBaseCSSClass()">
+<!--  BEGIN: layout/html/blueocean/decorator.vm -->
+    <div class="#PageBaseCSSClass()">
+
+      <div id="masthead">
+<!-- Banner Content -->
+      <div id="banner">
+        <table>
+          <tr>
+            <td>
+              <div>
+              <img src="#GetPageResource('images/Jetspeed_white_med.png')" alt="Logo" border="0" />
+              </div>
+            </td>
+            <td>
+              <div class="info">
+## For PortalFilter
+#if($portalFilter)
+#if($username)
+                <div>$messages.getString("portal.loginform.username") $username</div>
+                <div class="action">
+                  <span class="button"><a href="#BaseHref()portal/my-account.psml">$messages.getString("portal.loginform.change_password")</a></span>
+                  <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;" 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
+                </form>
+#end
+#end
+              </div>
+            </td>
+          </tr>
+        </table>
+      </div>
+
+<!-- Powered By -->
+      <div id="poweredby">
+        <img src="#GetPageResource('images/poweredby.gif')" alt="Powerd by" border="0" />
+      </div>
+
+<!-- Top Tabs Menu -->
+#set($pagesStandardMenu = $site.getMenu("pages"))
+#if(!$pagesStandardMenu.empty)
+      <div class="tabs">
+#includeTabsNavigation($pagesStandardMenu $LEFT_TO_RIGHT)
+      </div>
+#end
+
+## <!-- Back Navigation -->
+##       <div id="breadcrumbs">
+## #set($backStandardMenu = $site.getMenu("back"))
+## #if(!$backStandardMenu.empty)
+## #includeLinksNavigation($backStandardMenu $LEFT_TO_RIGHT $TITLE_FIRST "" "")
+## #else
+##         &nbsp;
+## #end
+##       </div>
+
+<!-- Breadcrumbs Back Navigation -->
+      <div id="breadcrumbs">
+#set($breadcrumbsStandardMenu = $site.getMenu("breadcrumbs"))
+#if(!$breadcrumbsStandardMenu.empty)
+#includeLinksNavigation($breadcrumbsStandardMenu $LEFT_TO_RIGHT "" $BREADCRUMBS_STYLE "")
+#else
+        &nbsp;
+#end
+     <!-- Page Action Bar -->
+##    <span style="position:absolute;right:5em">$jetspeed.renderPortletEntity("theClock", "j2-admin::DateTimePortlet")</span>
+#if($portalFilter)
+<span style="position:absolute;right:5em"></span>   
+#else
+#if ($request.getUserPrincipal())
+<span style="position:absolute;right:5em"><a href="#BaseHref()login/logout">Logout</a></span>   
+#end 
+#end
+     #PageActionBar()
+
+      </div>
+      </div>
+
+<!-- Content Table -->
+      <table cellpadding="0" cellspacing="0" border="0" width="100%" id="main">
+        <tr>
+
+<!-- Left Navigations Menu Table Data -->
+#set($navigationsStandardMenu = $site.getMenu("navigations"))
+
+#if(!$navigationsStandardMenu.empty)
+          <td valign="top" id="leftcol" >
+            <div id="navcolumn">
+              <table cellpadding="0" cellspacing="4" border="0" width="100%">
+#includeLinksWithIconNavigation($navigationsStandardMenu $TOP_TO_BOTTOM)
+              </table>
+            </div>
+          </td>
+#end
+
+<!-- Content Table Data -->
+          <td nowrap valign="top">
+  
+## $jetspeed.include($jetspeed.currentFragment)
+
+<!--  END: layout/html/blueocean/decorator.vm -->

Propchange: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/blueocean/header.vm
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/blueocean/resources/Messages.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/blueocean/resources/Messages_en.properties
------------------------------------------------------------------------------
    svn:eol-style = native



---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org


Mime
View raw message