From 624ed86d460a7fad50185936250219df845a71d9 Mon Sep 17 00:00:00 2001
From: pb <pb@8810af33-2d31-482b-a856-94f89814c4df>
Date: Tue, 9 Feb 2010 00:09:50 +0000
Subject: [PATCH] SHP integration layer: Fehler in default theme beseitigt,
 sitemap.jsp aktualisiert.

git-svn-id: https://svn.libreccm.org/ccm/trunk@339 8810af33-2d31-482b-a856-94f89814c4df
---
 .../__ccm__/themes/aplaws-generic/consultations-index.xsl   | 2 +-
 .../themes/aplaws-generic/forum-example/forum-index.css     | 2 +-
 .../web/templates/ccm-ldn-navigation/navigation/sitemap.jsp | 6 ++++++
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/ccm-shp-aplaws/web/__ccm__/themes/aplaws-generic/consultations-index.xsl b/ccm-shp-aplaws/web/__ccm__/themes/aplaws-generic/consultations-index.xsl
index 40ca23cd0..75fe0ebdd 100644
--- a/ccm-shp-aplaws/web/__ccm__/themes/aplaws-generic/consultations-index.xsl
+++ b/ccm-shp-aplaws/web/__ccm__/themes/aplaws-generic/consultations-index.xsl
@@ -8,7 +8,7 @@
   xmlns:nav="http://ccm.redhat.com/london/navigation"
   version="1.0">
 
-  <xsl:import href="../../../../ROOT/__ccm__/themes/aplaws/navigation-index.xsl"/>
+  <xsl:import href="../../themes/aplaws-generic/navigation-index.xsl"/>
   
   <xsl:template name="pageContent">
     <a class="intLink" name="top" />
diff --git a/ccm-shp-aplaws/web/__ccm__/themes/aplaws-generic/forum-example/forum-index.css b/ccm-shp-aplaws/web/__ccm__/themes/aplaws-generic/forum-example/forum-index.css
index 5ebe54aba..2948c5a28 100644
--- a/ccm-shp-aplaws/web/__ccm__/themes/aplaws-generic/forum-example/forum-index.css
+++ b/ccm-shp-aplaws/web/__ccm__/themes/aplaws-generic/forum-example/forum-index.css
@@ -1,5 +1,5 @@
 @import url("css/main.css");
-/* Check: Chris probably forgot the ! to comment the following lines out. */
+/* Chris presumably forgot the ! to comment the following 2 lines out
 /* <--@import url("/css/acs-master.css");--> */
 /* <--@import url("/css/tabbed-pane/tabbed-pane.css");-->  */
 
diff --git a/ccm-shp-aplaws/web/templates/ccm-ldn-navigation/navigation/sitemap.jsp b/ccm-shp-aplaws/web/templates/ccm-ldn-navigation/navigation/sitemap.jsp
index cf59b9ce0..79ac1ae65 100755
--- a/ccm-shp-aplaws/web/templates/ccm-ldn-navigation/navigation/sitemap.jsp
+++ b/ccm-shp-aplaws/web/templates/ccm-ldn-navigation/navigation/sitemap.jsp
@@ -3,6 +3,8 @@
           xmlns:show="/WEB-INF/bebop-show.tld"
 	  version="1.2"> 
 
+<!--  Anpassung sitemap-Seite, die auch Navigationsspalte und Breadcrumbs enthaelt.   -->
+
   <jsp:directive.page import="com.arsdigita.dispatcher.DispatcherHelper"/>
 
   <jsp:scriptlet>
@@ -12,6 +14,10 @@
   <define:page name="sitemapPage" application="navigation"
     title="APLAWS" cache="true">
 
+    <define:component name="categoryPath"
+      classname="com.arsdigita.london.navigation.ui.category.Path"/>
+    <define:component name="categoryMenu"
+      classname="com.arsdigita.london.navigation.ui.category.Menu"/>
     <define:component name="categoryNav"
       classname="com.arsdigita.london.navigation.ui.category.Hierarchy">
       <jsp:scriptlet>