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/11/17 09:38:31 UTC
svn commit: r476078 - in
/portals/jetspeed-2/trunk/src/webapp/desktop-themes: blue/ blue/css/
blue/images/ blue/resources/ blue/templates/ tigris/ tigris/css/
tigris/images/ tigris/resources/ tigris/templates/
Author: smilek
Date: Fri Nov 17 00:38:29 2006
New Revision: 476078
URL: http://svn.apache.org/viewvc?view=rev&rev=476078
Log:
added desktop theme support for new PortalBreadcrumbContainer widget
Added:
portals/jetspeed-2/trunk/src/webapp/desktop-themes/blue/css/PortalBreadcrumbContainer.css
portals/jetspeed-2/trunk/src/webapp/desktop-themes/blue/images/addportlet.gif (with props)
portals/jetspeed-2/trunk/src/webapp/desktop-themes/blue/templates/
portals/jetspeed-2/trunk/src/webapp/desktop-themes/blue/templates/PortalBreadcrumbContainer.html
portals/jetspeed-2/trunk/src/webapp/desktop-themes/blue/templates/PortalBreadcrumbLinkSeparator.html
portals/jetspeed-2/trunk/src/webapp/desktop-themes/tigris/css/PortalBreadcrumbContainer.css
portals/jetspeed-2/trunk/src/webapp/desktop-themes/tigris/images/addportlet.gif (with props)
portals/jetspeed-2/trunk/src/webapp/desktop-themes/tigris/templates/
portals/jetspeed-2/trunk/src/webapp/desktop-themes/tigris/templates/PortalBreadcrumbContainer.html
portals/jetspeed-2/trunk/src/webapp/desktop-themes/tigris/templates/PortalBreadcrumbLinkSeparator.html
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/styles.css
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/css/styles.css
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
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=476078&r1=476077&r2=476078
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/desktop-themes/blue/blue.jsp (original)
+++ portals/jetspeed-2/trunk/src/webapp/desktop-themes/blue/blue.jsp Fri Nov 17 00:38:29 2006
@@ -65,6 +65,7 @@
</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">
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=476078&r1=476077&r2=476078
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/desktop-themes/blue/blue.vm (original)
+++ portals/jetspeed-2/trunk/src/webapp/desktop-themes/blue/blue.vm Fri Nov 17 00:38:29 2006
@@ -51,6 +51,7 @@
</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" >
Added: portals/jetspeed-2/trunk/src/webapp/desktop-themes/blue/css/PortalBreadcrumbContainer.css
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/desktop-themes/blue/css/PortalBreadcrumbContainer.css?view=auto&rev=476078
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/desktop-themes/blue/css/PortalBreadcrumbContainer.css (added)
+++ portals/jetspeed-2/trunk/src/webapp/desktop-themes/blue/css/PortalBreadcrumbContainer.css Fri Nov 17 00:38:29 2006
@@ -0,0 +1,15 @@
+/*
+Copyright 2004 The Apache Software Foundation
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
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=476078&r1=476077&r2=476078
==============================================================================
--- 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 Fri Nov 17 00:38:29 2006
@@ -16,12 +16,32 @@
@import url("../../../decorations/layout/css/portal-standard.css");
+
+/* 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-blue #jetspeedPageControls {
+ float: right;
+ margin-right: 3px;
+ margin-top: 3px;
+}
+
+.layout-blue #portalBreadcrumbList {
+ float: left;
+ margin-left: 6px;
+ margin-top: 2px;
+}
+
+.layout-blue .portalPageActionButton {
+ height: 11px;
+ width: 11px;
+}
+
/* begin layout decorator blueocean */
@@ -274,17 +294,12 @@
}
.layout-blue #breadcrumbs {
- margin:0px;
- padding:3px;
- position:absolute;
- top:140px;
- left:0px;
- width:100%;
- height:30px;
- vertical-align:middle;
+ height: 20px;
+ width: 100%;
background-color: #ffffff;
- font-family:Verdana,Helvetica,Arial,sans-serif;
+
+ font-family: Verdana,Helvetica,Arial,sans-serif;
voice-family: "\"}\"";
voice-family: inherit;
font-size: 10pt;
@@ -299,9 +314,10 @@
}
.layout-blue #main {
- margin:0px;
- padding:3px;
- width:100%;
+ margin: 0px;
+ padding: 3px;
+ clear: both;
+ width: 100%;
}
.layout-blue #leftcol {
Added: portals/jetspeed-2/trunk/src/webapp/desktop-themes/blue/images/addportlet.gif
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/desktop-themes/blue/images/addportlet.gif?view=auto&rev=476078
==============================================================================
Binary file - no diff available.
Propchange: portals/jetspeed-2/trunk/src/webapp/desktop-themes/blue/images/addportlet.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: 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=diff&rev=476078&r1=476077&r2=476078
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/desktop-themes/blue/resources/Messages.properties (original)
+++ portals/jetspeed-2/trunk/src/webapp/desktop-themes/blue/resources/Messages.properties Fri Nov 17 00:38:29 2006
@@ -12,9 +12,12 @@
# 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
+desktop.action.menu=Window Menu
+desktop.action.tile=Tile Window
+desktop.action.untile=Untile Window
+desktop.action.heightexpand=Height - Expand
+desktop.action.heightnormal=Height - Normal
+desktop.action.restore=Restore
+desktop.action.removeportlet=Delete Portlet
+desktop.action.addportlet=Add Portlet
+desktop.action.editpage=Edit Page
Modified: 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=diff&rev=476078&r1=476077&r2=476078
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/desktop-themes/blue/resources/Messages_en.properties (original)
+++ portals/jetspeed-2/trunk/src/webapp/desktop-themes/blue/resources/Messages_en.properties Fri Nov 17 00:38:29 2006
@@ -12,9 +12,12 @@
# 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
+desktop.action.menu=Window Menu
+desktop.action.tile=Tile Window
+desktop.action.untile=Untile Window
+desktop.action.heightexpand=Height - Expand
+desktop.action.heightnormal=Height - Normal
+desktop.action.restore=Restore
+desktop.action.removeportlet=Delete Portlet
+desktop.action.addportlet=Add Portlet
+desktop.action.editpage=Edit Page
Added: portals/jetspeed-2/trunk/src/webapp/desktop-themes/blue/templates/PortalBreadcrumbContainer.html
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/desktop-themes/blue/templates/PortalBreadcrumbContainer.html?view=auto&rev=476078
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/desktop-themes/blue/templates/PortalBreadcrumbContainer.html (added)
+++ portals/jetspeed-2/trunk/src/webapp/desktop-themes/blue/templates/PortalBreadcrumbContainer.html Fri Nov 17 00:38:29 2006
@@ -0,0 +1 @@
+<div id="breadcrumbs"><div dojoAttachPoint="containerNode" id="portalBreadcrumbList"></div><div id="jetspeedPageControls"></div></div>
Added: portals/jetspeed-2/trunk/src/webapp/desktop-themes/blue/templates/PortalBreadcrumbLinkSeparator.html
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/desktop-themes/blue/templates/PortalBreadcrumbLinkSeparator.html?view=auto&rev=476078
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/desktop-themes/blue/templates/PortalBreadcrumbLinkSeparator.html (added)
+++ portals/jetspeed-2/trunk/src/webapp/desktop-themes/blue/templates/PortalBreadcrumbLinkSeparator.html Fri Nov 17 00:38:29 2006
@@ -0,0 +1 @@
+<span dojoAttachPoint="containerNode"> >> </span>
Added: portals/jetspeed-2/trunk/src/webapp/desktop-themes/tigris/css/PortalBreadcrumbContainer.css
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/desktop-themes/tigris/css/PortalBreadcrumbContainer.css?view=auto&rev=476078
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/desktop-themes/tigris/css/PortalBreadcrumbContainer.css (added)
+++ portals/jetspeed-2/trunk/src/webapp/desktop-themes/tigris/css/PortalBreadcrumbContainer.css Fri Nov 17 00:38:29 2006
@@ -0,0 +1,15 @@
+/*
+Copyright 2004 The Apache Software Foundation
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
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=476078&r1=476077&r2=476078
==============================================================================
--- 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 Fri Nov 17 00:38:29 2006
@@ -16,12 +16,32 @@
@import url("../../../decorations/layout/css/portal-standard.css");
+
+/* 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;
+ margin-right: 4px;
+ margin-top: 2px;
+}
+
+.layout-tigris #portalBreadcrumbList {
+ float: left;
+ margin-left: 6px;
+ margin-top: 2px;
+}
+
+.layout-tigris .portalPageActionButton {
+ height: 11px;
+ width: 11px;
+}
+
/* begin layout decorator tigris */
@@ -190,12 +210,15 @@
}
.layout-tigris #breadcrumbs {
+ height: 20px;
+ width: 100%;
+
border-top: 1px solid #fff;
background-color: #ccc;
+
voice-family: "\"}\"";
voice-family: inherit;
font-size: x-small;
- padding: 2px 8px;
}
.layout-tigris #breadcrumbs a {
@@ -217,7 +240,8 @@
.layout-tigris #main {
border-top: 1px solid #999;
- width:100%;
+ clear: both;
+ width: 100%;
}
.layout-tigris #leftcol
Added: portals/jetspeed-2/trunk/src/webapp/desktop-themes/tigris/images/addportlet.gif
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/desktop-themes/tigris/images/addportlet.gif?view=auto&rev=476078
==============================================================================
Binary file - no diff available.
Propchange: portals/jetspeed-2/trunk/src/webapp/desktop-themes/tigris/images/addportlet.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: 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=diff&rev=476078&r1=476077&r2=476078
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/desktop-themes/tigris/resources/Messages.properties (original)
+++ portals/jetspeed-2/trunk/src/webapp/desktop-themes/tigris/resources/Messages.properties Fri Nov 17 00:38:29 2006
@@ -12,9 +12,12 @@
# 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
+desktop.action.menu=Window Menu
+desktop.action.tile=Tile Window
+desktop.action.untile=Untile Window
+desktop.action.heightexpand=Height - Expand
+desktop.action.heightnormal=Height - Normal
+desktop.action.restore=Restore
+desktop.action.removeportlet=Delete Portlet
+desktop.action.addportlet=Add Portlet
+desktop.action.editpage=Edit Page
Modified: 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=diff&rev=476078&r1=476077&r2=476078
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/desktop-themes/tigris/resources/Messages_en.properties (original)
+++ portals/jetspeed-2/trunk/src/webapp/desktop-themes/tigris/resources/Messages_en.properties Fri Nov 17 00:38:29 2006
@@ -12,9 +12,12 @@
# 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
+desktop.action.menu=Window Menu
+desktop.action.tile=Tile Window
+desktop.action.untile=Untile Window
+desktop.action.heightexpand=Height - Expand
+desktop.action.heightnormal=Height - Normal
+desktop.action.restore=Restore
+desktop.action.removeportlet=Delete Portlet
+desktop.action.addportlet=Add Portlet
+desktop.action.editpage=Edit Page
Added: portals/jetspeed-2/trunk/src/webapp/desktop-themes/tigris/templates/PortalBreadcrumbContainer.html
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/desktop-themes/tigris/templates/PortalBreadcrumbContainer.html?view=auto&rev=476078
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/desktop-themes/tigris/templates/PortalBreadcrumbContainer.html (added)
+++ portals/jetspeed-2/trunk/src/webapp/desktop-themes/tigris/templates/PortalBreadcrumbContainer.html Fri Nov 17 00:38:29 2006
@@ -0,0 +1 @@
+<div id="breadcrumbs"><div dojoAttachPoint="containerNode" id="portalBreadcrumbList"></div><div id="jetspeedPageControls"></div></div>
Added: portals/jetspeed-2/trunk/src/webapp/desktop-themes/tigris/templates/PortalBreadcrumbLinkSeparator.html
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/desktop-themes/tigris/templates/PortalBreadcrumbLinkSeparator.html?view=auto&rev=476078
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/desktop-themes/tigris/templates/PortalBreadcrumbLinkSeparator.html (added)
+++ portals/jetspeed-2/trunk/src/webapp/desktop-themes/tigris/templates/PortalBreadcrumbLinkSeparator.html Fri Nov 17 00:38:29 2006
@@ -0,0 +1 @@
+<span dojoAttachPoint="containerNode"> >> </span>
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=476078&r1=476077&r2=476078
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/desktop-themes/tigris/tigris.jsp (original)
+++ portals/jetspeed-2/trunk/src/webapp/desktop-themes/tigris/tigris.jsp Fri Nov 17 00:38:29 2006
@@ -65,6 +65,7 @@
</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">
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=476078&r1=476077&r2=476078
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/desktop-themes/tigris/tigris.vm (original)
+++ portals/jetspeed-2/trunk/src/webapp/desktop-themes/tigris/tigris.vm Fri Nov 17 00:38:29 2006
@@ -51,6 +51,7 @@
</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">
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org