portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From smi...@apache.org
Subject svn commit: r472278 - in /portals/jetspeed-2/trunk/src/webapp/desktop-themes: blue/ blue/css/ blue/images/tabs/ blue/resources/ tigris/ tigris/css/ tigris/images/tabs/ tigris/resources/
Date Tue, 07 Nov 2006 21:24:49 GMT
Author: smilek
Date: Tue Nov  7 13:24:48 2006
New Revision: 472278

URL: http://svn.apache.org/viewvc?view=rev&rev=472278
Log:
updated for dojo-release-0.4.0

Added:
    portals/jetspeed-2/trunk/src/webapp/desktop-themes/blue/resources/
    portals/jetspeed-2/trunk/src/webapp/desktop-themes/blue/resources/Messages.properties
    portals/jetspeed-2/trunk/src/webapp/desktop-themes/blue/resources/Messages_en.properties
    portals/jetspeed-2/trunk/src/webapp/desktop-themes/tigris/resources/
    portals/jetspeed-2/trunk/src/webapp/desktop-themes/tigris/resources/Messages.properties
    portals/jetspeed-2/trunk/src/webapp/desktop-themes/tigris/resources/Messages_en.properties
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/blue/css/styles.css
    portals/jetspeed-2/trunk/src/webapp/desktop-themes/blue/images/tabs/tab_bot_left.gif
    portals/jetspeed-2/trunk/src/webapp/desktop-themes/blue/images/tabs/tab_bot_left_curr.gif
    portals/jetspeed-2/trunk/src/webapp/desktop-themes/blue/images/tabs/tab_bot_right.gif
    portals/jetspeed-2/trunk/src/webapp/desktop-themes/blue/images/tabs/tab_bot_right_curr.gif
    portals/jetspeed-2/trunk/src/webapp/desktop-themes/blue/images/tabs/tab_close.gif
    portals/jetspeed-2/trunk/src/webapp/desktop-themes/blue/images/tabs/tab_close_h.gif
    portals/jetspeed-2/trunk/src/webapp/desktop-themes/blue/images/tabs/tab_left.gif
    portals/jetspeed-2/trunk/src/webapp/desktop-themes/blue/images/tabs/tab_top_left.gif
    portals/jetspeed-2/trunk/src/webapp/desktop-themes/blue/images/tabs/tab_top_right.gif
    portals/jetspeed-2/trunk/src/webapp/desktop-themes/blue/theme.properties
    portals/jetspeed-2/trunk/src/webapp/desktop-themes/tigris/css/PortalTabContainer.css
    portals/jetspeed-2/trunk/src/webapp/desktop-themes/tigris/css/styles.css
    portals/jetspeed-2/trunk/src/webapp/desktop-themes/tigris/images/tabs/tab_bot_left.gif
    portals/jetspeed-2/trunk/src/webapp/desktop-themes/tigris/images/tabs/tab_bot_left_curr.gif
    portals/jetspeed-2/trunk/src/webapp/desktop-themes/tigris/images/tabs/tab_bot_right.gif
    portals/jetspeed-2/trunk/src/webapp/desktop-themes/tigris/images/tabs/tab_bot_right_curr.gif
    portals/jetspeed-2/trunk/src/webapp/desktop-themes/tigris/images/tabs/tab_close.gif
    portals/jetspeed-2/trunk/src/webapp/desktop-themes/tigris/images/tabs/tab_close_h.gif
    portals/jetspeed-2/trunk/src/webapp/desktop-themes/tigris/images/tabs/tab_left.gif
    portals/jetspeed-2/trunk/src/webapp/desktop-themes/tigris/images/tabs/tab_top_left.gif
    portals/jetspeed-2/trunk/src/webapp/desktop-themes/tigris/images/tabs/tab_top_right.gif
    portals/jetspeed-2/trunk/src/webapp/desktop-themes/tigris/theme.properties
    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=472278&r1=472277&r2=472278
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/desktop-themes/blue/blue.jsp (original)
+++ portals/jetspeed-2/trunk/src/webapp/desktop-themes/blue/blue.jsp Tue Nov  7 13:24:48 2006
@@ -26,19 +26,6 @@
     RequestContext requestContext = (RequestContext)request.getAttribute(RequestContext.REQUEST_PORTALENV);
 
     String desktopThemeStyleClass = "layout-" + desktop.getDesktopTheme();
