From 3e707fc3c3fa42dee72ffac71df602c8fcd5f562 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Fri, 19 Aug 2016 16:32:14 +0200 Subject: [PATCH] Please cherry-pick: - cleanups on templates MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- web/WEB-INF/templates/admin/admin_footer.tpl | 1 + web/WEB-INF/templates/admin/admin_menu.tpl | 1 + .../admin/user/admin_form_user_personal_data.tpl | 2 +- web/WEB-INF/templates/base.tpl | 9 ++++----- .../guest/user/register/guest_form_register_page1.tpl | 1 - .../guest/user/register/guest_form_register_page2.tpl | 2 +- web/WEB-INF/templates/login/user/user_footer.tpl | 1 + web/admin/user/admin_user_export.xhtml | 1 - 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/web/WEB-INF/templates/admin/admin_footer.tpl b/web/WEB-INF/templates/admin/admin_footer.tpl index 6aa4abef..e8c6756d 100644 --- 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"> +
    • diff --git a/web/WEB-INF/templates/admin/admin_menu.tpl b/web/WEB-INF/templates/admin/admin_menu.tpl index 731c3bf8..ce53c058 100644 --- a/web/WEB-INF/templates/admin/admin_menu.tpl +++ b/web/WEB-INF/templates/admin/admin_menu.tpl @@ -1,3 +1,4 @@ +
    - #{msg.ADMIN_PERSONAL_DATA_MINIMUM_NOTICE} +
    diff --git a/web/WEB-INF/templates/base.tpl b/web/WEB-INF/templates/base.tpl index 3a7d128f..59e93a4c 100644 --- a/web/WEB-INF/templates/base.tpl +++ b/web/WEB-INF/templates/base.tpl @@ -1,10 +1,9 @@ - + xmlns:ui="http://xmlns.jcp.org/jsf/facelets"> @@ -54,4 +53,4 @@
- + 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 a1fb51cd..7ccf32d9 100644 --- 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"> -
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 b68b6e8d..8e238180 100644 --- 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 @@
- #{msg.GUEST_REGISTRATION_PAGE2_TITLE} +
diff --git a/web/WEB-INF/templates/login/user/user_footer.tpl b/web/WEB-INF/templates/login/user/user_footer.tpl index 73d6d5e7..138ee1f6 100644 --- 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"> +
  • diff --git a/web/admin/user/admin_user_export.xhtml b/web/admin/user/admin_user_export.xhtml index 2039cccb..65bb4c67 100644 --- 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"> -- 2.39.5