Skip to content

Commit 2f2643d

Browse files
php-coderphp-coder
committed
Propagate ui:include.
1 parent a7c3ee7 commit 2f2643d

13 files changed

+22
-22
lines changed

‎webapp/404.xhtml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<link rel="stylesheet" type="text/css" href="styles/error.css" />
2222
</h:head>
2323
<h:body>
24-
<%@ include file="/WEB-INF/segments/header.jspf" %>
24+
<ui:include src="/segments/header.xhtml" />
2525
<div id="content">
2626
<table>
2727
<tr>
@@ -35,7 +35,7 @@
3535
</tr>
3636
</table>
3737
</div>
38-
<%@ include file="/WEB-INF/segments/footer.jspf" %>
38+
<ui:include src="/segments/footer.xhtml" />
3939
</h:body>
4040
</f:view>
4141
</html>

‎webapp/activate_user.xhtml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<link rel="stylesheet" type="text/css" href="styles/main.css" />
1313
</h:head>
1414
<h:body>
15-
<%@ include file="/WEB-INF/segments/header.jspf" %>
15+
<ui:include src="/segments/header.xhtml" />
1616
<div id="content">
1717
<h3>
1818
<h:outputText value="#{m.t_activation_on_site}" />
@@ -98,7 +98,7 @@
9898
</h:form>
9999
</div>
100100
</div>
101-
<%@ include file="/WEB-INF/segments/footer.jspf" %>
101+
<ui:include src="/segments/footer.xhtml" />
102102
</h:body>
103103
</f:view>
104104
</html>

‎webapp/activation_sent.xhtml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@
1111
<link rel="stylesheet" type="text/css" href="styles/main.css" />
1212
</h:head>
1313
<h:body>
14-
<%@ include file="/WEB-INF/segments/header.jspf" %>
14+
<ui:include src="/segments/header.xhtml" />
1515
<div id="content">
1616
<h3>
1717
<h:outputText value="#{m.t_registration_on_site}" />
1818
</h3>
1919
<h:outputText value="#{m.t_activation_sent_message}" />
2020
</div>
21-
<%@ include file="/WEB-INF/segments/footer.jspf" %>
21+
<ui:include src="/segments/footer.xhtml" />
2222
</h:body>
2323
</f:view>
2424
</html>

‎webapp/activation_successful.xhtml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<link rel="stylesheet" type="text/css" href="styles/main.css" />
1212
</h:head>
1313
<h:body>
14-
<%@ include file="/WEB-INF/segments/header.jspf" %>
14+
<ui:include src="/segments/header.xhtml" />
1515
<div id="content">
1616
<h3>
1717
<h:outputText value="#{m.t_activation_on_site}" />
@@ -21,7 +21,7 @@
2121
<f:param value="</a>" />
2222
</h:outputFormat>
2323
</div>
24-
<%@ include file="/WEB-INF/segments/footer.jspf" %>
24+
<ui:include src="/segments/footer.xhtml" />
2525
</h:body>
2626
</f:view>
2727
</html>

‎webapp/add_country.xhtml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<link rel="stylesheet" type="text/css" href="styles/main.css" />
1212
</h:head>
1313
<h:body>
14-
<%@ include file="/WEB-INF/segments/header.jspf" %>
14+
<ui:include src="/segments/header.xhtml" />
1515
<div id="content">
1616
<h3>
1717
<h:outputText value="#{m.t_add_country_ucfirst}" />
@@ -37,7 +37,7 @@
3737
</h:form>
3838
</div>
3939
</div>
40-
<%@ include file="/WEB-INF/segments/footer.jspf" %>
40+
<ui:include src="/segments/footer.xhtml" />
4141
</h:body>
4242
</f:view>
4343
</html>

‎webapp/add_stamps.xhtml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<link rel="stylesheet" type="text/css" href="styles/main.css" />
1313
</h:head>
1414
<h:body>
15-
<%@ include file="/WEB-INF/segments/header.jspf" %>
15+
<ui:include src="/segments/header.xhtml" />
1616
<div id="content">
1717
<h3>
1818
<h:outputText value="#{m.t_add_series_ucfirst}" />
@@ -66,7 +66,7 @@
6666
</h:form>
6767
</div>
6868
</div>
69-
<%@ include file="/WEB-INF/segments/footer.jspf" %>
69+
<ui:include src="/segments/footer.xhtml" />
7070
</h:body>
7171
</f:view>
7272
</html>

