Author: taylor Date: Thu Sep 28 15:22:42 2006 New Revision: 451046 URL: http://svn.apache.org/viewvc?view=rev&rev=451046 Log: http://issues.apache.org/jira/browse/JS2-586 remove clock in "PageActionBar" macro contribution from Evangelos Vlachogiannis Modified: portals/jetspeed-2/trunk/src/webapp/WEB-INF/jetspeed_macros.vm portals/jetspeed-2/trunk/src/webapp/decorations/layout/blueocean/header.vm portals/jetspeed-2/trunk/src/webapp/decorations/layout/jetspeed/header.vm portals/jetspeed-2/trunk/src/webapp/decorations/layout/jscookmenu/header.vm portals/jetspeed-2/trunk/src/webapp/decorations/layout/sunflower/header.vm portals/jetspeed-2/trunk/src/webapp/decorations/layout/thesolution/header.vm portals/jetspeed-2/trunk/src/webapp/decorations/layout/tigris/header.vm Modified: portals/jetspeed-2/trunk/src/webapp/WEB-INF/jetspeed_macros.vm URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/WEB-INF/jetspeed_macros.vm?view=diff&rev=451046&r1=451045&r2=451046 ============================================================================== --- portals/jetspeed-2/trunk/src/webapp/WEB-INF/jetspeed_macros.vm (original) +++ portals/jetspeed-2/trunk/src/webapp/WEB-INF/jetspeed_macros.vm Thu Sep 28 15:22:42 2006 @@ -97,7 +97,6 @@ #macro (PageActionBar) #set($_actions = $layoutDecoration.actions)
- $jetspeed.renderPortletEntity("theClock", "j2-admin::DateTimePortlet") #if($_actions.size() >0) #foreach ($_action in $_actions) ${_action.Alt} Modified: portals/jetspeed-2/trunk/src/webapp/decorations/layout/blueocean/header.vm URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/decorations/layout/blueocean/header.vm?view=diff&rev=451046&r1=451045&r2=451046 ============================================================================== --- portals/jetspeed-2/trunk/src/webapp/decorations/layout/blueocean/header.vm (original) +++ portals/jetspeed-2/trunk/src/webapp/decorations/layout/blueocean/header.vm Thu Sep 28 15:22:42 2006 @@ -127,6 +127,7 @@   #end + $jetspeed.renderPortletEntity("theClock", "j2-admin::DateTimePortlet") #PageActionBar()
Modified: portals/jetspeed-2/trunk/src/webapp/decorations/layout/jetspeed/header.vm URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/decorations/layout/jetspeed/header.vm?view=diff&rev=451046&r1=451045&r2=451046 ============================================================================== --- portals/jetspeed-2/trunk/src/webapp/decorations/layout/jetspeed/header.vm (original) +++ portals/jetspeed-2/trunk/src/webapp/decorations/layout/jetspeed/header.vm Thu Sep 28 15:22:42 2006 @@ -60,6 +60,7 @@

#includeTabsNavigation($site.siblingPages) + $jetspeed.renderPortletEntity("theClock", "j2-admin::DateTimePortlet") #PageActionBar()

