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 2006/09/20 19:07:08 UTC
svn commit: r448265 - in
/portals/jetspeed-2/trunk/src/webapp/desktop-themes: blue/blue.jsp
blue/blue.vm blue/css/PortalTabContainer.css
tigris/css/PortalTabContainer.css tigris/tigris.jsp tigris/tigris.vm
Author: smilek
Date: Wed Sep 20 10:07:08 2006
New Revision: 448265
URL: http://svn.apache.org/viewvc?view=rev&rev=448265
Log:
addressed conflicts between j2o desktop and dojo 0.3.1; corrected problem that prevented j2-admin constraints and permissions portlets from functioning in j2o desktop
Modified:
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/PortalTabContainer.css
portals/jetspeed-2/trunk/src/webapp/desktop-themes/tigris/css/PortalTabContainer.css
portals/jetspeed-2/trunk/src/webapp/desktop-themes/tigris/tigris.jsp
portals/jetspeed-2/trunk/src/webapp/desktop-themes/tigris/tigris.vm
Modified: portals/jetspeed-2/trunk/src/webapp/desktop-themes/blue/blue.jsp
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/desktop-themes/blue/blue.jsp?view=diff&rev=448265&r1=448264&r2=448265
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/desktop-themes/blue/blue.jsp (original)
+++ portals/jetspeed-2/trunk/src/webapp/desktop-themes/blue/blue.jsp Wed Sep 20 10:07:08 2006
@@ -80,9 +80,10 @@
dojo.require("dojo.widget.TabContainer");
dojo.require("dojo.widget.AccordionPane");
dojo.require("dojo.widget.Menu2");
+ dojo.require('dojo.widget.Checkbox');
dojo.require('dojo.widget.Dialog');
dojo.require('dojo.widget.Button');
- dojo.require("dojo.fx.html");
+ dojo.require("dojo.lfx.html");
dojo.require('dojo.widget.LayoutContainer');
dojo.require('dojo.widget.ContentPane');
@@ -114,7 +115,7 @@
<link rel="stylesheet" type="text/css" media="screen, projection" href='<%= desktop.getDesktopThemeResourceUrl("css/styles.css") %>'/>
<script language="JavaScript" type="text/javascript">
- function init()
+ function jsDesktopInit()
{
jetspeed.initializeDesktop( '<%= desktop.getDesktopTheme() %>', de_jsessionid_url( '<%= desktop.getDesktopThemeRootUrl() %>' ) );
}
@@ -126,7 +127,7 @@
{
jetspeed.doAction( bindArgs, portletEntityId );
}
- dojo.event.connect( dojo, "loaded", "init" );
+ dojo.addOnLoad( window.jsDesktopInit );
</script>
Modified: portals/jetspeed-2/trunk/src/webapp/desktop-themes/blue/blue.vm
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/desktop-themes/blue/blue.vm?view=diff&rev=448265&r1=448264&r2=448265
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/desktop-themes/blue/blue.vm (original)
+++ portals/jetspeed-2/trunk/src/webapp/desktop-themes/blue/blue.vm Wed Sep 20 10:07:08 2006
@@ -54,9 +54,10 @@
dojo.require("dojo.widget.TabContainer");
dojo.require("dojo.widget.AccordionPane");
dojo.require("dojo.widget.Menu2");
+ dojo.require('dojo.widget.Checkbox');
dojo.require('dojo.widget.Dialog');
dojo.require('dojo.widget.Button');
- dojo.require("dojo.fx.html");
+ dojo.require("dojo.lfx.html");
dojo.require('dojo.widget.LayoutContainer');
dojo.require('dojo.widget.ContentPane');
@@ -88,7 +89,7 @@
<link rel="stylesheet" type="text/css" media="screen, projection" href="$jetspeedDesktop.getDesktopThemeResourceUrl('css/styles.css')"/>
<script language="JavaScript" type="text/javascript">
- function init()
+ function jsDesktopInit()
{
jetspeed.initializeDesktop( "$jetspeedDesktop.getDesktopTheme()", de_jsessionid_url( "$jetspeedDesktop.getDesktopThemeRootUrl()" ) );
}
@@ -100,7 +101,7 @@
{
jetspeed.doAction( bindArgs, portletEntityId );
}
- dojo.event.connect(dojo, "loaded", "init");
+ dojo.addOnLoad( window.jsDesktopInit );
</script>
Modified: portals/jetspeed-2/trunk/src/webapp/desktop-themes/blue/css/PortalTabContainer.css
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/desktop-themes/blue/css/PortalTabContainer.css?view=diff&rev=448265&r1=448264&r2=448265
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/desktop-themes/blue/css/PortalTabContainer.css (original)
+++ portals/jetspeed-2/trunk/src/webapp/desktop-themes/blue/css/PortalTabContainer.css Wed Sep 20 10:07:08 2006
@@ -20,7 +20,8 @@
.dojoTabPaneWrapper {
position : relative;
- border-top : 1px solid;
+ border-top : 1px solid #6290d2;
+ clear: both;
}
.dojoTabLabels-top {
@@ -30,13 +31,20 @@
overflow : visible;
margin-bottom : -1px;
width : 100%;
+ z-index: 2; /* so the bottom of the tab label will cover up the border of dojoTabPaneWrapper */
+}
+.dojoTabLabels-top-noLayout {
+ overflow : visible;
+ margin-bottom : -1px;
+ width : 100%;
+ z-index: 2;
}
.dojoTabPaneTab {
position : relative;
float : left;
padding-left : 9px;
- border-bottom : 1px solid;
+ border-bottom : 1px solid #6290d2;
background : url(../images/tabs/tab_left.gif) no-repeat left top;
cursor: pointer;
}
@@ -97,10 +105,11 @@
overflow : visible;
margin-top : -1px;
width : 100%;
+ z-index: 2;
}
.dojoTabLabels-bottom .dojoTabPaneTab {
- border-top : 1px solid;
+ border-top : 1px solid #6290d2;
border-bottom : 0;
background : url(../images/tabs/tab_bot_left.gif) no-repeat left bottom;
}
@@ -129,11 +138,12 @@
right : 0px;
overflow : visible;
margin-left : -1px;
+ z-index: 2;
}
.dojoTabLabels-right-h .dojoTabPaneTab {
padding-left : 0;
- border-left : 1px solid;
+ border-left : 1px solid #6290d2;
border-bottom : 0;
background : url(../images/tabs/tab_bot_right.gif) no-repeat right bottom;
float : none;
@@ -145,7 +155,7 @@
.dojoTabLabels-right-h .dojoTabPaneTab.current {
border-left : 0;
- border-bottom : 1px solid;
+ border-bottom : 1px solid #6290d2;
}
/* left-h tabs */
@@ -156,10 +166,11 @@
left : 0px;
overflow : visible;
margin-right : -1px;
+ z-index: 2;
}
.dojoTabLabels-left-h .dojoTabPaneTab {
- border-right : 1px solid;
+ border-right : 1px solid #6290d2;
border-bottom : 0;
float : none;
background : url(../images/tabs/tab_top_left.gif) no-repeat left top;
@@ -167,11 +178,12 @@
.dojoTabLabels-left-h .dojoTabPaneTab.current {
border-right : 0;
- border-bottom : 1px solid;
+ border-bottom : 1px solid #6290d2;
padding-bottom : 0;
background : url(../images/tabs/tab_top_left.gif) no-repeat 0 -150px;
}
.dojoTabLabels-left-h .dojoTabPaneTab span {
background : 0;
+ border-bottom : 1px solid #6290d2;
}
Modified: portals/jetspeed-2/trunk/src/webapp/desktop-themes/tigris/css/PortalTabContainer.css
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/desktop-themes/tigris/css/PortalTabContainer.css?view=diff&rev=448265&r1=448264&r2=448265
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/desktop-themes/tigris/css/PortalTabContainer.css (original)
+++ portals/jetspeed-2/trunk/src/webapp/desktop-themes/tigris/css/PortalTabContainer.css Wed Sep 20 10:07:08 2006
@@ -20,7 +20,8 @@
.dojoTabPaneWrapper {
position : relative;
- border-top : 1px solid;
+ border-top : 1px solid #6290d2;
+ clear: both;
}
.dojoTabLabels-top {
@@ -30,13 +31,20 @@
overflow : visible;
margin-bottom : -1px;
width : 100%;
+ z-index: 2; /* so the bottom of the tab label will cover up the border of dojoTabPaneWrapper */
+}
+.dojoTabLabels-top-noLayout {
+ overflow : visible;
+ margin-bottom : -1px;
+ width : 100%;
+ z-index: 2;
}
.dojoTabPaneTab {
position : relative;
float : left;
padding-left : 9px;
- border-bottom : 1px solid;
+ border-bottom : 1px solid #6290d2;
background : url(../images/tabs/tab_left.gif) no-repeat left top;
cursor: pointer;
}
@@ -97,10 +105,11 @@
overflow : visible;
margin-top : -1px;
width : 100%;
+ z-index: 2;
}
.dojoTabLabels-bottom .dojoTabPaneTab {
- border-top : 1px solid;
+ border-top : 1px solid #6290d2;
border-bottom : 0;
background : url(../images/tabs/tab_bot_left.gif) no-repeat left bottom;
}
@@ -129,11 +138,12 @@
right : 0px;
overflow : visible;
margin-left : -1px;
+ z-index: 2;
}
.dojoTabLabels-right-h .dojoTabPaneTab {
padding-left : 0;
- border-left : 1px solid;
+ border-left : 1px solid #6290d2;
border-bottom : 0;
background : url(../images/tabs/tab_bot_right.gif) no-repeat right bottom;
float : none;
@@ -145,7 +155,7 @@
.dojoTabLabels-right-h .dojoTabPaneTab.current {
border-left : 0;
- border-bottom : 1px solid;
+ border-bottom : 1px solid #6290d2;
}
/* left-h tabs */
@@ -156,10 +166,11 @@
left : 0px;
overflow : visible;
margin-right : -1px;
+ z-index: 2;
}
.dojoTabLabels-left-h .dojoTabPaneTab {
- border-right : 1px solid;
+ border-right : 1px solid #6290d2;
border-bottom : 0;
float : none;
background : url(../images/tabs/tab_top_left.gif) no-repeat left top;
@@ -167,11 +178,12 @@
.dojoTabLabels-left-h .dojoTabPaneTab.current {
border-right : 0;
- border-bottom : 1px solid;
+ border-bottom : 1px solid #6290d2;
padding-bottom : 0;
background : url(../images/tabs/tab_top_left.gif) no-repeat 0 -150px;
}
.dojoTabLabels-left-h .dojoTabPaneTab span {
background : 0;
+ border-bottom : 1px solid #6290d2;
}
Modified: portals/jetspeed-2/trunk/src/webapp/desktop-themes/tigris/tigris.jsp
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/desktop-themes/tigris/tigris.jsp?view=diff&rev=448265&r1=448264&r2=448265
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/desktop-themes/tigris/tigris.jsp (original)
+++ portals/jetspeed-2/trunk/src/webapp/desktop-themes/tigris/tigris.jsp Wed Sep 20 10:07:08 2006
@@ -78,9 +78,10 @@
dojo.require("dojo.widget.TabContainer");
dojo.require("dojo.widget.AccordionPane");
dojo.require("dojo.widget.Menu2");
+ dojo.require('dojo.widget.Checkbox');
dojo.require('dojo.widget.Dialog');
dojo.require('dojo.widget.Button');
- dojo.require("dojo.fx.html");
+ dojo.require("dojo.lfx.html");
dojo.require('dojo.widget.LayoutContainer');
dojo.require('dojo.widget.ContentPane');
@@ -112,7 +113,7 @@
<link rel="stylesheet" type="text/css" media="screen, projection" href='<%= desktop.getDesktopThemeResourceUrl("css/styles.css") %>'/>
<script language="JavaScript" type="text/javascript">
- function init()
+ function jsDesktopInit()
{
jetspeed.initializeDesktop( '<%= desktop.getDesktopTheme() %>', de_jsessionid_url( '<%= desktop.getDesktopThemeRootUrl() %>' ) );
}
@@ -124,7 +125,7 @@
{
jetspeed.doAction( bindArgs, portletEntityId );
}
- dojo.event.connect( dojo, "loaded", "init" );
+ dojo.addOnLoad( window.jsDesktopInit );
</script>
Modified: portals/jetspeed-2/trunk/src/webapp/desktop-themes/tigris/tigris.vm
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/desktop-themes/tigris/tigris.vm?view=diff&rev=448265&r1=448264&r2=448265
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/desktop-themes/tigris/tigris.vm (original)
+++ portals/jetspeed-2/trunk/src/webapp/desktop-themes/tigris/tigris.vm Wed Sep 20 10:07:08 2006
@@ -52,9 +52,10 @@
dojo.require("dojo.widget.TabContainer");
dojo.require("dojo.widget.AccordionPane");
dojo.require("dojo.widget.Menu2");
+ dojo.require('dojo.widget.Checkbox');
dojo.require('dojo.widget.Dialog');
dojo.require('dojo.widget.Button');
- dojo.require("dojo.fx.html");
+ dojo.require("dojo.lfx.html");
dojo.require('dojo.widget.LayoutContainer');
dojo.require('dojo.widget.ContentPane');
@@ -86,7 +87,7 @@
<link rel="stylesheet" type="text/css" media="screen, projection" href="$jetspeedDesktop.getDesktopThemeResourceUrl('css/styles.css')"/>
<script language="JavaScript" type="text/javascript">
- function init()
+ function jsDesktopInit()
{
jetspeed.initializeDesktop( "$jetspeedDesktop.getDesktopTheme()", de_jsessionid_url( "$jetspeedDesktop.getDesktopThemeRootUrl()" ) );
}
@@ -98,7 +99,7 @@
{
jetspeed.doAction( bindArgs, portletEntityId );
}
- dojo.event.connect(dojo, "loaded", "init");
+ dojo.addOnLoad( window.jsDesktopInit );
</script>
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org