portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tay...@apache.org
Subject svn commit: r396569 [1/3] - in /portals/jetspeed-2/trunk/src: javascript/dojo/ webapp/desktop-themes/blue/ webapp/desktop-themes/blue/css/ webapp/desktop-themes/blue/images/tabs/ webapp/javascript/desktop/core/ webapp/javascript/desktop/widget/
Date Mon, 24 Apr 2006 14:51:35 GMT
Author: taylor
Date: Mon Apr 24 07:50:53 2006
New Revision: 396569

URL: http://svn.apache.org/viewcvs?rev=396569&view=rev
Log:
patch from Steve Milek for Jetspeed Desktop

A      widget/HtmlTabContainer.css
A      widget/PortalTabContainer.js
A      widget/BaseFloatingPane.js
M      widget/HtmlFloatingPane.html
M      widget/HtmlFloatingPane.css
M      widget/PortalTaskBar.js
M      widget/PortletWindow.js
M      core/core.js

M      blue/blue.jsp
A      blue/images/tabs/*
M      blue/css/styles.css
M      blue/blue.vm

Added:
    portals/jetspeed-2/trunk/src/webapp/desktop-themes/blue/images/tabs/
    portals/jetspeed-2/trunk/src/webapp/desktop-themes/blue/images/tabs/tab_bot_left.gif 
 (with props)
    portals/jetspeed-2/trunk/src/webapp/desktop-themes/blue/images/tabs/tab_bot_left_curr.gif
  (with props)
    portals/jetspeed-2/trunk/src/webapp/desktop-themes/blue/images/tabs/tab_bot_right.gif
  (with props)
    portals/jetspeed-2/trunk/src/webapp/desktop-themes/blue/images/tabs/tab_bot_right_curr.gif
  (with props)
    portals/jetspeed-2/trunk/src/webapp/desktop-themes/blue/images/tabs/tab_close.gif   (with
props)
    portals/jetspeed-2/trunk/src/webapp/desktop-themes/blue/images/tabs/tab_close_h.gif  
(with props)
    portals/jetspeed-2/trunk/src/webapp/desktop-themes/blue/images/tabs/tab_left.gif   (with
props)
    portals/jetspeed-2/trunk/src/webapp/desktop-themes/blue/images/tabs/tab_top_left.gif 
 (with props)
    portals/jetspeed-2/trunk/src/webapp/desktop-themes/blue/images/tabs/tab_top_right.gif
  (with props)
    portals/jetspeed-2/trunk/src/webapp/javascript/desktop/widget/BaseFloatingPane.js
    portals/jetspeed-2/trunk/src/webapp/javascript/desktop/widget/HtmlTabContainer.css
    portals/jetspeed-2/trunk/src/webapp/javascript/desktop/widget/PortalTabContainer.js
Modified:
    portals/jetspeed-2/trunk/src/javascript/dojo/VERSION.txt
    portals/jetspeed-2/trunk/src/javascript/dojo/dojo.zip
    portals/jetspeed-2/trunk/src/webapp/desktop-themes/blue/blue.jsp
    portals/jetspeed-2/trunk/src/webapp/desktop-themes/blue/blue.vm
    portals/jetspeed-2/trunk/src/webapp/desktop-themes/blue/css/styles.css
    portals/jetspeed-2/trunk/src/webapp/javascript/desktop/core/core.js
    portals/jetspeed-2/trunk/src/webapp/javascript/desktop/widget/HtmlFloatingPane.css
    portals/jetspeed-2/trunk/src/webapp/javascript/desktop/widget/HtmlFloatingPane.html
    portals/jetspeed-2/trunk/src/webapp/javascript/desktop/widget/PortalTaskBar.js
    portals/jetspeed-2/trunk/src/webapp/javascript/desktop/widget/PortletWindow.js

Modified: portals/jetspeed-2/trunk/src/javascript/dojo/VERSION.txt
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/javascript/dojo/VERSION.txt?rev=396569&r1=396568&r2=396569&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/src/javascript/dojo/VERSION.txt (original)
+++ portals/jetspeed-2/trunk/src/javascript/dojo/VERSION.txt Mon Apr 24 07:50:53 2006
@@ -1,6 +1,6 @@
-dojo.zip contains copy of dojo nightly build form 2006-04-06
+dojo.zip contains copy of dojo nightly build form 2006-04-21
 
-dojo-2006-04-06.tgz
+dojo-2006-04-21.tgz
 
 see http://archive.dojotoolkit.org
 

Modified: portals/jetspeed-2/trunk/src/javascript/dojo/dojo.zip
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/javascript/dojo/dojo.zip?rev=396569&r1=396568&r2=396569&view=diff
==============================================================================
Binary files - no diff available.

Modified: portals/jetspeed-2/trunk/src/webapp/desktop-themes/blue/blue.jsp
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/webapp/desktop-themes/blue/blue.jsp?rev=396569&r1=396568&r2=396569&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/desktop-themes/blue/blue.jsp (original)
+++ portals/jetspeed-2/trunk/src/webapp/desktop-themes/blue/blue.jsp Mon Apr 24 07:50:53 2006
@@ -14,9 +14,14 @@
 limitations under the License.
 --%>
 <%@ page language="java" import="org.apache.jetspeed.desktop.JetspeedDesktopContext" session="true"
%>
-
+<%@ page import="org.apache.jetspeed.request.RequestContext"%>
+<%@ page import="org.apache.jetspeed.Jetspeed" %>
+<%@ page import="org.apache.jetspeed.headerresource.HeaderResourceFactory" %>
 <% 
     JetspeedDesktopContext desktop = (JetspeedDesktopContext)request.getAttribute(JetspeedDesktopContext.DESKTOP_ATTRIBUTE);
+    //RequestContext requestContext = (RequestContext)request.getAttribute(RequestContext.REQUEST_PORTALENV);
+    //HeaderResourceFactory resourceHeaderFactory = (HeaderResourceFactory)Jetspeed.getComponentManager().getComponent("org.apache.jetspeed.headerresource.HeaderResourceFactory");
+    //String resourceHeader = resourceHeaderFactory.getHeaderResouce(requestContext).toString();
 %>
 
 <html>   <!-- NOTE: do not use strict doctype - see dojo svn log for FloatingPane.js
-->
@@ -37,7 +42,6 @@
         if (tEnds > 0) djConfig.baseScriptUri = djConfig.baseScriptUri.substring(0, tEnds);
     }
 </script>
-
 <!-- 
   DOJO Script
   -->
@@ -50,9 +54,11 @@
     dojo.require("dojo.io");
     dojo.require("dojo.collections.ArrayList");
     dojo.require("dojo.collections.Set");
+    //dojo.require("dojo.layout");
     dojo.require("dojo.widget.Manager");
     dojo.require("dojo.widget.TaskBar");
     dojo.require("dojo.widget.FloatingPane");
+    dojo.require("dojo.widget.TabContainer");
     dojo.require("dojo.widget.Menu2");
     dojo.require("dojo.fx.html");
 
@@ -63,30 +69,56 @@
 
     dojo.require("jetspeed.ui.widget.PortalTaskBar");
     dojo.require("jetspeed.ui.widget.PortletWindow");
-
-    dojo.hostenv.writeIncludes();    
+    dojo.require("jetspeed.ui.widget.PortalTabContainer");
+</script>
+<script language="JavaScript" type="text/javascript">
+    dojo.hostenv.writeIncludes();
 </script>
 <script language="JavaScript" type="text/javascript">
     dojo.widget.manager.registerWidgetPackage('jetspeed.ui.widget');
 </script>
-
 <!-- <base> tag must appear after dojo load in IE6 ( see http://trac.dojotoolkit.org/ticket/557
) -->
-<base id="basetag" href="<%= desktop.getPortalResourceUrl("/") %>"> <!-- http://localhost:8080/jetspeed/
-->
+<base id="basetag" href="<%= desktop.getPortalResourceUrl("/") %>">  <!--
http://localhost:8080/jetspeed/ --> 
 <link rel="stylesheet" type="text/css" media="screen, projection" href="desktop-themes/blue/css/styles.css"/>
 <script language="JavaScript" type="text/javascript">
     function init()
     {
         jetspeed.initializeDesktop();
     }
-    function doRender(url,portletEntityId)
+    function doRender( url, portletEntityId )
+    {
+        jetspeed.doRender( url, portletEntityId );
+    }
+    function doAction( url, portletEntityId, currentForm )
     {
-        jetspeed.doRender(url,portletEntityId);
+        jetspeed.doAction( url,portletEntityId, currentForm );
     }
-    function doAction(url, portletEntityId, currentForm)
+    dojo.event.connect( dojo, "loaded", "init" );
+</script>
+<script language="JavaScript" type="text/javascript">
+/*
+javascript: var tab = document.createElement( "div" ); tab.setAttribute( "label", "Blee"
); dojo.widget.byId( 'mainTabContainer' ).addChild( { domNode: tab } ); 
+javascript: var tab = document.createElement( "div" ); var tabText = document.createTextNode("Blee");
tab.appendChild( tabText ); dojo.widget.byId( 'mainTabContainer' ).addChild( { domNode: tab
} );
+javascript: var tab = document.createElement( "div" ); var tabText = document.createTextNode("Blee");
tab.appendChild( tabText ); dojo.widget.byId( 'mainTabContainer' ).addChild( { domNode: tab,
label: "Blee" } );
+javascript: dojo.widget.byId( 'mainTabContainer' ).addChild( { domNode: tab, label: "Blee"
} );
+*/
+    function notifyRetrieveAllMenusFinished()
     {
-        jetspeed.doAction(url,portletEntityId, currentForm);
+        dojo.debug( "window.notifyRetrieveAllMenusFinished" );
+        jetspeed.pageNavigateSuppress = true;
+        var menuObj = jetspeed.page.getMenu( "pages" );
+        if ( ! menuObj ) return;
+        var menuName = menuObj.getName();
+        if ( menuName == "pages" )
+        {
+            var portalTabWidget = dojo.widget.byId( "mainTabContainer" );
+            if ( ! portalTabWidget )
+                dojo.raise( "window.notifyRetrieveMenuFinished could not find widget for
mainTabContainer" );
+            portalTabWidget.createTabsFromMenu( menuObj );
+        }
+        jetspeed.pageNavigateSuppress = false;
     }
-    dojo.event.connect(dojo, "loaded", "init");
+    dojo.event.connect( jetspeed, "notifyRetrieveAllMenusFinished", "notifyRetrieveAllMenusFinished"
);  // jetspeed.notifyRetrieveMenuFinished
 </script>
 <style>
 
@@ -103,9 +135,13 @@
 
 <!-- Start Jetspeed Desktop -->
 <body class="layout-blue" id="jetspeedPage">
+<div widgetId="mainTabContainer" dojoType="PortalTabContainer" style="width: 100%; height:
25px;"></div>
 <div class="layout-blue" id="jetspeedDesktop">
 <!-- Start Taskbar -->
-<div dojoType="PortalTaskBar" id="jetspeedTaskbar" style="background-color: #666; width:
98%; bottom: 5px; height: 110px" resizable="false">
+<!-- the presence of the PortalTaskBar here is hiding a style load problem (at least in
ff - sure to be worse in IE) -->
+<!-- for now we need to keep this here until this can be fixed -->
+<!-- (when we don't want a taskbar - set windowState to "minimized", otherwise omit windowState)
-->
+<div dojoType="PortalTaskBar" id="jetspeedTaskbar" style="background-color: #666; width:
98%; bottom: 5px; height: 110px" windowState="minimized" resizable="false">
 </div>
 <!-- End Taskbar -->
 </div>

Modified: portals/jetspeed-2/trunk/src/webapp/desktop-themes/blue/blue.vm
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/webapp/desktop-themes/blue/blue.vm?rev=396569&r1=396568&r2=396569&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/desktop-themes/blue/blue.vm (original)
+++ portals/jetspeed-2/trunk/src/webapp/desktop-themes/blue/blue.vm Mon Apr 24 07:50:53 2006
@@ -59,6 +59,8 @@
     dojo.require("jetspeed.ui.widget.PortalTaskBar");
     dojo.require("jetspeed.ui.widget.PortletWindow");
 
+</script>
+<script language="JavaScript" type="text/javascript">
     dojo.hostenv.writeIncludes();
 </script>
 <script language="JavaScript" type="text/javascript">

Modified: portals/jetspeed-2/trunk/src/webapp/desktop-themes/blue/css/styles.css
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/webapp/desktop-themes/blue/css/styles.css?rev=396569&r1=396568&r2=396569&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/desktop-themes/blue/css/styles.css (original)
+++ portals/jetspeed-2/trunk/src/webapp/desktop-themes/blue/css/styles.css Mon Apr 24 07:50:53
2006
@@ -82,6 +82,64 @@
 
 
 
+/*  begin dojo styles  */
+
+/* tabcontainer */
+
+.layout-blue .dojoTabPaneTab {
+    background-image: url(../images/tabs/tab_left.gif);
+}
+
+.layout-blue .dojoTabPaneTab span {
+    background-image: url(../images/tabs/tab_top_right.gif);
+}
+
+.layout-blue .dojoTabPanePaneClose {
+    background-image: url(../images/tabs/tab_close.gif);
+}
+
+.layout-blue .dojoTabPanePaneCloseHover {
+    background-image: url(../images/tabs/tab_close_h.gif);
+}
+
+.layout-blue .dojoTabPaneTabClose {
+    background-image: url(../images/tabs/tab_close.gif);
+}
+
+.layout-blue .dojoTabPaneTabCloseHover {
+    background-image: url(../images/tabs/tab_close_h.gif);
+}
+
+.layout-blue .dojoTabLabels-bottom .dojoTabPaneTab {
+    background-image: url(../images/tabs/tab_bot_left.gif);
+}
+
+.layout-blue .dojoTabLabels-bottom .dojoTabPaneTab span {
+    background-image: url(../images/tabs/tab_bot_right.gif);
+}
+
+.layout-blue .dojoTabLabels-bottom .dojoTabPaneTab.current {
+    background-image: url(../images/tabs/tab_bot_left_curr.gif);
+}
+
+.layout-blue .dojoTabLabels-bottom .dojoTabPaneTab.current span {
+    background-image: url(../images/tabs/tab_bot_right_curr.gif);
+}
+
+.layout-blue .dojoTabLabels-right-h .dojoTabPaneTab {
+    background-image: url(../images/tabs/tab_bot_right.gif);
+}
+
+.layout-blue .dojoTabLabels-left-h .dojoTabPaneTab {
+    background-image: url(../images/tabs/tab_top_left.gif);
+}
+
+.layout-blue .dojoTabLabels-left-h .dojoTabPaneTab.current {
+    background-image: url(../images/tabs/tab_top_left.gif);
+}
+
+
+/*  end dojo styles  */
 
 
 

Added: portals/jetspeed-2/trunk/src/webapp/desktop-themes/blue/images/tabs/tab_bot_left.gif
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/webapp/desktop-themes/blue/images/tabs/tab_bot_left.gif?rev=396569&view=auto
==============================================================================
Binary file - no diff available.

Propchange: portals/jetspeed-2/trunk/src/webapp/desktop-themes/blue/images/tabs/tab_bot_left.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: portals/jetspeed-2/trunk/src/webapp/desktop-themes/blue/images/tabs/tab_bot_left_curr.gif
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/webapp/desktop-themes/blue/images/tabs/tab_bot_left_curr.gif?rev=396569&view=auto
==============================================================================
Binary file - no diff available.

Propchange: portals/jetspeed-2/trunk/src/webapp/desktop-themes/blue/images/tabs/tab_bot_left_curr.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: portals/jetspeed-2/trunk/src/webapp/desktop-themes/blue/images/tabs/tab_bot_right.gif
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/webapp/desktop-themes/blue/images/tabs/tab_bot_right.gif?rev=396569&view=auto
==============================================================================
Binary file - no diff available.

Propchange: portals/jetspeed-2/trunk/src/webapp/desktop-themes/blue/images/tabs/tab_bot_right.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: portals/jetspeed-2/trunk/src/webapp/desktop-themes/blue/images/tabs/tab_bot_right_curr.gif
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/webapp/desktop-themes/blue/images/tabs/tab_bot_right_curr.gif?rev=396569&view=auto
==============================================================================
Binary file - no diff available.

Propchange: portals/jetspeed-2/trunk/src/webapp/desktop-themes/blue/images/tabs/tab_bot_right_curr.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: portals/jetspeed-2/trunk/src/webapp/desktop-themes/blue/images/tabs/tab_close.gif
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/webapp/desktop-themes/blue/images/tabs/tab_close.gif?rev=396569&view=auto
==============================================================================
Binary file - no diff available.

Propchange: portals/jetspeed-2/trunk/src/webapp/desktop-themes/blue/images/tabs/tab_close.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: portals/jetspeed-2/trunk/src/webapp/desktop-themes/blue/images/tabs/tab_close_h.gif
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/webapp/desktop-themes/blue/images/tabs/tab_close_h.gif?rev=396569&view=auto
==============================================================================
Binary file - no diff available.

Propchange: portals/jetspeed-2/trunk/src/webapp/desktop-themes/blue/images/tabs/tab_close_h.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: portals/jetspeed-2/trunk/src/webapp/desktop-themes/blue/images/tabs/tab_left.gif
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/webapp/desktop-themes/blue/images/tabs/tab_left.gif?rev=396569&view=auto
==============================================================================
Binary file - no diff available.

Propchange: portals/jetspeed-2/trunk/src/webapp/desktop-themes/blue/images/tabs/tab_left.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: portals/jetspeed-2/trunk/src/webapp/desktop-themes/blue/images/tabs/tab_top_left.gif
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/webapp/desktop-themes/blue/images/tabs/tab_top_left.gif?rev=396569&view=auto
==============================================================================
Binary file - no diff available.

Propchange: portals/jetspeed-2/trunk/src/webapp/desktop-themes/blue/images/tabs/tab_top_left.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: portals/jetspeed-2/trunk/src/webapp/desktop-themes/blue/images/tabs/tab_top_right.gif
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/webapp/desktop-themes/blue/images/tabs/tab_top_right.gif?rev=396569&view=auto
==============================================================================
Binary file - no diff available.

Propchange: portals/jetspeed-2/trunk/src/webapp/desktop-themes/blue/images/tabs/tab_top_right.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream



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