-
-    //Enumeration iter = request.getAttributeNames();
-    //String debugout = "";
-    //while ( iter.hasMoreElements() )
-    //{
-    //    debugout += iter.nextElement().toString() + ", " ;
-    //}
-    //System.out.println( "request.getAttributeNames() : " + debugout );
-
-    //Fragment rootFragment = (Fragment)requestContext.getPage().getRootContentFragment();
-
-    //String testThemeResourceUrl = desktop.getDesktopThemeResourceUrl("images/logo.gif");
-    ///System.out.println( "t h e m e : " + testThemeResourceUrl );
 %>
 <html> <!-- .jsp --> <!-- NOTE: do not use strict doctype - see dojo svn log
for FloatingPane.js -->
 <head>
@@ -77,13 +64,13 @@
     </tr>
   </table>
 </div>
-<div widgetId="jetspeed-menu-pages" dojoType="PortalTabContainer" style="width: 100%;
height: 30px; margin-top: 2px; margin-left: -1px"></div>
-<table cellpadding="0" cellspacing="0" border="0" width="100%" id="main" style="position:
static">  <!-- id="main"  has top: 170px and position: absolute -->
+<div widgetId="jetspeed-menu-pages" dojoType="jetspeed:PortalTabContainer" style="width:
100%; margin-top: 2px; margin-left: -1px"></div>
+<table cellpadding="0" cellspacing="0" border="0" width="100%" id="main">
 <tr>
-<td valign="top" id="leftcol" >
-<div widgetId="jetspeed-menu-navigations" dojoType="PortalAccordionContainer" style=""></div>
+<td id="leftcol">
+<div widgetId="jetspeed-menu-navigations" dojoType="jetspeed:PortalAccordionContainer"></div>
 </td>
-<td style="vertical-align: top">   <!-- hack of "vertical-align: top" needed by
IE once the leftnav was added  -->
+<td id="jetspeedDesktopCell">
 <!-- Start Jetspeed Desktop -->
 <div class="<%= desktopThemeStyleClass %>" id="jetspeedDesktop"></div>
 <!-- End Jetspeed Desktop -->
@@ -91,10 +78,8 @@
 </tr>
 </table>
 <!-- Start Taskbar -->
-<!-- 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>
+<!-- <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 -->

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=472278&r1=472277&r2=472278
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/desktop-themes/blue/blue.vm (original)
+++ portals/jetspeed-2/trunk/src/webapp/desktop-themes/blue/blue.vm Tue Nov  7 13:24:48 2006
@@ -50,13 +50,13 @@
     </tr>
   </table>
 </div>
-<div widgetId="jetspeed-menu-pages" dojoType="PortalTabContainer" style="width: 100%;
height: 35px; margin-top: 2px; margin-left: -1px"></div>
-<table cellpadding="0" cellspacing="0" border="0" width="100%" id="main" style="position:
static">  <!-- id="main"  has top: 170px and position: absolute -->
+<div widgetId="jetspeed-menu-pages" dojoType="jetspeed:PortalTabContainer" style="width:
100%; margin-top: 2px; margin-left: -1px"></div>
+<table cellpadding="0" cellspacing="0" border="0" width="100%" id="main">
 <tr>
-<td valign="top" id="leftcol" >
-<div widgetId="jetspeed-menu-navigations" dojoType="PortalAccordionContainer" style=""></div>
+<td id="leftcol" >
+<div widgetId="jetspeed-menu-navigations" dojoType="jetspeed:PortalAccordionContainer"></div>
 </td>
-<td style="vertical-align: top">   <!-- hack of "vertical-align: top" needed by
IE once the leftnav was added  -->
+<td id="jetspeedDesktopCell">
 <!-- Start Jetspeed Desktop -->
 <div class="layout-${jetspeedDesktop.getDesktopTheme()}" id="jetspeedDesktop"></div>
 <!-- End Jetspeed Desktop -->
@@ -64,10 +64,8 @@
 </tr>
 </table>
 <!-- Start Taskbar -->
