]> git.mxchange.org Git - jjobs-war.git/commitdiff
projects / jjobs-war.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (from parent 1: 06eaf4b)
Please cherry-pick:
authorRoland Häder <roland@mxchange.org>
Fri, 19 Aug 2016 14:32:14 +0000 (16:32 +0200)
committerRoland Haeder <roland@mxchange.org>
Sun, 21 Aug 2016 19:52:53 +0000 (21:52 +0200)
- cleanups on templates

Signed-off-by: Roland Häder <roland@mxchange.org>
web/WEB-INF/templates/admin/admin_footer.tpl patch | blob | history
web/WEB-INF/templates/admin/admin_menu.tpl patch | blob | history
web/WEB-INF/templates/admin/user/admin_form_user_personal_data.tpl patch | blob | history
web/WEB-INF/templates/base.tpl patch | blob | history
web/WEB-INF/templates/guest/user/register/guest_form_register_page1.tpl patch | blob | history
web/WEB-INF/templates/guest/user/register/guest_form_register_page2.tpl patch | blob | history
web/WEB-INF/templates/login/user/user_footer.tpl patch | blob | history
web/admin/user/admin_user_export.xhtml patch | blob | history

diff --git a/web/WEB-INF/templates/admin/admin_footer.tpl b/web/WEB-INF/templates/admin/admin_footer.tpl
index 6aa4abef727e32af27f71aad8f6e712c4c83432a..e8c6756d4f73ac4680ed4c34581566e84aabbc31 100644 (file)
--- a/web/WEB-INF/templates/admin/admin_footer.tpl
+++ b/web/WEB-INF/templates/admin/admin_footer.tpl
@@ -3,6 +3,7 @@
        xmlns:f="http://java.sun.com/jsf/core"
        xmlns:h="http://java.sun.com/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+
        <div class="footer">
                <ul class="footer_nav">
                        <li><h:link outcome="index" value="#{msg.LINK_ADMIN_FOOTER_TO_WEBPAGE}" /></li>
diff --git a/web/WEB-INF/templates/admin/admin_menu.tpl b/web/WEB-INF/templates/admin/admin_menu.tpl
index 731c3bf8d1a9d1344e1427bf496b925d5db20024..ce53c0588669eeab315358342981ab577a36f5d5 100644 (file)
--- a/web/WEB-INF/templates/admin/admin_menu.tpl
+++ b/web/WEB-INF/templates/admin/admin_menu.tpl
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" ?>
 <ui:composition
        xmlns="http://www.w3.org/1999/xhtml"
        xmlns:f="http://java.sun.com/jsf/core"
diff --git a/web/WEB-INF/templates/admin/user/admin_form_user_personal_data.tpl b/web/WEB-INF/templates/admin/user/admin_form_user_personal_data.tpl
index 67d67310c865b1e77d0ba3c1f1764b781ac569ed..8b47c6f865d53d39d789e1e2ba50493e59c85e26 100644 (file)
--- a/web/WEB-INF/templates/admin/user/admin_form_user_personal_data.tpl
+++ b/web/WEB-INF/templates/admin/user/admin_form_user_personal_data.tpl
@@ -6,7 +6,7 @@
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
        <div class="para notice">
-               #{msg.ADMIN_PERSONAL_DATA_MINIMUM_NOTICE}
+               <h:outputText value="#{msg.ADMIN_USER_PERSONAL_DATA_MINIMUM_NOTICE}" />
        </div>
 
        <ui:include src="/WEB-INF/templates/admin/contact/admin_form_contact_data.tpl" />
diff --git a/web/WEB-INF/templates/base.tpl b/web/WEB-INF/templates/base.tpl
index 3a7d128fc7fd4824d72341f38a4c86cf35ef5a35..59e93a4c6f7b0d5e8fcad9983476869d8b9fe224 100644 (file)
--- a/web/WEB-INF/templates/base.tpl
+++ b/web/WEB-INF/templates/base.tpl
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<html
-       lang="#{localizationController.language}" xml:lang="#{localizationController.language}"
+<ui:composition
        xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:f="http://java.sun.com/jsf/core"
        xmlns:h="http://java.sun.com/jsf/html"
-       xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-       xmlns:f="http://xmlns.jcp.org/jsf/core">
+       xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
        <ui:insert name="metadata">
        </ui:insert>
@@ -54,4 +53,4 @@
                        </div>
                </h:body>
        </f:view>
-</html>
+</ui:composition>
diff --git a/web/WEB-INF/templates/guest/user/register/guest_form_register_page1.tpl b/web/WEB-INF/templates/guest/user/register/guest_form_register_page1.tpl
index a1fb51cdaef14d524e7109639b049b65eb0539e7..7ccf32d9dd677b30fca62304276436b8874ea594 100644 (file)
--- a/web/WEB-INF/templates/guest/user/register/guest_form_register_page1.tpl
+++ b/web/WEB-INF/templates/guest/user/register/guest_form_register_page1.tpl
@@ -5,7 +5,6 @@
        xmlns:h="http://java.sun.com/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-
        <h:form id="form_register_page1">
                <h:panelGroup styleClass="table_medium" layout="block">
                        <div class="table_header">
diff --git a/web/WEB-INF/templates/guest/user/register/guest_form_register_page2.tpl b/web/WEB-INF/templates/guest/user/register/guest_form_register_page2.tpl
index b68b6e8d7b8a72954af190c8b83a2464f2587782..8e23818007fb71377bdcdf3361d747af356aeede 100644 (file)
--- a/web/WEB-INF/templates/guest/user/register/guest_form_register_page2.tpl
+++ b/web/WEB-INF/templates/guest/user/register/guest_form_register_page2.tpl
@@ -8,7 +8,7 @@
        <h:form id="form_register_page2">
                <h:panelGroup styleClass="table_medium" layout="block">
                        <div class="table_header">
-                               #{msg.GUEST_REGISTRATION_PAGE2_TITLE}
+                               <h:outputText value="#{msg.GUEST_REGISTRATION_PAGE2_TITLE}" />
                        </div>
 
                        <ui:include src="/WEB-INF/templates/contact/form_contact_data.tpl" />
diff --git a/web/WEB-INF/templates/login/user/user_footer.tpl b/web/WEB-INF/templates/login/user/user_footer.tpl
index 73d6d5e72cecdec96ba2a420f18a05b69068316b..138ee1f6a28942ba2845f4849551f5dd3fa535f9 100644 (file)
--- a/web/WEB-INF/templates/login/user/user_footer.tpl
+++ b/web/WEB-INF/templates/login/user/user_footer.tpl
@@ -4,6 +4,7 @@
        xmlns:f="http://java.sun.com/jsf/core"
        xmlns:h="http://java.sun.com/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+
        <div class="footer">
                <ul class="footer_nav">
                        <li class="footer_link">
diff --git a/web/admin/user/admin_user_export.xhtml b/web/admin/user/admin_user_export.xhtml
index 2039cccb2dcd05fdb91b604936039b1a11446539..65bb4c671cc65ab8ad14f1d4a658a7f7da3daea3 100644 (file)
--- a/web/admin/user/admin_user_export.xhtml
+++ b/web/admin/user/admin_user_export.xhtml
@@ -5,7 +5,6 @@
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
        xmlns:h="http://xmlns.jcp.org/jsf/html"
        xmlns:f="http://xmlns.jcp.org/jsf/core"
-
        xmlns:p="http://primefaces.org/ui">
 
        <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
Unnamed repository; edit this file 'description' to name the repository.