From 1854b507413f1fe8ea1a233719f7cd6b1b6e0863 Mon Sep 17 00:00:00 2001
From: Ralph Soika <ralph.soika@imixs.com>
Date: Fri, 6 Sep 2024 14:45:19 +0200
Subject: [PATCH] fixed templates

Issue #601
---
 docker/docker-compose-dev.yaml                |   3 +-
 .../src/main/webapp/error.xhtml               |   2 +-
 .../src/main/webapp/layout/template.xhtml     |  66 ++---
 .../main/webapp/layout/template_error.xhtml   | 167 ++++++++++++
 .../main/webapp/layout/template_plain.xhtml   | 241 ------------------
 .../main/webapp/layout/template_print.xhtml   |  58 ++---
 .../src/main/webapp/pages/textblock.xhtml     |  21 +-
 7 files changed, 231 insertions(+), 327 deletions(-)
 create mode 100644 imixs-office-workflow-app/src/main/webapp/layout/template_error.xhtml
 delete mode 100644 imixs-office-workflow-app/src/main/webapp/layout/template_plain.xhtml

diff --git a/docker/docker-compose-dev.yaml b/docker/docker-compose-dev.yaml
index 98032a46..9996ade4 100644
--- a/docker/docker-compose-dev.yaml
+++ b/docker/docker-compose-dev.yaml
@@ -9,13 +9,14 @@ services:
       - dbdata:/var/lib/postgresql/data
 
   app:
-    image: imixs/imixs-office-workflow
+    image: imixs/imixs-office-workflow:latest
     depends_on:
       - db
     environment:
       TZ: "CET"
       LANG: "en_US.UTF-8"
       JAVA_OPTS: "-Dnashorn.args=--no-deprecation-warning"
+      DEBUG: "true"
       MAILGATEWAY: "localhost"
       POSTGRES_USER: "postgres"
       POSTGRES_PASSWORD: "adminadmin"
diff --git a/imixs-office-workflow-app/src/main/webapp/error.xhtml b/imixs-office-workflow-app/src/main/webapp/error.xhtml
index 988ca06a..acd558ec 100644
--- a/imixs-office-workflow-app/src/main/webapp/error.xhtml
+++ b/imixs-office-workflow-app/src/main/webapp/error.xhtml
@@ -1,6 +1,6 @@
 <ui:composition xmlns="http://www.w3.org/1999/xhtml" xmlns:f="http://xmlns.jcp.org/jsf/core"
 	xmlns:h="http://xmlns.jcp.org/jsf/html" xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-	template="/layout/template.xhtml">
+	template="/layout/template_error.xhtml">
 
 	<ui:define name="content">
 		<!-- Display only if error messages available -->
diff --git a/imixs-office-workflow-app/src/main/webapp/layout/template.xhtml b/imixs-office-workflow-app/src/main/webapp/layout/template.xhtml
index 9f682b4f..a9b020e9 100644
--- a/imixs-office-workflow-app/src/main/webapp/layout/template.xhtml
+++ b/imixs-office-workflow-app/src/main/webapp/layout/template.xhtml
@@ -23,82 +23,72 @@
 
 	<!-- *** CSS *** -->
 
-	<link rel="shortcut icon" type="image/x-icon"
-		href="#{facesContext.externalContext.requestContextPath}/layout/favicon.ico" />
+	<link rel="shortcut icon" type="image/x-icon" href="#{request.contextPath}/layout/favicon.ico" />
 
 	<!-- imixs-responsive css -->
-	<link
-		href="#{facesContext.externalContext.requestContextPath}/layout/css/imixs-basic.css?build=#{app.application_build_timestamp}"
+	<link href="#{request.contextPath}/layout/css/imixs-basic.css?build=#{app.application_build_timestamp}"
 		charset="UTF-8" type="text/css" rel="stylesheet" />