-<!-- 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>
+<!-- <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 -->

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=472278&r1=472277&r2=472278
==============================================================================
--- 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 Tue
Nov  7 13:24:48 2006
@@ -19,37 +19,39 @@
 }
 
 .dojoTabPaneWrapper {
-	position : relative;
-	border-top : 1px solid #6290d2;
-    clear: both;
+	border : 1px solid #6290d2;
+	_zoom: 1; /* force IE6 layout mode so top border doesnt disappear */
+	display: block;
+	clear: both;
 }
 
 .dojoTabLabels-top {
-	position : absolute;
+	position : relative;
 	top : 0px;
 	left : 0px;
 	overflow : visible;
 	margin-bottom : -1px;
 	width : 100%;
-    z-index: 2;	/* so the bottom of the tab label will cover up the border of dojoTabPaneWrapper
*/
+	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;
+
+.dojoTabNoLayout.dojoTabLabels-top .dojoTab {
+	margin-bottom: -1px;
+	_margin-bottom: 0px; /* IE filter so top border lines up correctly */
 }
 
-.dojoTabPaneTab {
+.dojoTab {
 	position : relative;
 	float : left;
 	padding-left : 9px;
 	border-bottom : 1px solid #6290d2;
 	background : url(../images/tabs/tab_left.gif) no-repeat left top;
 	cursor: pointer;
+	white-space: nowrap;
+	z-index: 3;
 }
 
-.dojoTabPaneTab span {
+.dojoTab div {
 	display : block;
 	padding : 4px 15px 4px 6px;
 	background : url(../images/tabs/tab_top_right.gif) no-repeat right top;
@@ -57,40 +59,31 @@
 	font-size : 90%;
 }
 
-.dojoTabPanePaneClose {
-	position : absolute;
-	bottom : 0px;
-	right : 6px;
-	height : 12px;
-	width : 12px;
-	background : url(../images/tabs/tab_close.gif) no-repeat right top;
-}
-
-.dojoTabPanePaneCloseHover {
-	background-image : url(../images/tabs/tab_close_h.gif);
-}
-
-.dojoTabPaneTabClose {
-	display : inline;
+.dojoTab .close {
+	display : inline-block;
 	height : 12px;
 	width : 12px;
 	padding : 0 12px 0 0;
 	margin : 0 -10px 0 10px;
-	background : url(../images/tabs/tab_close.gif) no-repeat right top;
 	cursor : default;
+	font-size: small;
+}
+
+.dojoTab .closeImage {
+	background : url(../images/tabs/tab_close.gif) no-repeat right top;
 }
 
-.dojoTabPaneTabCloseHover {
+.dojoTab .closeHover {
 	background-image : url(../images/tabs/tab_close_h.gif);
 }
 
-.dojoTabPaneTab.current {
+.dojoTab.current {
 	padding-bottom : 1px;
 	border-bottom : 0;
 	background-position : 0 -150px;
 }
 
-.dojoTabPaneTab.current span {
+.dojoTab.current div {
 	padding-bottom : 5px;
 	margin-bottom : -1px;
 	background-position : 100% -150px;
@@ -99,49 +92,48 @@
 /* bottom tabs */
 
 .dojoTabLabels-bottom {
-	position : absolute;
+	position : relative;
 	bottom : 0px;
 	left : 0px;
 	overflow : visible;
 	margin-top : -1px;
 	width : 100%;
-    z-index: 2;
+	z-index: 2;
 }
 
-.dojoTabLabels-bottom .dojoTabPaneTab {
+.dojoTabNoLayout.dojoTabLabels-bottom {
+	position : relative;
+}
+
+.dojoTabLabels-bottom .dojoTab {
 	border-top :  1px solid #6290d2;
 	border-bottom : 0;
 	background : url(../images/tabs/tab_bot_left.gif) no-repeat left bottom;
 }
 
-.dojoTabLabels-bottom .dojoTabPaneTab span {
+.dojoTabLabels-bottom .dojoTab div {
 	background : url(../images/tabs/tab_bot_right.gif) no-repeat right bottom;
 }
 
-.dojoTabLabels-bottom .dojoTabPaneTab.current {
-	padding-top : 1px;
+.dojoTabLabels-bottom .dojoTab.current {
 	border-top : 0;
 	background : url(../images/tabs/tab_bot_left_curr.gif) no-repeat left bottom;
 }
 
-.dojoTabLabels-bottom .dojoTabPaneTab.current span {
-	padding-top : 5px;
-	margin-top : -1px;
+.dojoTabLabels-bottom .dojoTab.current div {
+	padding-top : 4px;
 	background : url(../images/tabs/tab_bot_right_curr.gif) no-repeat right bottom;
 }
 
 /* right-h tabs */
 
 .dojoTabLabels-right-h {
-	position : absolute;
-	top : 0px;
-	right : 0px;
 	overflow : visible;
 	margin-left : -1px;
-    z-index: 2;
+	z-index: 2;
 }
 
-.dojoTabLabels-right-h .dojoTabPaneTab {
+.dojoTabLabels-right-h .dojoTab {
 	padding-left : 0;
 	border-left :  1px solid #6290d2;
 	border-bottom : 0;
@@ -149,11 +141,11 @@
 	float : none;
 }
 
-.dojoTabLabels-right-h .dojoTabPaneTab span {
+.dojoTabLabels-right-h .dojoTab div {
 	padding : 4px 15px 4px 15px;
 }
 
-.dojoTabLabels-right-h .dojoTabPaneTab.current {
+.dojoTabLabels-right-h .dojoTab.current {
 	border-left :  0;
 	border-bottom :  1px solid #6290d2;
 }
@@ -161,29 +153,26 @@
 /* left-h tabs */
 
 .dojoTabLabels-left-h {
-	position : absolute;
-	top : 0px;
-	left : 0px;
 	overflow : visible;
 	margin-right : -1px;
 	z-index: 2;
 }
 
-.dojoTabLabels-left-h .dojoTabPaneTab {
+.dojoTabLabels-left-h .dojoTab {
 	border-right :  1px solid #6290d2;
 	border-bottom : 0;
 	float : none;
 	background : url(../images/tabs/tab_top_left.gif) no-repeat left top;
 }
 
-.dojoTabLabels-left-h .dojoTabPaneTab.current {
+.dojoTabLabels-left-h .dojoTab.current {
 	border-right : 0;
 	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 {
+.dojoTabLabels-left-h .dojoTab div {
 	background : 0;
 	border-bottom :  1px solid #6290d2;
 }

Modified: portals/jetspeed-2/trunk/src/webapp/desktop-themes/blue/css/styles.css
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/desktop-themes/blue/css/styles.css?view=diff&rev=472278&r1=472277&r2=472278
==============================================================================
--- 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 Tue Nov  7 13:24:48
2006
@@ -301,9 +301,6 @@
 .layout-blue #main {
     margin:0px;
     padding:3px;
-    position:absolute;
-    top:170px;
-    left:0px;
     width:100%;
 }
 
@@ -311,6 +308,7 @@
     width:130px;
     padding:0px;
     margin:0px;
+    vertical-align:top;
 }
 
 .layout-blue #navcolumn table {

Modified: portals/jetspeed-2/trunk/src/webapp/desktop-themes/blue/images/tabs/tab_bot_left.gif
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/desktop-themes/blue/images/tabs/tab_bot_left.gif?view=diff&rev=472278&r1=472277&r2=472278
==============================================================================
Binary files - no diff available.

Modified: portals/jetspeed-2/trunk/src/webapp/desktop-themes/blue/images/tabs/tab_bot_left_curr.gif
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/desktop-themes/blue/images/tabs/tab_bot_left_curr.gif?view=diff&rev=472278&r1=472277&r2=472278
==============================================================================
Binary files - no diff available.

Modified: portals/jetspeed-2/trunk/src/webapp/desktop-themes/blue/images/tabs/tab_bot_right.gif
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/desktop-themes/blue/images/tabs/tab_bot_right.gif?view=diff&rev=472278&r1=472277&r2=472278
==============================================================================
Binary files - no diff available.

Modified: portals/jetspeed-2/trunk/src/webapp/desktop-themes/blue/images/tabs/tab_bot_right_curr.gif
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/desktop-themes/blue/images/tabs/tab_bot_right_curr.gif?view=diff&rev=472278&r1=472277&r2=472278
==============================================================================
Binary files - no diff available.

Modified: portals/jetspeed-2/trunk/src/webapp/desktop-themes/blue/images/tabs/tab_close.gif
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/desktop-themes/blue/images/tabs/tab_close.gif?view=diff&rev=472278&r1=472277&r2=472278
==============================================================================
Binary files - no diff available.

Modified: portals/jetspeed-2/trunk/src/webapp/desktop-themes/blue/images/tabs/tab_close_h.gif
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/desktop-themes/blue/images/tabs/tab_close_h.gif?view=diff&rev=472278&r1=472277&r2=472278
==============================================================================
Binary files - no diff available.

Modified: portals/jetspeed-2/trunk/src/webapp/desktop-themes/blue/images/tabs/tab_left.gif
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/desktop-themes/blue/images/tabs/tab_left.gif?view=diff&rev=472278&r1=472277&r2=472278
==============================================================================
Binary files - no diff available.

Modified: portals/jetspeed-2/trunk/src/webapp/desktop-themes/blue/images/tabs/tab_top_left.gif
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/desktop-themes/blue/images/tabs/tab_top_left.gif?view=diff&rev=472278&r1=472277&r2=472278
==============================================================================
Binary files - no diff available.

Modified: portals/jetspeed-2/trunk/src/webapp/desktop-themes/blue/images/tabs/tab_top_right.gif
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/desktop-themes/blue/images/tabs/tab_top_right.gif?view=diff&rev=472278&r1=472277&r2=472278
==============================================================================
Binary files - no diff available.

Added: portals/jetspeed-2/trunk/src/webapp/desktop-themes/blue/resources/Messages.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/desktop-themes/blue/resources/Messages.properties?view=auto&rev=472278
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/desktop-themes/blue/resources/Messages.properties
(added)
+++ portals/jetspeed-2/trunk/src/webapp/desktop-themes/blue/resources/Messages.properties
Tue Nov  7 13:24:48 2006
@@ -0,0 +1,20 @@
+# 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.
+
+desktop.window.action.tile=Tile Window
+desktop.window.action.untile=Untile Window
+desktop.window.action.heightexpand=Height - Expand
+desktop.window.action.heightnormal=Height - Normal
+desktop.window.action.restore=Restore
+desktop.window.action.remove=Delete Portlet

Added: portals/jetspeed-2/trunk/src/webapp/desktop-themes/blue/resources/Messages_en.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/desktop-themes/blue/resources/Messages_en.properties?view=auto&rev=472278
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/desktop-themes/blue/resources/Messages_en.properties
(added)
+++ portals/jetspeed-2/trunk/src/webapp/desktop-themes/blue/resources/Messages_en.properties
Tue Nov  7 13:24:48 2006
@@ -0,0 +1,20 @@
+# 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.
+
+desktop.window.action.tile=Tile Window
+desktop.window.action.untile=Untile Window
+desktop.window.action.heightexpand=Height - Expand
+desktop.window.action.heightnormal=Height - Normal
+desktop.window.action.restore=Restore
+desktop.window.action.remove=Delete Portlet

Modified: portals/jetspeed-2/trunk/src/webapp/desktop-themes/blue/theme.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/desktop-themes/blue/theme.properties?view=diff&rev=472278&r1=472277&r2=472278
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/desktop-themes/blue/theme.properties (original)
+++ portals/jetspeed-2/trunk/src/webapp/desktop-themes/blue/theme.properties Tue Nov  7 13:24:48
2006
@@ -14,3 +14,4 @@
 
 id=blue
 template.extension=.jsp
+resource.file=Messages

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=472278&r1=472277&r2=472278
==============================================================================
--- 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 Tue
Nov  7 13:24:48 2006
@@ -19,37 +19,39 @@
 }
 
 .dojoTabPaneWrapper {
-	position : relative;
-	border-top : 1px solid #6290d2;
-    clear: both;
+	border : 1px solid #6290d2;
+	_zoom: 1; /* force IE6 layout mode so top border doesnt disappear */
+	display: block;
+	clear: both;
 }
 
 .dojoTabLabels-top {
-	position : absolute;
+	position : relative;
 	top : 0px;
 	left : 0px;
 	overflow : visible;
 	margin-bottom : -1px;
 	width : 100%;
-    z-index: 2;	/* so the bottom of the tab label will cover up the border of dojoTabPaneWrapper
*/
+	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;
+
+.dojoTabNoLayout.dojoTabLabels-top .dojoTab {
+	margin-bottom: -1px;
+	_margin-bottom: 0px; /* IE filter so top border lines up correctly */
 }
 
-.dojoTabPaneTab {
+.dojoTab {
 	position : relative;
 	float : left;
 	padding-left : 9px;
 	border-bottom : 1px solid #6290d2;
 	background : url(../images/tabs/tab_left.gif) no-repeat left top;
 	cursor: pointer;
+	white-space: nowrap;
+	z-index: 3;
 }
 
-.dojoTabPaneTab span {
+.dojoTab div {
 	display : block;
 	padding : 4px 15px 4px 6px;
 	background : url(../images/tabs/tab_top_right.gif) no-repeat right top;
@@ -57,40 +59,31 @@
 	font-size : 90%;
 }
 
-.dojoTabPanePaneClose {
-	position : absolute;
-	bottom : 0px;
-	right : 6px;
-	height : 12px;
-	width : 12px;
-	background : url(../images/tabs/tab_close.gif) no-repeat right top;
-}
-
-.dojoTabPanePaneCloseHover {
-	background-image : url(../images/tabs/tab_close_h.gif);
-}
-
-.dojoTabPaneTabClose {
-	display : inline;
+.dojoTab .close {
+	display : inline-block;
 	height : 12px;
 	width : 12px;
 	padding : 0 12px 0 0;
 	margin : 0 -10px 0 10px;
-	background : url(../images/tabs/tab_close.gif) no-repeat right top;
 	cursor : default;
+	font-size: small;
+}
+
+.dojoTab .closeImage {
+	background : url(../images/tabs/tab_close.gif) no-repeat right top;
 }
 
-.dojoTabPaneTabCloseHover {
+.dojoTab .closeHover {
 	background-image : url(../images/tabs/tab_close_h.gif);
 }
 
-.dojoTabPaneTab.current {
+.dojoTab.current {
 	padding-bottom : 1px;
 	border-bottom : 0;
 	background-position : 0 -150px;
 }
 
-.dojoTabPaneTab.current span {
+.dojoTab.current div {
 	padding-bottom : 5px;
 	margin-bottom : -1px;
 	background-position : 100% -150px;
@@ -99,49 +92,48 @@
 /* bottom tabs */
 
 .dojoTabLabels-bottom {
-	position : absolute;
+	position : relative;
 	bottom : 0px;
 	left : 0px;
 	overflow : visible;
 	margin-top : -1px;
 	width : 100%;
-    z-index: 2;
+	z-index: 2;
+}
+
+.dojoTabNoLayout.dojoTabLabels-bottom {
+	position : relative;
 }
 
-.dojoTabLabels-bottom .dojoTabPaneTab {
+.dojoTabLabels-bottom .dojoTab {
 	border-top :  1px solid #6290d2;
 	border-bottom : 0;
 	background : url(../images/tabs/tab_bot_left.gif) no-repeat left bottom;
 }
 
-.dojoTabLabels-bottom .dojoTabPaneTab span {
+.dojoTabLabels-bottom .dojoTab div {
 	background : url(../images/tabs/tab_bot_right.gif) no-repeat right bottom;
 }
 
-.dojoTabLabels-bottom .dojoTabPaneTab.current {
-	padding-top : 1px;
+.dojoTabLabels-bottom .dojoTab.current {
 	border-top : 0;
 	background : url(../images/tabs/tab_bot_left_curr.gif) no-repeat left bottom;
 }
 
-.dojoTabLabels-bottom .dojoTabPaneTab.current span {
-	padding-top : 5px;
-	margin-top : -1px;
+.dojoTabLabels-bottom .dojoTab.current div {
+	padding-top : 4px;
 	background : url(../images/tabs/tab_bot_right_curr.gif) no-repeat right bottom;
 }
 
 /* right-h tabs */
 
 .dojoTabLabels-right-h {
-	position : absolute;
-	top : 0px;
-	right : 0px;
 	overflow : visible;
 	margin-left : -1px;
-    z-index: 2;
+	z-index: 2;
 }
 
-.dojoTabLabels-right-h .dojoTabPaneTab {
+.dojoTabLabels-right-h .dojoTab {
 	padding-left : 0;
 	border-left :  1px solid #6290d2;
 	border-bottom : 0;
@@ -149,11 +141,11 @@
 	float : none;
 }
 
-.dojoTabLabels-right-h .dojoTabPaneTab span {
+.dojoTabLabels-right-h .dojoTab div {
 	padding : 4px 15px 4px 15px;
 }
 
-.dojoTabLabels-right-h .dojoTabPaneTab.current {
+.dojoTabLabels-right-h .dojoTab.current {
 	border-left :  0;
 	border-bottom :  1px solid #6290d2;
 }
@@ -161,29 +153,26 @@
 /* left-h tabs */
 
 .dojoTabLabels-left-h {
-	position : absolute;
-	top : 0px;
-	left : 0px;
 	overflow : visible;
 	margin-right : -1px;
-    z-index: 2;
+	z-index: 2;
 }
 
-.dojoTabLabels-left-h .dojoTabPaneTab {
+.dojoTabLabels-left-h .dojoTab {
 	border-right :  1px solid #6290d2;
 	border-bottom : 0;
 	float : none;
 	background : url(../images/tabs/tab_top_left.gif) no-repeat left top;
 }
 
-.dojoTabLabels-left-h .dojoTabPaneTab.current {
+.dojoTabLabels-left-h .dojoTab.current {
 	border-right : 0;
 	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 {
+.dojoTabLabels-left-h .dojoTab div {
 	background : 0;
-    border-bottom :  1px solid #6290d2;
+	border-bottom :  1px solid #6290d2;
 }

Modified: portals/jetspeed-2/trunk/src/webapp/desktop-themes/tigris/css/styles.css
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/desktop-themes/tigris/css/styles.css?view=diff&rev=472278&r1=472277&r2=472278
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/desktop-themes/tigris/css/styles.css (original)
+++ portals/jetspeed-2/trunk/src/webapp/desktop-themes/tigris/css/styles.css Tue Nov  7 13:24:48
2006
@@ -217,6 +217,7 @@
 
 .layout-tigris #main {
     border-top: 1px solid #999;
+    width:100%;
 }
 
 .layout-tigris #leftcol 
@@ -225,6 +226,7 @@
     voice-family: "\"}\"";
     voice-family: inherit;
     font-size: x-small;
+    vertical-align: top;
 }
 
 .layout-tigris #leftcol a {

Modified: portals/jetspeed-2/trunk/src/webapp/desktop-themes/tigris/images/tabs/tab_bot_left.gif
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/desktop-themes/tigris/images/tabs/tab_bot_left.gif?view=diff&rev=472278&r1=472277&r2=472278
==============================================================================
Binary files - no diff available.

Modified: portals/jetspeed-2/trunk/src/webapp/desktop-themes/tigris/images/tabs/tab_bot_left_curr.gif
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/desktop-themes/tigris/images/tabs/tab_bot_left_curr.gif?view=diff&rev=472278&r1=472277&r2=472278
==============================================================================
Binary files - no diff available.

Modified: portals/jetspeed-2/trunk/src/webapp/desktop-themes/tigris/images/tabs/tab_bot_right.gif
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/desktop-themes/tigris/images/tabs/tab_bot_right.gif?view=diff&rev=472278&r1=472277&r2=472278
==============================================================================
Binary files - no diff available.

Modified: portals/jetspeed-2/trunk/src/webapp/desktop-themes/tigris/images/tabs/tab_bot_right_curr.gif
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/desktop-themes/tigris/images/tabs/tab_bot_right_curr.gif?view=diff&rev=472278&r1=472277&r2=472278
==============================================================================
Binary files - no diff available.

Modified: portals/jetspeed-2/trunk/src/webapp/desktop-themes/tigris/images/tabs/tab_close.gif
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/desktop-themes/tigris/images/tabs/tab_close.gif?view=diff&rev=472278&r1=472277&r2=472278
==============================================================================
Binary files - no diff available.

Modified: portals/jetspeed-2/trunk/src/webapp/desktop-themes/tigris/images/tabs/tab_close_h.gif
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/desktop-themes/tigris/images/tabs/tab_close_h.gif?view=diff&rev=472278&r1=472277&r2=472278
==============================================================================
Binary files - no diff available.

Modified: portals/jetspeed-2/trunk/src/webapp/desktop-themes/tigris/images/tabs/tab_left.gif
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/desktop-themes/tigris/images/tabs/tab_left.gif?view=diff&rev=472278&r1=472277&r2=472278
==============================================================================
Binary files - no diff available.

Modified: portals/jetspeed-2/trunk/src/webapp/desktop-themes/tigris/images/tabs/tab_top_left.gif
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/desktop-themes/tigris/images/tabs/tab_top_left.gif?view=diff&rev=472278&r1=472277&r2=472278
==============================================================================
Binary files - no diff available.

Modified: portals/jetspeed-2/trunk/src/webapp/desktop-themes/tigris/images/tabs/tab_top_right.gif
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/desktop-themes/tigris/images/tabs/tab_top_right.gif?view=diff&rev=472278&r1=472277&r2=472278
==============================================================================
Binary files - no diff available.

Added: portals/jetspeed-2/trunk/src/webapp/desktop-themes/tigris/resources/Messages.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/desktop-themes/tigris/resources/Messages.properties?view=auto&rev=472278
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/desktop-themes/tigris/resources/Messages.properties
(added)
+++ portals/jetspeed-2/trunk/src/webapp/desktop-themes/tigris/resources/Messages.properties
Tue Nov  7 13:24:48 2006
@@ -0,0 +1,20 @@
+# 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.
+
+desktop.window.action.tile=Tile Window
+desktop.window.action.untile=Untile Window
+desktop.window.action.heightexpand=Height - Expand
+desktop.window.action.heightnormal=Height - Normal
+desktop.window.action.restore=Restore
+desktop.window.action.remove=Delete Portlet

Added: portals/jetspeed-2/trunk/src/webapp/desktop-themes/tigris/resources/Messages_en.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/desktop-themes/tigris/resources/Messages_en.properties?view=auto&rev=472278
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/desktop-themes/tigris/resources/Messages_en.properties
(added)
+++ portals/jetspeed-2/trunk/src/webapp/desktop-themes/tigris/resources/Messages_en.properties
Tue Nov  7 13:24:48 2006
@@ -0,0 +1,20 @@
+# 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.
+
+desktop.window.action.tile=Tile Window
+desktop.window.action.untile=Untile Window
+desktop.window.action.heightexpand=Height - Expand
+desktop.window.action.heightnormal=Height - Normal
+desktop.window.action.restore=Restore
+desktop.window.action.remove=Delete Portlet

Modified: portals/jetspeed-2/trunk/src/webapp/desktop-themes/tigris/theme.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/desktop-themes/tigris/theme.properties?view=diff&rev=472278&r1=472277&r2=472278
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/desktop-themes/tigris/theme.properties (original)
+++ portals/jetspeed-2/trunk/src/webapp/desktop-themes/tigris/theme.properties Tue Nov  7
13:24:48 2006
@@ -13,4 +13,5 @@
 # limitations under the License.
 
 id=tigris
-template.extension=.jsp
+template.extension=.vm
+resource.file=Messages

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=472278&r1=472277&r2=472278
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/desktop-themes/tigris/tigris.jsp (original)
+++ portals/jetspeed-2/trunk/src/webapp/desktop-themes/tigris/tigris.jsp Tue Nov  7 13:24:48
2006
@@ -26,19 +26,6 @@
     RequestContext requestContext = (RequestContext)request.getAttribute(RequestContext.REQUEST_PORTALENV);
 
     String desktopThemeStyleClass = "layout-" + desktop.getDesktopTheme();
-
-    //Enumeration iter = request.getAttributeNames();
-    //String debugout = "";
-    //while ( iter.hasMoreElements() )
-    //{
-    //    debugout += iter.nextElement().toString() + ", " ;
-    //}
-    //System.out.println( "request.getAttributeNames() : " + debugout );
-
-    //Fragment rootFragment = (Fragment)requestContext.getPage().getRootContentFragment();
-
-    //String testThemeResourceUrl = desktop.getDesktopThemeResourceUrl("images/logo.gif");
-    ///System.out.println( "t h e m e : " + testThemeResourceUrl );
 %>
 <html> <!-- .jsp --> <!-- NOTE: do not use strict doctype - see dojo svn log
for FloatingPane.js -->
 <head>
@@ -77,13 +64,13 @@
     </tr>
   </table>
 </div>
-<div widgetId="jetspeed-menu-pages" dojoType="PortalTabContainer" style="width: 100%;
height: 30px; margin-top: 2px; margin-left: -1px"></div>
-<table cellpadding="0" cellspacing="0" border="0" width="100%" id="main" style="position:
static">  <!-- id="main"  has top: 170px and position: absolute -->
+<div widgetId="jetspeed-menu-pages" dojoType="jetspeed:PortalTabContainer" style="width:
100%; margin-top: 2px; margin-left: -1px"></div>
+<table cellpadding="0" cellspacing="0" border="0" width="100%" id="main">
 <tr>
-<td valign="top" id="leftcol" >
-<div widgetId="jetspeed-menu-navigations" dojoType="PortalAccordionContainer" style=""></div>
+<td id="leftcol">
+<div widgetId="jetspeed-menu-navigations" dojoType="jetspeed:PortalAccordionContainer"
style=""></div>
 </td>
-<td style="vertical-align: top">   <!-- hack of "vertical-align: top" needed by
IE once the leftnav was added  -->
+<td id="jetspeedDesktopCell">
 <!-- Start Jetspeed Desktop -->
 <div class="<%= desktopThemeStyleClass %>" id="jetspeedDesktop"></div>
 <!-- End Jetspeed Desktop -->
@@ -91,10 +78,8 @@
 </tr>
 </table>
 <!-- Start Taskbar -->
-<!-- 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>
+<!-- <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 -->

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=472278&r1=472277&r2=472278
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/desktop-themes/tigris/tigris.vm (original)
+++ portals/jetspeed-2/trunk/src/webapp/desktop-themes/tigris/tigris.vm Tue Nov  7 13:24:48
2006
@@ -50,13 +50,13 @@
     </tr>
   </table>
 </div>
-<div widgetId="jetspeed-menu-pages" dojoType="PortalTabContainer" style="width: 100%;
height: 35px; margin-top: 2px; margin-left: -1px"></div>
-<table cellpadding="0" cellspacing="0" border="0" width="100%" id="main" style="position:
static">  <!-- id="main"  has top: 170px and position: absolute -->
+<div widgetId="jetspeed-menu-pages" dojoType="jetspeed:PortalTabContainer" style="width:
100%; margin-top: 2px; margin-left: -1px"></div>
+<table cellpadding="0" cellspacing="0" border="0" width="100%" id="main">
 <tr>
-<td valign="top" id="leftcol" >
-<div widgetId="jetspeed-menu-navigations" dojoType="PortalAccordionContainer" style=""></div>
+<td id="leftcol">
+<div widgetId="jetspeed-menu-navigations" dojoType="jetspeed:PortalAccordionContainer"
style=""></div>
 </td>
-<td style="vertical-align: top">   <!-- hack of "vertical-align: top" needed by
IE once the leftnav was added  -->
+<td id="jetspeedDesktopCell">
 <!-- Start Jetspeed Desktop -->
 <div class="layout-${jetspeedDesktop.getDesktopTheme()}" id="jetspeedDesktop"></div>
 <!-- End Jetspeed Desktop -->
@@ -64,10 +64,8 @@
 </tr>
 </table>
 <!-- Start Taskbar -->
-<!-- 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>
+<!-- <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 -->



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