Author: smilek
Date: Mon Nov 13 05:21:52 2006
New Revision: 474300
URL: http://svn.apache.org/viewvc?view=rev&rev=474300
Log:
added desktop windowtheme default and list of allowed desktop windowthemes
Modified:
portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/aggregator/impl/HeaderAggregatorImpl.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=474300&r1=474299&r2=474300
==============================================================================
---
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
Mon Nov 13 05:21:52 2006
@@ -622,7 +622,7 @@
String windowActionButtonOrderName =
HeaderResource.HEADER_CONFIG_DESKTOP_WINDOW_ACTION_BUTTON_ORDER;
String actionButtonOrderContent = makeJSONStringArray(
(List)desktopConfigMap.get( windowActionButtonOrderName ), actionList );
- if ( actionButtonOrderContent.length() > 0 )
+ if ( actionButtonOrderContent != null &&
actionButtonOrderContent.length() > 0 )
{
if ( canAddHeaderNamedResourceFragment(
windowActionButtonOrderName, namedResourcesAddedFragmentsDefault, null ) )
{
@@ -632,7 +632,7 @@
String windowActionNoImageName =
HeaderResource.HEADER_CONFIG_DESKTOP_WINDOW_ACTION_NOIMAGE;
String actionNoImageContent = makeJSONStringArray(
(List)desktopConfigMap.get( windowActionNoImageName ), actionList );
- if ( actionNoImageContent.length() > 0 )
+ if ( actionNoImageContent != null && actionNoImageContent.length() > 0
)
{
if ( canAddHeaderNamedResourceFragment( windowActionNoImageName,
namedResourcesAddedFragmentsDefault, null ) )
{
@@ -642,7 +642,7 @@
String windowActionMenuOrderName =
HeaderResource.HEADER_CONFIG_DESKTOP_WINDOW_ACTION_MENU_ORDER;
String actionMenuOrderContent = makeJSONStringArray(
(List)desktopConfigMap.get( windowActionMenuOrderName ), actionList );
- if ( actionMenuOrderContent.length() > 0 )
+ if ( actionMenuOrderContent != null && actionMenuOrderContent.length()
> 0 )
{
if ( canAddHeaderNamedResourceFragment( windowActionMenuOrderName,
namedResourcesAddedFragmentsDefault, null ) )
{
@@ -660,12 +660,28 @@
desktopDojoConfigContent.append( " " ).append(
HeaderResource.HEADER_INTERNAL_DOJO_CONFIG_JETSPEED_VAR_NAME ).append(
".windowActionButtonHide = " ).append( windowActionButtonHide ).append( ";"
).append( EOL );
}
- // windowActionButtonMax - desktop.window.action.button.maximum
String windowActionButtonMaxName =
HeaderResource.HEADER_CONFIG_DESKTOP_WINDOW_ACTION_BUTTON_MAX;
String windowActionButtonMax = makeJSONInteger( desktopConfigMap.get(
windowActionButtonMaxName ), false );
if ( windowActionButtonMax != null &&
canAddHeaderNamedResourceFragment( windowActionButtonMaxName,
namedResourcesAddedFragmentsDefault, null ) )
{
desktopDojoConfigContent.append( " " ).append(
HeaderResource.HEADER_INTERNAL_DOJO_CONFIG_JETSPEED_VAR_NAME ).append(
".windowActionButtonMax = " ).append( windowActionButtonMax ).append( ";"
).append( EOL );
+ }
+
+ String windowThemeName =
HeaderResource.HEADER_CONFIG_DESKTOP_WINDOW_ACTION_BUTTON_MAX;
+ String windowTheme = (String)desktopConfigMap.get( windowThemeName );
+ if ( windowTheme != null && windowTheme.length() > 0 &&
canAddHeaderNamedResourceFragment( windowThemeName,
namedResourcesAddedFragmentsDefault, null ) )
+ {
+ desktopDojoConfigContent.append( " " ).append(
HeaderResource.HEADER_INTERNAL_DOJO_CONFIG_JETSPEED_VAR_NAME ).append(
".windowTheme = \"" ).append( windowTheme ).append( "\";" ).append( EOL );
+ }
+
+ String windowThemesAllowedName =
HeaderResource.HEADER_CONFIG_DESKTOP_WINDOW_THEME_ALLOWED;
+ String windowThemesAllowedContent = makeJSONStringArray(
(List)desktopConfigMap.get( windowThemesAllowedName ) );
+ if ( windowThemesAllowedContent != null &&
windowThemesAllowedContent.length() > 0 )
+ {
+ if ( canAddHeaderNamedResourceFragment( windowThemesAllowedName,
namedResourcesAddedFragmentsDefault, null ) )
+ {
+ desktopDojoConfigContent.append( " " ).append(
HeaderResource.HEADER_INTERNAL_DOJO_CONFIG_JETSPEED_VAR_NAME ).append(
".windowThemesAllowed = " ).append( windowThemesAllowedContent ).append( ";"
).append( EOL );
+ }
}
if ( desktopDojoConfigContent.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=474300&r1=474299&r2=474300
==============================================================================
---
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
Mon Nov 13 05:21:52 2006
@@ -97,6 +97,9 @@
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_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_INTERNAL_CONFIG_DESKTOP_WINDOW_ACTION =
"desktop.window.action";
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
