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 index 3d98e665..0acbc079 100644 --- 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 @@ -3,63 +3,82 @@ body { font-size: 0.33cm; overflow: auto; } + h1 { font-size: 1.4em !important; } -h2,h3,h4 { + +h2, +h3, +h4 { font-size: 1.3em !important; } + +.branding h1 { + font-size: 1.4rem !important; +} + .imixs-form { - margin:0; + margin: 0; } + .imixs-form .imixs-header { - padding: 0; - margin-bottom: 0; - border:0; + padding: 0; + margin-bottom: 0; + border: 0; min-height: 0; } +.imixs-form h1 { + font-size: 1.8em; + margin-bottom: 1.0em; +} .imixs-form-panel { - border-top: 0px solid #e0e4e7; - padding: 4px 0px; + border-top: 0px solid #e0e4e7; + padding: 4px 0px; } .imixs-form-panel h1 { - border-bottom: 1px solid #e0e4e7; + border-bottom: 1px solid #e0e4e7; } .imixs-viewentry .content-block { - font-size: inherit; + font-size: inherit; } .imixs-header .imixs-subnav { display: none; } -.imixs-workitem-chronicle-content table { +.imixs-workitem-chronicle-content table { width: 100%; } #footer { - padding:0; + padding: 0; border-top: 1px solid #ccc; } + #footer ul { - text-align: left; -} + text-align: right; +} + #footer a { display: none; } -#footer1 ul li , #footer2 ul li { + +#footer1 ul li, +#footer2 ul li { display: inline; } + #footer1 { display: none; } .imixs-form .imixs-body { - margin-left:10px; + margin-left: 10px; } @@ -69,19 +88,23 @@ h2,h3,h4 { .marty-userlistinput { - border: none; - padding: 0; + border: none; + padding: 0; } /* hide marty widgets */ -.imixsLinkWidget, .imixsFileUpload, .marty-workitemlink-inputbox { +.imixsLinkWidget, +.imixsFileUpload, +.marty-workitemlink-inputbox { display: none; } -.imixs-action-dms-comment , .imixs-action-dms-remove{ +.imixs-action-dms-comment, +.imixs-action-dms-remove { display: none; - + } + /* hide widget lables */ .imixs-no-print { display: none !important; @@ -103,15 +126,15 @@ h2,h3,h4 { display: none; } -input[disabled],select[disabled],textarea[disabled] { +input[disabled], +select[disabled], +textarea[disabled] { background-color: #fefefe; -} - - -@media print{ - .noprint{ - display:none; - } } +@media print { + .noprint { + display: none; + } +} \ 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 07319875..918807e0 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 @@ -1,14 +1,10 @@ - - + @@ -22,52 +18,43 @@ - <ui:param name="title" - value="#{propertyController.getProperty('application.title')}"></ui:param> + <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}" /> - - + + - - + - + - + - - + + - + @@ -117,7 +104,7 @@ - @@ -143,15 +128,17 @@
- +
+ +
+

#{app.application_title}

+

+
+
+
-

Default Content

 @@ -178,7 +165,7 @@
- + @@ -187,56 +174,73 @@ src="#{facesContext.externalContext.requestContextPath}/js/imixs-core.js?build=#{app.application_build_timestamp}"> - + diff --git a/imixs-office-workflow-app/src/main/webapp/pages/workitems/forms/custom.xhtml b/imixs-office-workflow-app/src/main/webapp/pages/workitems/forms/custom.xhtml index e0a722e2..e89d9bd8 100644 --- a/imixs-office-workflow-app/src/main/webapp/pages/workitems/forms/custom.xhtml +++ b/imixs-office-workflow-app/src/main/webapp/pages/workitems/forms/custom.xhtml @@ -1,14 +1,10 @@ - + + + - -
@@ -31,7 +27,6 @@
- @@ -40,8 +35,7 @@ - - - + + \ No newline at end of file diff --git a/imixs-office-workflow-app/src/main/webapp/pages/workitems/forms/form_basic.xhtml b/imixs-office-workflow-app/src/main/webapp/pages/workitems/forms/form_basic.xhtml index 8548a5d6..2c280aee 100644 --- a/imixs-office-workflow-app/src/main/webapp/pages/workitems/forms/form_basic.xhtml +++ b/imixs-office-workflow-app/src/main/webapp/pages/workitems/forms/form_basic.xhtml @@ -1,19 +1,15 @@ - + - - - + value="#{modelController.getProcessDescription(workflowController.workitem.item['$taskid'],workflowController.workitem.item['$ModelVersion'],workflowController.workitem)}"> + + + + @@ -22,21 +18,4 @@ - - - - -
-

- -

- - - - - -
- - \ No newline at end of file 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 index 12fdd820..6ea53c0b 100644 --- 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 @@ -11,24 +11,16 @@ - - -
-

- -

- - - - - -
- + + + + + +
-
\ No newline at end of file