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 sm...@apache.org on 2007/05/16 12:14:58 UTC

svn commit: r538514 - in /portals/jetspeed-2/trunk/src/webapp/decorations/layout: blueocean/ blueocean/css/ blueocean/images/desktop/loading/ blueocean/resources/ tigris/ tigris/css/ tigris/images/desktop/loading/ tigris/resources/

Author: smilek
Date: Wed May 16 03:14:51 2007
New Revision: 538514

URL: http://svn.apache.org/viewvc?view=rev&rev=538514
Log:
added js-showloading div tag to desktop layout templates; added loading images; added loading text resource (for default locale)

Added:
    portals/jetspeed-2/trunk/src/webapp/decorations/layout/blueocean/images/desktop/loading/
    portals/jetspeed-2/trunk/src/webapp/decorations/layout/blueocean/images/desktop/loading/loading_left.png   (with props)
    portals/jetspeed-2/trunk/src/webapp/decorations/layout/blueocean/images/desktop/loading/loading_middle.png   (with props)
    portals/jetspeed-2/trunk/src/webapp/decorations/layout/blueocean/images/desktop/loading/loading_right.png   (with props)
    portals/jetspeed-2/trunk/src/webapp/decorations/layout/tigris/images/desktop/loading/
    portals/jetspeed-2/trunk/src/webapp/decorations/layout/tigris/images/desktop/loading/loading_left.png   (with props)
    portals/jetspeed-2/trunk/src/webapp/decorations/layout/tigris/images/desktop/loading/loading_middle.png   (with props)
    portals/jetspeed-2/trunk/src/webapp/decorations/layout/tigris/images/desktop/loading/loading_right.png   (with props)
Modified:
    portals/jetspeed-2/trunk/src/webapp/decorations/layout/blueocean/css/desktop.css
    portals/jetspeed-2/trunk/src/webapp/decorations/layout/blueocean/desktop.jsp
    portals/jetspeed-2/trunk/src/webapp/decorations/layout/blueocean/desktop.vm
    portals/jetspeed-2/trunk/src/webapp/decorations/layout/blueocean/resources/Messages.properties
    portals/jetspeed-2/trunk/src/webapp/decorations/layout/tigris/css/desktop.css
    portals/jetspeed-2/trunk/src/webapp/decorations/layout/tigris/desktop.jsp
    portals/jetspeed-2/trunk/src/webapp/decorations/layout/tigris/desktop.vm
    portals/jetspeed-2/trunk/src/webapp/decorations/layout/tigris/resources/Messages.properties

Modified: portals/jetspeed-2/trunk/src/webapp/decorations/layout/blueocean/css/desktop.css
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/decorations/layout/blueocean/css/desktop.css?view=diff&rev=538514&r1=538513&r2=538514
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/decorations/layout/blueocean/css/desktop.css (original)
+++ portals/jetspeed-2/trunk/src/webapp/decorations/layout/blueocean/css/desktop.css Wed May 16 03:14:51 2007
@@ -1,73 +1,107 @@
-/*
+/*
 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 jetspeed desktop settings  */