-	<link
-		href="#{facesContext.externalContext.requestContextPath}/layout/css/imixs-layout.css?build=#{app.application_build_timestamp}"
+	<link href="#{request.contextPath}/layout/css/imixs-layout.css?build=#{app.application_build_timestamp}"
 		charset="UTF-8" type="text/css" rel="stylesheet" />
 
 
 
 	<!-- imixsHeader (must be loaded before office-css! -->
 	<i:imixsHeader disablecss="false" dateformat="#{message.datePatternShort}" build="#{app.application_workflow_build}"
-		xtheme="#{facesContext.externalContext.requestContextPath}/layout/themes/#{app.application_theme}" />
+		xtheme="#{request.contextPath}/layout/themes/#{app.application_theme}" />
 
 	<!--  font icons -->
-	<link
-		href="#{facesContext.externalContext.requestContextPath}/layout/css/fonts/open_sans.css?build=#{app.application_build_timestamp}"
+	<link href="#{request.contextPath}/layout/css/fonts/open_sans.css?build=#{app.application_build_timestamp}"
 		charset="UTF-8" type="text/css" rel="stylesheet" />
-	<link
-		href="#{facesContext.externalContext.requestContextPath}/layout/css/fonts/typicons.css?build=#{app.application_build_timestamp}"
+	<link href="#{request.contextPath}/layout/css/fonts/typicons.css?build=#{app.application_build_timestamp}"
 		charset="UTF-8" type="text/css" rel="stylesheet" />
 
 	<!-- imixs-office-workflow css -->
-	<link
-		href="#{facesContext.externalContext.requestContextPath}/marty/imixs-marty.css?build=#{app.application_build_timestamp}"
-		charset="UTF-8" type="text/css" rel="stylesheet" />
-	<link
-		href="#{facesContext.externalContext.requestContextPath}/layout/css/office-theme.css?build=#{app.application_build_timestamp}"
+	<link href="#{request.contextPath}/marty/imixs-marty.css?build=#{app.application_build_timestamp}" charset="UTF-8"
+		type="text/css" rel="stylesheet" />
+	<link href="#{request.contextPath}/layout/css/office-theme.css?build=#{app.application_build_timestamp}"
 		charset="UTF-8" type="text/css" rel="stylesheet" />
 
 
 
 	<!-- Chronicle Feature css -->
-	<link
-		href="#{facesContext.externalContext.requestContextPath}/layout/css/office-theme-chronicle.css?build=#{app.application_build_timestamp}"
+	<link href="#{request.contextPath}/layout/css/office-theme-chronicle.css?build=#{app.application_build_timestamp}"
 		charset="UTF-8" type="text/css" rel="stylesheet" />
 
 
 	<link
-		href="#{facesContext.externalContext.requestContextPath}/layout/css/office-theme-autocomplete.css?build=#{app.application_build_timestamp}"
+		href="#{request.contextPath}/layout/css/office-theme-autocomplete.css?build=#{app.application_build_timestamp}"
 		charset="UTF-8" type="text/css" rel="stylesheet" />
 	<link
-		href="#{facesContext.externalContext.requestContextPath}/layout/css/office-theme-suggestinput.css?build=#{app.application_build_timestamp}"
+		href="#{request.contextPath}/layout/css/office-theme-suggestinput.css?build=#{app.application_build_timestamp}"
 		charset="UTF-8" type="text/css" rel="stylesheet" />
 
 	<!-- ML Feature css -->
-	<link
-		href="#{facesContext.externalContext.requestContextPath}/layout/css/office-theme-ai.css?build=#{app.application_build_timestamp}"
+	<link href="#{request.contextPath}/layout/css/office-theme-ai.css?build=#{app.application_build_timestamp}"
 		charset="UTF-8" type="text/css" rel="stylesheet" />
 
 	<!-- custom css -->
-	<link
-		href="#{facesContext.externalContext.requestContextPath}/layout/css/custom.css?build=#{app.application_build_timestamp}"
-		charset="UTF-8" type="text/css" rel="stylesheet" />
+	<link href="#{request.contextPath}/layout/css/custom.css?build=#{app.application_build_timestamp}" charset="UTF-8"
+		type="text/css" rel="stylesheet" />
 
 
 	<!-- *** MS IE Support *** -->
 
 	<!-- IE 7 support -->
 	<h:outputText
-		value="&lt;!--[if IE 7]&gt;&lt;link rel=&quot;stylesheet&quot; type=&quot;text/css&quot; href=&quot;#{facesContext.externalContext.requestContextPath}/layout/css/ie-support.css&quot; /&gt;&lt;![endif]--&gt;"
+		value="&lt;!--[if IE 7]&gt;&lt;link rel=&quot;stylesheet&quot; type=&quot;text/css&quot; href=&quot;#{request.contextPath}/layout/css/ie-support.css&quot; /&gt;&lt;![endif]--&gt;"
 		escape="false" />
 	<!-- IE 8 support -->
 	<h:outputText
-		value="&lt;!--[if IE 8]&gt;&lt;link rel=&quot;stylesheet&quot; type=&quot;text/css&quot; href=&quot;#{facesContext.externalContext.requestContextPath}/layout/css/ie-support.css&quot; /&gt;&lt;![endif]--&gt;"
+		value="&lt;!--[if IE 8]&gt;&lt;link rel=&quot;stylesheet&quot; type=&quot;text/css&quot; href=&quot;#{request.contextPath}/layout/css/ie-support.css&quot; /&gt;&lt;![endif]--&gt;"
 		escape="false" />
 	<!-- IE 9 support -->
 	<h:outputText
-		value="&lt;!--[if IE 9]&gt;&lt;link rel=&quot;stylesheet&quot; type=&quot;text/css&quot; href=&quot;#{facesContext.externalContext.requestContextPath}/layout/css/ie-support.css&quot; /&gt;&lt;![endif]--&gt;"
+		value="&lt;!--[if IE 9]&gt;&lt;link rel=&quot;stylesheet&quot; type=&quot;text/css&quot; href=&quot;#{request.contextPath}/layout/css/ie-support.css&quot; /&gt;&lt;![endif]--&gt;"
 		escape="false" />
 	<!-- IE 10 support -->
 	<h:outputText
-		value="&lt;!--[if IE 10]&gt;&lt;link rel=&quot;stylesheet&quot; type=&quot;text/css&quot; href=&quot;#{facesContext.externalContext.requestContextPath}/layout/css/ie-support.css&quot; /&gt;&lt;![endif]--&gt;"
+		value="&lt;!--[if IE 10]&gt;&lt;link rel=&quot;stylesheet&quot; type=&quot;text/css&quot; href=&quot;#{request.contextPath}/layout/css/ie-support.css&quot; /&gt;&lt;![endif]--&gt;"
 		escape="false" />
 
 	<!-- The Top-Margin form the content container depends on the HistoryNav panel. If not history entries are displayed the 
@@ -115,39 +105,39 @@
 
 	<!-- tinyMCE -->
 	<script type="text/javascript"
-		src="#{facesContext.externalContext.requestContextPath}/js/tinymce/tinymce.min.js?build=#{app.application_build_timestamp}"></script>
+		src="#{request.contextPath}/js/tinymce/tinymce.min.js?build=#{app.application_build_timestamp}"></script>
 
 	<!-- datepicker regional -->
 	<script type="text/javascript"
-		src="#{facesContext.externalContext.requestContextPath}/js/#{message['jquey.datepicker.regional']}?build=#{app.application_build_timestamp}"></script>
+		src="#{request.contextPath}/js/#{message['jquey.datepicker.regional']}?build=#{app.application_build_timestamp}"></script>
 
 	<!-- Load DataTablePlugin  -->
 	<script type="text/javascript"
-		src="#{facesContext.externalContext.requestContextPath}/js/jquery.dataTables.min.js?build=#{app.application_build_timestamp}"></script>
+		src="#{request.contextPath}/js/jquery.dataTables.min.js?build=#{app.application_build_timestamp}"></script>
 
 	<!-- Load showdown (markup to html)  -->
 	<script type="text/javascript"
-		src="#{facesContext.externalContext.requestContextPath}/js/marked.min.js?build=#{app.application_build_timestamp}"></script>
+		src="#{request.contextPath}/js/marked.min.js?build=#{app.application_build_timestamp}"></script>
 
 
 	<!-- Imixs-Office-Workflow  -->
 	<script type="text/javascript"
-		src="#{facesContext.externalContext.requestContextPath}/js/imixs-core.js?build=#{app.application_build_timestamp}"></script>
+		src="#{request.contextPath}/js/imixs-core.js?build=#{app.application_build_timestamp}"></script>
 
 	<!-- Load the marty component script -->
 	<script type="text/javascript"
-		src="#{facesContext.externalContext.requestContextPath}/marty/imixs-marty.js?build=#{app.application_build_timestamp}"></script>
+		src="#{request.contextPath}/marty/imixs-marty.js?build=#{app.application_build_timestamp}"></script>
 
 
 	<script type="text/javascript"
-		src="#{facesContext.externalContext.requestContextPath}/js/imixs-office.main.js?build=#{app.application_build_timestamp}"></script>
+		src="#{request.contextPath}/js/imixs-office.main.js?build=#{app.application_build_timestamp}"></script>
 
 	<script type="text/javascript"
-		src="#{facesContext.externalContext.requestContextPath}/js/imixs-office.main.js?build=#{app.application_build_timestamp}"></script>
+		src="#{request.contextPath}/js/imixs-office.main.js?build=#{app.application_build_timestamp}"></script>
 
 
 	<script type="text/javascript"
-		src="#{facesContext.externalContext.requestContextPath}/js/imixs-office.autocomplete.js?build=#{app.application_build_timestamp}"></script>
+		src="#{request.contextPath}/js/imixs-office.autocomplete.js?build=#{app.application_build_timestamp}"></script>
 
 
 	<script type="text/javascript">
diff --git a/imixs-office-workflow-app/src/main/webapp/layout/template_error.xhtml b/imixs-office-workflow-app/src/main/webapp/layout/template_error.xhtml
new file mode 100644
index 00000000..db263928
--- /dev/null
+++ b/imixs-office-workflow-app/src/main/webapp/layout/template_error.xhtml
@@ -0,0 +1,167 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html
+	PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:f="http://xmlns.jcp.org/jsf/core"
+	xmlns:h="http://xmlns.jcp.org/jsf/html" xmlns:c="http://xmlns.jcp.org/jsp/jstl/core"
+	xmlns:ui="http://xmlns.jcp.org/jsf/facelets" xmlns:pt="http://xmlns.jcp.org/jsf/passthrough"
+	xmlns:fn="http://xmlns.jcp.org/jsp/jstl/functions" xmlns:marty="http://xmlns.jcp.org/jsf/composite/marty"
+	xmlns:i="http://xmlns.jcp.org/jsf/composite/imixs">
+
+<h:head>
+	<meta name="viewport" content="width=device-width" />
+	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+	<meta content="text/javascript" http-equiv="Content-Script-Type" />
+	<meta content="text/css" http-equiv="Content-Style-Type" />
+	<meta content="text/html; charset=UTF-8" http-equiv="Content-Type" />
+	<meta name="robots" content="noindex" />
+
+	<title>
+		<ui:param name="title" value="#{propertyController.getProperty('application.title')}"></ui:param>
+		<h:outputText rendered="#{empty title}" value="#{resourceBundleHandler.findMessage('application_title')}" />
+		<h:outputText rendered="#{!empty title}" value="#{title}" />
+	</title>
+
+	<!-- *** CSS *** -->
+
+	<link rel="shortcut icon" type="image/x-icon" href="/layout/favicon.ico" />
+
+	<!-- imixs-responsive css -->
+	<link href="#{request.contextPath}/layout/css/imixs-basic.css?build=#{app.application_build_timestamp}"
+		charset="UTF-8" type="text/css" rel="stylesheet" />
+	<link href="#{request.contextPath}/layout/css/imixs-layout.css?build=#{app.application_build_timestamp}"
+		charset="UTF-8" type="text/css" rel="stylesheet" />
+
+	<!-- no imixs head ! -->
+	<!-- imixsHeader (must be loaded before office-css! -->
+	<i:imixsHeader disablecss="false" dateformat="#{message.datePatternShort}"
+		build="#{app.application_workflow_build}" />
+
+	<!--  font icons -->
+	<link href="#{request.contextPath}/layout/css/fonts/open_sans.css?build=#{app.application_build_timestamp}"
+		charset="UTF-8" type="text/css" rel="stylesheet" />
+	<link href="#{request.contextPath}/layout/css/fonts/typicons.css?build=#{app.application_build_timestamp}"
+		charset="UTF-8" type="text/css" rel="stylesheet" />
+
+	<!-- imixs-office-workflow css -->
+	<link href="#{request.contextPath}/marty/imixs-marty.css?build=#{app.application_build_timestamp}" charset="UTF-8"
+		type="text/css" rel="stylesheet" />
+	<link href="#{request.contextPath}/layout/css/office-theme.css?build=#{app.application_build_timestamp}"
+		charset="UTF-8" type="text/css" rel="stylesheet" />
+
+	<!-- custom css -->
+	<link href="#{request.contextPath}/layout/css/custom.css?build=#{app.application_build_timestamp}" charset="UTF-8"
+		type="text/css" rel="stylesheet" />
+
+
+
+
+	<!-- *** SCRIPTS *** -->
+
+	<!-- tinyMCE -->
+	<script type="text/javascript"
+		src="#{request.contextPath}/js/tinymce/tinymce.min.js?build=#{app.application_build_timestamp}"></script>
+
+	<!-- datepicker regional -->
+	<script type="text/javascript"
+		src="#{request.contextPath}/js/#{message['jquey.datepicker.regional']}?build=#{app.application_build_timestamp}"></script>
+
+	<!-- Load DataTablePlugin  -->
+	<script type="text/javascript"
+		src="#{request.contextPath}/js/jquery.dataTables.min.js?build=#{app.application_build_timestamp}"></script>
+
+	<!-- Load showdown (markup to html)  -->
+	<script type="text/javascript"
+		src="#{request.contextPath}/js/marked.min.js?build=#{app.application_build_timestamp}"></script>
+
+
+	<!-- Imixs-Office-Workflow  -->
+	<script type="text/javascript"
+		src="#{request.contextPath}/js/imixs-core.js?build=#{app.application_build_timestamp}"></script>
+
+	<!-- Load the marty component script -->
+	<script type="text/javascript"
+		src="#{request.contextPath}/marty/imixs-marty.js?build=#{app.application_build_timestamp}"></script>
+
+
+	<script type="text/javascript"
+		src="#{request.contextPath}/js/imixs-office.main.js?build=#{app.application_build_timestamp}"></script>
+
+	<script type="text/javascript"
+		src="#{request.contextPath}/js/imixs-office.main.js?build=#{app.application_build_timestamp}"></script>
+
+
+	<script type="text/javascript">
+		/*<![CDATA[*/
+		// define script name spaces
+		var imixs = IMIXS.org.imixs.core;
+
+		// define variables for office scripts loaded from resource bundles....
+		imixsOfficeMain.contextPath = "#{request.contextPath}/";
+		imixsOfficeMain.error_message_mce_image_size = "#{message.error_message_mce_image_size}";
+		imixsOfficeMain.imixs_date_showWeek = ("true" === "#{app['jquey.datepicker.showWeek']}");
+		/*]]>*/
+	</script>
+
+
+	<ui:insert name="scripts">
+		<!-- default  -->
+	</ui:insert>
+
+
+</h:head>
+
+
+<h:body>
+	<f:view>
+
+		<!-- SystemSetupStatus=#{initController.initStatus} -->
+		<div id="imixs-app">
+			<div id="imixs-header" class="imixs-servicenav">
+				<ui:insert name="servicenav">
+					<ui:include src="servicenav.xhtml" />
+				</ui:insert>
+			</div>
+
+			<!-- content -->
+			<div id="imixs-content">
+
+
+
+				<div id="imixs-main">
+
+					<ui:insert name="content">
+						<!-- Default Content -->
+					</ui:insert>
+				</div>
+
+
+				<!-- footer -->
+				<ui:insert name="footer">
+					<div id="imixs-footer">
+						<div id="footer1">
+							<ui:insert name="extra">
+								<ui:include src="/layout/extra.xhtml" />
+							</ui:insert>
+						</div>
+						<div id="footer2">
+							<ui:insert name="footer">
+								<ui:include src="/layout/footer.xhtml" />
+							</ui:insert>
+						</div>
+					</div>
+				</ui:insert>
+				<!-- END footer -->
+
+			</div>
+			<!-- END content -->
+
+			<div class="imixs-wait">
+				<!-- empty -->
+			</div>
+
+		</div>
+	</f:view>
+</h:body>
+
+
+</html>
\ No newline at end of file
diff --git a/imixs-office-workflow-app/src/main/webapp/layout/template_plain.xhtml b/imixs-office-workflow-app/src/main/webapp/layout/template_plain.xhtml
deleted file mode 100644
index 3e6088d8..00000000
--- a/imixs-office-workflow-app/src/main/webapp/layout/template_plain.xhtml
+++ /dev/null
@@ -1,241 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" 
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"
-	xmlns:f="http://xmlns.jcp.org/jsf/core"
-	xmlns:h="http://xmlns.jcp.org/jsf/html"
-	xmlns:c="http://xmlns.jcp.org/jsp/jstl/core"
-	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-	xmlns:pt="http://xmlns.jcp.org/jsf/passthrough"
-	xmlns:fn="http://xmlns.jcp.org/jsp/jstl/functions"
-	xmlns:marty="http://xmlns.jcp.org/jsf/composite/marty"
-	xmlns:i="http://xmlns.jcp.org/jsf/composite/imixs">
-
-<h:head>
-	<meta name="viewport" content="width=device-width" />
-	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-	<meta content="text/javascript" http-equiv="Content-Script-Type" />
-	<meta content="text/css" http-equiv="Content-Style-Type" />
-	<meta content="text/html; charset=UTF-8" http-equiv="Content-Type" />
-	<meta content="Imixs Workflow" name="keywords" />
-	<meta name="robots" content="noindex" />
-
-
-	<title>
-		<ui:param name="title"
-				value="#{propertyController.getProperty('application.title')}"></ui:param>
-		<h:outputText rendered="#{empty title}" value="#{resourceBundleHandler.findMessage('application_title')}" />
-		<h:outputText rendered="#{!empty title}" value="#{title}" />
-	</title>
-
-	<!-- imixs-css -->
-	<link
-		href="#{facesContext.externalContext.requestContextPath}/layout/css/imixs-basic.css"
-		charset="UTF-8" type="text/css" rel="stylesheet" />
-	<link
-		href="#{facesContext.externalContext.requestContextPath}/layout/css/imixs-layout.css"
-		charset="UTF-8" type="text/css" rel="stylesheet" />
-
-
-	<!-- #### Customize TinyMCE  Start -->
-	<!--  tinymce disable can be set back to true if new defaulttinymce is supported -->
-	<i:imixsHeader disablecss="false" disabletinymce="true"
-		dateformat="#{message.datePatternShort}"
-		theme="#{facesContext.externalContext.requestContextPath}/layout/themes/#{app.application_theme}" />
-	<!-- #### Customize TinyMCE  END -->
-
-
-
-
-	<link
-		href="#{facesContext.externalContext.requestContextPath}/marty/imixs-marty.css"
-		charset="UTF-8" type="text/css" rel="stylesheet" />
-
-	<link
-		href="#{facesContext.externalContext.requestContextPath}/layout/css/fonts/typicons.css?build=#{app.application_build_timestamp}"
-		charset="UTF-8" type="text/css" rel="stylesheet" />
-	<link
-		href="#{facesContext.externalContext.requestContextPath}/layout/css/office-theme.css"
-		charset="UTF-8" type="text/css" rel="stylesheet" />
-
-	<link
-		href="#{facesContext.externalContext.requestContextPath}/layout/css/office-theme-print.css"
-		charset="UTF-8" type="text/css" rel="stylesheet" />
-
-	<link
-		href="#{facesContext.externalContext.requestContextPath}/layout/css/custom.css"
-		charset="UTF-8" type="text/css" rel="stylesheet" />
-	<link
-		href="#{facesContext.externalContext.requestContextPath}/layout/css/custom-print.css"
-		charset="UTF-8" type="text/css" rel="stylesheet" />
-
-	<!-- IE 7 support -->
-	<h:outputText
-		value="&lt;!--[if IE 7]&gt;&lt;link rel=&quot;stylesheet&quot; type=&quot;text/css&quot; href=&quot;#{facesContext.externalContext.requestContextPath}/layout/css/ie-support.css&quot; /&gt;&lt;![endif]--&gt;"
-		escape="false" />
-	<!-- IE 8 support -->
-	<h:outputText
-		value="&lt;!--[if IE 8]&gt;&lt;link rel=&quot;stylesheet&quot; type=&quot;text/css&quot; href=&quot;#{facesContext.externalContext.requestContextPath}/layout/css/ie-support.css&quot; /&gt;&lt;![endif]--&gt;"
-		escape="false" />
-	<!-- IE 9 support -->
-	<h:outputText
-		value="&lt;!--[if IE 9]&gt;&lt;link rel=&quot;stylesheet&quot; type=&quot;text/css&quot; href=&quot;#{facesContext.externalContext.requestContextPath}/layout/css/ie-support.css&quot; /&gt;&lt;![endif]--&gt;"
-		escape="false" />
-	<!-- IE 10 support -->
-	<h:outputText
-		value="&lt;!--[if IE 10]&gt;&lt;link rel=&quot;stylesheet&quot; type=&quot;text/css&quot; href=&quot;#{facesContext.externalContext.requestContextPath}/layout/css/ie-support.css&quot; /&gt;&lt;![endif]--&gt;"
-		escape="false" />
-		
-
-	<!-- *** SCRIPTS *** -->
-
-	<!-- tinyMCE -->
-	<script type="text/javascript"
-		src="#{facesContext.externalContext.requestContextPath}/js/tinymce/tinymce.min.js?build=#{app.application_build_timestamp}"></script>
-
-	<!-- datepicker regional -->
-	<script type="text/javascript"
-		src="#{facesContext.externalContext.requestContextPath}/js/#{message['jquey.datepicker.regional']}?build=#{app.application_build_timestamp}"></script>
-
-	<!-- Load the marty component script -->
-	<script type="text/javascript"
-		src="#{facesContext.externalContext.requestContextPath}/marty/imixs-marty.js?build=#{app.application_build_timestamp}"></script>
-
-	<!-- Load DataTablePlugin  -->
-	<script type="text/javascript"
-		src="#{facesContext.externalContext.requestContextPath}/js/jquery.dataTables.min.js?build=#{app.application_build_timestamp}"></script>
-
-	<!-- Chart.js -->
-	<script type="text/javascript"
-		src="#{facesContext.externalContext.requestContextPath}/js/chartjs/Chart.bundle.min.js?build=#{app.application_build_timestamp}"></script>
-
-	<!-- Imixs-Office-Workflow  -->
-	<script type="text/javascript"
-		src="#{facesContext.externalContext.requestContextPath}/js/imixs-core.js?build=#{app.application_build_timestamp}"></script>
-	<script type="text/javascript"
-		src="#{facesContext.externalContext.requestContextPath}/js/imixs-office.main.js?build=#{app.application_build_timestamp}"></script>
-	<script type="text/javascript"
-		src="#{facesContext.externalContext.requestContextPath}/js/imixs-office.main.custom.js?build=#{app.application_build_timestamp}"></script>
-
-    <script type="text/javascript">
-		/*<![CDATA[*/
-
-		// define script name spaces
-		var imixs = IMIXS.org.imixs.core
-		var imixsOfficeWorkflow = IMIXS.org.imixs.workflow.office;
-
-		// define variables for office scripts loaded from resource bundles....
-		imixsOfficeMain.contextPath="#{facesContext.externalContext.requestContextPath}";
-		imixsOfficeMain.error_message_mce_image_size="#{message.error_message_mce_image_size}";
-		imixsOfficeMain.imixs_date_showWeek=("true"==="#{app['jquey.datepicker.showWeek']}");
-		
-		
-		/*]]>*/
-	</script>
-	<ui:insert name="header">
-	</ui:insert>
-
-
-</h:head>
-
-
-<h:body>
-	<f:view locale="#{userController.locale}">
-
-		<div id="imixs-container">
-			
-			<div id="imixs-wrapper">
-
-				<div id="imixs-content">
-					<!-- 
-					<ui:insert name="historynav">
-						<ui:include src="historynav.xhtml" />
-					</ui:insert>
-					 -->
-					<ui:insert name="content">
-						<h1>Default Content</h1>
-					</ui:insert>
-				</div>
-
-			</div>
-
-			<!-- END container -->
-
-			<div id="footer">
-				<div id="footer1">
-					<ui:insert name="extra">
-						<ui:include src="/layout/extra.xhtml" />
-					</ui:insert>
-				</div>
-				<div id="footer2">
-					<ui:insert name="footer">
-						<ui:include src="/layout/footer.xhtml" />
-					</ui:insert>
-				</div>
-			</div>
-			<!-- END footer -->
-
-
-		</div>
-	</f:view>
-	
-	<!-- Load the marty component script -->
-	<script type="text/javascript"
-		src="#{facesContext.externalContext.requestContextPath}/marty/imixs-marty.js"></script>
-	<!-- Imixs-Office-Workflow  -->
-	<script type="text/javascript"
-		src="#{facesContext.externalContext.requestContextPath}/js/imixs-core.js?build=#{app.application_build_timestamp}"></script>
-	<script type="text/javascript"
-		src="#{facesContext.externalContext.requestContextPath}/js/imixs-office-workflow.js?build=#{app.application_build_timestamp}"></script>
-	
-	<script type="text/javascript">
-	/*<![CDATA[*/
-
-		/* Init Script */
-		var imixs = IMIXS.org.imixs.core, 
-			imixsOfficeWorkflow = IMIXS.org.imixs.workflow.office;
-
-		imixsOfficeMain.contextPath="#{facesContext.externalContext.requestContextPath}";
-		
-		$(document).ready(function() {
-			imixsOfficeMain.initLayout();
-			
-			/* This script replaces input fields with their values
-			 * we skip radio inputs and checkboxes.
-			 * if a input field is inside a parent element with the class named '.imixs-custom-print' 
-			 * then the input will be printed as it is  
-			 * 
-			 */
-			$(".imixs-body input[type=text], .imixs-body textarea").each(function(index) {
-				var hauptding=$(this).closest( ".imixs-custom-print" );
-				if (hauptding.length==0) {
-					var content = $(this).val();
-					$(this).after("<span style=\"white-space: pre-line;\">"+content+"</span>").hide();		
-				}
-			});
-
-			$(".imixs-body input[type=radio]").each(function(index) {
-				var content = $(this).val();
-				var label= $(this).next().next().text();
-			});
-			
-			
-			$(".imixs-body select").each(function(index) {
-				$( "option:selected",this ).each(function() {
-				    var content=$( this ).text();				    
-			    	$(this).parent().after("<span style=\"white-space: pre-line;\">"+content+"</span>");
-				  });
-				$(this).hide();
-			});
-				
-			// hide buttons
-			$(".imixs-body input[type=submit], .imixs-body input[type=rest], .imixs-body input[type=button], .imixs-body :button").hide();
-			
-		});
-		
-		
-	/*]]>*/
-	</script>
-</h:body>
-
-</html>
\ No newline at end of file
diff --git a/imixs-office-workflow-app/src/main/webapp/layout/template_print.xhtml b/imixs-office-workflow-app/src/main/webapp/layout/template_print.xhtml
index 78cb8a4a..15c7cb1e 100644
--- a/imixs-office-workflow-app/src/main/webapp/layout/template_print.xhtml
+++ b/imixs-office-workflow-app/src/main/webapp/layout/template_print.xhtml
@@ -25,53 +25,46 @@
 	</title>
 
 	<!-- imixs-css -->
-	<link href="#{facesContext.externalContext.requestContextPath}/layout/css/imixs-basic.css" charset="UTF-8"
-		type="text/css" rel="stylesheet" />
-	<link href="#{facesContext.externalContext.requestContextPath}/layout/css/imixs-layout.css" charset="UTF-8"
-		type="text/css" rel="stylesheet" />
+	<link href="#{request.contextPath}/layout/css/imixs-basic.css" charset="UTF-8" type="text/css" rel="stylesheet" />
+	<link href="#{request.contextPath}/layout/css/imixs-layout.css" charset="UTF-8" type="text/css" rel="stylesheet" />
 
 
 	<!-- #### Customize TinyMCE  Start -->
 	<!--  tinymce disable can be set back to true if new defaulttinymce is supported -->
 	<i:imixsHeader disablecss="false" disabletinymce="true" dateformat="#{message.datePatternShort}"
-		theme="#{facesContext.externalContext.requestContextPath}/layout/themes/#{app.application_theme}" />
+		theme="#{request.contextPath}/layout/themes/#{app.application_theme}" />
 	<!-- #### Customize TinyMCE  END -->
 
 
 
 
-	<link href="#{facesContext.externalContext.requestContextPath}/marty/imixs-marty.css" charset="UTF-8"
-		type="text/css" rel="stylesheet" />
+	<link href="#{request.contextPath}/marty/imixs-marty.css" charset="UTF-8" type="text/css" rel="stylesheet" />
 
-	<link
-		href="#{facesContext.externalContext.requestContextPath}/layout/css/fonts/typicons.css?build=#{app.application_build_timestamp}"
+	<link href="#{request.contextPath}/layout/css/fonts/typicons.css?build=#{app.application_build_timestamp}"
 		charset="UTF-8" type="text/css" rel="stylesheet" />
-	<link href="#{facesContext.externalContext.requestContextPath}/layout/css/office-theme.css" charset="UTF-8"
-		type="text/css" rel="stylesheet" />
+	<link href="#{request.contextPath}/layout/css/office-theme.css" charset="UTF-8" type="text/css" rel="stylesheet" />
 
-	<link href="#{facesContext.externalContext.requestContextPath}/layout/css/office-theme-print.css" charset="UTF-8"
-		type="text/css" rel="stylesheet" />
+	<link href="#{request.contextPath}/layout/css/office-theme-print.css" charset="UTF-8" type="text/css"
+		rel="stylesheet" />
 
-	<link href="#{facesContext.externalContext.requestContextPath}/layout/css/custom.css" charset="UTF-8"
-		type="text/css" rel="stylesheet" />
-	<link href="#{facesContext.externalContext.requestContextPath}/layout/css/custom-print.css" charset="UTF-8"
-		type="text/css" rel="stylesheet" />
+	<link href="#{request.contextPath}/layout/css/custom.css" charset="UTF-8" type="text/css" rel="stylesheet" />
+	<link href="#{request.contextPath}/layout/css/custom-print.css" charset="UTF-8" type="text/css" rel="stylesheet" />
 
 	<!-- IE 7 support -->
 	<h:outputText
-		value="&lt;!--[if IE 7]&gt;&lt;link rel=&quot;stylesheet&quot; type=&quot;text/css&quot; href=&quot;#{facesContext.externalContext.requestContextPath}/layout/css/ie-support.css&quot; /&gt;&lt;![endif]--&gt;"
+		value="&lt;!--[if IE 7]&gt;&lt;link rel=&quot;stylesheet&quot; type=&quot;text/css&quot; href=&quot;#{request.contextPath}/layout/css/ie-support.css&quot; /&gt;&lt;![endif]--&gt;"
 		escape="false" />
 	<!-- IE 8 support -->
 	<h:outputText
-		value="&lt;!--[if IE 8]&gt;&lt;link rel=&quot;stylesheet&quot; type=&quot;text/css&quot; href=&quot;#{facesContext.externalContext.requestContextPath}/layout/css/ie-support.css&quot; /&gt;&lt;![endif]--&gt;"
+		value="&lt;!--[if IE 8]&gt;&lt;link rel=&quot;stylesheet&quot; type=&quot;text/css&quot; href=&quot;#{request.contextPath}/layout/css/ie-support.css&quot; /&gt;&lt;![endif]--&gt;"
 		escape="false" />
 	<!-- IE 9 support -->
 	<h:outputText
-		value="&lt;!--[if IE 9]&gt;&lt;link rel=&quot;stylesheet&quot; type=&quot;text/css&quot; href=&quot;#{facesContext.externalContext.requestContextPath}/layout/css/ie-support.css&quot; /&gt;&lt;![endif]--&gt;"
+		value="&lt;!--[if IE 9]&gt;&lt;link rel=&quot;stylesheet&quot; type=&quot;text/css&quot; href=&quot;#{request.contextPath}/layout/css/ie-support.css&quot; /&gt;&lt;![endif]--&gt;"
 		escape="false" />
 	<!-- IE 10 support -->
 	<h:outputText
-		value="&lt;!--[if IE 10]&gt;&lt;link rel=&quot;stylesheet&quot; type=&quot;text/css&quot; href=&quot;#{facesContext.externalContext.requestContextPath}/layout/css/ie-support.css&quot; /&gt;&lt;![endif]--&gt;"
+		value="&lt;!--[if IE 10]&gt;&lt;link rel=&quot;stylesheet&quot; type=&quot;text/css&quot; href=&quot;#{request.contextPath}/layout/css/ie-support.css&quot; /&gt;&lt;![endif]--&gt;"
 		escape="false" />
 
 
@@ -79,31 +72,31 @@
 
 	<!-- tinyMCE -->
 	<script type="text/javascript"
-		src="#{facesContext.externalContext.requestContextPath}/js/tinymce/tinymce.min.js?build=#{app.application_build_timestamp}"></script>
+		src="#{request.contextPath}/js/tinymce/tinymce.min.js?build=#{app.application_build_timestamp}"></script>
 
 	<!-- datepicker regional -->
 	<script type="text/javascript"
-		src="#{facesContext.externalContext.requestContextPath}/js/#{message['jquey.datepicker.regional']}?build=#{app.application_build_timestamp}"></script>
+		src="#{request.contextPath}/js/#{message['jquey.datepicker.regional']}?build=#{app.application_build_timestamp}"></script>
 
 	<!-- Load the marty component script -->
 	<script type="text/javascript"
-		src="#{facesContext.externalContext.requestContextPath}/marty/imixs-marty.js?build=#{app.application_build_timestamp}"></script>
+		src="#{request.contextPath}/marty/imixs-marty.js?build=#{app.application_build_timestamp}"></script>
 
 	<!-- Load DataTablePlugin  -->
 	<script type="text/javascript"
-		src="#{facesContext.externalContext.requestContextPath}/js/jquery.dataTables.min.js?build=#{app.application_build_timestamp}"></script>
+		src="#{request.contextPath}/js/jquery.dataTables.min.js?build=#{app.application_build_timestamp}"></script>
 
 	<!-- Chart.js -->
 	<script type="text/javascript"
-		src="#{facesContext.externalContext.requestContextPath}/js/chartjs/Chart.bundle.min.js?build=#{app.application_build_timestamp}"></script>
+		src="#{request.contextPath}/js/chartjs/Chart.bundle.min.js?build=#{app.application_build_timestamp}"></script>
 
 	<!-- Imixs-Office-Workflow  -->
 	<script type="text/javascript"
-		src="#{facesContext.externalContext.requestContextPath}/js/imixs-core.js?build=#{app.application_build_timestamp}"></script>
+		src="#{request.contextPath}/js/imixs-core.js?build=#{app.application_build_timestamp}"></script>
 	<script type="text/javascript"
-		src="#{facesContext.externalContext.requestContextPath}/js/imixs-office.main.js?build=#{app.application_build_timestamp}"></script>
+		src="#{request.contextPath}/js/imixs-office.main.js?build=#{app.application_build_timestamp}"></script>
 	<script type="text/javascript"
-		src="#{facesContext.externalContext.requestContextPath}/js/imixs-office.main.custom.js?build=#{app.application_build_timestamp}"></script>
+		src="#{request.contextPath}/js/imixs-office.main.custom.js?build=#{app.application_build_timestamp}"></script>
 
 	<script type="text/javascript">
 		/*<![CDATA[*/
@@ -174,13 +167,12 @@
 	</f:view>
 
 	<!-- Load the marty component script -->
-	<script type="text/javascript"
-		src="#{facesContext.externalContext.requestContextPath}/marty/imixs-marty.js"></script>
+	<script type="text/javascript" src="#{request.contextPath}/marty/imixs-marty.js"></script>
 	<!-- Imixs-Office-Workflow  -->
 	<script type="text/javascript"
-		src="#{facesContext.externalContext.requestContextPath}/js/imixs-core.js?build=#{app.application_build_timestamp}"></script>
+		src="#{request.contextPath}/js/imixs-core.js?build=#{app.application_build_timestamp}"></script>
 	<script type="text/javascript"
-		src="#{facesContext.externalContext.requestContextPath}/js/imixs-office-workflow.js?build=#{app.application_build_timestamp}"></script>
+		src="#{request.contextPath}/js/imixs-office-workflow.js?build=#{app.application_build_timestamp}"></script>
 
 	<script type="text/javascript">
 		/*<![CDATA[*/
diff --git a/imixs-office-workflow-app/src/main/webapp/pages/textblock.xhtml b/imixs-office-workflow-app/src/main/webapp/pages/textblock.xhtml
index 63747be5..b19f4adf 100644
--- a/imixs-office-workflow-app/src/main/webapp/pages/textblock.xhtml
+++ b/imixs-office-workflow-app/src/main/webapp/pages/textblock.xhtml
@@ -1,12 +1,8 @@
-<ui:composition xmlns="http://www.w3.org/1999/xhtml"
-	xmlns:f="http://xmlns.jcp.org/jsf/core"
-	xmlns:h="http://xmlns.jcp.org/jsf/html"
-	xmlns:c="http://xmlns.jcp.org/jsp/jstl/core"
-	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-	xmlns:pt="http://xmlns.jcp.org/jsf/passthrough"
-	xmlns:marty="http://xmlns.jcp.org/jsf/composite/marty"
-	xmlns:i="http://xmlns.jcp.org/jsf/composite/imixs"
-	template="/layout/template_plain.xhtml">
+<ui:composition xmlns="http://www.w3.org/1999/xhtml" xmlns:f="http://xmlns.jcp.org/jsf/core"
+	xmlns:h="http://xmlns.jcp.org/jsf/html" xmlns:c="http://xmlns.jcp.org/jsp/jstl/core"
+	xmlns:ui="http://xmlns.jcp.org/jsf/facelets" xmlns:pt="http://xmlns.jcp.org/jsf/passthrough"
+	xmlns:marty="http://xmlns.jcp.org/jsf/composite/marty" xmlns:i="http://xmlns.jcp.org/jsf/composite/imixs"
+	template="/layout/template.xhtml">
 
 	<!-- out textbock content as html page -->
 
@@ -18,12 +14,11 @@
 		<f:view>
 			<h:form id="textblock_form_id">
 				<div class="imixs-body">
-					<h:outputText escape="false"
-						value="#{documentController.document.item['txtcontent']}"></h:outputText>
+					<h:outputText escape="false" value="#{documentController.document.item['txtcontent']}">
+					</h:outputText>
 				</div>
 			</h:form>
 		</f:view>
 	</ui:define>
 
-</ui:composition>
-
+</ui:composition>
\ No newline at end of file