Skip to content

Commit 4dfb53b

Browse files
committed
fixes Faces Syntax (Issue #30)
1 parent 67dc270 commit 4dfb53b

File tree

5 files changed

+17
-33
lines changed

5 files changed

+17
-33
lines changed

src/main/webapp/login.xhtml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@
1414

1515
<div>
1616
<h1>
17-
<h:outputLabel value="#{message.login_title}" />
17+
<h:outputText value="#{message.login_title}" />
1818
</h1>
1919
<h:panelGrid columns="2">
2020

21-
<h:outputLabel value="#{message.username}:" />
21+
<h:outputText value="#{message.username}:" />
2222
<h:inputText id="j_username" />
2323

24-
<h:outputLabel value="#{message.password}:" />
24+
<h:outputText value="#{message.password}:" />
2525
<h:inputSecret id="j_password" />
2626

2727
</h:panelGrid>

src/main/webapp/pages/config/team.xhtml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@
2323
<dl>
2424

2525
<dt>
26-
<h:outputLabel value="#{message.name}:">
26+
<h:outputText value="#{message.name}:">
2727
<h:message style="color: red" for="subject_id" showSummary="true"
2828
showDetail="true" />
29-
</h:outputLabel>
29+
</h:outputText>
3030
</dt>
3131
<dd>
3232
<h:inputText style="width: 20em;" required="true"
@@ -37,7 +37,7 @@
3737
</dd>
3838

3939
<dt style="clear: left;">
40-
<h:outputLabel value="#{message.members}:" />
40+
<h:outputText value="#{message.members}:" />
4141
</dt>
4242

4343

@@ -72,13 +72,13 @@
7272

7373
<h:panelGrid columns="2">
7474

75-
<h:outputLabel value="#{message.created}: " />
75+
<h:outputText value="#{message.created}: " />
7676
<h:outputText
7777
value="#{documentController.document.item['$created']} ">
7878
<f:convertDateTime timeZone="CET" type="both" dateStyle="medium" />
7979
</h:outputText>
8080

81-
<h:outputLabel value="#{message.modified}: " />
81+
<h:outputText value="#{message.modified}: " />
8282
<h:outputText
8383
value="#{documentController.document.item['$modified']} ">
8484
<f:convertDateTime timeZone="CET" type="both" dateStyle="medium" />

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@
1212

1313
<dl>
1414
<dt>
15-
<h:outputLabel value="#{message.subject}">
15+
<h:outputText value="#{message.subject}">
1616
<h:message style="color: red" for="subject_id" showSummary="true"
1717
showDetail="false" />
18-
</h:outputLabel>
18+
</h:outputText>
1919
</dt>
2020
<dd style="width: 400px;">
2121
<h:inputText style="width: 20em;" required="true"
@@ -25,17 +25,17 @@
2525
</dd>
2626

2727
<dt>
28-
<h:outputLabel value="#{message.date}"></h:outputLabel>
28+
<h:outputText value="#{message.date}"></h:outputText>
2929
</dt>
3030
<dd style="width: 350px;">
3131
<i:imixsDateInput value="#{workflowController.workitem.item['date']}" showtime="true" minuteinterval="5"/>
3232
</dd>
3333

3434
<dt style="clear: left;">
35-
<h:outputLabel value="Team:">
35+
<h:outputText value="Team:">
3636
<h:message style="color: red" for="team_id" showSummary="true"
3737
showDetail="false" />
38-
</h:outputLabel>
38+
</h:outputText>
3939
</dt>
4040

4141

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

Lines changed: 3 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
<div class="imixs-panel">
77
<h2>#{message.workflow}</h2>
88

9-
109
<!-- **** Workflow Actions only visible if user is autor ***** -->
1110
<ui:fragment
1211
rendered="#{empty workflowController.workitem.item['$lastevent'] or workflowController.workitem.item['$isauthor']}">
@@ -20,58 +19,43 @@
2019
<h:commandButton value="#{message.close}" action="/pages/my_tasklist?faced-redirect=true"
2120
actionListener="#{workflowController.close()}" />
2221

23-
24-
25-
26-
2722
<dl>
2823
<!-- ### Kommentar ### -->
2924
<dt class="imixs-no-print">
30-
<h:outputLabel value="#{message['comment']}:" />
25+
<h:outputText value="#{message['comment']}:" />
3126
</dt>
3227
<dd>
3328
<h:inputTextarea value="#{workflowController.workitem.item['txtComment']}" />
3429
</dd>
3530
</dl>
3631

3732
<h:panelGrid columns="3">
38-
<h:outputLabel value="#{message.created}: " />
33+
<h:outputText value="#{message.created}: " />
3934
<h:outputText value="#{workflowController.workitem.item['$created']} ">
4035
<f:convertDateTime timeZone="CET" type="both" dateStyle="medium" />
4136
</h:outputText>
4237
<h:outputText value=" #{message.by} #{workflowController.workitem.item['namcreator']} " />
43-
<h:outputLabel value="#{message.modified}: " />
38+
<h:outputText value="#{message.modified}: " />
4439
<h:outputText value="#{workflowController.workitem.item['$modified']} ">
4540
<f:convertDateTime timeZone="CET" type="both" dateStyle="medium" />
4641
</h:outputText>
4742
<h:outputText value=" #{message.by} #{workflowController.workitem.item['namcurrenteditor']}" />
4843
</h:panelGrid>
4944

50-
51-
5245
<div class="imixs-tabs">
5346
<ul>
5447
<li><a href="#tab-1">Activities</a></li>
5548
<li><a href="#tab-2">Documents</a></li>
56-
5749
</ul>
5850
<div id="tab-1">
59-
6051
<ui:include src="/pages/workitems/workitem_chronicle.xhtml" />
6152
</div>
6253
<div id="tab-2">
6354
<ui:include src="/pages/workitems/sub_documents.xhtml" />
64-
65-
66-
6755
</div>
6856

6957
</div>
7058

71-
72-
7359
</div>
7460

75-
76-
7761
</f:subview>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<tr class="header">
1414
<td style="width: 160px; vertical-align: top;">
1515

16-
<h:graphicImage
16+
<h:graphicImage alt="#{chronicle.user}"
1717
styleClass="imixs-workitem-chronicle-usericon"
1818
title="#{chronicle.user}"
1919
value="https://www.gravatar.com/avatar/#{chronicle.user}?d=identicon">

0 commit comments

Comments
 (0)