-
-DIV.portlet
-{
-    margin: 2px;    /* necessary to override margin settings from decorations/layout/css/standard-columns.css */
-                    /* needs to match margin setting for .dojoFloatingPaneClient */
-}
-
-.layout-blueocean #jetspeedPageControls {
-    float: right;
-    width: 100px;
-}
-
-.layout-blueocean #portalBreadcrumbList {
-    float: left;
-    margin-left: 6px;
-    margin-top: 2px;
-}
-
-.layout-blueocean .portalPageActionButton {
-	height: 11px;
-	width: 11px;
-}
-
-/*  end jetspeed desktop settings  */
-
-
-/*  begin layout decorator blueocean additions  */
-
-.layout-blueocean #breadcrumbs {
-    height: 20px;
-    width: 100%;
-
-    background-color: #ffffff;
-
-    font-family: Verdana,Helvetica,Arial,sans-serif;
-    voice-family: "\"}\"";
-    voice-family: inherit;
-    font-size: 10pt;
-}
-
-/*  end layout decorator blueocean additions  */
-
-
-/*  begin layout decorator blueocean embellishments  */
-
-.layout-blueocean #main {
-    clear: both;
-}
-
-.layout-blueocean #leftcol {
-    vertical-align:top;
-}
-
-/*  end layout decorator blueocean embellishments  */
-
+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 jetspeed desktop settings  */
+
+DIV.portlet
+{
+    margin: 2px;    /* necessary to override margin settings from decorations/layout/css/standard-columns.css */
+                    /* needs to match margin setting for .dojoFloatingPaneClient */
+}
+
+.layout-blueocean #jetspeedPageControls {
+    float: right;
+    width: 100px;
+}
+
+.layout-blueocean #portalBreadcrumbList {
+    float: left;
+    margin-left: 6px;
+    margin-top: 2px;
+}
+
+.layout-blueocean .portalPageActionButton {
+	height: 11px;
+	width: 11px;
+}
+
+/*  end jetspeed desktop settings  */
+
+
+/*  begin layout decorator blueocean additions  */
+
+.layout-blueocean #breadcrumbs {
+    height: 20px;
+    width: 100%;
+
+    background-color: #ffffff;
+
+    font-family: Verdana,Helvetica,Arial,sans-serif;
+    voice-family: "\"}\"";
+    voice-family: inherit;
+    font-size: 10pt;
+}
+
+/*  end layout decorator blueocean additions  */
+
+
+/*  begin layout decorator blueocean embellishments  */
+
+.layout-blueocean #main {
+    clear: both;
+}
+
+.layout-blueocean #leftcol {
+    vertical-align:top;
+}
+
+.js-showloading {
+    z-index: 999;
+    position: absolute;
+    top: 38%;
+    left: 45%;
+    height: 50px;
+}
+.js-showloading-left {
+    background-image: url(../images/desktop/loading/loading_left.png);
+    background-repeat: no-repeat;
+    background-position: 0 0;
+    width: 5px;
+    height: 50px;
+}
+.js-showloading-middle {
+    background-image: url(../images/desktop/loading/loading_middle.png);
+    background-repeat: repeat-x;
+    background-position: 0 0;
+    height: 50px;
+    text-align: center;
+    vertical-align: middle;
+    font-weight: bold;
+}
+.js-showloading-right {
+    background-image: url(../images/desktop/loading/loading_right.png);
+    background-repeat: no-repeat;
+    background-position: 0 0;
+    width: 5px;
+    height: 50px;
+}
+.js-showloading-content {
+    padding: 0 25px;
+}
+
+/*  end layout decorator blueocean embellishments  */
+

Modified: portals/jetspeed-2/trunk/src/webapp/decorations/layout/blueocean/desktop.jsp
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/decorations/layout/blueocean/desktop.jsp?view=diff&rev=538514&r1=538513&r2=538514
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/decorations/layout/blueocean/desktop.jsp (original)
+++ portals/jetspeed-2/trunk/src/webapp/decorations/layout/blueocean/desktop.jsp Wed May 16 03:14:51 2007
@@ -1,93 +1,104 @@
-<%--
+<%--
 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_ATTRIBUTE);