‎webapp/auth_user.xhtml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<link rel="stylesheet" type="text/css" href="styles/main.css" />
1313
</h:head>
1414
<h:body>
15-
<%@ include file="/WEB-INF/segments/header.jspf" %>
15+
<ui:include src="/segments/header.xhtml" />
1616
<div id="content">
1717
<h3>
1818
<h:outputText value="#{m.t_authorization_on_site}" />
@@ -62,7 +62,7 @@
6262
</h:form>
6363
</div>
6464
</div>
65-
<%@ include file="/WEB-INF/segments/footer.jspf" %>
65+
<ui:include src="/segments/footer.xhtml" />
6666
</h:body>
6767
</f:view>
6868
</html>

‎webapp/index.xhtml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<link rel="stylesheet" type="text/css" href="styles/main.css" />
1212
</h:head>
1313
<h:body>
14-
<%@ include file="/WEB-INF/segments/header.jspf" %>
14+
<ui:include src="/segments/header.xhtml" />
1515
<div id="content">
1616
<h:outputText value="#{m.t_you_may}" />:
1717
<ul>
@@ -32,7 +32,7 @@
3232
</li>
3333
</ul>
3434
</div>
35-
<%@ include file="/WEB-INF/segments/footer.jspf" %>
35+
<ui:include src="/segments/footer.xhtml" />
3636
</h:body>
3737
</f:view>
3838
</html>

‎webapp/maintenance.xhtml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,15 @@
1212
<link rel="stylesheet" type="text/css" href="styles/error.css" />
1313
</h:head>
1414
<h:body>
15-
<%@ include file="/WEB-INF/segments/header.jspf" %>
15+
<ui:include src="/segments/header.xhtml" />
1616
<div id="content">
1717
<div id="error-msg">
1818
<h:outputFormat value="#{m.t_maintenance_on_site}" escape="false">
1919
<f:param value="<br />" />
2020
</h:outputFormat>
2121
</div>
2222
</div>
23-
<%@ include file="/WEB-INF/segments/footer.jspf" %>
23+
<ui:include src="/segments/footer.xhtml" />
2424
</h:body>
2525
</f:view>
2626
</html>

‎webapp/register_user.xhtml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<link rel="stylesheet" type="text/css" href="styles/main.css" />
1313
</h:head>
1414
<h:body>
15-
<%@ include file="/WEB-INF/segments/header.jspf" %>
15+
<ui:include src="/segments/header.xhtml" />
1616
<div id="content">
1717
<h3>
1818
<h:outputText value="#{m.t_registration_on_site}" />
@@ -54,7 +54,7 @@
5454
</h:form>
5555
</div>
5656
</div>
57-
<%@ include file="/WEB-INF/segments/footer.jspf" %>
57+
<ui:include src="/segments/footer.xhtml" />
5858
</h:body>
5959
</f:view>
6060
</html>

‎webapp/restore_password.xhtml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@
1111
<link rel="stylesheet" type="text/css" href="styles/main.css" />
1212
</h:head>
1313
<h:body>
14-
<%@ include file="/WEB-INF/segments/header.jspf" %>
14+
<ui:include src="/segments/header.xhtml" />
1515
<div id="content">
1616
<%-- TODO: add content (#19) --%>
1717
</div>
18-
<%@ include file="/WEB-INF/segments/footer.jspf" %>
18+
<ui:include src="/segments/footer.xhtml" />
1919
</h:body>
2020
</f:view>
2121
</html>

‎webapp/WEB-INF/segments/footer.jspf renamed to ‎webapp/segments/footer.xhtml

File renamed without changes.

‎webapp/WEB-INF/segments/header.jspf renamed to ‎webapp/segments/header.xhtml

File renamed without changes.

0 commit comments

Comments
 (0)