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:33:33 UTC
svn commit: r476077 - in /portals/jetspeed-2/trunk:
components/portal/src/java/org/apache/jetspeed/aggregator/impl/
components/portal/src/java/org/apache/jetspeed/desktop/impl/
jetspeed-api/src/java/org/apache/jetspeed/headerresource/
Author: smilek
Date: Fri Nov 17 00:33:32 2006
New Revision: 476077
URL: http://svn.apache.org/viewvc?view=rev&rev=476077
Log:
added desktop tooltip on/off flag for page and window action buttons; added more action names for desktop resource lookup
Modified:
portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/aggregator/impl/HeaderAggregatorImpl.java
portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/desktop/impl/JetspeedDesktopImpl.java
portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/headerresource/HeaderResource.java
Modified: portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/aggregator/impl/HeaderAggregatorImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/aggregator/impl/HeaderAggregatorImpl.java?view=diff&rev=476077&r1=476076&r2=476077
==============================================================================
--- portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/aggregator/impl/HeaderAggregatorImpl.java (original)
+++ portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/aggregator/impl/HeaderAggregatorImpl.java Fri Nov 17 00:33:32 2006
@@ -659,6 +659,13 @@
{
desktopDojoConfigContent.append( " " ).append( HeaderResource.HEADER_INTERNAL_DOJO_CONFIG_JETSPEED_VAR_NAME ).append( ".windowActionButtonHide = " ).append( windowActionButtonHide ).append( ";" ).append( EOL );
}
+
+ String windowActionButtonTooltipName = HeaderResource.HEADER_CONFIG_DESKTOP_WINDOW_ACTION_BUTTON_TOOLTIP;
+ String windowActionButtonTooltip = makeJSONBoolean( desktopConfigMap.get( windowActionButtonTooltipName ) );
+ if ( windowActionButtonTooltip != null && canAddHeaderNamedResourceFragment( windowActionButtonTooltipName, namedResourcesAddedFragmentsDefault, null ) )
+ {
+ desktopDojoConfigContent.append( " " ).append( HeaderResource.HEADER_INTERNAL_DOJO_CONFIG_JETSPEED_VAR_NAME ).append( ".windowActionButtonTooltip = " ).append( windowActionButtonTooltip ).append( ";" ).append( EOL );
+ }
String windowActionButtonMaxName = HeaderResource.HEADER_CONFIG_DESKTOP_WINDOW_ACTION_BUTTON_MAX;
String windowActionButtonMax = makeJSONInteger( desktopConfigMap.get( windowActionButtonMaxName ), false );
@@ -682,6 +689,13 @@
{
desktopDojoConfigContent.append( " " ).append( HeaderResource.HEADER_INTERNAL_DOJO_CONFIG_JETSPEED_VAR_NAME ).append( ".windowThemesAllowed = " ).append( windowThemesAllowedContent ).append( ";" ).append( EOL );
}
+ }
+
+ String pageActionButtonTooltipName = HeaderResource.HEADER_CONFIG_DESKTOP_PAGE_ACTION_BUTTON_TOOLTIP;
+ String pageActionButtonTooltip = makeJSONBoolean( desktopConfigMap.get( pageActionButtonTooltipName ) );
+ if ( pageActionButtonTooltip != null && canAddHeaderNamedResourceFragment( pageActionButtonTooltipName, namedResourcesAddedFragmentsDefault, null ) )
+ {
+ desktopDojoConfigContent.append( " " ).append( HeaderResource.HEADER_INTERNAL_DOJO_CONFIG_JETSPEED_VAR_NAME ).append( ".pageActionButtonTooltip = " ).append( pageActionButtonTooltip ).append( ";" ).append( EOL );
}
if ( desktopDojoConfigContent.length() > 0 )
Modified: portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/desktop/impl/JetspeedDesktopImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/desktop/impl/JetspeedDesktopImpl.java?view=diff&rev=476077&r1=476076&r2=476077
==============================================================================
--- portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/desktop/impl/JetspeedDesktopImpl.java (original)
+++ portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/desktop/impl/JetspeedDesktopImpl.java Fri Nov 17 00:33:32 2006
@@ -59,8 +59,8 @@
private final static String DOJO_CONFIG_THEME_VAR_NAME = HeaderResource.HEADER_INTERNAL_DOJO_CONFIG_JETSPEED_VAR_NAME + ".desktopTheme";
private final static String DOJO_CONFIG_ACTION_LABELS_NAME = HeaderResource.HEADER_INTERNAL_DOJO_CONFIG_JETSPEED_VAR_NAME + ".desktopActionLabels";
- private final static String[] DESKTOP_WINDOW_ACTIONS = new String[] { "tile", "untile", "heightexpand", "heightnormal", "restore", "remove" };
- private final static String DESKTOP_WINDOW_ACTION_RESOURCE_NAME_PREFIX = "desktop.window.action.";
+ private final static String[] DESKTOP_ACTIONS = new String[] { "menu", "tile", "untile", "heightexpand", "heightnormal", "restore", "removeportlet", "addportlet", "editpage" };
+ private final static String DESKTOP_ACTION_RESOURCE_NAME_PREFIX = "desktop.action.";
private static final Log log = LogFactory.getLog( JetspeedDesktopImpl.class );
@@ -139,9 +139,9 @@
// desktop action labels
StringBuffer desktopActionLabels = new StringBuffer();
ResourceBundle messages = desktopContext.getResourceBundle( request.getLocale() );
- for ( int i = 0 ; i < DESKTOP_WINDOW_ACTIONS.length ; i++ )
+ for ( int i = 0 ; i < DESKTOP_ACTIONS.length ; i++ )
{
- String actionLabel = messages.getString( DESKTOP_WINDOW_ACTION_RESOURCE_NAME_PREFIX + DESKTOP_WINDOW_ACTIONS[ i ] );
+ String actionLabel = messages.getString( DESKTOP_ACTION_RESOURCE_NAME_PREFIX + DESKTOP_ACTIONS[ i ] );
if ( actionLabel != null )
{
if ( desktopActionLabels.length() == 0 )
@@ -152,7 +152,7 @@
{
desktopActionLabels.append( ", " );
}
- desktopActionLabels.append( DESKTOP_WINDOW_ACTIONS[ i ] ).append( ": \"" ).append( actionLabel ).append( "\"" );
+ desktopActionLabels.append( DESKTOP_ACTIONS[ i ] ).append( ": \"" ).append( actionLabel ).append( "\"" );
}
}
if ( desktopActionLabels.length() > 0 )
Modified: portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/headerresource/HeaderResource.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/headerresource/HeaderResource.java?view=diff&rev=476077&r1=476076&r2=476077
==============================================================================
--- portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/headerresource/HeaderResource.java (original)
+++ portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/headerresource/HeaderResource.java Fri Nov 17 00:33:32 2006
@@ -96,10 +96,11 @@
public final static String HEADER_CONFIG_DESKTOP_WINDOW_ACTION_NOIMAGE = "desktop.window.action.noimage";
public final static String HEADER_CONFIG_DESKTOP_WINDOW_ACTION_MENU_ORDER = "desktop.window.action.menu.order";
public final static String HEADER_CONFIG_DESKTOP_WINDOW_ACTION_BUTTON_HIDE = "desktop.window.action.button.hide";
+ public final static String HEADER_CONFIG_DESKTOP_WINDOW_ACTION_BUTTON_TOOLTIP = "desktop.window.action.button.tooltip";
public final static String HEADER_CONFIG_DESKTOP_WINDOW_ACTION_BUTTON_MAX = "desktop.window.action.button.maximum";
public final static String HEADER_CONFIG_DESKTOP_WINDOW_THEME = "desktop.window.theme";
public final static String HEADER_CONFIG_DESKTOP_WINDOW_THEME_ALLOWED = "desktop.window.theme.allowed";
-
+ public final static String HEADER_CONFIG_DESKTOP_PAGE_ACTION_BUTTON_TOOLTIP = "desktop.page.action.button.tooltip";
public final static String HEADER_INTERNAL_CONFIG_DESKTOP_WINDOW_ACTION = "desktop.window.action";
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org