fixed

Issue #549
imixs · Sep 7, 2023 · 4424f58 · 4424f58
1 parent 8c8d2e2
commit 4424f58
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 31 deletions.
diff --git a/imixs-office-workflow-app/src/main/webapp/layout/css/office-theme-print.css b/imixs-office-workflow-app/src/main/webapp/layout/css/office-theme-print.css
@@ -1,10 +1,8 @@
 /* Imixs-Office-Workflow Print Design  */
-
-
 body {
 	font-size: 0.33cm;
+	overflow: auto;
 }
-
 h1 {
 	font-size: 1.4em !important;
 }
@@ -38,6 +36,11 @@ h2,h3,h4 {
 .imixs-header .imixs-subnav {
 	display: none;
 }
+
+.imixs-workitem-chronicle-content table  {
+	width: 100%;
+}
+
 #footer {
 	padding:0;
 	border-top: 1px solid #ccc;
@@ -48,6 +51,9 @@ h2,h3,h4 {
 #footer a {
 	display: none;
 }
+#footer1 ul li , #footer2 ul li {
+	display: inline;
+}
 #footer1 {
 	display: none;
 }

diff --git a/imixs-office-workflow-app/src/main/webapp/pages/workitems/forms/form_print.xhtml b/imixs-office-workflow-app/src/main/webapp/pages/workitems/forms/form_print.xhtml
@@ -28,30 +28,10 @@
 		</div>
 	</c:forEach>
 
+	<!-- Workflow and Chronicle -->
+	<div class="imixs-workitem-chronicle">
+		<ui:include src="/pages/workitems/workitem_chronicle.xhtml" />
 
-	<!-- comments -->
-	<ui:fragment  rendered="#{! empty workflowController.workitem.getItemValue('txtCommentLog')}">
-		<div class="imixs-form-panel">
-			<h3>#{message.comments}</h3>
-			<ui:include src="/pages/workitems/forms/sub_comment.xhtml">
-				<ui:param name="workitem" value="#{workflowController.workitem}" />
-			</ui:include>
-		</div>
-	</ui:fragment>
-
-	<!-- documents -->
-	<ui:fragment rendered="#{! empty dmsController.dmsList}">
-		<div class="imixs-form-panel">
-			<h1>#{message.documents}</h1>
-			<ui:include src="/pages/workitems/forms/sub_attachments.xhtml" />
-		</div>
-	</ui:fragment>
-
-	<!-- *** History **** -->
-	<div class="imixs-form-panel">
-		<h1>#{message.history}</h1>
-		<ui:include src="/pages/workitems/workitem_history.xhtml" />
 	</div>
 
-
 </ui:composition>
diff --git a/imixs-office-workflow-app/src/main/webapp/pages/workitems/workitem_chronicle.xhtml b/imixs-office-workflow-app/src/main/webapp/pages/workitems/workitem_chronicle.xhtml
@@ -13,7 +13,7 @@
 		<div class="imixs-form-section imixs-form-comment">
 		  <dl class="imixsWidgetAddNewLabel imixs-no-print">
 			<!-- ### Kommentar ### -->
-			<dt class="imixs-no-print">
+			<dt>
 				<h:outputLabel value="#{message['form.comment.comment']}:" />
 			</dt>
 			<dd>
@@ -25,7 +25,7 @@
 	</div>
 
 	<ui:param name="newWorkitem" value="#{workflowController.isNewWorkitem()}"/>
-	<div class="imixs-workitem-chronicle-tabs">
+	<div class="imixs-workitem-chronicle-tabs imixs-no-print">
 		<ul>
 			<ui:fragment rendered="#{!newWorkitem}">
 				<li class="active"><a href="#" onclick="imixsOfficeWorkitem.toggleChronicleHistory();return false;" class="chronicle-tab-history"><span class="typcn typcn-rss"></span> #{message.history}</a></li>
@@ -38,7 +38,7 @@
 		<div id="imixs-workitem-chronicle-tab-history" class="entries">
 			<ui:include src="/pages/workitems/workitem_chronicle_entries.xhtml" />
 		</div>
-		<div id="imixs-workitem-chronicle-tab-documents" class="documents" style="margin-top:10px;display:#{newWorkitem?'normal':'none'};">
+		<div id="imixs-workitem-chronicle-tab-documents" class="documents imixs-no-print" style="margin-top:10px;display:#{newWorkitem?'normal':'none'};">
 			<ui:include src="/pages/workitems/workitem_documents.xhtml" />
 		</div>
 	</div>

diff --git a/imixs-office-workflow-app/src/main/webapp/pages/workitems/workitem_chronicle_entries.xhtml b/imixs-office-workflow-app/src/main/webapp/pages/workitems/workitem_chronicle_entries.xhtml
@@ -8,7 +8,7 @@
 	xmlns:i="http://xmlns.jcp.org/jsf/composite/imixs">
 
 	<!-- Navigation panel - toggle buttons for each category -->
-	<h:panelGroup id="chronicle-nav" layout="block" styleClass="filter">
+	<h:panelGroup id="chronicle-nav" layout="block" styleClass="filter imixs-no-print">
 		<ul>
 			<li><h:commandLink
 					styleClass="#{'history' eq chronicleController.filter?'active':!empty chronicleController.filter?'inactive':''}"

diff --git a/imixs-office-workflow-app/src/main/webapp/pages/workitems/workitem_chronicle_entry.xhtml b/imixs-office-workflow-app/src/main/webapp/pages/workitems/workitem_chronicle_entry.xhtml
@@ -15,7 +15,7 @@
 	<!-- 1) User Icon and Time -->
 	<tr class="header">
 		<td style="vertical-align: top;"><h:graphicImage
-				styleClass="imixs-workitem-chronicle-usericon"
+				styleClass="imixs-workitem-chronicle-usericon imixs-no-print"
 				title="#{profile.item['txtusername']}"
 				rendered="#{! empty profile.item['txtusericon']}"
 				value="/api/snapshot/#{profile.item['$uniqueid']}/file/#{profile.item['txtusericon']}">