You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by sh...@apache.org on 2007/05/28 02:50:37 UTC
svn commit: r542064 - in
/portals/jetspeed-2/trunk/src/webapp/decorations/layout:
sunflower/decorator-macros.vm sunflower/header.vm
thesolution/decorator-macros.vm thesolution/header.vm
Author: shinsuke
Date: Sun May 27 17:50:36 2007
New Revision: 542064
URL: http://svn.apache.org/viewvc?view=rev&rev=542064
Log:
removed #*...*# and cr.
Modified:
portals/jetspeed-2/trunk/src/webapp/decorations/layout/sunflower/decorator-macros.vm
portals/jetspeed-2/trunk/src/webapp/decorations/layout/sunflower/header.vm
portals/jetspeed-2/trunk/src/webapp/decorations/layout/thesolution/decorator-macros.vm
portals/jetspeed-2/trunk/src/webapp/decorations/layout/thesolution/header.vm
Modified: portals/jetspeed-2/trunk/src/webapp/decorations/layout/sunflower/decorator-macros.vm
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/decorations/layout/sunflower/decorator-macros.vm?view=diff&rev=542064&r1=542063&r2=542064
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/decorations/layout/sunflower/decorator-macros.vm (original)
+++ portals/jetspeed-2/trunk/src/webapp/decorations/layout/sunflower/decorator-macros.vm Sun May 27 17:50:36 2007
@@ -173,18 +173,14 @@
#foreach($element in $_menu.elements.iterator())
#if($element.elementType == "option")
#if(!$rowStarted)
-#*
- <tr>
- <td>
- <div class="toolgroup">
- <div class="body">
- <div class="FolderList">
-*#
+## <tr>
+## <td>
+## <div class="toolgroup">
+## <div class="body">
+## <div class="FolderList">
#elseif(!$elementsStarted)
-#*
- <div class="body">
- <div class="FolderList">
-*#
+## <div class="body">
+## <div class="FolderList">
#end
#set($linkTitle = $element.getTitle($preferedLocale))
#set($linkName = $element.getShortTitle($preferedLocale))
@@ -201,58 +197,44 @@
#set($elementsStarted = true)
#elseif($element.elementType == "menu")
#if(!$rowStarted)
-#*
- <tr>
- <td>
- <div class="toolgroup">
- <div class="body">
- <div class="FolderList">
-*#
+## <tr>
+## <td>
+## <div class="toolgroup">
+## <div class="body">
+## <div class="FolderList">
#elseif(!$elementsStarted)
-#*
- <div class="body">
- <div class="FolderList">
-*#
+## <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">
-*#
+## <tr>
+## <td>
+## <div class="toolgroup">
#elseif($elementsStarted)
-#*
- </div>
- </div>
-*#
+## </div>
+## </div>
#end
#set($separatorTitle = $element.getTitle($preferedLocale))
#set($separatorText = $element.getText($preferedLocale))
<h2>${separatorText}</h2>
-#*
- <div class="label">
- ${separatorText}
- </div>
-*#
+## <div class="label">
+## ${separatorText}
+## </div>
#set($rowStarted = true)
#set($elementsStarted = false)
#end
#end
#if($elementsStarted)
-#*
- </div>
- </div>
-*#
+## </div>
+## </div>
#end
#if($rowStarted)
-#*
- </div>
- </td>
- </tr>
-*#
+## </div>
+## </td>
+## </tr>
#end
#end
Modified: portals/jetspeed-2/trunk/src/webapp/decorations/layout/sunflower/header.vm
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/decorations/layout/sunflower/header.vm?view=diff&rev=542064&r1=542063&r2=542064
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/decorations/layout/sunflower/header.vm (original)
+++ portals/jetspeed-2/trunk/src/webapp/decorations/layout/sunflower/header.vm Sun May 27 17:50:36 2007
@@ -1,91 +1,91 @@
-#*
+#*
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.
-*#
-
-#*
-This original design comes from Open Source Web Design.
- http://www.oswd.org/design/preview/id/2904
- Modified by Shinsuke Sugaya <sh...@yahoo.co.jp>
-*#
-
-#* 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()
-
-<html>
- <head>
- #includeHeaderResource()
-
- <meta http-equiv="Content-type" content="#ContentType()" />
- <meta http-equiv="Content-style-type" content="text/css" />
-
- #includeJavaScriptForHead()
- #IncludeStylesheets()
-
- <title>#PageTitle()</title>
-
- <meta name="version" content="#SiteVersionTag()">
- <meta name="keywords" content="" />
- <meta name="description" content="#PageDescription()" />
- </head>
-
-<body class="#PageBaseCSSClass()">
-<div class="#PageBaseCSSClass()">
-<div class="thebox">
- <div class="logo"><a href="#BaseHref()">Jetspeed</a></div>
-
-<!-- Top Tabs Menu -->
-#set($pagesStandardMenu = $site.getMenu("pages"))
-#if(!$pagesStandardMenu.empty)
-#includeTabsNavigation($pagesStandardMenu $LEFT_TO_RIGHT)
-#end
-
- <div class="side">
-
-<!-- Left Navigations Menu Table Data -->
-#set($navigationsStandardMenu = $site.getMenu("navigations"))
-
-#if(!$navigationsStandardMenu.empty)
-#includeLinksWithIconNavigation($navigationsStandardMenu $TOP_TO_BOTTOM)
-#end
-
- </div>
-
- <div class="content">
-
-<div id="breadcrumbs">
-#set($breadcrumbsStandardMenu = $site.getMenu("breadcrumbs"))
-#if(!$breadcrumbsStandardMenu.empty)
-#includeLinksNavigation($breadcrumbsStandardMenu $LEFT_TO_RIGHT "" $BREADCRUMBS_STYLE "")
-#else
-
-#end
- <!-- Page Action Bar -->
-## <span style="position:absolute;right:5em">$jetspeed.renderPortletEntity("theClock", "j2-admin::DateTimePortlet")</span>
-#if ($request.getUserPrincipal())
-<span style="position:absolute;right:5em"><a href="#BaseHref()login/logout">Logout</a></span>
-#end
- #PageActionBar()
-
-</div>
-
-
-<!-- END: layout/html/sunflower/decorator.vm -->
+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.
+*#
+
+#*
+This original design comes from Open Source Web Design.
+ http://www.oswd.org/design/preview/id/2904
+ Modified by Shinsuke Sugaya <sh...@yahoo.co.jp>
+*#
+
+#* 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()
+
+<html>
+ <head>
+ #includeHeaderResource()
+
+ <meta http-equiv="Content-type" content="#ContentType()" />
+ <meta http-equiv="Content-style-type" content="text/css" />
+
+ #includeJavaScriptForHead()
+ #IncludeStylesheets()
+
+ <title>#PageTitle()</title>
+
+ <meta name="version" content="#SiteVersionTag()">
+ <meta name="keywords" content="" />
+ <meta name="description" content="#PageDescription()" />
+ </head>
+
+<body class="#PageBaseCSSClass()">
+<div class="#PageBaseCSSClass()">
+<div class="thebox">
+ <div class="logo"><a href="#BaseHref()">Jetspeed</a></div>
+
+<!-- Top Tabs Menu -->
+#set($pagesStandardMenu = $site.getMenu("pages"))
+#if(!$pagesStandardMenu.empty)
+#includeTabsNavigation($pagesStandardMenu $LEFT_TO_RIGHT)
+#end
+
+ <div class="side">
+
+<!-- Left Navigations Menu Table Data -->
+#set($navigationsStandardMenu = $site.getMenu("navigations"))
+
+#if(!$navigationsStandardMenu.empty)
+#includeLinksWithIconNavigation($navigationsStandardMenu $TOP_TO_BOTTOM)
+#end
+
+ </div>
+
+ <div class="content">
+
+<div id="breadcrumbs">
+#set($breadcrumbsStandardMenu = $site.getMenu("breadcrumbs"))
+#if(!$breadcrumbsStandardMenu.empty)
+#includeLinksNavigation($breadcrumbsStandardMenu $LEFT_TO_RIGHT "" $BREADCRUMBS_STYLE "")
+#else
+
+#end
+ <!-- Page Action Bar -->
+## <span style="position:absolute;right:5em">$jetspeed.renderPortletEntity("theClock", "j2-admin::DateTimePortlet")</span>
+#if ($request.getUserPrincipal())
+<span style="position:absolute;right:5em"><a href="#BaseHref()login/logout">Logout</a></span>
+#end
+ #PageActionBar()
+
+</div>
+
+
+<!-- END: layout/html/sunflower/decorator.vm -->
Modified: portals/jetspeed-2/trunk/src/webapp/decorations/layout/thesolution/decorator-macros.vm
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/decorations/layout/thesolution/decorator-macros.vm?view=diff&rev=542064&r1=542063&r2=542064
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/decorations/layout/thesolution/decorator-macros.vm (original)
+++ portals/jetspeed-2/trunk/src/webapp/decorations/layout/thesolution/decorator-macros.vm Sun May 27 17:50:36 2007
@@ -173,18 +173,14 @@
#foreach($element in $_menu.elements.iterator())
#if($element.elementType == "option")
#if(!$rowStarted)
-#*
- <tr>
- <td>
- <div class="toolgroup">
- <div class="body">
- <div class="FolderList">
-*#
+## <tr>
+## <td>
+## <div class="toolgroup">
+## <div class="body">
+## <div class="FolderList">
#elseif(!$elementsStarted)
-#*
- <div class="body">
- <div class="FolderList">
-*#
+## <div class="body">
+## <div class="FolderList">
#end
#set($linkTitle = $element.getTitle($preferedLocale))
#set($linkName = $element.getShortTitle($preferedLocale))
@@ -201,58 +197,44 @@
#set($elementsStarted = true)
#elseif($element.elementType == "menu")
#if(!$rowStarted)
-#*
- <tr>
- <td>
- <div class="toolgroup">
- <div class="body">
- <div class="FolderList">
-*#
+## <tr>
+## <td>
+## <div class="toolgroup">
+## <div class="body">
+## <div class="FolderList">
#elseif(!$elementsStarted)
-#*
- <div class="body">
- <div class="FolderList">
-*#
+## <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">
-*#
+## <tr>
+## <td>
+## <div class="toolgroup">
#elseif($elementsStarted)
-#*
- </div>
- </div>
-*#
+## </div>
+## </div>
#end
#set($separatorTitle = $element.getTitle($preferedLocale))
#set($separatorText = $element.getText($preferedLocale))
<h3>${separatorText}</h3>
-#*
- <div class="label">
- ${separatorText}
- </div>
-*#
+## <div class="label">
+## ${separatorText}
+## </div>
#set($rowStarted = true)
#set($elementsStarted = false)
#end
#end
#if($elementsStarted)
-#*
- </div>
- </div>
-*#
+## </div>
+## </div>
#end
#if($rowStarted)
-#*
- </div>
- </td>
- </tr>
-*#
+## </div>
+## </td>
+## </tr>
#end
#end
Modified: portals/jetspeed-2/trunk/src/webapp/decorations/layout/thesolution/header.vm
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/decorations/layout/thesolution/header.vm?view=diff&rev=542064&r1=542063&r2=542064
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/decorations/layout/thesolution/header.vm (original)
+++ portals/jetspeed-2/trunk/src/webapp/decorations/layout/thesolution/header.vm Sun May 27 17:50:36 2007
@@ -1,91 +1,91 @@
-#*
+#*
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.
-*#
-
-#*
-This original design comes from Open Web Design.
- http://www.openwebdesign.org/viewdesign.phtml?id=2730&referer=%2Fbrowse.php
- Modified by Shinsuke Sugaya <sh...@yahoo.co.jp>
-*#
-
-#* 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()
-
-<html>
- <head>
- #includeHeaderResource()
-
- <meta http-equiv="Content-type" content="#ContentType()" />
- <meta http-equiv="Content-style-type" content="text/css" />
-
- #includeJavaScriptForHead()
- #IncludeStylesheets()
-
- <title>#PageTitle()</title>
-
- <meta name="version" content="#SiteVersionTag()">
- <meta name="keywords" content="" />
- <meta name="description" content="#PageDescription()" />
- </head>
-
-<body class="#PageBaseCSSClass()">
-<div class="#PageBaseCSSClass()">
-
- <div id="container">
- <div id="topbar">
-<!-- Top Tabs Menu -->
-#set($pagesStandardMenu = $site.getMenu("pages"))
-#if(!$pagesStandardMenu.empty)
-#includeTabsNavigation($pagesStandardMenu $LEFT_TO_RIGHT)
-#end
- </div>
- <div id="header">
- <h1>Jetspeed 2 Enterprise Portal</h1>
- <div id="navbar">
-<ul><li>
-#set($breadcrumbsStandardMenu = $site.getMenu("breadcrumbs"))
-#if(!$breadcrumbsStandardMenu.empty)
-#includeLinksNavigation($breadcrumbsStandardMenu $LEFT_TO_RIGHT "" $BREADCRUMBS_STYLE "")
-#else
-
-#end
-</li></ul>
- </div>
- </div>
- <div id="core">
- <div id="coreleft">
-<!-- Left Navigations Menu Table Data -->
-#set($navigationsStandardMenu = $site.getMenu("navigations"))
-
-#if(!$navigationsStandardMenu.empty)
-#includeLinksWithIconNavigation($navigationsStandardMenu $TOP_TO_BOTTOM)
-#end
- </div>
- <div id="corecenter">
-
- <!-- Page Action Bar -->
-## <span style="position:absolute;right:5em">$jetspeed.renderPortletEntity("theClock", "j2-admin::DateTimePortlet")</span>
-#if ($request.getUserPrincipal())
-<span style="position:absolute;right:15em"><a href="#BaseHref()login/logout">Logout</a></span>
-#end
- #PageActionBar()
-<!-- END: layout/html/thesolution/decorator.vm -->
+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.
+*#
+
+#*
+This original design comes from Open Web Design.
+ http://www.openwebdesign.org/viewdesign.phtml?id=2730&referer=%2Fbrowse.php
+ Modified by Shinsuke Sugaya <sh...@yahoo.co.jp>
+*#
+
+#* 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()
+
+<html>
+ <head>
+ #includeHeaderResource()
+
+ <meta http-equiv="Content-type" content="#ContentType()" />
+ <meta http-equiv="Content-style-type" content="text/css" />
+
+ #includeJavaScriptForHead()
+ #IncludeStylesheets()
+
+ <title>#PageTitle()</title>
+
+ <meta name="version" content="#SiteVersionTag()">
+ <meta name="keywords" content="" />
+ <meta name="description" content="#PageDescription()" />
+ </head>
+
+<body class="#PageBaseCSSClass()">
+<div class="#PageBaseCSSClass()">
+
+ <div id="container">
+ <div id="topbar">
+<!-- Top Tabs Menu -->
+#set($pagesStandardMenu = $site.getMenu("pages"))
+#if(!$pagesStandardMenu.empty)
+#includeTabsNavigation($pagesStandardMenu $LEFT_TO_RIGHT)
+#end
+ </div>
+ <div id="header">
+ <h1>Jetspeed 2 Enterprise Portal</h1>
+ <div id="navbar">
+<ul><li>
+#set($breadcrumbsStandardMenu = $site.getMenu("breadcrumbs"))
+#if(!$breadcrumbsStandardMenu.empty)
+#includeLinksNavigation($breadcrumbsStandardMenu $LEFT_TO_RIGHT "" $BREADCRUMBS_STYLE "")
+#else
+
+#end
+</li></ul>
+ </div>
+ </div>
+ <div id="core">
+ <div id="coreleft">
+<!-- Left Navigations Menu Table Data -->
+#set($navigationsStandardMenu = $site.getMenu("navigations"))
+
+#if(!$navigationsStandardMenu.empty)
+#includeLinksWithIconNavigation($navigationsStandardMenu $TOP_TO_BOTTOM)
+#end
+ </div>
+ <div id="corecenter">
+
+ <!-- Page Action Bar -->
+## <span style="position:absolute;right:5em">$jetspeed.renderPortletEntity("theClock", "j2-admin::DateTimePortlet")</span>
+#if ($request.getUserPrincipal())
+<span style="position:absolute;right:15em"><a href="#BaseHref()login/logout">Logout</a></span>
+#end
+ #PageActionBar()
+<!-- END: layout/html/thesolution/decorator.vm -->
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org