=================================================================== --- components/portal/src/java/org/apache/jetspeed/container/url/impl/JetspeedPortletURL.java (revision 449944) +++ components/portal/src/java/org/apache/jetspeed/container/url/impl/JetspeedPortletURL.java (working copy) @@ -30,13 +30,17 @@ */ public class JetspeedPortletURL extends PortletURLImpl { + private String portletAnchor = null; public JetspeedPortletURL(PortletWindow portletWindow, HttpServletRequest servletRequest, HttpServletResponse servletResponse, boolean isAction) - { + { super(portletWindow, servletRequest, servletResponse, isAction); + // for better accessibility when an action is submitted the portal points to portlet id that submitted the action + if(isAction) + this.portletAnchor = "#" + portletWindow.getPortletEntity().getId(); } public String toString() - { - return servletResponse.encodeURL(super.toString()); + { + return servletResponse.encodeURL(super.toString()) + this.portletAnchor; } } Index: applications/j2-admin/src/java/org/apache/jetspeed/portlets/localeselector/resources/LocaleSelectorResources.properties =================================================================== --- applications/j2-admin/src/java/org/apache/jetspeed/portlets/localeselector/resources/LocaleSelectorResources.properties (revision 449944) +++ applications/j2-admin/src/java/org/apache/jetspeed/portlets/localeselector/resources/LocaleSelectorResources.properties (working copy) @@ -24,6 +24,7 @@ localeselector.label.change=Change # Locale Name +localeselector.locale.el=Greek localeselector.locale.hu=Hungarian localeselector.locale.de=German localeselector.locale.en=English Index: applications/j2-admin/src/java/org/apache/jetspeed/portlets/localeselector/resources/LocaleSelectorResources_en.properties =================================================================== --- applications/j2-admin/src/java/org/apache/jetspeed/portlets/localeselector/resources/LocaleSelectorResources_en.properties (revision 449944) +++ applications/j2-admin/src/java/org/apache/jetspeed/portlets/localeselector/resources/LocaleSelectorResources_en.properties (working copy) @@ -12,21 +12,20 @@ # See the License for the specific language governing permissions and # limitations under the License. # -# $Id: LocaleSelectorResources_en.properties 348264 2005-11-22 22:06:45Z taylor $ +# $Id: LocaleSelectorResources.properties 348264 2005-11-22 22:06:45Z taylor $ # -# LOCALIZATION MAINTAINER: -# Jetspeed Development Team -# portlet info -javax.portlet.title=Locale Selector -javax.portlet.short-title=This is a portlet to select your preferred locale -javax.portlet.keywords=Locale,Language +# Base Locales +# DO NOT TRANSLATE & DO NOT INCLUDE IN L10N PROPERTIES FILE +localeselector.locales=de,en,es,fr,hu,it,ja,ko,nl,pl,pt,ru,sv,zh,zh_TW # Label localeselector.label.language=Language: localeselector.label.change=Change # Locale Name +localeselector.locale.el=Greek +localeselector.locale.hu=Hungarian localeselector.locale.de=German localeselector.locale.en=English localeselector.locale.es=Spanish @@ -35,10 +34,9 @@ localeselector.locale.ja=Japanese localeselector.locale.ko=Korean localeselector.locale.nl=Dutch +localeselector.locale.pl=Polish +localeselector.locale.pt=Portuguese +localeselector.locale.ru=Russian localeselector.locale.sv=Swedish localeselector.locale.zh=Simplified Chinese localeselector.locale.zh_TW=Traditional Chinese -localeselector.locale.ru=Russian -localeselector.locale.pt=Portuguese - - Index: applications/j2-admin/src/webapp/WEB-INF/security/login/login.jsp =================================================================== --- applications/j2-admin/src/webapp/WEB-INF/security/login/login.jsp (revision 449944) +++ applications/j2-admin/src/webapp/WEB-INF/security/login/login.jsp (working copy) @@ -41,9 +41,9 @@ -
+
-
+
@@ -51,34 +51,27 @@ -
+
-
+
-
+
-
+
-
- - - + + - - - - - - - - - -
">
">
+ "/> +
+ + + "/>
Index: layout-portlets/src/java/org/apache/jetspeed/portlets/layout/resources/LayoutResource.properties =================================================================== --- layout-portlets/src/java/org/apache/jetspeed/portlets/layout/resources/LayoutResource.properties (revision 449944) +++ layout-portlets/src/java/org/apache/jetspeed/portlets/layout/resources/LayoutResource.properties (working copy) @@ -17,7 +17,7 @@ portal.page.help.title = Portal Pages portal.page.help.view = Render the page in view mode. portal.page.help.help = Get help on a page or portlet. -portal.page.help.edit = Edit a portal page. Which includes changing the theme or layout, adding pages, changing the portlet application decorators, and moving or removing portlet applications from a page. +portal.page.help.edit = Edit a portal page. Which includes changing the theme or layout, adding pages, changing the portlet application decorators, and moving or removing portlet applications from a page. [reload page] portal.page.help.select = Add more portlet applications to a page. portal.portlet.help.title = Portlet Applications portal.portlet.help.minimize = Minimize a portlet. @@ -34,22 +34,24 @@ portal.page.editing.theme=Theme: portal.page.editing.layout=Layout: -portal.page.editing.changelayout=Change -portal.page.editing.addlayout=Add -portal.page.editing.page=Page: -portal.page.editing.addpage=Add -portal.page.editing.portlet=Portlet: -portal.page.editing.addportlet=Add a Portlet -portal.page.editing.movePortletLeft=Move Portlet Left -portal.page.editing.movePortletUp=Move Portlet Up -portal.page.editing.removePortlet=Remove Portlet -portal.page.editing.movePortletDown=Move Portlet Down -portal.page.editing.movePortletRight=Move Portlet Right -portal.page.editing.moveLayoutLeft=Move Layout Left -portal.page.editing.moveLayoutUp=Move Layout Up -portal.page.editing.removeLayout=Remove Layout -portal.page.editing.moveLayoutDown=Move Layout Down -portal.page.editing.moveLayoutRight=Move Layout Right +portal.page.editing.changelayout=Change Layout +portal.page.editing.changetheme=Change Theme +portal.page.editing.addlayout=Add portlet +portal.page.editing.page=New Page: +portal.page.editing.addpage=Create Page +portal.page.editing.portlet=Add Portlet [pop up window]: +portal.page.editing.addportlet=Add a Portlet [new window] +portal.page.editing.movePortletLeft=Move Portlet Left [reload page] +portal.page.editing.movePortletUp=Move Portlet Up [reload page] +portal.page.editing.removePortlet=Remove Portlet [reload page] +portal.page.editing.movePortletDown=Move Portlet Down [reload page] +portal.page.editing.movePortletRight=Move Portlet Right [reload page] +portal.page.editing.moveLayoutLeft=Move Layout Left [reload page] +portal.page.editing.moveLayoutUp=Move Layout Up [reload page] +portal.page.editing.removeLayout=Remove Layout [reload page] +portal.page.editing.moveLayoutDown=Move Layout Down [reload page] +portal.page.editing.moveLayoutRight=Move Layout Right [reload page] +portal.page.editing.editFieldset=Customize portal.loginform.logout=Logout portal.loginform.login=Login @@ -57,3 +59,8 @@ portal.loginform.password=Password: portal.loginform.change_password=Change Password portal.loginform.error.invalid_password=Invalid password + +portal.page.navigation.skip=skip +portal.page.navigation.msg.pages=Select page or +portal.page.navigation.msg.page-navigations=Select subsite or +portal.page.navigation.msg.additional-links=Select additional link or Index: layout-portlets/src/java/org/apache/jetspeed/portlets/layout/resources/LayoutResource_en.properties =================================================================== --- layout-portlets/src/java/org/apache/jetspeed/portlets/layout/resources/LayoutResource_en.properties (revision 449944) +++ layout-portlets/src/java/org/apache/jetspeed/portlets/layout/resources/LayoutResource_en.properties (working copy) @@ -17,7 +17,7 @@ portal.page.help.title = Portal Pages portal.page.help.view = Render the page in view mode. portal.page.help.help = Get help on a page or portlet. -portal.page.help.edit = Edit a portal page. Which includes changing the theme or layout, adding pages, changing the portlet application decorators, and moving or removing portlet applications from a page. +portal.page.help.edit = Edit a portal page. Which includes changing the theme or layout, adding pages, changing the portlet application decorators, and moving or removing portlet applications from a page. [reload page] portal.page.help.select = Add more portlet applications to a page. portal.portlet.help.title = Portlet Applications portal.portlet.help.minimize = Minimize a portlet. @@ -34,22 +34,24 @@ portal.page.editing.theme=Theme: portal.page.editing.layout=Layout: -portal.page.editing.changelayout=Change -portal.page.editing.addlayout=Add -portal.page.editing.page=Page: -portal.page.editing.addpage=Add -portal.page.editing.portlet=Portlet: -portal.page.editing.addportlet=Add a Portlet -portal.page.editing.movePortletLeft=Move Portlet Left -portal.page.editing.movePortletUp=Move Portlet Up -portal.page.editing.removePortlet=Remove Portlet -portal.page.editing.movePortletDown=Move Portlet Down -portal.page.editing.movePortletRight=Move Portlet Right -portal.page.editing.moveLayoutLeft=Move Layout Left -portal.page.editing.moveLayoutUp=Move Layout Up -portal.page.editing.removeLayout=Remove Layout -portal.page.editing.moveLayoutDown=Move Layout Down -portal.page.editing.moveLayoutRight=Move Layout Right +portal.page.editing.changelayout=Change Layout +portal.page.editing.changetheme=Change Theme +portal.page.editing.addlayout=Add portlet +portal.page.editing.page=New Page: +portal.page.editing.addpage=Create Page +portal.page.editing.portlet=Add Portlet [pop up window]: +portal.page.editing.addportlet=Add a Portlet [new window] +portal.page.editing.movePortletLeft=Move Portlet Left [reload page] +portal.page.editing.movePortletUp=Move Portlet Up [reload page] +portal.page.editing.removePortlet=Remove Portlet [reload page] +portal.page.editing.movePortletDown=Move Portlet Down [reload page] +portal.page.editing.movePortletRight=Move Portlet Right [reload page] +portal.page.editing.moveLayoutLeft=Move Layout Left [reload page] +portal.page.editing.moveLayoutUp=Move Layout Up [reload page] +portal.page.editing.removeLayout=Remove Layout [reload page] +portal.page.editing.moveLayoutDown=Move Layout Down [reload page] +portal.page.editing.moveLayoutRight=Move Layout Right [reload page] +portal.page.editing.editFieldset=Customize portal.loginform.logout=Logout portal.loginform.login=Login @@ -57,3 +59,8 @@ portal.loginform.password=Password: portal.loginform.change_password=Change Password portal.loginform.error.invalid_password=Invalid password + +portal.page.navigation.skip=skip +portal.page.navigation.msg.pages=Select page or +portal.page.navigation.msg.page-navigations=Select subsite or +portal.page.navigation.msg.additional-links=Select additional link or Index: src/webapp/WEB-INF/templates/layout/html/columns/layout.vm =================================================================== --- src/webapp/WEB-INF/templates/layout/html/columns/layout.vm (revision 449944) +++ src/webapp/WEB-INF/templates/layout/html/columns/layout.vm (working copy) @@ -1,4 +1,4 @@ - +## #* Copyright 2004 The Apache Software Foundation @@ -54,7 +54,6 @@ #if($editing)
- #if($isRoot) #getBoolProperty($allowChangePageTheme $rootDecorator "allow.change.page.theme" true) #getBoolProperty($allowAddPage $rootDecorator "allow.add.page" true) @@ -80,16 +79,22 @@ #set($submit = ".submit()")
+
+ $messages.getString("portal.page.editing.editFieldset") + + #if ($allowChangePageTheme) - - #foreach($td in $decorationFactory.getPageDecorations($rc)) -
-
+ +
+ #end +
#if($allowAddPortlet) - + ## #set ($chooser = "${jetspeed.basePath}/system/customizer/portlet-selector.psml") - - - + + $messages.getString("portal.page.editing.addportlet") + + ##$messages.getString( #end -
+
+ + + + + +
#end #set ($dcnt = 0) #set ($columnIndex = 0) #if($editing) + #getBoolProperty($allowChangePortletDecorator $rootDecorator "allow.change.portlet.decorator" true) #end - #foreach($column in $columnLayout.columns) #set($columnFloat = $columnLayout.getColumnFloat($columnIndex)) #set($columnWidth = $columnLayout.getColumnWidth($columnIndex)) - +
- - #foreach($f in $column) + + #foreach($f in $column) ## Set up coordinates for this fragment #set($coords = $columnLayout.getCoordinate($f)) #set($col = $coords.x) @@ -158,16 +171,18 @@ #if($f.type == "portlet") #set($fragmentType="Portlet") #if($allowChangePortletDecorator) -
#end - +
## Now get the real content $jetspeed.setCurrentFragment($f) #if($f.type == "portlet") #parse($f.decoration.template) #else $f.renderedContent - #end + #end +
#end @@ -215,13 +231,15 @@ -
+ #if ($isRoot) +
+##
+
#parse($myFragment.decoration.footer) #end - Index: src/webapp/WEB-INF/pages/myportal.psml =================================================================== --- src/webapp/WEB-INF/pages/myportal.psml (revision 0) +++ src/webapp/WEB-INF/pages/myportal.psml (revision 0) @@ -0,0 +1,39 @@ + + Index: src/webapp/WEB-INF/pages/folder.metadata =================================================================== --- src/webapp/WEB-INF/pages/folder.metadata (revision 449944) +++ src/webapp/WEB-INF/pages/folder.metadata (working copy) @@ -1,6 +1,7 @@ - Root Folder + Root + Αρχική Répertoire racine ルートフォルダ Carpeta raiz @@ -8,8 +9,8 @@ 根文件夾 Jetspeed2.link @@ -49,6 +50,8 @@ + + public-view Index: src/webapp/WEB-INF/pages/default-page.psml =================================================================== --- src/webapp/WEB-INF/pages/default-page.psml (revision 449944) +++ src/webapp/WEB-INF/pages/default-page.psml (working copy) @@ -1,80 +1,45 @@ - - - - Welcome to Jetspeed 2 - Ma Premiere Page de PSML - Jetspeed 2 へようこそ - ¡Bienvenido a Jetspeed 2! - Köszönti a Jetspeed 2! - 欢迎来到Jetspeed 2 - 歡迎來到Jetspeed 2 - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - public-view - + Καλώς Ήλθατε + Welcome Index: src/webapp/decorations/portlet/accessible/decorator.vm =================================================================== --- src/webapp/decorations/portlet/accessible/decorator.vm (revision 0) +++ src/webapp/decorations/portlet/accessible/decorator.vm (revision 0) @@ -0,0 +1,58 @@ +#* +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. +*# + +#* ************************* READ ME ************************************* +This is the default template to be used for rendering decorations. If you +find you cannot accomplish your design requirements by defining a custom +style sheet for your decoration, you can define your own decorator.vm in +the root of your decortaion. This will be used instead of the default. +************************************************************************ *# + +#set($decoration = $f.decoration) +#set($actions = $decoration.actions) + + + +
+ #set($solo = $jetspeed.MappedWindowState.toString()=="solo") + #if (!$solo) +
+
+ #set ($ws=$jetspeed.MappedWindowState) + + $!jetspeed.getTitle($jetspeed.getCurrentPortletEntity(), $f) +
+ + #PortletActionBar($decoration) + +
+ #end + #if (!$jetspeed.isHidden($f) && $jetspeed.WindowState.toString() != "minimized") + #if (!$solo) +
+ #end +
  + $f.renderedContent +
+ #if (!$solo) +
+ #end + #end +
+ + + + Index: src/webapp/decorations/portlet/accessible/css/styles.css =================================================================== --- src/webapp/decorations/portlet/accessible/css/styles.css (revision 0) +++ src/webapp/decorations/portlet/accessible/css/styles.css (revision 0) @@ -0,0 +1,589 @@ +/* +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. +*/ + + + +.accessible .PTitle +{ + background-image:url(../images/title_background.gif); + color:#0080b0; + + margin:0px; + padding-left:3px; + height:20px; +} + +.accessible .PTitleContent +{ + font-weight:bold; + display: inline; + float: left; + white-space: normal; +} + +.accessible .PActionBar +{ + float: right; + display: inline; +} + +.accessible .PContentBorder +{ + border: 1px solid #90d0ff; + } + +.accessible .PContent +{ + clear:both; + margin:0px; + padding-left: 1em; + white-space: normal; + background-color: #ffffff; + font-size: 10pt; +} + + +/* font */ +.accessible .PTitleLeft, +.accessible .PTitle, +.accessible .PTitleContent, +.accessible .PTitleRight, +.accessible .PContentLeft, +.accessible .PContent, +.accessible .PContentRight, +.accessible .PBottomLeft, +.accessible .PBottom, +.accessible .PBottomRight +{ + font-family: Verdana, Helvetica, Arial, sans-serif; + + voice-family: inherit; + font-size: 10pt; +} + + + +/* --------------------------------- */ +/* PLT.C.1 Links (Anchor) */ +/* --------------------------------- */ + +.accessible A:link, +.accessible A:visited { + text-decoration: underline; +} + +.accessible A:hover, +.accessible A:active { + text-decoration: underline; +} + +/* font */ +.accessible A:link, +.accessible A:visited, +.accessible A:hover, +.accessible A:active +{ + font-family: Verdana, Helvetica, Arial, sans-serif; + voice-family: "\"}\""; + voice-family: inherit; + font-size: 10pt; +} + + +/* --------------------------------- */ +/* PLT.C.2 Fonts */ +/* --------------------------------- */ + +.accessible .portlet-font { + color: black; +} +.accessible .portlet-font-dim { + color: gray; +} + +/* font */ +.accessible .portlet-font, +.accessible .portlet-font-dim +{ + font-family: Verdana, Helvetica, Arial, sans-serif; + voice-family: "\"}\""; + voice-family: inherit; + font-size: 10pt; +} + + + +/* --------------------------------- */ +/* PLT.C.3 Messages */ +/* --------------------------------- */ +.accessible .portlet-msg-status, +.accessible .portlet-msg-info { + background: url(../images/icon_info_sml.gif); + background-repeat: no-repeat; + padding-left: 20px; + min-height: 15px; +} + +.accessible .portlet-msg-error { + background: url(../images/icon_error_sml.gif); + background-repeat: no-repeat; + padding-left: 20px; + min-height: 15px; +} + +.accessible .portlet-msg-alert { + background: url(../images/icon_warning_sml.gif); + background-repeat: no-repeat; + padding-left: 20px; + min-height: 15px; +} + +.accessible .portlet-msg-success { + background: url(../images/icon_success_sml.gif); + background-repeat: no-repeat; + padding-left: 20px; + min-height: 15px; +} + +/* font */ +.accessible .portlet-msg-status, +.accessible .portlet-msg-info, +.accessible .portlet-msg-error, +.accessible .portlet-msg-alert, +.accessible .portlet-msg-success +{ + font-family: Verdana, Helvetica, Arial, sans-serif; + voice-family: "\"}\""; + voice-family: inherit; + font-size: 10pt; +} + + +/* --------------------------------- */ +/* PLT.C.4 Sections */ +/* --------------------------------- */ +.accessible .portlet-section-header { + background-image:url(../images/header_background.gif); + background-repeat: repeat-x; + background-color:#90d0ff; + color: #fff; + padding: 5px; + margin-right: 2px; + margin-left: 2px; + clear: both; +} + +.accessible .portlet-section-body { + background: #efefef; + border: none; + padding: 2px 3px; + text-align: left; + vertical-align: top; + text-align: left; +} + +.accessible .portlet-section-alternate { + background: #ddd; + border: none; + padding: 2px 3px; + text-align: left; + vertical-align: top; + text-align: left; +} + +.accessible .portlet-section-selected { + /* TODO : ex. change color */ + background: #ffe; + border: none; + padding: 2px 3px; + text-align: left; + vertical-align: top; + text-align: left; + font-weight:bold; +} + +.accessible .portlet-section-subheader { + background-image:url(../images/subheader_background.gif); + background-repeat: repeat-x; + background-color:#c0e0f0; + color: #0080b0; + padding: 5px; + margin-right: 2px; + margin-left: 2px; + clear: both; +} + +.accessible .portlet-section-footer { + background-image:url(../images/footer_background.gif); + background-repeat: repeat-x; + background-color:#c0e0f0; + background-position: top left; + color: #0080b0; + padding: 5px; + margin-right: 2px; + margin-left: 2px; + clear: both; +} + +.accessible .portlet-section-text { + padding: 1em; + padding-bottom: .3em; + padding-left: 1em; +} + +/* font */ +.accessible .portlet-section-header, +.accessible .portlet-section-body, +.accessible .portlet-section-alternate, +.accessible .portlet-section-selected, +.accessible .portlet-section-subheader, +.accessible .portlet-section-footer, +.accessible .portlet-section-text +{ + font-family: Verdana, Helvetica, Arial, sans-serif; + voice-family: "\"}\""; + voice-family: inherit; + font-size: 10pt; +} + + +/* --------------------------------- */ +/* PLT.C.5 Forms */ +/* --------------------------------- */ +.accessible .portlet-form-label { +} + +.accessible .portlet-form-input-field { + background-color:#90d0ff; +} + +.accessible .portlet-form-button { + background-image:url(../images/button_background.gif); + background-color:#90d0ff; + color:#ffffff; + + font-weight: bold; +} + +.accessible .portlet-icon-label { +} + +.accessible .portlet-dlg-icon-label { +} + +.accessible .portlet-form-field-label { +} + +.accessible .portlet-form-field { +} + +/* font */ +.accessible .portlet-form-label, +.accessible .portlet-form-input-field, +.accessible .portlet-form-button, +.accessible .portlet-icon-label, +.accessible .portlet-dlg-icon-label, +.accessible .portlet-form-field-label, +.accessible .portlet-form-field +{ + font-family: Verdana, Helvetica, Arial, sans-serif; + voice-family: "\"}\""; + voice-family: inherit; + font-size: 10pt; +} + + +/* --------------------------------- */ +/* PLT.C.6 Menus */ +/* --------------------------------- */ +.accessible .portlet-menu { + background: #efefef; + margin-bottom: 6px; + border-right: 1px solid #aaa; + border-bottom: 1px solid #aaa; + padding: 4px 4px 4px 0; + padding-bottom: .3em; + padding-left: 1em; +} + +.accessible .portlet-menu-item { + text-decoration: none; + color: blue; +} + +.accessible .portlet-menu-item-selected { + text-decoration: none; + color: #555 !important; +} + +.accessible .portlet-menu-item-hover { + text-decoration: none; + color: #f30 !important; +} + +.accessible .portlet-menu-item-hover-selected { + text-decoration: none; + color: #555 !important; + font-weight: bold; +} + +.accessible .portlet-menu-cascade-item { + text-decoration: none; + margin-top: .3em; + padding-bottom: 0; + color: blue; +} + +.accessible .portlet-menu-cascade-item-selected { + text-decoration: none; + color: #555 !important; + font-weight: bold; +} + +.accessible .portlet-menu-description { +} + +.accessible .portlet-menu-caption { + border-bottom: 1px solid #666; + border-right: 1px solid #666; + background: #ddd; + color: #555; + padding: 4px; +} + +/* font */ +.accessible .portlet-menu, +.accessible .portlet-menu-item, +.accessible .portlet-menu-item-selected, +.accessible .portlet-menu-item-hover, +.accessible .portlet-menu-item-hover-selected, +.accessible .portlet-menu-cascade-item, +.accessible .portlet-menu-cascade-item-selected, +.accessible .portlet-menu-description, +.accessible .portlet-menu-caption +{ + font-family: Verdana, Helvetica, Arial, sans-serif; + voice-family: "\"}\""; + voice-family: inherit; + font-size: 10pt; +} + + +/* --------------------------------- */ +/* PLT.C.6 Menus (arrowfolder style) */ +/* --------------------------------- */ +.accessible .arrowfolder .portlet-menu { + background: #efefef; + margin-bottom: 6px; + border-right: 1px solid #aaa; + border-bottom: 1px solid #aaa; + padding: 4px 4px 4px 0; + padding-bottom: .3em; + padding-left: 1em; +} + +.accessible .arrowfolder .portlet-menu-item { + text-decoration: none; + color: blue; + padding-left: 34px; + background-image: url(../images/icon_arrowdoc_sml.gif); + background-repeat: no-repeat; + +} + +.accessible .arrowfolder .portlet-menu-item-selected { + text-decoration: none; + color: #555 !important; + padding-left: 34px; + background-image: url(../images/icon_arrowdoc_sml.gif); + background-repeat: no-repeat; +} + +.accessible .arrowfolder .portlet-menu-item-hover { + text-decoration: none; + color: #f30 !important; + padding-left: 34px; + background-image: url(../images/icon_arrowdoc_sml.gif); + background-repeat: no-repeat; +} + +.accessible .arrowfolder .portlet-menu-item-hover-selected { + text-decoration: none; + color: #555 !important; + font-weight: bold; + padding-left: 34px; + background-image: url(../images/icon_arrowdoc_sml.gif); + background-repeat: no-repeat; +} + +.accessible .arrowfolder .portlet-menu-cascade-item { + text-decoration: none; + margin-top: .3em; + padding-bottom: 0; + color: blue; + padding-left: 34px; + background-image: url(../images/icon_arrowfolderclosed1_sml.gif); + background-repeat: no-repeat; +} + +.accessible .arrowfolder .portlet-menu-cascade-item-selected { + text-decoration: none; + color: #555 !important; + font-weight: bold; + padding-left: 34px; + background-image: url(../images/icon_arrowfolderopen2_sml.gif); + background-repeat: no-repeat; +} + +.accessible .arrowfolder .portlet-menu-description { +} + +.accessible .arrowfolder .portlet-menu-caption { + border-bottom: 1px solid #666; + border-right: 1px solid #666; + background: #ddd; + color: #555; + padding: 4px; +} + +/* font */ +.accessible .arrowfolder .portlet-menu, +.accessible .arrowfolder .portlet-menu-item, +.accessible .arrowfolder .portlet-menu-item-selected, +.accessible .arrowfolder .portlet-menu-item-hover, +.accessible .arrowfolder .portlet-menu-item-hover-selected, +.accessible .arrowfolder .portlet-menu-cascade-item, +.accessible .arrowfolder .portlet-menu-cascade-item-selected, +.accessible .arrowfolder .portlet-menu-description, +.accessible .arrowfolder .portlet-menu-caption +{ + font-family: Verdana, Helvetica, Arial, sans-serif; + voice-family: "\"}\""; + voice-family: inherit; + font-size: 10pt; +} + +/* --------------------------------- */ +/* Tree component */ +/* --------------------------------- */ + +.accessible .tree { + lineheight: 18px; + font-family: arial, sans-serif; +} + +.accessible .tree-node { + padding: 2px 15px 2px 5px; +} + +.accessible .tree-node a { + text-decoration: none; +} + +.accessible .tree-node-selected { + padding: 2px 15px 2px 5px; +} + +.accessible .tree-node-selected a { + text-decoration: none; + font-weight: bold; +} + +/* --------------------------------- */ +/* Portlet Table */ +/* --------------------------------- */ +.accessible th, td, input { + font-family: Verdana, Helvetica, Arial, sans-serif; +} + +.accessible table, +.accessible th, +.accessible td { + vertical-align: top; + font-size: 10pt; + border: none; + white-space: normal; + /* action buttons shifts right a few millimeters by the following */ +} + +.accessible th +{ + font-size: 11pt; +} + +.accessible .portlet-table-header { + background-image:url(../images/header_background.gif); + background-repeat: repeat-x; + background-color:#90d0ff; + color: #fff; + + border: 0.75px solid #fff; + padding: 2px 3px; + text-align: left; +} + +.accessible .portlet-table-footer { + background-image:url(../images/footer_background.gif); + background-repeat: repeat-x; + background-color:#c0e0f0; + color: #0080b0; + + font-size: 10pt; + padding: 5px; + margin: .67em 2px; + margin-top: 0; +} + + +.accessible .portlet-table-row1 td { + font-size: 10pt; + background: #ddd; + border-bottom: 1px solid #fff; +} + +.accessible .portlet-table-row2 td { + font-size: 10pt; + background: #efefef; + border-bottom: 1px solid #fff; +} + +.accessible .portlet-table-col1 { + border-right: 1px solid #fff; + padding: 2px 15px 2px 5px; +} + +.accessible .portlet-table-col2 { + border-left: 1px solid #fff; + padding: 2px 15px 2px 5px; +} + +/* --------------------------------- */ +/* Portlet Data Scroller Table */ +/* --------------------------------- */ + +.accessible .portlet-scroller-grid td { + horizontal-align: center; +} + +.accessible .portlet-scroller { + horizontal-align: center; +} + +.accessible .portlet-paginator { + horizontal-align: center; +} + + Index: src/webapp/decorations/portlet/accessible/decorator.properties =================================================================== --- src/webapp/decorations/portlet/accessible/decorator.properties (revision 0) +++ src/webapp/decorations/portlet/accessible/decorator.properties (revision 0) @@ -0,0 +1,19 @@ +# 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. + +id=accessible +name=accessible +template.type=velocity +template.extension=.vm +decorates=portlet Index: src/webapp/decorations/layout/accessible/footer.vm =================================================================== --- src/webapp/decorations/layout/accessible/footer.vm (revision 0) +++ src/webapp/decorations/layout/accessible/footer.vm (revision 0) @@ -0,0 +1,27 @@ +#* +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. +*# + + + + Index: src/webapp/decorations/layout/accessible/decorator-macros.vm =================================================================== --- src/webapp/decorations/layout/accessible/decorator-macros.vm (revision 0) +++ src/webapp/decorations/layout/accessible/decorator-macros.vm (revision 0) @@ -0,0 +1,84 @@ +#* define navigation constants *# +#macro (defineNavigationConstants) + #* Constants for layout orientation *# + #set($LEFT_TO_RIGHT = "LeftToRight") + #set($RIGHT_TO_LEFT = "RightToLeft") + #set($TOP_TO_BOTTOM = "TopToBottom") + #set($BOTTOM_TO_TOP = "BottomToTop") + #set($TITLE_FIRST = "TitleFirst") + #set($TITLE_LAST = "TitleLast") + #set($BREADCRUMBS_STYLE = "BreadcrumbsStyle") + #set($messages = $portletConfig.getResourceBundle($renderRequest.Locale)) + +#end +#* + Dispalys the standard action bar for this page. +*# +#macro (PageActionBar) + #set($_actions = $layoutDecoration.actions) +
+ #if($_actions.size() >0) + #foreach ($_action in $_actions) + ${_action.Name} + ##${_action.Alt} + #end + #end +
+#end + +#macro (Breadcrumbs) + #set($_breadcrumbs = $site.getMenu("breadcrumbs").elements) + +#end +#macro (intraPortletNavigation $columnLayout $className) + +#end +#* include pages navigation component *# +#macro (includeNavigation $domain $msg_key $_orientation $skipId) + #set($_menu = $site.getMenu($domain)) + #if(!$_menu.empty) +
+ $messages.getString($msg_key) $messages.getString("portal.page.navigation.skip") +
    + #foreach($element in $_menu.elements.iterator()) + #if($element.elementType == "option") + #set($tabTitle = $element.getTitle($preferedLocale)) + #set($tabName = $element.getShortTitle($preferedLocale)) + #if($_orientation == $LEFT_TO_RIGHT) + #if($element.isSelected($site)) +
  • ${tabName}
    • + #else + #set($tabUrl = $jetspeed.getAbsoluteUrl($element.url)) +
  • ${tabName}
    • + #end + #end + #end + #end +
+
+ #end +#end + + + + + Index: src/webapp/decorations/layout/accessible/css/styles.css =================================================================== --- src/webapp/decorations/layout/accessible/css/styles.css (revision 0) +++ src/webapp/decorations/layout/accessible/css/styles.css (revision 0) @@ -0,0 +1,389 @@ +/* +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. +*/ + +@import url("../../css/portal-standard.css"); + +body { + font-family: Verdana, Helvetica, Arial, sans-serif; + voice-family: "\"}\""; + voice-family: inherit; + padding: 1em; + background: #fff; + color: #000; + white-space: normal; +} + +.hidden +{ + position:absolute; + top:-200px; +} + +/** + This white-space setting is VERY important as it keeps content from "spilling" + outside of portlets. + */ + +td, +th +{ + white-space: normal; +} + +th +{ + font-size: 12pt; +} + +a:link, a:visited { + color: blue; +} + +a:hover { + color: #f30 !important; +} + +body.layout-blueocean +{ + margin: 0; + padding: 0; +} + + +.Link +{ +} + +.LinkFolder +{ +} + +.LinkPage +{ +} + + + + + +.layout-accessible .button +{ + background-image:url(../images/button_background.gif); + padding-left:5px; + padding-right:5px; + padding-top:3px; + padding-bottom:3px; + margin:1px; + text-align:center; + vertical-align:middle; +} + +.layout-accessible .button a +{ + color:#0080b0; + text-decoration: none; + font-weight:bold; + font-family:Verdana,Helvetica,Arial,sans-serif; + voice-family:"\"}\""; + voice-family:inherit; + font-size:9pt; +} + +.layout-accessible #banner { + margin:0px; + padding:0px; + position:absolute; + top:0px; + left:0px; + width:100%; + height:100px; + background-image:url(../images/banner_background.gif); +} + +.layout-accessible #banner table { + margin:0px; + padding:1px; + width:100%; + height:100px; +} + +.layout-accessible #banner .action { + margin:0px; + padding:0px; + height:20px; + vertical-align:middle; +} + +.layout-accessible #banner .logo { + height:95px; +} + +.layout-accessible #banner .logo img { + margin-top:25px; +} + +.layout-accessible #banner .info { + vertical-align:top; + text-align:right; + height:95px; + + color:#ffffff; + font-family:Verdana,Helvetica,Arial,sans-serif; + voice-family:"\"}\""; + voice-family:inherit; + font-size:10pt; +} + +.layout-accessible #banner .info div { + margin:0px; + padding:2px; +} + +.layout-accessible #banner .info input { + border:1px; + border-color:#0000ff; + + font-weight:bold; +} + +.layout-accessible #poweredby { + margin:0px; + padding:1px; + position:absolute; + top:100px; + left:0px; + width:100%; + height:15px; + background-image:url(../images/poweredby_background.gif); + text-align:right; +} + +.layout-accessible .tabs { + margin:0px; + padding:0px; + position:absolute; + top:115px; + left:0px; + width:100%; + height:25px; + background-image:url(../images/tab_background.gif); +} + +.layout-accessible .tabs table { + margin:0px; + padding:0px; +} + +.layout-accessible .tabs td { + padding-top: 3px; + padding-bottom: 3px; + font-family:Verdana,Helvetica,Arial,sans-serif; + font-weight: bold; + voice-family: "\"}\""; + voice-family: inherit; + font-size: 10pt; +} + +.layout-accessible .LTabLeftLow +{ + width: 10px; + + background-image:url(../images/tab_background.gif); + border-left: 1px solid #fff; + padding:0px; +} + +.layout-accessible .LTabLow +{ + height:25px; + + background-image:url(../images/tab_background.gif); + padding-left: 0px; + padding-right: 0px; + +} + +.layout-accessible .LTabLow A:link, +.layout-accessible .LTabLow A:visited, +.layout-accessible .LTabLow A:hover, +.layout-accessible .LTabLow A:active +{ + text-decoration: none; + color:#0080b0; + + font-family:Verdana,Helvetica,Arial,sans-serif; + font-weight: bold; + voice-family: "\"}\""; + voice-family: inherit; + font-size: 10pt; +} + +.layout-accessible .LTabRightLow +{ + width: 10px; + + background-image:url(../images/tab_background.gif); + border-right: 1px solid #999999; + padding:0px; +} + +.layout-accessible .LTabLeft +{ + width: 10px; + + background-image:url(../images/selected_tab_background.gif); + border-left: 1px solid #fff; + padding:0px; +} + +.layout-accessible .LTab +{ + height:25px; + + background-image:url(../images/selected_tab_background.gif); + color: #ffffff; + padding-left: 0px; + padding-right: 0px; +} + +.layout-accessible .LTabRight +{ + width:10px; + + background-image:url(../images/selected_tab_background.gif); + border-right: 1px solid #333; + padding: 0px; +} + +.layout-accessible #breadcrumbs { + margin:0px; + padding:3px; + position:absolute; + top:140px; + left:0px; + width:100%; + height:30px; + vertical-align:middle; + + background-color: #ffffff; + font-family:Verdana,Helvetica,Arial,sans-serif; + voice-family: "\"}\""; + voice-family: inherit; + font-size: 10pt; +} + +.layout-accessible #breadcrumbs a { + text-decoration: none; + font-family:Verdana,Helvetica,Arial,sans-serif; + voice-family: "\"}\""; + voice-family: inherit; + font-size: 10pt; +} + +.layout-accessible #masthead { + margin:0px; + padding:0px; + width:100%; + height:175px; +} + +.layout-accessible #main { + margin:0px; + padding:3px; + width:100%; +} + +.layout-accessible #leftcol { + width:130px; + padding:0px; + margin:0px; +} + +.layout-accessible #navcolumn table { + width:100%; + padding:2px; + margin:0px; +} + +.layout-accessible .toolgroup { +} + +.layout-accessible .toolgroup .label { + background-image:url(../images/tab_background.gif); + background-color:#90d0ff; + color:#0080b0; + padding:4px; + margin:0px; + + font-weight: bold; + voice-family: "\"}\""; + voice-family: inherit; + font-size: 10pt; +} + +.layout-accessible .toolgroup .body { + border: 1px solid #90d0ff; + padding: 4px 4px 4px 0; + margin-bottom:4px; +} + +.layout-accessible .toolgroup .body div { + padding-bottom: .3em; + padding-left: 0; + voice-family: "\"}\""; + voice-family: inherit; + font-size: 10pt; +} + +.layout-accessible .toolgroup .body div div { + padding-left: .5em; +} + +.layout-accessible .toolgroup .pagetitle{ + font-weight: bold; + padding-left: .5em; + voice-family: "\"}\""; + voice-family: inherit; + font-size: x-small; +} + +.layout-accessible .toolgroup .body div p { + margin-top: .0; + padding-bottom: 0; + padding-left: 0; + margin-top: .0; + margin-bottom: .0; +} + + + +#portal-page-actions A img +{ + display: inline; +} + +#portal-page-actions +{ + display: inline; + position: absolute; + right: 5px; +} + +.FolderList +{ + display: inline; +} + Index: src/webapp/decorations/layout/accessible/header.vm =================================================================== --- src/webapp/decorations/layout/accessible/header.vm (revision 0) +++ src/webapp/decorations/layout/accessible/header.vm (revision 0) @@ -0,0 +1,96 @@ +#* +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. +*# + +#* Add the current layouts configuration values to the context *# +#defineLayoutObjects() + +#* Loads our custom macros *# +#parse($layoutDecoration.getResource("decorator-macros.vm")) + +#* Add all template constants to the current context *# +#defineNavigationConstants() + +#* Username *# +#set($username = $JS2RequestContext.request.remoteUser) + +#set($columnLayout = $renderRequest.getAttribute("columnLayout")) + + + + + + ## include header resources immdiately after head and before base is reset to the portal + ## web application context path root; this implies that header resources can not reliably + ## employ relative urls to locate content + #includeHeaderResource() + + + + + + + #includeJavaScriptForHead() + #IncludeStylesheets() + + #PageTitle() + + + + + + + + #Breadcrumbs() + + + +
+ #includeNavigation("pages" "portal.page.navigation.msg.pages" $LEFT_TO_RIGHT "portal-nav-main") +
+ +
+ #includeNavigation("page-navigations" "portal.page.navigation.msg.page-navigations" $LEFT_TO_RIGHT "portal-nav-additional") +
+
+ #includeNavigation("additional-links" "portal.page.navigation.msg.additional-links" $LEFT_TO_RIGHT "endnav") +
+ + + + + + Index: src/webapp/decorations/layout/accessible/decorator.properties =================================================================== --- src/webapp/decorations/layout/accessible/decorator.properties (revision 0) +++ src/webapp/decorations/layout/accessible/decorator.properties (revision 0) @@ -0,0 +1,28 @@ +# 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. + +id=accessible +template.type=velocity +template.extension=.vm +template.macros=-macros +decorates=layout +base.css.class=layout-accessible + +##following are defaults +#allow.change.page.theme=true +#allow.change.layout=true +#max.layout.nesting=2 +#allow.add.page=true +#allow.add.portlet=true +#allow.change.portlet.decorator=true Index: .classpath =================================================================== --- .classpath (revision 449944) +++ .classpath (working copy) @@ -100,12 +100,12 @@ - - - - - - + + + + + + @@ -116,5 +116,6 @@ +