From db52e4d66d60184d53a27ba4d6772461daacc03d Mon Sep 17 00:00:00 2001
From: tknall <tknall@7b5415b0-85f9-ee4d-85bd-d5d0c3b42d1c>
Date: Fri, 22 Mar 2013 08:57:51 +0000
Subject: Maintenance update (bugfixes, new features, cleanup...) Refer to
 /dok/RELEASE_NOTES-3.3.txt for further information.

git-svn-id: https://joinup.ec.europa.eu/svn/pdf-as/pdf-as/trunk@931 7b5415b0-85f9-ee4d-85bd-d5d0c3b42d1c
---
 pdf-as-web/src/main/webapp/WEB-INF/decorators.xml |  9 +++++++--
 pdf-as-web/src/main/webapp/WEB-INF/sitemesh.xml   | 21 +++++++++------------
 2 files changed, 16 insertions(+), 14 deletions(-)

(limited to 'pdf-as-web/src/main/webapp/WEB-INF')

diff --git a/pdf-as-web/src/main/webapp/WEB-INF/decorators.xml b/pdf-as-web/src/main/webapp/WEB-INF/decorators.xml
index 6585f97..e1fff32 100644
--- a/pdf-as-web/src/main/webapp/WEB-INF/decorators.xml
+++ b/pdf-as-web/src/main/webapp/WEB-INF/decorators.xml
@@ -5,6 +5,11 @@
 		<pattern>*.pdf</pattern>
 		<pattern>/*.pdf</pattern>
 	</excludes>
-	<decorator name="production_de" page="/sitemesh/standalone.jsp?lang=de"/>
-	<decorator name="production_en" page="/sitemesh/standalone.jsp?lang=en"/>
+
+	<!-- Default layout if no other layout has been chosen. -->
+	<!-- In order to apply other layouts, modify the context element information 
+		(${catalina.home}/conf/Catalina/localhost/pdf-as.xml) -->
+	<decorator name="production_de" page="/sitemesh/standalone.jsp?locale=de" />
+	<decorator name="production_en" page="/sitemesh/standalone.jsp?locale=en" />
+
 </decorators>
\ No newline at end of file
diff --git a/pdf-as-web/src/main/webapp/WEB-INF/sitemesh.xml b/pdf-as-web/src/main/webapp/WEB-INF/sitemesh.xml
index c6653cc..cda7eb3 100644
--- a/pdf-as-web/src/main/webapp/WEB-INF/sitemesh.xml
+++ b/pdf-as-web/src/main/webapp/WEB-INF/sitemesh.xml
@@ -1,30 +1,27 @@
 <sitemesh>
+
     <property name="decorators-file" value="/WEB-INF/decorators.xml"/>
     <excludes file="${decorators-file}"/>
 
 	<page-parsers>
 		<parser content-type="text/html" class="com.opensymphony.module.sitemesh.parser.HTMLPageParser" />
 	</page-parsers>
+
 	<decorator-mappers>
+
 		<mapper class="com.opensymphony.module.sitemesh.mapper.PageDecoratorMapper">
 			<param name="property.1" value="meta.decorator" />
 			<param name="property.2" value="decorator" />
 		</mapper>
-		<!--
-		<mapper class="com.opensymphony.module.sitemesh.mapper.LanguageDecoratorMapper">
-			<param name="match.en" value="en" />
-		</mapper>
-		-->
+
 		<mapper class="at.gv.egiz.pdfas.web.i18n.LanguageDecoratorMapper"/>
+
 		<mapper class="com.opensymphony.module.sitemesh.mapper.FrameSetDecoratorMapper"/>
-		<mapper class="com.opensymphony.module.sitemesh.mapper.PrintableDecoratorMapper">
-			<param name="decorator" value="printable" />
-			<param name="parameter.name" value="printable" />
-			<param name="parameter.value" value="true" />
-		</mapper>
-		<mapper class="com.opensymphony.module.sitemesh.mapper.FileDecoratorMapper"/>
-		<mapper class="com.opensymphony.module.sitemesh.mapper.ConfigDecoratorMapper">
+
+		<mapper class="com.opensymphony.module.sitemesh.mapper.EnvEntryDecoratorMapper">
 			<param name="config" value="${decorators-file}" />
 		</mapper>
+
 	</decorator-mappers>
+
 </sitemesh>
-- 
cgit v1.2.3