Skip to content

Commit

Permalink
fixed templates
Browse files Browse the repository at this point in the history
Issue #601
  • Loading branch information
rsoika committed Sep 6, 2024
1 parent 0c6fe51 commit 1854b50
Show file tree
Hide file tree
Showing 7 changed files with 231 additions and 327 deletions.
3 changes: 2 additions & 1 deletion docker/docker-compose-dev.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion imixs-office-workflow-app/src/main/webapp/error.xhtml
Original file line number Diff line number Diff line change
@@ -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 -->
Expand Down
66 changes: 28 additions & 38 deletions imixs-office-workflow-app/src/main/webapp/layout/template.xhtml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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">
Expand Down
167 changes: 167 additions & 0 deletions imixs-office-workflow-app/src/main/webapp/layout/template_error.xhtml
Original file line number Diff line number Diff line change
@@ -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>
Loading

0 comments on commit 1854b50

Please sign in to comment.