-    RequestContext requestContext = (RequestContext)request.getAttribute(RequestContext.REQUEST_PORTALENV);
-
-    String layoutStyleClass = "layout-" + desktop.getLayoutDecorationName();
-%>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<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">
-<div id="banner" style="position: static">    <!-- BOZO: set to absolute in stylesheet - don't know why - no apparent reason -->
-  <table>
-    <tr>
-      <td>
-        <div class="logo">
-        <img src='<%= desktop.getLayoutBaseUrl("images/Jetspeed_white_med.png") %>' alt="Logo" border="0"/>
-        </div>
-      </td>
-      <td>
-        <div align="right" id="login">
-          &nbsp;
-        </div>
-      </td>
-    </tr>
-  </table>
-</div>
-<div widgetId="jetspeed-menu-pages" dojoType="jetspeed:PortalTabContainer" style="width: 100%; margin-top: 2px; margin-left: -1px"></div>
-<div widgetId="jetspeed-menu-breadcrumbs" dojoType="jetspeed:PortalBreadcrumbContainer" style="width: 100%; margin-top: 2px; margin-left: -1px"></div>
-<table cellpadding="0" cellspacing="0" border="0" width="100%" id="main">
-<tr>
-<td id="leftcol">
-<div widgetId="jetspeed-menu-navigations" dojoType="jetspeed:PortalAccordionContainer"></div>
-</td>
-<td id="jetspeedDesktopCell">
-<!-- Start Jetspeed Desktop -->
-<div class="<%= layoutStyleClass %>" id="jetspeedDesktop"></div>
-<!-- End Jetspeed Desktop -->
-</td>
-</tr>
-</table>
-<!-- Start Taskbar -->
-<!-- (when we don't want a taskbar - set windowState to "minimized", otherwise omit windowState) -->
-<!-- <div dojoType="jetspeed:PortalTaskBar" id="jetspeedTaskbar" style="background-color: #666; width: 98%; bottom: 5px; height: 110px" windowState="minimized" resizable="false"></div> -->
-<!-- End Taskbar -->
-</div>
-<!-- End Jetspeed Page -->
-  <p>
-     <img src="$jetspeedDesktop.getLayoutBaseUrl('images/Jetspeed_blue_sm.png')" 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.
+--%>
+<%@ 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_ATTRIBUTE);
+    RequestContext requestContext = (RequestContext)request.getAttribute(RequestContext.REQUEST_PORTALENV);
+
+    String layoutStyleClass = "layout-" + desktop.getLayoutDecorationName();
+%>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<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">
+<div id="banner" style="position: static">    <!-- BOZO: set to absolute in stylesheet - don't know why - no apparent reason -->
+  <table>
+    <tr>
+      <td>
+        <div class="logo">
+        <img src='<%= desktop.getLayoutBaseUrl("images/Jetspeed_white_med.png") %>' alt="Logo" border="0"/>
+        </div>
+      </td>
+      <td>
+        <div align="right" id="login">
+          &nbsp;
+        </div>
+      </td>
+    </tr>
+  </table>
+</div>
+<div widgetId="jetspeed-menu-pages" dojoType="jetspeed:PortalTabContainer" style="width: 100%; margin-top: 2px; margin-left: -1px"></div>
+<div widgetId="jetspeed-menu-breadcrumbs" dojoType="jetspeed:PortalBreadcrumbContainer" style="width: 100%; margin-top: 2px; margin-left: -1px"></div>
+<table cellpadding="0" cellspacing="0" border="0" width="100%" id="main">
+<tr>
+<td id="leftcol">
+<div widgetId="jetspeed-menu-navigations" dojoType="jetspeed:PortalAccordionContainer"></div>
+</td>
+<td id="jetspeedDesktopCell">
+<!-- Start Jetspeed Desktop -->
+<div class="<%= layoutStyleClass %>" id="jetspeedDesktop"></div>
+<!-- End Jetspeed Desktop -->
+</td>
+</tr>
+</table>
+<!-- Start Taskbar -->
+<!-- (when we don't want a taskbar - set windowState to "minimized", otherwise omit windowState) -->
+<!-- <div dojoType="jetspeed:PortalTaskBar" id="jetspeedTaskbar" style="background-color: #666; width: 98%; bottom: 5px; height: 110px" windowState="minimized" resizable="false"></div> -->
+<!-- End Taskbar -->
+</div>
+<!-- End Jetspeed Page -->
+  <p>
+     <img src="$jetspeedDesktop.getLayoutBaseUrl('images/Jetspeed_blue_sm.png')" alt="Jetspeed 2 Powered" border="0" />
+    </p>
+<div id="js-showloading" style="display: none">
+    <table class="js-showloading">
+        <tr>
+            <td class="js-showloading-left">&nbsp;</td>
+            <td class="js-showloading-middle">
+                <div class="js-showloading-content" id="js-showloading-content">&lt;loading&gt; ...</div>
+            </td>
+            <td class="js-showloading-right">&nbsp;</td>
+        </tr>
+    </table>
+</div>
+</body>
+</html>

Modified: portals/jetspeed-2/trunk/src/webapp/decorations/layout/blueocean/desktop.vm
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/decorations/layout/blueocean/desktop.vm?view=diff&rev=538514&r1=538513&r2=538514
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/decorations/layout/blueocean/desktop.vm (original)
+++ portals/jetspeed-2/trunk/src/webapp/decorations/layout/blueocean/desktop.vm Wed May 16 03:14:51 2007
@@ -1,79 +1,90 @@
-#*
+#*
 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.
-*#
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<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">
-<div id="banner" style="position: static">    <!-- BOZO: set to absolute in stylesheet - don't know why - no apparent reason -->
-  <table>
-    <tr>
-      <td>
-        <div class="logo">
-        <img src="$jetspeedDesktop.getLayoutBaseUrl('images/Jetspeed_white_med.png')" alt="Logo" border="0"/>
-        </div>
-      </td>
-      <td>
-        <div align="right" id="login">
-          &nbsp;
-        </div>
-      </td>
-    </tr>
-  </table>
-</div>
-<div widgetId="jetspeed-menu-pages" dojoType="jetspeed:PortalTabContainer" style="width: 100%; margin-top: 2px; margin-left: -1px"></div>
-<div widgetId="jetspeed-menu-breadcrumbs" dojoType="jetspeed:PortalBreadcrumbContainer" style="width: 100%; margin-top: 2px; margin-left: -1px"></div>
-<table cellpadding="0" cellspacing="0" border="0" width="100%" id="main">
-<tr>
-<td id="leftcol" >
-<div widgetId="jetspeed-menu-navigations" dojoType="jetspeed:PortalAccordionContainer"></div>
-</td>
-<td id="jetspeedDesktopCell">
-<!-- Start Jetspeed Desktop -->
-<div class="layout-${jetspeedDesktop.getLayoutDecorationName()}" id="jetspeedDesktop"></div>
-<!-- End Jetspeed Desktop -->
-</td>
-</tr>
-</table>
-<!-- Start Taskbar -->
-<!-- (when we don't want a taskbar - set windowState to "minimized", otherwise omit windowState) -->
-<!-- <div dojoType="jetspeed:PortalTaskBar" id="jetspeedTaskbar" style="background-color: #666; width: 98%; bottom: 5px; height: 110px" windowState="minimized" resizable="false"></div> -->
-<!-- End Taskbar -->
-</div>
-<!-- End Jetspeed Page -->
-  <p>
-     <img src="$jetspeedDesktop.getLayoutBaseUrl('images/Jetspeed_blue_sm.png')" 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.
+*#
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<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">
+<div id="banner" style="position: static">    <!-- BOZO: set to absolute in stylesheet - don't know why - no apparent reason -->
+  <table>
+    <tr>
+      <td>
+        <div class="logo">
+        <img src="$jetspeedDesktop.getLayoutBaseUrl('images/Jetspeed_white_med.png')" alt="Logo" border="0"/>
+        </div>
+      </td>
+      <td>
+        <div align="right" id="login">
+          &nbsp;
+        </div>
+      </td>
+    </tr>
+  </table>
+</div>
+<div widgetId="jetspeed-menu-pages" dojoType="jetspeed:PortalTabContainer" style="width: 100%; margin-top: 2px; margin-left: -1px"></div>
+<div widgetId="jetspeed-menu-breadcrumbs" dojoType="jetspeed:PortalBreadcrumbContainer" style="width: 100%; margin-top: 2px; margin-left: -1px"></div>
+<table cellpadding="0" cellspacing="0" border="0" width="100%" id="main">
+<tr>
+<td id="leftcol" >
+<div widgetId="jetspeed-menu-navigations" dojoType="jetspeed:PortalAccordionContainer"></div>
+</td>
+<td id="jetspeedDesktopCell">
+<!-- Start Jetspeed Desktop -->
+<div class="layout-${jetspeedDesktop.getLayoutDecorationName()}" id="jetspeedDesktop"></div>
+<!-- End Jetspeed Desktop -->
+</td>
+</tr>
+</table>
+<!-- Start Taskbar -->
+<!-- (when we don't want a taskbar - set windowState to "minimized", otherwise omit windowState) -->
+<!-- <div dojoType="jetspeed:PortalTaskBar" id="jetspeedTaskbar" style="background-color: #666; width: 98%; bottom: 5px; height: 110px" windowState="minimized" resizable="false"></div> -->
+<!-- End Taskbar -->
+</div>
+<!-- End Jetspeed Page -->
+  <p>
+     <img src="$jetspeedDesktop.getLayoutBaseUrl('images/Jetspeed_blue_sm.png')" alt="Jetspeed 2 Powered" border="0" />
+    </p>
+<div id="js-showloading" style="display: none">
+    <table class="js-showloading">
+        <tr>
+            <td class="js-showloading-left">&nbsp;</td>
+            <td class="js-showloading-middle">
+                <div class="js-showloading-content" id="js-showloading-content">&lt;loading&gt; ...</div>
+            </td>
+            <td class="js-showloading-right">&nbsp;</td>
+        </tr>
+    </table>
+</div>
+</body>
+</html>

Added: portals/jetspeed-2/trunk/src/webapp/decorations/layout/blueocean/images/desktop/loading/loading_left.png
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/decorations/layout/blueocean/images/desktop/loading/loading_left.png?view=auto&rev=538514
==============================================================================
Binary file - no diff available.

Propchange: portals/jetspeed-2/trunk/src/webapp/decorations/layout/blueocean/images/desktop/loading/loading_left.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: portals/jetspeed-2/trunk/src/webapp/decorations/layout/blueocean/images/desktop/loading/loading_middle.png
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/decorations/layout/blueocean/images/desktop/loading/loading_middle.png?view=auto&rev=538514
==============================================================================
Binary file - no diff available.

Propchange: portals/jetspeed-2/trunk/src/webapp/decorations/layout/blueocean/images/desktop/loading/loading_middle.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: portals/jetspeed-2/trunk/src/webapp/decorations/layout/blueocean/images/desktop/loading/loading_right.png
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/decorations/layout/blueocean/images/desktop/loading/loading_right.png?view=auto&rev=538514
==============================================================================
Binary file - no diff available.

Propchange: portals/jetspeed-2/trunk/src/webapp/decorations/layout/blueocean/images/desktop/loading/loading_right.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Modified: portals/jetspeed-2/trunk/src/webapp/decorations/layout/blueocean/resources/Messages.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/decorations/layout/blueocean/resources/Messages.properties?view=diff&rev=538514&r1=538513&r2=538514
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/decorations/layout/blueocean/resources/Messages.properties (original)
+++ portals/jetspeed-2/trunk/src/webapp/decorations/layout/blueocean/resources/Messages.properties Wed May 16 03:14:51 2007
@@ -22,3 +22,4 @@
 desktop.action.removeportlet=Delete Portlet
 desktop.action.addportlet=Add Portlet
 desktop.action.editpage=Edit Page
+desktop.action.loading=loading ...

Modified: portals/jetspeed-2/trunk/src/webapp/decorations/layout/tigris/css/desktop.css
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/decorations/layout/tigris/css/desktop.css?view=diff&rev=538514&r1=538513&r2=538514
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/decorations/layout/tigris/css/desktop.css (original)
+++ portals/jetspeed-2/trunk/src/webapp/decorations/layout/tigris/css/desktop.css Wed May 16 03:14:51 2007
@@ -1,74 +1,112 @@
-/*
+/*
 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 jetspeed desktop settings  */
-
-DIV.portlet
-{
-    margin: 2px;    /* necessary to override margin settings from decorations/layout/css/standard-columns.css */
-                    /* needs to match margin setting for .dojoFloatingPaneClient */
-}
-
-.layout-tigris #jetspeedPageControls {
-    float: right;
-    width: 100px;
-}
-
-.layout-tigris #portalBreadcrumbList {
-    float: left;
-    margin-left: 6px;
-    margin-top: 2px;
-}
-
-.layout-tigris .portalPageActionButton {
-	height: 11px;
-	width: 11px;
-}
-
-/*  end jetspeed desktop settings  */
-
-
-/*  begin layout decorator tigris additions  */
-
-.layout-tigris #breadcrumbs {
-    height: 20px;
-    width: 100%;
-
-    border-top: 1px solid #fff;
-    background-color: #ccc;
-
-    voice-family: "\"}\"";
-    voice-family: inherit;
-    font-size: x-small;
-}
-
-/*  end layout decorator tigris additions  */
-
-
-/*  begin layout decorator tigris embellishments  */
-
-.layout-tigris #main {
-    clear: both;
-    width: 100%;
-}
-
-.layout-tigris #leftcol { 
-    vertical-align: top;
-}
-
-/*  end layout decorator tigris embellishments  */
-
+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 jetspeed desktop settings  */
+
+DIV.portlet
+{
+    margin: 2px;    /* necessary to override margin settings from decorations/layout/css/standard-columns.css */
+                    /* needs to match margin setting for .dojoFloatingPaneClient */
+}
+
+.layout-tigris #jetspeedPageControls {
+    float: right;
+    width: 100px;
+}
+
+.layout-tigris #portalBreadcrumbList {
+    float: left;
+    margin-left: 6px;
+    margin-top: 2px;
+}
+
+.layout-tigris .portalPageActionButton {
+	height: 11px;
+	width: 11px;
+}
+
+/*  end jetspeed desktop settings  */
+
+
+/*  begin layout decorator tigris additions  */
+
+.layout-tigris #breadcrumbs {
+    height: 20px;
+    width: 100%;
+
+    border-top: 1px solid #fff;
+    background-color: #ccc;
+
+    voice-family: "\"}\"";
+    voice-family: inherit;
+    font-size: x-small;
+}
+
+/*  end layout decorator tigris additions  */
+
+
+/*  begin layout decorator tigris embellishments  */
+
+.layout-tigris #main {
+    clear: both;
+    width: 100%;
+}
+
+.layout-tigris #leftcol { 
+    vertical-align: top;
+}
+
+/*.layout-tigris #navcolumn {
+    padding: 5px;
+}*/
+
+.js-showloading {
+    z-index: 999;
+    position: absolute;
+    top: 41%;
+    left: 45%;
+    height: 50px;
+}
+.js-showloading-left {
+    background-image: url(../images/desktop/loading/loading_left.png);
+    background-repeat: no-repeat;
+    background-position: 0 0;
+    width: 5px;
+    height: 50px;
+}
+.js-showloading-middle {
+    background-image: url(../images/desktop/loading/loading_middle.png);
+    background-repeat: repeat-x;
+    background-position: 0 0;
+    height: 50px;
+    text-align: center;
+    vertical-align: middle;
+    font-weight: bold;
+}
+.js-showloading-right {
+    background-image: url(../images/desktop/loading/loading_right.png);
+    background-repeat: no-repeat;
+    background-position: 0 0;
+    width: 5px;
+    height: 50px;
+}
+.js-showloading-content {
+    padding: 0 25px;
+}
+
+/*  end layout decorator tigris embellishments  */
+

