From 5d5c67db9a25d56bbda596c7aab0e0eee2a35742 Mon Sep 17 00:00:00 2001 From: pb Date: Sat, 20 Jun 2009 16:12:56 +0000 Subject: [PATCH] Weiterer fix f. ccm-ldn-theme, Korrektur fest kodiereter Pfade, noch quick and very dirty! git-svn-id: https://svn.libreccm.org/ccm/trunk@201 8810af33-2d31-482b-a856-94f89814c4df --- .../src/com/arsdigita/london/theme/ThemeConstants.java | 2 +- .../london/theme/ui/ThemeXSLParameterGenerator.java | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ccm-ldn-theme/src/com/arsdigita/london/theme/ThemeConstants.java b/ccm-ldn-theme/src/com/arsdigita/london/theme/ThemeConstants.java index e694f123c..999604617 100755 --- a/ccm-ldn-theme/src/com/arsdigita/london/theme/ThemeConstants.java +++ b/ccm-ldn-theme/src/com/arsdigita/london/theme/ThemeConstants.java @@ -28,7 +28,7 @@ public interface ThemeConstants { // TODO: it would be nice if this value in com.arsdigita.web.URL // was public public final static String CCM_PREFIX = "__ccm__"; - public final static String WEB_APP_NAME = "ccm-ldn-theme"; + public final static String WEB_APP_NAME = "ROOT"; // The location of the sync jsp used to sync up the multiple servers. public final static String SYNC_JSP = "sync-theme.jsp"; diff --git a/ccm-ldn-theme/src/com/arsdigita/london/theme/ui/ThemeXSLParameterGenerator.java b/ccm-ldn-theme/src/com/arsdigita/london/theme/ui/ThemeXSLParameterGenerator.java index 7fa3dd152..7f002d76f 100755 --- a/ccm-ldn-theme/src/com/arsdigita/london/theme/ui/ThemeXSLParameterGenerator.java +++ b/ccm-ldn-theme/src/com/arsdigita/london/theme/ui/ThemeXSLParameterGenerator.java @@ -73,7 +73,8 @@ public class ThemeXSLParameterGenerator implements XSLParameterGenerator, } if (themeURL != null) { - return "/" + WEB_APP_NAME + "/" + CCM_PREFIX + "/" + + // return "/" + WEB_APP_NAME + "/" + CCM_PREFIX + "/" + + return "/" + CCM_PREFIX + "/" + Web.getContext().getRequestURL().getContextPath() + baseDir + themeURL; } else { @@ -88,4 +89,4 @@ public class ThemeXSLParameterGenerator implements XSLParameterGenerator, return themeURL; } } -} +}