Skip to content

Commit 66600b6

Browse files
committed
fixed startup pages
1 parent f80bdfc commit 66600b6

2 files changed

Lines changed: 30 additions & 32 deletions

File tree

src/main/webapp/pages/welcome.xhtml

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
1-
<ui:composition xmlns="http://www.w3.org/1999/xhtml"
2-
xmlns:f="http://xmlns.jcp.org/jsf/core"
3-
xmlns:h="http://xmlns.jcp.org/jsf/html"
4-
xmlns:c="http://xmlns.jcp.org/jsp/jstl/core"
5-
xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
6-
xmlns:i="http://xmlns.jcp.org/jsf/composite/imixs"
1+
<ui:composition xmlns="http://www.w3.org/1999/xhtml" xmlns:f="http://xmlns.jcp.org/jsf/core"
2+
xmlns:h="http://xmlns.jcp.org/jsf/html" xmlns:c="http://xmlns.jcp.org/jsp/jstl/core"
3+
xmlns:ui="http://xmlns.jcp.org/jsf/facelets" xmlns:i="http://xmlns.jcp.org/jsf/composite/imixs"
74
template="/layout/template.xhtml">
85

96
<ui:define name="content">
@@ -28,8 +25,8 @@
2825

2926
<h2>Imixs Workflow</h2>
3027
<p>
31-
The Open Source project <a href="http://www.imixs.org"
32-
target="imixs-workflow">Imixs-Workflow</a> provides you with an
28+
The Open Source project <a href="http://www.imixs.org" target="imixs-workflow">Imixs-Workflow</a>
29+
provides you with an
3330
open and powerful workflow management platform that combines the
3431
design and the execution of business processes in a highly scalable
3532
and easy to use environment.
@@ -44,12 +41,11 @@
4441
<h2>Imixs BPMN</h2>
4542
<p>
4643
You can define your own business process models using the <a
47-
href="https://www.imixs.org/doc/modelling/index.html"
48-
target="imixs-workflow">Imixs-BPMN modeller tool</a> and you can
44+
href="https://www.imixs.org/doc/modelling/index.html" target="imixs-workflow">Imixs-BPMN
45+
modeller tool</a> and you can
4946
upload and execute your models directly within Imixs Process
5047
Manager. General information about how to model can be found <a
51-
href="https://www.imixs.org/doc/modelling/howto.html"
52-
target="imixs-workflow">here</a>.
48+
href="https://www.imixs.org/doc/modelling/howto.html" target="imixs-workflow">here</a>.
5349
</p>
5450
</div>
5551

@@ -90,4 +86,4 @@
9086

9187

9288
</ui:define>
93-
</ui:composition>
89+
</ui:composition>

src/main/webapp/pages/workitems/start.xhtml

Lines changed: 21 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<ui:composition xmlns="http://www.w3.org/1999/xhtml" xmlns:f="http://xmlns.jcp.org/jsf/core"
22
xmlns:h="http://xmlns.jcp.org/jsf/html" xmlns:c="http://xmlns.jcp.org/jsp/jstl/core"
33
xmlns:ui="http://xmlns.jcp.org/jsf/facelets" xmlns:i="http://xmlns.jcp.org/jsf/composite/imixs"
4-
template="/layout/template.xhtml">
4+
xmlns:fn="http://xmlns.jcp.org/jsp/jstl/functions" template="/layout/template.xhtml">
55

66
<f:metadata>
77
<f:viewAction action="#{workflowController.onLoad()}" />
@@ -19,24 +19,26 @@
1919
<!-- get first task by group -->
2020
<ui:param name="version" value="#{modelController.getVersionByGroup(group)}" />
2121
<ui:param name="initialTask" value="#{modelController.findStartTaskByGroup(version,group)}" />
22-
<li>
23-
<h:panelGroup rendered="#{!empty initialTask}">
24-
<h:commandLink title=" " styleClass="action-create"
25-
actionListener="#{workflowController.create(version,initialTask.item['taskid'],null)}"
26-
action="/pages/workitems/workitem">
27-
<span class="typcn typcn-folder-add" style="margin-right:5px;"></span>
28-
<h:outputText value="#{group}" />
29-
</h:commandLink>
30-
<p>
31-
<h:outputText value="#{initialTask.item['rtfdescription']}" escape="false" />
32-
</p>
33-
<span class="imixs-tooltip">
34-
<h:outputText value="#{initialTask.item['rtfdescription']}" escape="false" />
35-
</span>
36-
</h:panelGroup>
37-
<h:outputText style="color:red" rendered="#{empty initialTask}"
38-
value="Model not found: #{group}"></h:outputText>
39-
</li>
22+
<ui:fragment rendered="#{!fn:startsWith(version, 'marty') and group ne 'Default Process'}">
23+
<li>
24+
<h:panelGroup rendered="#{!empty initialTask}">
25+
<h:commandLink title=" " styleClass="action-create"
26+
actionListener="#{workflowController.create(version,initialTask.item['taskid'],null)}"
27+
action="/pages/workitems/workitem">
28+
<span class="typcn typcn-folder-add" style="margin-right:5px;"></span>
29+
<h:outputText value="#{group}" />
30+
</h:commandLink>
31+
<p>
32+
<h:outputText value="#{initialTask.item['rtfdescription']}" escape="false" />
33+
</p>
34+
<span class="imixs-tooltip">
35+
<h:outputText value="#{initialTask.item['rtfdescription']}" escape="false" />
36+
</span>
37+
</h:panelGroup>
38+
<h:outputText style="color:red" rendered="#{empty initialTask}"
39+
value="Model not found: #{version}:#{group}"></h:outputText>
40+
</li>
41+
</ui:fragment>
4042
</ui:repeat>
4143
</ul>
4244

0 commit comments

Comments
 (0)