From: Roland Häder Date: Fri, 19 Aug 2016 13:19:03 +0000 (+0200) Subject: Please cherry-pick: X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=06eaf4b5a4990cfd2d26a0f449c343ae24aef21b;p=jjobs-war.git Please cherry-pick: - added debugger class for making JSF life-cycles visible, thanks to BalusC for this free code - registered above debugger - rewrote all templates with f:metadata to, again, BalusC's recommendation to have "metadata" in a own ui:define block - added NOISY debug lines (please comment out on productive systems!) Signed-off-by: Roland Häder --- diff --git a/src/java/de/chotime/landingpage/converter/fax/LandingFaxNumberConverter.java b/src/java/de/chotime/landingpage/converter/fax/LandingFaxNumberConverter.java index f133ea0a..7bd5fd33 100644 --- a/src/java/de/chotime/landingpage/converter/fax/LandingFaxNumberConverter.java +++ b/src/java/de/chotime/landingpage/converter/fax/LandingFaxNumberConverter.java @@ -73,6 +73,9 @@ public class LandingFaxNumberConverter implements Converter { @Override public Object getAsObject (final FacesContext context, final UIComponent component, final String submittedValue) { + // Log message + this.loggerBeanLocal.logTrace(MessageFormat.format("{0}.getAsObject: context={1},component={2},submittedValue={3} - CALLED!", this.getClass().getSimpleName(), context, component, submittedValue)); //NOI18N + // Is the value null or empty? if ((null == submittedValue) || (submittedValue.trim().isEmpty())) { // Warning message @@ -89,6 +92,9 @@ public class LandingFaxNumberConverter implements Converter { // Try to parse the value as long Long faxNumberId = Long.valueOf(submittedValue); + // Log message + this.loggerBeanLocal.logDebug(MessageFormat.format("{0}.getAsObject: faxNumberId={1}", this.getClass().getSimpleName(), faxNumberId)); //NOI18N + // Try to get mobile instance from it faxNumber = this.phoneBean.findFaxNumberById(faxNumberId); } catch (final NumberFormatException ex) { @@ -99,6 +105,9 @@ public class LandingFaxNumberConverter implements Converter { this.loggerBeanLocal.logDebug(MessageFormat.format("{0}.getAsObject(): Exception: {1} - Returning null ...", this.getClass().getSimpleName(), ex)); //NOI18N } + // Log message + this.loggerBeanLocal.logTrace(MessageFormat.format("{0}.getAsObject: faxNumber={1} - EXIT!", this.getClass().getSimpleName(), faxNumber)); //NOI18N + // Return it return faxNumber; } diff --git a/src/java/de/chotime/landingpage/debug/LandingDebugLifeCycleListener.java b/src/java/de/chotime/landingpage/debug/LandingDebugLifeCycleListener.java new file mode 100644 index 00000000..2a1c24a4 --- /dev/null +++ b/src/java/de/chotime/landingpage/debug/LandingDebugLifeCycleListener.java @@ -0,0 +1,51 @@ +/* + * Copyright (C) 2016 Roland Haeder + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ +package de.chotime.landingpage.debug; + +import java.text.MessageFormat; +import javax.faces.event.PhaseEvent; +import javax.faces.event.PhaseId; +import javax.faces.event.PhaseListener; + +/** + * A listener for debugging JSF lifecycle phases + *

