portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tay...@apache.org
Subject svn commit: r451046 - in /portals/jetspeed-2/trunk/src/webapp: WEB-INF/ decorations/layout/blueocean/ decorations/layout/jetspeed/ decorations/layout/jscookmenu/ decorations/layout/sunflower/ decorations/layout/thesolution/ decorations/layout/tigris/
Date Thu, 28 Sep 2006 22:22:43 GMT
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)
   <div id="portal-page-actions" >        
-    $jetspeed.renderPortletEntity("theClock", "j2-admin::DateTimePortlet")
     #if($_actions.size() >0)
     #foreach ($_action in $_actions)   
      <a href="${_action.Action}" title="${_action.Name}" class="action pageAction" ><img
src="${_action.Link}" alt="${_action.Alt}" border="0" /></a>

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 @@
         &nbsp;
 #end
      <!-- Page Action Bar -->
+    <span style="position:absolute;right:5em">$jetspeed.renderPortletEntity("theClock",
"j2-admin::DateTimePortlet")</span>
      #PageActionBar()
 
       </div>

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 @@
 </p>
   <p>
   #includeTabsNavigation($site.siblingPages)
+  <span style="position:absolute;right:5em">$jetspeed.renderPortletEntity("theClock",
"j2-admin::DateTimePortlet")</span>  
   #PageActionBar()
   </p>
 </p>

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"))
-
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-  <head>
-
-## include header resources immdiately after head and before base is reset to the portal
-## web application context path root; this implies that header resources can not reliably
-## employ relative urls to locate content
-#includeHeaderResource()
-
-	<base href="#BaseHref()">
-    <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="/* $Id$" />
-    <meta name="keywords" content="" />
-    <meta name="description" content="#PageDescription()" />
-
-<!-- JSCookMenu setup -->
-    <script language="JavaScript" src="#GetPageResource("scripts/JSCookMenu.js")"></script>
-    <link rel="stylesheet" href="#GetPageResource("css/${jsCookMenuTheme}/theme.css")"
type="text/css">
-    <script language="JavaScript" src="#GetPageResource("scripts/${jsCookMenuTheme}/theme.js")"></script>
-
-  </head>
-  <body marginwidth="0" marginheight="0" class="#PageBaseCSSClass()">
-
-<!--  BEGIN: layout/html/jscookmenu/decorator.vm -->
-
-    <div class="#PageBaseCSSClass()">
-
-<!-- Banner Content -->
-      <div id="banner">
-        <table border="0" cellspacing="0" cellpadding="8" width="100%">
-          <tr>
-            <td>
-              <h1><img src="#GetPageResource('images/jetspeed-logo.gif')" alt="Jetspeed
2 Logo" border="0"/></h1>
-            </td>
-            <td>
-              &nbsp;
-            </td>
-          </tr>
-        </table>
-      </div>
-
-<!-- Top Menu -->
-#if(!$siteNavigationsStandardMenu.empty)
-#includeJSCookMenuDefinition("tophorizontalmenu" $siteNavigationsStandardMenu)
-      <div id="tophorizontalmenu"></div>
-#includeJSCookMenuDraw("tophorizontalmenu" $jsCookMenuTheme $LEFT_TO_RIGHT)
-#end
-
-<!-- Breadcrumbs Back Navigation -->
-      <div id="breadcrumbs">
-#if(!$breadcrumbsStandardMenu.empty)
-#includeLinksNavigation($breadcrumbsStandardMenu $LEFT_TO_RIGHT "" $BREADCRUMBS_STYLE "")
-#PageActionBar()
-#else
-        &nbsp;
-#end
-      </div>
-
-<!-- Content Table -->
-      <table cellpadding="0" cellspacing="0" border="0" width="100%" id="main">
-        <tr>
-
-<!-- Left Menu Table Data -->
-#if(!$additionalLinksStandardMenu.empty)
-          <td valign="top" width="20%">
-#includeJSCookMenuDefinition("leftverticalmenu" $additionalLinksStandardMenu)
-         
-            <div id="leftverticalmenu"></div>
-#includeJSCookMenuDraw("leftverticalmenu" $jsCookMenuTheme $TOP_TO_BOTTOM)
-          </td>
-#end
-
-<!-- Content Table Data -->
-          <td nowrap valign="top">
-  
-<!--  END: layout/html/jscookmenu/decorator.vm -->
+#*
+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"))
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+  <head>
+
+## include header resources immdiately after head and before base is reset to the portal
+## web application context path root; this implies that header resources can not reliably
+## employ relative urls to locate content
+#includeHeaderResource()
+
+	<base href="#BaseHref()">
+    <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="/* $Id$" />
+    <meta name="keywords" content="" />
+    <meta name="description" content="#PageDescription()" />
+
+<!-- JSCookMenu setup -->
+    <script language="JavaScript" src="#GetPageResource("scripts/JSCookMenu.js")"></script>
+    <link rel="stylesheet" href="#GetPageResource("css/${jsCookMenuTheme}/theme.css")"
type="text/css">
+    <script language="JavaScript" src="#GetPageResource("scripts/${jsCookMenuTheme}/theme.js")"></script>
+
+  </head>
+  <body marginwidth="0" marginheight="0" class="#PageBaseCSSClass()">
+
+<!--  BEGIN: layout/html/jscookmenu/decorator.vm -->
+
+    <div class="#PageBaseCSSClass()">
+
+<!-- Banner Content -->
+      <div id="banner">
+        <table border="0" cellspacing="0" cellpadding="8" width="100%">
+          <tr>
+            <td>
+              <h1><img src="#GetPageResource('images/jetspeed-logo.gif')" alt="Jetspeed
2 Logo" border="0"/></h1>
+            </td>
+            <td>
+              &nbsp;
+            </td>
+          </tr>
+        </table>
+      </div>
+
+<!-- Top Menu -->
+#if(!$siteNavigationsStandardMenu.empty)
+#includeJSCookMenuDefinition("tophorizontalmenu" $siteNavigationsStandardMenu)
+      <div id="tophorizontalmenu"></div>
+#includeJSCookMenuDraw("tophorizontalmenu" $jsCookMenuTheme $LEFT_TO_RIGHT)
+#end
+
+<!-- Breadcrumbs Back Navigation -->
+      <div id="breadcrumbs">
+#if(!$breadcrumbsStandardMenu.empty)
+#includeLinksNavigation($breadcrumbsStandardMenu $LEFT_TO_RIGHT "" $BREADCRUMBS_STYLE "")
+<span style="position:absolute;right:5em">$jetspeed.renderPortletEntity("theClock",
"j2-admin::DateTimePortlet")</span>
+#PageActionBar()
+#else
+        &nbsp;
+#end
+      </div>
+
+<!-- Content Table -->
+      <table cellpadding="0" cellspacing="0" border="0" width="100%" id="main">
+        <tr>
+
+<!-- Left Menu Table Data -->
+#if(!$additionalLinksStandardMenu.empty)
+          <td valign="top" width="20%">
+#includeJSCookMenuDefinition("leftverticalmenu" $additionalLinksStandardMenu)
+         
+            <div id="leftverticalmenu"></div>
+#includeJSCookMenuDraw("leftverticalmenu" $jsCookMenuTheme $TOP_TO_BOTTOM)
+          </td>
+#end
+
+<!-- Content Table Data -->
+          <td nowrap valign="top">
+  
+<!--  END: layout/html/jscookmenu/decorator.vm -->

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 <shinsuke@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>
-    ## include header resources immdiately after head and before base is reset to the portal
-    ## web application context path root; this implies that header resources can not reliably
-    ## employ relative urls to locate content
-    #includeHeaderResource()
-
-	<base href="#BaseHref()">
-    <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
-        &nbsp;
-#end
-     <!-- Page Action Bar -->
-     #PageActionBar()
-
-</div>
-
-
-<!--  END: layout/html/sunflower/decorator.vm -->
+#*
+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 <shinsuke@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>
+    ## include header resources immdiately after head and before base is reset to the portal
+    ## web application context path root; this implies that header resources can not reliably
+    ## employ relative urls to locate content
+    #includeHeaderResource()
+
+	<base href="#BaseHref()">
+    <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
+        &nbsp;
+#end
+     <!-- Page Action Bar -->
+    <span style="position:absolute;right:5em">$jetspeed.renderPortletEntity("theClock",
"j2-admin::DateTimePortlet")</span>     
+     #PageActionBar()
+
+</div>
+
+
+<!--  END: layout/html/sunflower/decorator.vm -->

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 <shinsuke@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>
-    ## include header resources immdiately after head and before base is reset to the portal
-    ## web application context path root; this implies that header resources can not reliably
-    ## employ relative urls to locate content
-    #includeHeaderResource()
-
-	<base href="#BaseHref()">
-    <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
-        &nbsp;
-#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 -->
-     #PageActionBar()
-<!--  END: layout/html/thesolution/decorator.vm -->
+#*
+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 <shinsuke@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>
+    ## include header resources immdiately after head and before base is reset to the portal
+    ## web application context path root; this implies that header resources can not reliably
+    ## employ relative urls to locate content
+    #includeHeaderResource()
+
+	<base href="#BaseHref()">
+    <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
+        &nbsp;
+#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>     
+     #PageActionBar()
+<!--  END: layout/html/thesolution/decorator.vm -->

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 @@
         &nbsp;
 #end
      <!-- Page Action Bar -->
+    <span style="position:absolute;right:5em">$jetspeed.renderPortletEntity("theClock",
"j2-admin::DateTimePortlet")</span>    
      #PageActionBar()
 
    </div>



---------------------------------------------------------------------
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