Modified: portals/jetspeed-2/trunk/src/webapp/decorations/layout/tigris/desktop.jsp
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/decorations/layout/tigris/desktop.jsp?view=diff&rev=538514&r1=538513&r2=538514
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/decorations/layout/tigris/desktop.jsp (original)
+++ portals/jetspeed-2/trunk/src/webapp/decorations/layout/tigris/desktop.jsp Wed May 16 03:14:51 2007
@@ -1,93 +1,104 @@
-<%--
+<%--
 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_ATTRIBUTE);
-    RequestContext requestContext = (RequestContext)request.getAttribute(RequestContext.REQUEST_PORTALENV);
-
-    String layoutStyleClass = "layout-" + desktop.getLayoutDecorationName();
-%>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<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">
-<div id="banner" style="position: static">    <!-- BOZO: set to absolute in stylesheet - don't know why - no apparent reason -->
-  <table>
-    <tr>
-      <td>
-        <div class='logo'>
-        <img src='<%= desktop.getLayoutBaseUrl("images/Jetspeed_blue_med.png") %>' alt="Logo" border="0"/>
-        </div>
-      </td>
-      <td>
-        <div align="right" id="login">
-          &nbsp;
-        </div>
-      </td>
-    </tr>
-  </table>
-</div>
-<div widgetId="jetspeed-menu-pages" dojoType="jetspeed:PortalTabContainer" style="width: 100%; margin-top: 2px; margin-left: -1px"></div>
-<div widgetId="jetspeed-menu-breadcrumbs" dojoType="jetspeed:PortalBreadcrumbContainer" style="width: 100%; margin-top: 2px; margin-left: -1px"></div>
-<table cellpadding="0" cellspacing="0" border="0" width="100%" id="main">
-<tr>
-<td id="leftcol">
-<div widgetId="jetspeed-menu-navigations" dojoType="jetspeed:PortalAccordionContainer" style=""></div>
-</td>
-<td id="jetspeedDesktopCell">
-<!-- Start Jetspeed Desktop -->
-<div class="<%= layoutStyleClass %>" id="jetspeedDesktop"></div>
-<!-- End Jetspeed Desktop -->
-</td>
-</tr>
-</table>
-<!-- Start Taskbar -->
-<!-- (when we don't want a taskbar - set windowState to "minimized", otherwise omit windowState) -->
-<!-- <div dojoType="jetspeed:PortalTaskBar" id="jetspeedTaskbar" style="background-color: #666; width: 98%; bottom: 5px; height: 110px" windowState="minimized" resizable="false"></div> -->
-<!-- End Taskbar -->
-</div>
-<!-- End Jetspeed Page -->
-  <p>
-     <img src="$jetspeedDesktop.getLayoutBaseUrl('images/Jetspeed_blue_sm.png')" 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.
+--%>
+<%@ 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_ATTRIBUTE);
+    RequestContext requestContext = (RequestContext)request.getAttribute(RequestContext.REQUEST_PORTALENV);
+
+    String layoutStyleClass = "layout-" + desktop.getLayoutDecorationName();
+%>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<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">
+<div id="banner" style="position: static">    <!-- BOZO: set to absolute in stylesheet - don't know why - no apparent reason -->
+  <table>
+    <tr>
+      <td>
+        <div class='logo'>
+        <img src='<%= desktop.getLayoutBaseUrl("images/Jetspeed_blue_med.png") %>' alt="Logo" border="0"/>
+        </div>
+      </td>
+      <td>
+        <div align="right" id="login">
+          &nbsp;
+        </div>
+      </td>
+    </tr>
+  </table>
+</div>
+<div widgetId="jetspeed-menu-pages" dojoType="jetspeed:PortalTabContainer" style="width: 100%; margin-top: 2px; margin-left: -1px"></div>
+<div widgetId="jetspeed-menu-breadcrumbs" dojoType="jetspeed:PortalBreadcrumbContainer" style="width: 100%; margin-top: 2px; margin-left: -1px"></div>
+<table cellpadding="0" cellspacing="0" border="0" width="100%" id="main">
+<tr>
+<td id="leftcol">
+<div widgetId="jetspeed-menu-navigations" dojoType="jetspeed:PortalAccordionContainer" style=""></div>
+</td>
+<td id="jetspeedDesktopCell">
+<!-- Start Jetspeed Desktop -->
+<div class="<%= layoutStyleClass %>" id="jetspeedDesktop"></div>
+<!-- End Jetspeed Desktop -->
+</td>
+</tr>
+</table>
+<!-- Start Taskbar -->
+<!-- (when we don't want a taskbar - set windowState to "minimized", otherwise omit windowState) -->
+<!-- <div dojoType="jetspeed:PortalTaskBar" id="jetspeedTaskbar" style="background-color: #666; width: 98%; bottom: 5px; height: 110px" windowState="minimized" resizable="false"></div> -->
+<!-- End Taskbar -->
+</div>
+<!-- End Jetspeed Page -->
+  <p>
+     <img src="$jetspeedDesktop.getLayoutBaseUrl('images/Jetspeed_blue_sm.png')" alt="Jetspeed 2 Powered" border="0" />
+    </p>
+<div id="js-showloading" style="display: none">
+    <table class="js-showloading">
+        <tr>
+            <td class="js-showloading-left">&nbsp;</td>
+            <td class="js-showloading-middle">
+                <div class="js-showloading-content" id="js-showloading-content">&lt;loading&gt; ...</div>
+            </td>
+            <td class="js-showloading-right">&nbsp;</td>
+        </tr>
+    </table>
+</div>
+</body>
+</html>

Modified: portals/jetspeed-2/trunk/src/webapp/decorations/layout/tigris/desktop.vm
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/decorations/layout/tigris/desktop.vm?view=diff&rev=538514&r1=538513&r2=538514
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/decorations/layout/tigris/desktop.vm (original)
+++ portals/jetspeed-2/trunk/src/webapp/decorations/layout/tigris/desktop.vm Wed May 16 03:14:51 2007
@@ -1,86 +1,97 @@
-#*
+#*
 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.
-*#
-#*
-<!--  
-Would prefer: <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-Firefox shrinks dojoButton widths when they have images if the XHTML DOCTYPE is used; aside from that it would be the doctype choice
-Primary cause for setting doctype is to prevent IE (including IE7) from using too large of a baseline font-size
--->
-*#
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<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">
-<div id="banner" style="position: static">    <!-- BOZO: set to absolute in stylesheet - don't know why - no apparent reason -->
-  <table>
-    <tr>
-      <td>
-        <div class='logo'>
-        <img src="$jetspeedDesktop.getLayoutBaseUrl('images/Jetspeed_blue_med.png')" alt="Logo" border="0"/>
-        </div>
-      </td>
-      <td>
-        <div align="right" id="login">
-          &nbsp;
-        </div>
-      </td>
-    </tr>
-  </table>
-</div>
-<div widgetId="jetspeed-menu-pages" dojoType="jetspeed:PortalTabContainer" style="width: 100%; margin-top: 2px; margin-left: -1px"></div>
-<div widgetId="jetspeed-menu-breadcrumbs" dojoType="jetspeed:PortalBreadcrumbContainer" style="width: 100%; margin-top: 2px; margin-left: -1px"></div>
-<table cellpadding="0" cellspacing="0" border="0" width="100%" id="main">
-<tr>
-<td id="leftcol">
-<div widgetId="jetspeed-menu-navigations" dojoType="jetspeed:PortalAccordionContainer" style=""></div>
-</td>
-<td id="jetspeedDesktopCell">
-<!-- Start Jetspeed Desktop -->
-<div class="layout-${jetspeedDesktop.getLayoutDecorationName()}" id="jetspeedDesktop"></div>
-<!-- End Jetspeed Desktop -->
-</td>
-</tr>
-</table>
-<!-- Start Taskbar -->
-<!-- (when we don't want a taskbar - set windowState to "minimized", otherwise omit windowState) -->
-<!-- <div dojoType="jetspeed:PortalTaskBar" id="jetspeedTaskbar" style="background-color: #666; width: 98%; bottom: 5px; height: 110px" windowState="minimized" resizable="false"></div> -->
-<!-- End Taskbar -->
-</div>
-<!-- End Jetspeed Page -->
-  <p>
-     <img src="$jetspeedDesktop.getLayoutBaseUrl('images/Jetspeed_blue_sm.png')" 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.
+*#
+#*
+<!--  
+Would prefer: <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+Firefox shrinks dojoButton widths when they have images if the XHTML DOCTYPE is used; aside from that it would be the doctype choice
+Primary cause for setting doctype is to prevent IE (including IE7) from using too large of a baseline font-size
+-->
+*#
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<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">
+<div id="banner" style="position: static">    <!-- BOZO: set to absolute in stylesheet - don't know why - no apparent reason -->
+  <table>
+    <tr>
+      <td>
+        <div class='logo'>
+        <img src="$jetspeedDesktop.getLayoutBaseUrl('images/Jetspeed_blue_med.png')" alt="Logo" border="0"/>
+        </div>
+      </td>
+      <td>
+        <div align="right" id="login">
+          &nbsp;
+        </div>
+      </td>
+    </tr>
+  </table>
+</div>
+<div widgetId="jetspeed-menu-pages" dojoType="jetspeed:PortalTabContainer" style="width: 100%; margin-top: 2px; margin-left: -1px"></div>
+<div widgetId="jetspeed-menu-breadcrumbs" dojoType="jetspeed:PortalBreadcrumbContainer" style="width: 100%; margin-top: 2px; margin-left: -1px"></div>
+<table cellpadding="0" cellspacing="0" border="0" width="100%" id="main">
+<tr>
+<td id="leftcol">
+<div widgetId="jetspeed-menu-navigations" dojoType="jetspeed:PortalAccordionContainer" style=""></div>
+</td>
+<td id="jetspeedDesktopCell">
+<!-- Start Jetspeed Desktop -->
+<div class="layout-${jetspeedDesktop.getLayoutDecorationName()}" id="jetspeedDesktop"></div>
+<!-- End Jetspeed Desktop -->
+</td>
+</tr>
+</table>
+<!-- Start Taskbar -->
+<!-- (when we don't want a taskbar - set windowState to "minimized", otherwise omit windowState) -->
+<!-- <div dojoType="jetspeed:PortalTaskBar" id="jetspeedTaskbar" style="background-color: #666; width: 98%; bottom: 5px; height: 110px" windowState="minimized" resizable="false"></div> -->
+<!-- End Taskbar -->
+</div>
+<!-- End Jetspeed Page -->
+  <p>
+     <img src="$jetspeedDesktop.getLayoutBaseUrl('images/Jetspeed_blue_sm.png')" alt="Jetspeed 2 Powered" border="0" />
+    </p>
+<div id="js-showloading" style="display: none">
+    <table class="js-showloading">
+        <tr>
+            <td class="js-showloading-left">&nbsp;</td>
+            <td class="js-showloading-middle">
+                <div class="js-showloading-content" id="js-showloading-content">&lt;loading&gt; ...</div>
+            </td>
+            <td class="js-showloading-right">&nbsp;</td>
+        </tr>
+    </table>
+</div>
+</body>
+</html>

Added: portals/jetspeed-2/trunk/src/webapp/decorations/layout/tigris/images/desktop/loading/loading_left.png
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/decorations/layout/tigris/images/desktop/loading/loading_left.png?view=auto&rev=538514
==============================================================================
Binary file - no diff available.

Propchange: portals/jetspeed-2/trunk/src/webapp/decorations/layout/tigris/images/desktop/loading/loading_left.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: portals/jetspeed-2/trunk/src/webapp/decorations/layout/tigris/images/desktop/loading/loading_middle.png
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/decorations/layout/tigris/images/desktop/loading/loading_middle.png?view=auto&rev=538514
==============================================================================
Binary file - no diff available.

Propchange: portals/jetspeed-2/trunk/src/webapp/decorations/layout/tigris/images/desktop/loading/loading_middle.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: portals/jetspeed-2/trunk/src/webapp/decorations/layout/tigris/images/desktop/loading/loading_right.png
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/decorations/layout/tigris/images/desktop/loading/loading_right.png?view=auto&rev=538514
==============================================================================
Binary file - no diff available.

Propchange: portals/jetspeed-2/trunk/src/webapp/decorations/layout/tigris/images/desktop/loading/loading_right.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Modified: portals/jetspeed-2/trunk/src/webapp/decorations/layout/tigris/resources/Messages.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/decorations/layout/tigris/resources/Messages.properties?view=diff&rev=538514&r1=538513&r2=538514
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/decorations/layout/tigris/resources/Messages.properties (original)
+++ portals/jetspeed-2/trunk/src/webapp/decorations/layout/tigris/resources/Messages.properties Wed May 16 03:14:51 2007
@@ -22,3 +22,4 @@
 desktop.action.removeportlet=Delete Portlet
 desktop.action.addportlet=Add Portlet
 desktop.action.editpage=Edit Page
+desktop.action.loading=loading ...



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