Modified: portals/jetspeed-2/trunk/src/webapp/decorations/layout/jscookmenu/header.vm URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/decorations/layout/jscookmenu/header.vm?view=diff&rev=451046&r1=451045&r2=451046 ============================================================================== --- portals/jetspeed-2/trunk/src/webapp/decorations/layout/jscookmenu/header.vm (original) +++ portals/jetspeed-2/trunk/src/webapp/decorations/layout/jscookmenu/header.vm Thu Sep 28 15:22:42 2006 @@ -1,141 +1,142 @@ -#* -Copyright 2005 The Apache Software Foundation - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*# - -#* -JSCookMenu (c) Copyright 2002-2005 by Heng Yuan - -Permission is hereby granted, free of charge, to any person obtaining a -copy of this software and associated documentation files (the "Software"), -to deal in the Software without restriction, including without limitation -the rights to use, copy, modify, merge, publish, distribute, sublicense, -and/or sell copies of the Software, and to permit persons to whom the -Software is furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included -in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -DEALINGS IN THE SOFTWARE. -*# - -#* 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() - -#* Access page context *# -#set($site = $request.getAttribute("org.apache.jetspeed.portalsite.PortalSiteRequestContext")) - -#* select default JSCookMenu theme *# -#set($jsCookMenuTheme = $JSCOOKMENU_JETSPEED_THEME) - -#* Access page menus *# -#set($siteNavigationsStandardMenu = $site.getMenu("site-navigations")) -#set($breadcrumbsStandardMenu = $site.getMenu("breadcrumbs")) -#set($additionalLinksStandardMenu = $site.getMenu("additional-links")) - - - - - -## include header resources immdiately after head and before base is reset to the portal -## web application context path root; this implies that header resources can not reliably -## employ relative urls to locate content -#includeHeaderResource() - - - - - -#includeJavaScriptForHead() -#IncludeStylesheets() - - #PageTitle() - - - - - - - - - - - - - - - -
- - - - - -#if(!$siteNavigationsStandardMenu.empty) -#includeJSCookMenuDefinition("tophorizontalmenu" $siteNavigationsStandardMenu) -
-#includeJSCookMenuDraw("tophorizontalmenu" $jsCookMenuTheme $LEFT_TO_RIGHT) -#end - - - - - - - - - -#if(!$additionalLinksStandardMenu.empty) - -#end - - -
-#includeJSCookMenuDefinition("leftverticalmenu" $additionalLinksStandardMenu) - -
-#includeJSCookMenuDraw("leftverticalmenu" $jsCookMenuTheme $TOP_TO_BOTTOM) -
- - +#* +Copyright 2005 The Apache Software Foundation + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*# + +#* +JSCookMenu (c) Copyright 2002-2005 by Heng Yuan + +Permission is hereby granted, free of charge, to any person obtaining a +copy of this software and associated documentation files (the "Software"), +to deal in the Software without restriction, including without limitation +the rights to use, copy, modify, merge, publish, distribute, sublicense, +and/or sell copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included +in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +DEALINGS IN THE SOFTWARE. +*# + +#* 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() + +#* Access page context *# +#set($site = $request.getAttribute("org.apache.jetspeed.portalsite.PortalSiteRequestContext")) + +#* select default JSCookMenu theme *# +#set($jsCookMenuTheme = $JSCOOKMENU_JETSPEED_THEME) + +#* Access page menus *# +#set($siteNavigationsStandardMenu = $site.getMenu("site-navigations")) +#set($breadcrumbsStandardMenu = $site.getMenu("breadcrumbs")) +#set($additionalLinksStandardMenu = $site.getMenu("additional-links")) + + + + + +## include header resources immdiately after head and before base is reset to the portal +## web application context path root; this implies that header resources can not reliably +## employ relative urls to locate content +#includeHeaderResource() + + + + + +#includeJavaScriptForHead() +#IncludeStylesheets() + + #PageTitle() + + + + + + + + + + + + + + + +
+ + + + + +#if(!$siteNavigationsStandardMenu.empty) +#includeJSCookMenuDefinition("tophorizontalmenu" $siteNavigationsStandardMenu) +
+#includeJSCookMenuDraw("tophorizontalmenu" $jsCookMenuTheme $LEFT_TO_RIGHT) +#end + + + + + + + + + +#if(!$additionalLinksStandardMenu.empty) + +#end + + +
+#includeJSCookMenuDefinition("leftverticalmenu" $additionalLinksStandardMenu) + +
+#includeJSCookMenuDraw("leftverticalmenu" $jsCookMenuTheme $TOP_TO_BOTTOM) +
+ + 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=451046&r1=451045&r2=451046 ============================================================================== --- portals/jetspeed-2/trunk/src/webapp/decorations/layout/sunflower/header.vm (original) +++ portals/jetspeed-2/trunk/src/webapp/decorations/layout/sunflower/header.vm Thu Sep 28 15:22:42 2006 @@ -1,90 +1,91 @@ -#* -Copyright 2004 The Apache Software Foundation - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*# - -#* -This original design comes from Open Source Web Design. - http://www.oswd.org/design/preview/id/2904 - Modified by Shinsuke Sugaya -*# - -#* 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() - - - - ## include header resources immdiately after head and before base is reset to the portal - ## web application context path root; this implies that header resources can not reliably - ## employ relative urls to locate content - #includeHeaderResource() - - - - - - #includeJavaScriptForHead() - #IncludeStylesheets() - - #PageTitle() - - - - - - - -
-
- - - -#set($pagesStandardMenu = $site.getMenu("pages")) -#if(!$pagesStandardMenu.empty) -#includeTabsNavigation($pagesStandardMenu $LEFT_TO_RIGHT) -#end - -
- - -#set($navigationsStandardMenu = $site.getMenu("navigations")) - -#if(!$navigationsStandardMenu.empty) -#includeLinksWithIconNavigation($navigationsStandardMenu $TOP_TO_BOTTOM) -#end - -
- -
- - - - - +#* +Copyright 2004 The Apache Software Foundation + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*# + +#* +This original design comes from Open Source Web Design. + http://www.oswd.org/design/preview/id/2904 + Modified by Shinsuke Sugaya +*# + +#* 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() + + + + ## include header resources immdiately after head and before base is reset to the portal + ## web application context path root; this implies that header resources can not reliably + ## employ relative urls to locate content + #includeHeaderResource() + + + + + + #includeJavaScriptForHead() + #IncludeStylesheets() + + #PageTitle() + + + + + + + +
+
+ + + +#set($pagesStandardMenu = $site.getMenu("pages")) +#if(!$pagesStandardMenu.empty) +#includeTabsNavigation($pagesStandardMenu $LEFT_TO_RIGHT) +#end + +
+ + +#set($navigationsStandardMenu = $site.getMenu("navigations")) + +#if(!$navigationsStandardMenu.empty) +#includeLinksWithIconNavigation($navigationsStandardMenu $TOP_TO_BOTTOM) +#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=451046&r1=451045&r2=451046 ============================================================================== --- portals/jetspeed-2/trunk/src/webapp/decorations/layout/thesolution/header.vm (original) +++ portals/jetspeed-2/trunk/src/webapp/decorations/layout/thesolution/header.vm Thu Sep 28 15:22:42 2006 @@ -1,90 +1,91 @@ -#* -Copyright 2004 The Apache Software Foundation - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*# - -#* -This original design comes from Open Web Design. - http://www.openwebdesign.org/viewdesign.phtml?id=2730&referer=%2Fbrowse.php - Modified by Shinsuke Sugaya -*# - -#* 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() - - - - ## include header resources immdiately after head and before base is reset to the portal - ## web application context path root; this implies that header resources can not reliably - ## employ relative urls to locate content - #includeHeaderResource() - - - - - - #includeJavaScriptForHead() - #IncludeStylesheets() - - #PageTitle() - - - - - - - -
- -
-
- -#set($pagesStandardMenu = $site.getMenu("pages")) -#if(!$pagesStandardMenu.empty) -#includeTabsNavigation($pagesStandardMenu $LEFT_TO_RIGHT) -#end -
- -
-
- -#set($navigationsStandardMenu = $site.getMenu("navigations")) - -#if(!$navigationsStandardMenu.empty) -#includeLinksWithIconNavigation($navigationsStandardMenu $TOP_TO_BOTTOM) -#end -
-
- - - #PageActionBar() - +#* +Copyright 2004 The Apache Software Foundation + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*# + +#* +This original design comes from Open Web Design. + http://www.openwebdesign.org/viewdesign.phtml?id=2730&referer=%2Fbrowse.php + Modified by Shinsuke Sugaya +*# + +#* 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() + + + + ## include header resources immdiately after head and before base is reset to the portal + ## web application context path root; this implies that header resources can not reliably + ## employ relative urls to locate content + #includeHeaderResource() + + + + + + #includeJavaScriptForHead() + #IncludeStylesheets() + + #PageTitle() + + + + + + + +
+ +
+
+ +#set($pagesStandardMenu = $site.getMenu("pages")) +#if(!$pagesStandardMenu.empty) +#includeTabsNavigation($pagesStandardMenu $LEFT_TO_RIGHT) +#end +
+ +
+
+ +#set($navigationsStandardMenu = $site.getMenu("navigations")) + +#if(!$navigationsStandardMenu.empty) +#includeLinksWithIconNavigation($navigationsStandardMenu $TOP_TO_BOTTOM) +#end +
+
+ + + $jetspeed.renderPortletEntity("theClock", "j2-admin::DateTimePortlet") + #PageActionBar() + Modified: portals/jetspeed-2/trunk/src/webapp/decorations/layout/tigris/header.vm URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/decorations/layout/tigris/header.vm?view=diff&rev=451046&r1=451045&r2=451046 ============================================================================== --- portals/jetspeed-2/trunk/src/webapp/decorations/layout/tigris/header.vm (original) +++ portals/jetspeed-2/trunk/src/webapp/decorations/layout/tigris/header.vm Thu Sep 28 15:22:42 2006 @@ -90,6 +90,7 @@   #end + $jetspeed.renderPortletEntity("theClock", "j2-admin::DateTimePortlet") #PageActionBar()
--------------------------------------------------------------------- To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org For additional commands, e-mail: jetspeed-dev-help@portals.apache.org