+ * @author Roland Haeder + */ +public class LandingDebugLifeCycleListener implements PhaseListener { + + /** + * Serial number + */ + private static final long serialVersionUID = 523_467_675_719_515L; + + @Override + public void afterPhase (final PhaseEvent event) { + System.out.println(MessageFormat.format("<--- End phase {0}", event.getPhaseId())); //NOI18N + } + + @Override + public void beforePhase (final PhaseEvent event) { + System.out.println(MessageFormat.format("---> Start phase {0}", event.getPhaseId())); //NOI18N + } + + @Override + public PhaseId getPhaseId () { + return PhaseId.ANY_PHASE; + } + +} diff --git a/src/java/org/mxchange/jjobs/beans/contact/phone/JobsAdminContactPhoneWebRequestBean.java b/src/java/org/mxchange/jjobs/beans/contact/phone/JobsAdminContactPhoneWebRequestBean.java index b5fa53a5..3bca9397 100644 --- a/src/java/org/mxchange/jjobs/beans/contact/phone/JobsAdminContactPhoneWebRequestBean.java +++ b/src/java/org/mxchange/jjobs/beans/contact/phone/JobsAdminContactPhoneWebRequestBean.java @@ -67,6 +67,11 @@ import org.mxchange.jusercore.events.user.add.AdminAddedUserEvent; @RequestScoped public class JobsAdminContactPhoneWebRequestBean extends BaseJobsController implements JobsAdminContactPhoneWebRequestController { + /** + * Call-stack instance (5 may show BeanELResolver.getValue as caller) + */ + private static final short THREAD_STACK = 5; + /** * Serial number */ @@ -129,6 +134,9 @@ public class JobsAdminContactPhoneWebRequestBean extends BaseJobsController impl * Default constructor */ public JobsAdminContactPhoneWebRequestBean () { + String caller = MessageFormat.format("{0}.{1}", Thread.currentThread().getStackTrace()[3].getClassName(), Thread.currentThread().getStackTrace()[3].getMethodName()); + System.out.println(MessageFormat.format("{0}: Constructed, caller: {1}", this.getClass().getSimpleName(), caller)); + // Try it try { // Get initial context diff --git a/src/java/org/mxchange/jjobs/beans/contact/phone/JobsContactPhoneWebSessionBean.java b/src/java/org/mxchange/jjobs/beans/contact/phone/JobsContactPhoneWebSessionBean.java index 1337cc17..165bc260 100644 --- a/src/java/org/mxchange/jjobs/beans/contact/phone/JobsContactPhoneWebSessionBean.java +++ b/src/java/org/mxchange/jjobs/beans/contact/phone/JobsContactPhoneWebSessionBean.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2016 Cho-Time GmbH + * Copyright (C) 2016 Roland Haeder * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -44,7 +44,7 @@ import org.mxchange.jusercore.events.user.add.AdminAddedUserEvent; /** * An administrative contact phone controller (bean) *

- * @author Roland Haeder + * @author Roland Haeder */ @Named ("contactPhoneController") @SessionScoped diff --git a/src/java/org/mxchange/jjobs/beans/contact/phone/JobsContactPhoneWebSessionController.java b/src/java/org/mxchange/jjobs/beans/contact/phone/JobsContactPhoneWebSessionController.java index 7c245183..f798a08b 100644 --- a/src/java/org/mxchange/jjobs/beans/contact/phone/JobsContactPhoneWebSessionController.java +++ b/src/java/org/mxchange/jjobs/beans/contact/phone/JobsContactPhoneWebSessionController.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2016 Cho-Time GmbH + * Copyright (C) 2016 Roland Haeder * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -30,7 +30,7 @@ import org.mxchange.jusercore.events.user.add.AdminAddedUserEvent; /** * An interface for user beans *

- * @author Roland Haeder + * @author Roland Haeder */ @Local public interface JobsContactPhoneWebSessionController extends Serializable { diff --git a/src/java/org/mxchange/jjobs/beans/helper/JobsWebRequestHelper.java b/src/java/org/mxchange/jjobs/beans/helper/JobsWebRequestHelper.java index 2fe796f2..081dc6c7 100644 --- a/src/java/org/mxchange/jjobs/beans/helper/JobsWebRequestHelper.java +++ b/src/java/org/mxchange/jjobs/beans/helper/JobsWebRequestHelper.java @@ -21,6 +21,7 @@ import javax.enterprise.context.RequestScoped; import javax.inject.Inject; import javax.inject.Named; import org.mxchange.jcontacts.contact.Contact; +import org.mxchange.jjobs.beans.BaseJobsController; import org.mxchange.jjobs.beans.contact.JobsAdminContactWebRequestController; import org.mxchange.jjobs.beans.phone.JobsAdminPhoneWebRequestController; import org.mxchange.jjobs.beans.user.JobsUserWebSessionController; @@ -36,7 +37,12 @@ import org.mxchange.jusercore.model.user.User; */ @Named ("adminHelper") @RequestScoped -public class JobsWebRequestHelper implements JobsWebRequestController { +public class JobsWebRequestHelper extends BaseJobsController implements JobsWebRequestController { + + /** + * Call-stack instance (5 may show BeanELResolver.getValue as caller) + */ + private static final short THREAD_STACK = 5; /** * Serial number @@ -90,10 +96,15 @@ public class JobsWebRequestHelper implements JobsWebRequestController { * Default constructor */ public JobsWebRequestHelper () { + String caller = MessageFormat.format("{0}.{1}", Thread.currentThread().getStackTrace()[3].getClassName(), Thread.currentThread().getStackTrace()[3].getMethodName()); + System.out.println(MessageFormat.format("{0}: Constructed, caller: {1}", this.getClass().getSimpleName(), caller)); } @Override public void copyContactToController () { + String caller = MessageFormat.format("{0}.{1}", Thread.currentThread().getStackTrace()[THREAD_STACK].getClassName(), Thread.currentThread().getStackTrace()[THREAD_STACK].getMethodName()); + System.out.println(MessageFormat.format("{0}.copyContactToController: CALLED, caller: {2}", this.getClass().getSimpleName(), this.contact, caller)); + // Validate contact instance if (this.getContact() == null) { // Throw NPE @@ -125,7 +136,7 @@ public class JobsWebRequestHelper implements JobsWebRequestController { } else if (this.getFaxNumber().getPhoneId() < 1) { // Invalid id number throw new IllegalArgumentException(MessageFormat.format("this.faxNumber.phoneId={0} is not valid", this.getFaxNumber().getPhoneId())); - } else if (this.getFaxNumber().getPhoneAreaCode()== null) { + } else if (this.getFaxNumber().getPhoneAreaCode() == null) { // Throw again throw new NullPointerException("this.faxNumber.phoneAreaCode is null"); } else if (this.getFaxNumber().getPhoneAreaCode() < 1) { @@ -166,7 +177,7 @@ public class JobsWebRequestHelper implements JobsWebRequestController { } else if (this.getLandLineNumber().getPhoneId() < 1) { // Invalid id number throw new IllegalArgumentException(MessageFormat.format("this.landLineNumber.phoneId={0} is not valid", this.getLandLineNumber().getPhoneId())); - } else if (this.getLandLineNumber().getPhoneAreaCode()== null) { + } else if (this.getLandLineNumber().getPhoneAreaCode() == null) { // Throw again throw new NullPointerException("this.landLineNumber.phoneAreaCode is null"); } else if (this.getLandLineNumber().getPhoneAreaCode() < 1) { @@ -261,11 +272,15 @@ public class JobsWebRequestHelper implements JobsWebRequestController { @Override public Contact getContact () { + String caller = MessageFormat.format("{0}.{1}", Thread.currentThread().getStackTrace()[THREAD_STACK].getClassName(), Thread.currentThread().getStackTrace()[THREAD_STACK].getMethodName()); + System.out.println(MessageFormat.format("{0}: Returning this.contact={1}, caller: {2}", this.getClass().getSimpleName(), this.contact, caller)); return this.contact; } @Override public void setContact (final Contact contact) { + String caller = MessageFormat.format("{0}.{1}", Thread.currentThread().getStackTrace()[THREAD_STACK].getClassName(), Thread.currentThread().getStackTrace()[THREAD_STACK].getMethodName()); + System.out.println(MessageFormat.format("{0}: Setting contact={1}, previous: {2}, caller: {3}", this.getClass().getSimpleName(), contact, this.contact, caller)); this.contact = contact; } diff --git a/src/java/org/mxchange/jjobs/beans/phone/JobsAdminPhoneWebRequestBean.java b/src/java/org/mxchange/jjobs/beans/phone/JobsAdminPhoneWebRequestBean.java index 462d12f9..ad707af4 100644 --- a/src/java/org/mxchange/jjobs/beans/phone/JobsAdminPhoneWebRequestBean.java +++ b/src/java/org/mxchange/jjobs/beans/phone/JobsAdminPhoneWebRequestBean.java @@ -56,6 +56,11 @@ import org.mxchange.jphone.phonenumbers.phone.AdminPhoneSessionBeanRemote; @RequestScoped public class JobsAdminPhoneWebRequestBean extends BaseJobsController implements JobsAdminPhoneWebRequestController { + /** + * Call-stack position + */ + private static final short THREAD_STACK = 5; + /** * Serial number */ @@ -128,8 +133,7 @@ public class JobsAdminPhoneWebRequestBean extends BaseJobsController implements private Long phoneNumber; /** - * Event being fired when a list of all unsed fax numbers is being - * created. + * Event being fired when a list of all unsed fax numbers is being created. */ @Inject @Any @@ -155,6 +159,9 @@ public class JobsAdminPhoneWebRequestBean extends BaseJobsController implements * Default constructor */ public JobsAdminPhoneWebRequestBean () { + String caller = MessageFormat.format("{0}.{1}", Thread.currentThread().getStackTrace()[3].getClassName(), Thread.currentThread().getStackTrace()[3].getMethodName()); + System.out.println(MessageFormat.format("{0}: Constructed, caller: {1}", this.getClass().getSimpleName(), caller)); + // Try it try { // Get initial context @@ -308,11 +315,15 @@ public class JobsAdminPhoneWebRequestBean extends BaseJobsController implements @Override public DialableFaxNumber getChoosenFaxNumber () { + String caller = MessageFormat.format("{0}.{1}", Thread.currentThread().getStackTrace()[THREAD_STACK].getClassName(), Thread.currentThread().getStackTrace()[THREAD_STACK].getMethodName()); + System.out.println(MessageFormat.format("{0}: Returning this.choosenFaxNumber={1}, caller: {2}", this.getClass().getSimpleName(), this.choosenFaxNumber, caller)); return this.choosenFaxNumber; } @Override public void setChoosenFaxNumber (final DialableFaxNumber choosenFaxNumber) { + String caller = MessageFormat.format("{0}.{1}", Thread.currentThread().getStackTrace()[THREAD_STACK].getClassName(), Thread.currentThread().getStackTrace()[THREAD_STACK].getMethodName()); + System.out.println(MessageFormat.format("{0}: Settin choosenFaxNumber={1}, previous: this.choosenFaxNumber={2}, caller: {3}", this.getClass().getSimpleName(), choosenFaxNumber, this.choosenFaxNumber, caller)); this.choosenFaxNumber = choosenFaxNumber; } diff --git a/src/java/org/mxchange/jjobs/validator/booleans/JobsUserProfileVisibilityValidator.java b/src/java/org/mxchange/jjobs/validator/booleans/JobsUserProfileVisibilityValidator.java index 25849b09..2b948d29 100644 --- a/src/java/org/mxchange/jjobs/validator/booleans/JobsUserProfileVisibilityValidator.java +++ b/src/java/org/mxchange/jjobs/validator/booleans/JobsUserProfileVisibilityValidator.java @@ -16,6 +16,7 @@ */ package org.mxchange.jjobs.validator.booleans; +import java.text.MessageFormat; import javax.faces.component.UIComponent; import javax.faces.context.FacesContext; import javax.faces.validator.FacesValidator; @@ -38,14 +39,20 @@ public class JobsUserProfileVisibilityValidator extends BaseBooleanValidator imp @Override public void validate (final FacesContext context, final UIComponent component, final Object value) throws ValidatorException { + // Log message + System.out.println(MessageFormat.format("{0}.validate: context={1},component={2},value={3} - CALLED!", this.getClass().getSimpleName(), context, component, value)); + // The required field String[] requiredFields = {"landLineAreaCode", "landLineNumber", "faxAreaCode", "faxNumber", "mobileNumber"}; //NOI18N + // Log message + System.out.println(MessageFormat.format("{0}.validate: component.clientId={1}", this.getClass().getSimpleName(), component.getClientId())); + // Pre-validation (example: not null, not a string, empty string ...) - super.preValidate(context, component, value, requiredFields, false); + super.preValidate(context, component, value, requiredFields, true); - // Trace message - //* NOISY-DEBUG: */ System.out.println("validate: EXIT!"); //NOI18N + // Log message + System.out.println(MessageFormat.format("{0}.validate: EXIT!", this.getClass().getSimpleName())); } } diff --git a/web/WEB-INF/faces-config.xml b/web/WEB-INF/faces-config.xml index d23945fc..0de8e75c 100644 --- a/web/WEB-INF/faces-config.xml +++ b/web/WEB-INF/faces-config.xml @@ -9,6 +9,9 @@ en_US + + de.chotime.landingpage.debug.LandingDebugLifeCycleListener + * diff --git a/web/WEB-INF/templates/admin/fax/admin_form_add_contact_fax.tpl b/web/WEB-INF/templates/admin/fax/admin_form_add_contact_fax.tpl index c13329c9..b350fa75 100644 --- a/web/WEB-INF/templates/admin/fax/admin_form_add_contact_fax.tpl +++ b/web/WEB-INF/templates/admin/fax/admin_form_add_contact_fax.tpl @@ -61,7 +61,10 @@

- + + + +
diff --git a/web/WEB-INF/templates/admin/landline/admin_form_add_contact_landline.tpl b/web/WEB-INF/templates/admin/landline/admin_form_add_contact_landline.tpl index 28d711c9..e2ec77f6 100644 --- a/web/WEB-INF/templates/admin/landline/admin_form_add_contact_landline.tpl +++ b/web/WEB-INF/templates/admin/landline/admin_form_add_contact_landline.tpl @@ -61,7 +61,10 @@
- + + + +
diff --git a/web/WEB-INF/templates/admin/mobile/admin_form_add_contact_mobile.tpl b/web/WEB-INF/templates/admin/mobile/admin_form_add_contact_mobile.tpl index c89840e1..cb686076 100644 --- a/web/WEB-INF/templates/admin/mobile/admin_form_add_contact_mobile.tpl +++ b/web/WEB-INF/templates/admin/mobile/admin_form_add_contact_mobile.tpl @@ -49,7 +49,10 @@
- + + + +
diff --git a/web/WEB-INF/templates/base.tpl b/web/WEB-INF/templates/base.tpl index 8aeeb260..3a7d128f 100644 --- a/web/WEB-INF/templates/base.tpl +++ b/web/WEB-INF/templates/base.tpl @@ -6,6 +6,9 @@ xmlns:ui="http://xmlns.jcp.org/jsf/facelets" xmlns:f="http://xmlns.jcp.org/jsf/core"> + + + diff --git a/web/WEB-INF/web.xml b/web/WEB-INF/web.xml index f48fcf3a..2a3053a1 100644 --- a/web/WEB-INF/web.xml +++ b/web/WEB-INF/web.xml @@ -2,6 +2,10 @@ An application for handling and sending out applications to companies. JJobs v1.0 + + javax.faces.PROJECT_STAGE + Development + Whether the multi-page registration page or a single registration page is active is_feature_user_register_multiple_page_enabled diff --git a/web/admin/contact/admin_contact_delete.xhtml b/web/admin/contact/admin_contact_delete.xhtml index 34b63835..6a069436 100644 --- a/web/admin/contact/admin_contact_delete.xhtml +++ b/web/admin/contact/admin_contact_delete.xhtml @@ -7,12 +7,14 @@ xmlns:f="http://xmlns.jcp.org/jsf/core" > - - - - - + + + + + + + #{msg.PAGE_TITLE_ADMIN_DELETE_CONTACT} diff --git a/web/admin/contact/admin_contact_edit.xhtml b/web/admin/contact/admin_contact_edit.xhtml index e6e11210..c973a90c 100644 --- a/web/admin/contact/admin_contact_edit.xhtml +++ b/web/admin/contact/admin_contact_edit.xhtml @@ -7,12 +7,14 @@ xmlns:f="http://xmlns.jcp.org/jsf/core" > - - - - - + + + + + + + #{msg.PAGE_TITLE_ADMIN_EDIT_CONTACT} diff --git a/web/admin/contact/admin_contact_show.xhtml b/web/admin/contact/admin_contact_show.xhtml index ec009c3a..4dbbab12 100644 --- a/web/admin/contact/admin_contact_show.xhtml +++ b/web/admin/contact/admin_contact_show.xhtml @@ -7,12 +7,14 @@ xmlns:f="http://xmlns.jcp.org/jsf/core" > - - - - - + + + + + + + #{msg.PAGE_TITLE_ADMIN_SHOW_CONTACT} diff --git a/web/admin/contact/unlink/admin_contact_fax_unlink.xhtml b/web/admin/contact/unlink/admin_contact_fax_unlink.xhtml index 6d9a47bc..6d0e615d 100644 --- a/web/admin/contact/unlink/admin_contact_fax_unlink.xhtml +++ b/web/admin/contact/unlink/admin_contact_fax_unlink.xhtml @@ -7,12 +7,14 @@ xmlns:f="http://xmlns.jcp.org/jsf/core" > - - - - - + + + + + + + #{msg.PAGE_TITLE_ADMIN_UNLINK_CONTACT_FAX_NUMBER} diff --git a/web/admin/contact/unlink/admin_contact_landline_unlink.xhtml b/web/admin/contact/unlink/admin_contact_landline_unlink.xhtml index cb177c4d..489ee1f0 100644 --- a/web/admin/contact/unlink/admin_contact_landline_unlink.xhtml +++ b/web/admin/contact/unlink/admin_contact_landline_unlink.xhtml @@ -7,12 +7,14 @@ xmlns:f="http://xmlns.jcp.org/jsf/core" > - - - - - + + + + + + + #{msg.PAGE_TITLE_ADMIN_UNLINK_CONTACT_LAND_LINE_NUMBER} diff --git a/web/admin/contact/unlink/admin_contact_mobile_unlink.xhtml b/web/admin/contact/unlink/admin_contact_mobile_unlink.xhtml index 80116b69..1c226a3c 100644 --- a/web/admin/contact/unlink/admin_contact_mobile_unlink.xhtml +++ b/web/admin/contact/unlink/admin_contact_mobile_unlink.xhtml @@ -7,10 +7,12 @@ xmlns:f="http://xmlns.jcp.org/jsf/core" > - - - - + + + + + + #{msg.PAGE_TITLE_ADMIN_UNLINK_CONTACT_MOBILE_NUMBER} diff --git a/web/admin/fax/admin_fax_delete.xhtml b/web/admin/fax/admin_fax_delete.xhtml index 67b6c54e..ade80e5a 100644 --- a/web/admin/fax/admin_fax_delete.xhtml +++ b/web/admin/fax/admin_fax_delete.xhtml @@ -7,11 +7,13 @@ xmlns:f="http://xmlns.jcp.org/jsf/core" > - - - - + + + + + + #{msg.PAGE_TITLE_ADMIN_DELETE_FAX} diff --git a/web/admin/fax/admin_fax_edit.xhtml b/web/admin/fax/admin_fax_edit.xhtml index be346549..20e186d6 100644 --- a/web/admin/fax/admin_fax_edit.xhtml +++ b/web/admin/fax/admin_fax_edit.xhtml @@ -7,12 +7,14 @@ xmlns:f="http://xmlns.jcp.org/jsf/core" > - - - - - + + + + + + + #{msg.PAGE_TITLE_ADMIN_EDIT_FAX} diff --git a/web/admin/fax/admin_fax_show.xhtml b/web/admin/fax/admin_fax_show.xhtml index 9a02c0d7..81251537 100644 --- a/web/admin/fax/admin_fax_show.xhtml +++ b/web/admin/fax/admin_fax_show.xhtml @@ -7,11 +7,13 @@ xmlns:f="http://xmlns.jcp.org/jsf/core" > - - - - + + + + + + #{msg.PAGE_TITLE_ADMIN_SHOW_FAX} diff --git a/web/admin/landline/admin_landline_delete.xhtml b/web/admin/landline/admin_landline_delete.xhtml index d9c359fd..67f398ee 100644 --- a/web/admin/landline/admin_landline_delete.xhtml +++ b/web/admin/landline/admin_landline_delete.xhtml @@ -7,11 +7,13 @@ xmlns:f="http://xmlns.jcp.org/jsf/core" > - - - - + + + + + + #{msg.PAGE_TITLE_ADMIN_DELETE_LAND_LINE} diff --git a/web/admin/landline/admin_landline_edit.xhtml b/web/admin/landline/admin_landline_edit.xhtml index 97d31978..c29fca9a 100644 --- a/web/admin/landline/admin_landline_edit.xhtml +++ b/web/admin/landline/admin_landline_edit.xhtml @@ -7,12 +7,14 @@ xmlns:f="http://xmlns.jcp.org/jsf/core" > - - - - - + + + + + + + #{msg.PAGE_TITLE_ADMIN_EDIT_LAND_LINE_NUMBER} diff --git a/web/admin/landline/admin_landline_show.xhtml b/web/admin/landline/admin_landline_show.xhtml index 773e8aa1..6ceeb3ca 100644 --- a/web/admin/landline/admin_landline_show.xhtml +++ b/web/admin/landline/admin_landline_show.xhtml @@ -7,11 +7,13 @@ xmlns:f="http://xmlns.jcp.org/jsf/core" > - - - - + + + + + + #{msg.PAGE_TITLE_ADMIN_SHOW_LAND_LINE} diff --git a/web/admin/mobile/admin_mobile_delete.xhtml b/web/admin/mobile/admin_mobile_delete.xhtml index 536a64d3..c9377851 100644 --- a/web/admin/mobile/admin_mobile_delete.xhtml +++ b/web/admin/mobile/admin_mobile_delete.xhtml @@ -7,9 +7,11 @@ xmlns:f="http://xmlns.jcp.org/jsf/core" > - - - + + + + + #{msg.PAGE_TITLE_ADMIN_DELETE_MOBILE_NUMBER} diff --git a/web/admin/mobile/admin_mobile_edit.xhtml b/web/admin/mobile/admin_mobile_edit.xhtml index 4eaf05d7..09f436e4 100644 --- a/web/admin/mobile/admin_mobile_edit.xhtml +++ b/web/admin/mobile/admin_mobile_edit.xhtml @@ -7,10 +7,12 @@ xmlns:f="http://xmlns.jcp.org/jsf/core" > - - - - + + + + + + #{msg.PAGE_TITLE_ADMIN_EDIT_MOBILE_NUMBER} diff --git a/web/admin/mobile/admin_mobile_show.xhtml b/web/admin/mobile/admin_mobile_show.xhtml index 1fbe6f19..6beb5e68 100644 --- a/web/admin/mobile/admin_mobile_show.xhtml +++ b/web/admin/mobile/admin_mobile_show.xhtml @@ -7,9 +7,11 @@ xmlns:f="http://xmlns.jcp.org/jsf/core" > - - - + + + + + #{msg.PAGE_TITLE_ADMIN_SHOW_MOBILE_NUMBER} diff --git a/web/admin/user/admin_user_delete.xhtml b/web/admin/user/admin_user_delete.xhtml index 4a1c9969..2dda44de 100644 --- a/web/admin/user/admin_user_delete.xhtml +++ b/web/admin/user/admin_user_delete.xhtml @@ -7,12 +7,14 @@ xmlns:f="http://xmlns.jcp.org/jsf/core" > - - - - - + + + + + + + #{msg.PAGE_TITLE_ADMIN_DELETE_USER} diff --git a/web/admin/user/admin_user_edit.xhtml b/web/admin/user/admin_user_edit.xhtml index eb18aaf5..be0d4472 100644 --- a/web/admin/user/admin_user_edit.xhtml +++ b/web/admin/user/admin_user_edit.xhtml @@ -8,12 +8,14 @@ xmlns:f="http://xmlns.jcp.org/jsf/core" > - - - - - + + + + + + + #{msg.PAGE_TITLE_ADMIN_EDIT_USER} diff --git a/web/admin/user/admin_user_lock.xhtml b/web/admin/user/admin_user_lock.xhtml index c7bd7b3e..04443773 100644 --- a/web/admin/user/admin_user_lock.xhtml +++ b/web/admin/user/admin_user_lock.xhtml @@ -8,12 +8,14 @@ xmlns:f="http://xmlns.jcp.org/jsf/core" > - - - - - + + + + + + + #{msg.PAGE_TITLE_ADMIN_LOCK_USER} diff --git a/web/admin/user/admin_user_show.xhtml b/web/admin/user/admin_user_show.xhtml index cc29b299..2694b41b 100644 --- a/web/admin/user/admin_user_show.xhtml +++ b/web/admin/user/admin_user_show.xhtml @@ -7,12 +7,14 @@ xmlns:f="http://xmlns.jcp.org/jsf/core" > - - - - - + + + + + + + #{msg.PAGE_TITLE_ADMIN_SHOW_USER} diff --git a/web/admin/user/admin_user_unlock.xhtml b/web/admin/user/admin_user_unlock.xhtml index ce0d3a9d..9682c043 100644 --- a/web/admin/user/admin_user_unlock.xhtml +++ b/web/admin/user/admin_user_unlock.xhtml @@ -7,10 +7,12 @@ xmlns:f="http://xmlns.jcp.org/jsf/core" > - - - - + + + + + + #{msg.PAGE_TITLE_ADMIN_UNLOCK_USER} diff --git a/web/guest/user/confirm_account.xhtml b/web/guest/user/confirm_account.xhtml index 0adfb02d..a6d5789c 100644 --- a/web/guest/user/confirm_account.xhtml +++ b/web/guest/user/confirm_account.xhtml @@ -7,12 +7,14 @@ xmlns:f="http://xmlns.jcp.org/jsf/core" > - - - - - + + + + + + + #{msg.PAGE_TITLE_INDEX_CONFIRM_ACCOUNT} diff --git a/web/guest/user/user_profile.xhtml b/web/guest/user/user_profile.xhtml index e57c5865..62ff8d7d 100644 --- a/web/guest/user/user_profile.xhtml +++ b/web/guest/user/user_profile.xhtml @@ -6,15 +6,17 @@ xmlns:h="http://xmlns.jcp.org/jsf/html" xmlns:f="http://xmlns.jcp.org/jsf/core"> - - - - - - - - #{msg.PAGE_TITLE_LOGIN_USER_PROFILE} + + + + + + + + + + #{msg.PAGE_TITLE_USER_LOGIN_USER_PROFILE} #{msg.PAGE_TITLE_INDEX_USER_PROFILE}