*/
private List<BasicData> filteredBasicData;
+ /**
+ * Selected basic data
+ */
+ private BasicData selectedBasicData;
+
/**
* Default constructor
*/
this.filteredBasicData = filteredBasicData;
}
+ /**
+ * Getter for selected basic data
+ * <p>
+ * @return Selected basic data
+ */
+ public BasicData getSelectedBasicData () {
+ return this.selectedBasicData;
+ }
+
+ /**
+ * Setter for selected basic data
+ * <p>
+ * @param selectedBasicData Selected basic data
+ */
+ public void setSelectedBasicData (final BasicData selectedBasicData) {
+ this.selectedBasicData = selectedBasicData;
+ }
+
/**
* Initializer method
*/
import org.mxchange.jcontactsbusiness.model.opening_time.dayofweek.DayOfTheWeek;
import org.mxchange.jcountry.model.data.Country;
import org.mxchange.jjobs.beans.BaseJobsBean;
+import org.mxchange.jjobs.beans.business.branchoffice.list.JobsBranchOfficeListWebViewController;
import org.mxchange.jphone.model.phonenumbers.fax.DialableFaxNumber;
import org.mxchange.jphone.model.phonenumbers.fax.FaxNumber;
import org.mxchange.jphone.model.phonenumbers.landline.DialableLandLineNumber;
private Event<ObservableBranchOfficeAddedEvent> branchOfficeAddedEvent;
/**
- * A general branch office controller (backing bean)
+ * A list branch office controller (backing bean)
*/
@Inject
- private JobsBranchOfficeWebRequestController branchOfficeController;
+ private JobsBranchOfficeListWebViewController branchOfficeListController;
/**
* Owner/leader of branch office
*/
private boolean isBranchOfficeCreatedByRequiredData (final BranchOffice branchOffice) {
// Get full list from other bean
- final List<BranchOffice> branchOffices = this.branchOfficeController.allBranchOffices();
+ final List<BranchOffice> branchOffices = this.branchOfficeListController.allBranchOffices();
// Default is not found
boolean isFound = false;
*/
package org.mxchange.jjobs.beans.business.branchoffice;
-import fish.payara.cdi.jsr107.impl.NamedCache;
-import java.text.MessageFormat;
-import java.util.Comparator;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Objects;
-import javax.annotation.PostConstruct;
-import javax.cache.Cache;
-import javax.ejb.EJB;
import javax.enterprise.context.RequestScoped;
-import javax.enterprise.event.Observes;
-import javax.inject.Inject;
import javax.inject.Named;
-import org.mxchange.jcontactsbusiness.events.branchoffice.added.ObservableBranchOfficeAddedEvent;
-import org.mxchange.jcontactsbusiness.exceptions.branchoffice.BranchOfficeNotFoundException;
-import org.mxchange.jcontactsbusiness.model.branchoffice.BranchOffice;
-import org.mxchange.jcontactsbusiness.model.branchoffice.BranchOfficeSessionBeanRemote;
import org.mxchange.jjobs.beans.BaseJobsBean;
/**
*/
private static final long serialVersionUID = 5_028_697_360_461L;
- /**
- * A list of all branch offices
- */
- private final List<BranchOffice> allBranchOffices;
-
- /**
- * EJB for administrative purposes
- */
- @EJB (lookup = "java:global/jjobs-ejb/branchOffice!org.mxchange.jcontactsbusiness.model.branchoffice.BranchOfficeSessionBeanRemote")
- private BranchOfficeSessionBeanRemote branchOfficeBean;
-
- /**
- * A list of all branch offices (globally)
- */
- @Inject
- @NamedCache (cacheName = "branchOfficeCache")
- private Cache<Long, BranchOffice> branchOfficeCache;
-
- /**
- * A list of filtered branch offices
- */
- private List<BranchOffice> filteredBranchOffices;
-
/**
* Default constructor
*/
public JobsBranchOfficeWebRequestBean () {
// Call super constructor
super();
-
- // Init list
- this.allBranchOffices = new LinkedList<>();
- }
-
- /**
- * Observes events being fired when a branch office has been added.
- * <p>
- * @param event Event being fired
- * <p>
- * @throws NullPointerException If the parameter or it's carried instance is
- * null
- * @throws IllegalArgumentException If the branchId is zero or lower
- */
- public void afterBranchOfficeAddedEvent (@Observes final ObservableBranchOfficeAddedEvent event) {
- // Validate parameter
- if (null == event) {
- // Throw NPE
- throw new NullPointerException("event is null"); //NOI18N
- } else if (event.getBranchOffice() == null) {
- // Throw NPE again
- throw new NullPointerException("event.branchOffice is null"); //NOI18N
- } else if (event.getBranchOffice().getBranchId() == null) {
- // Throw it again
- throw new NullPointerException("event.branchOffice.branchId is null"); //NOI18N
- } else if (event.getBranchOffice().getBranchId() < 1) {
- // Throw IAE
- throw new IllegalArgumentException(MessageFormat.format("event.branchOffice.branchId={0} is not valid", event.getBranchOffice().getBranchId())); //NOI18N
- }
-
- // Add instance to cache
- this.branchOfficeCache.put(event.getBranchOffice().getBranchId(), event.getBranchOffice());
- this.allBranchOffices.add(event.getBranchOffice());
- }
-
- @Override
- @SuppressWarnings ("ReturnOfCollectionOrArrayField")
- public List<BranchOffice> allBranchOffices () {
- return this.allBranchOffices;
- }
-
- @Override
- public BranchOffice findBranchOfficeById (final Long branchOfficeId) throws BranchOfficeNotFoundException {
- // Validate parameter
- if (null == branchOfficeId) {
- // Throw NPE
- throw new NullPointerException("branchOfficeId is null"); //NOI18N
- } else if (branchOfficeId < 1) {
- // Throw IAE
- throw new IllegalArgumentException(MessageFormat.format("branchOfficeId={0} is invalid", branchOfficeId)); //NOI18N
- } else if (!this.branchOfficeCache.containsKey(branchOfficeId)) {
- // Not found
- throw new BranchOfficeNotFoundException(branchOfficeId);
- }
-
- // Get it from cache
- final BranchOffice branchOffice = this.branchOfficeCache.get(branchOfficeId);
-
- // Return it
- return branchOffice;
- }
-
- /**
- * Getter for a list of filtered branch offices
- * <p>
- * @return Filtered branch offices
- */
- @SuppressWarnings ("ReturnOfCollectionOrArrayField")
- public List<BranchOffice> getFilteredBranchOffices () {
- return this.filteredBranchOffices;
- }
-
- /**
- * Setter for a list of filtered branch offices
- * <p>
- * @param filteredBranchOffices Filtered branch offices
- */
- @SuppressWarnings ("AssignmentToCollectionOrArrayFieldFromParameter")
- public void setFilteredBranchOffices (final List<BranchOffice> filteredBranchOffices) {
- this.filteredBranchOffices = filteredBranchOffices;
- }
-
- /**
- * Initializer method
- */
- @PostConstruct
- public void initializeList () {
- // Is cache there?
- if (!this.branchOfficeCache.iterator().hasNext()) {
- // Get whole list
- final List<BranchOffice> branchOffices = this.branchOfficeBean.allBranchOffices();
-
- // Add all
- for (final BranchOffice branchOffice : branchOffices) {
- // Add it to cache
- this.branchOfficeCache.put(branchOffice.getBranchId(), branchOffice);
- }
- }
-
- // Is the list empty, but filled cache?
- if (this.allBranchOffices.isEmpty() && this.branchOfficeCache.iterator().hasNext()) {
- // Get iterator
- final Iterator<Cache.Entry<Long, BranchOffice>> iterator = this.branchOfficeCache.iterator();
-
- // Build up list
- while (iterator.hasNext()) {
- // GEt next element
- final Cache.Entry<Long, BranchOffice> next = iterator.next();
-
- // Add to list
- this.allBranchOffices.add(next.getValue());
- }
-
- // Sort list
- this.allBranchOffices.sort(new Comparator<BranchOffice>() {
- @Override
- public int compare (final BranchOffice o1, final BranchOffice o2) {
- return o1.getBranchId() > o2.getBranchId() ? 1 : o1.getBranchId() < o2.getBranchId() ? -1 : 0;
- }
- });
- }
- }
-
- @Override
- public Boolean isEmailAddressRegistered (final String emailAddress) {
- // Validate parameter
- if (null == emailAddress) {
- // Throw NPE
- throw new NullPointerException("emailAddress is null"); //NOI18N
- } else if (emailAddress.isEmpty()) {
- // Throw IAE
- throw new IllegalArgumentException("emailAddress is empty"); //NOI18N
- }
-
- // Default is not found
- boolean isFound = false;
-
- // Check all entries
- for (final BranchOffice branchOffice : this.allBranchOffices()) {
- // Is email address used?
- if (Objects.equals(branchOffice.getBranchEmailAddress(), emailAddress)) {
- // Found it
- isFound = true;
- break;
- }
- }
-
- // Return flag
- return isFound;
}
}
package org.mxchange.jjobs.beans.business.branchoffice;
import java.io.Serializable;
-import java.util.List;
-import org.mxchange.jcontactsbusiness.exceptions.branchoffice.BranchOfficeNotFoundException;
-import org.mxchange.jcontactsbusiness.model.branchoffice.BranchOffice;
/**
* An interface for general branch office controller
*/
public interface JobsBranchOfficeWebRequestController extends Serializable {
- /**
- * Checks if given email address is already registered by an other branch
- * office
- * <p>
- * @param emailAddress Email address
- * <p>
- * @return Whether the email address has been already registered
- */
- Boolean isEmailAddressRegistered (final String emailAddress);
-
- /**
- * Returns a list of all branch offices
- * <p>
- * @return A list of all branch offices
- */
- List<BranchOffice> allBranchOffices ();
-
- /**
- * Tries to find a branch office with given id number
- * <p>
- * @param branchOfficeId Branch office id
- * <p>
- * @return A branch office instance
- * <p>
- * @throws BranchOfficeNotFoundException If the branch office was not found
- */
- BranchOffice findBranchOfficeById (final Long branchOfficeId) throws BranchOfficeNotFoundException;
-
}
--- /dev/null
+/*
+ * Copyright (C) 2017, 2018 Free Software Foundation
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+package org.mxchange.jjobs.beans.business.branchoffice.list;
+
+import fish.payara.cdi.jsr107.impl.NamedCache;
+import java.text.MessageFormat;
+import java.util.Comparator;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Objects;
+import javax.annotation.PostConstruct;
+import javax.cache.Cache;
+import javax.ejb.EJB;
+import javax.enterprise.event.Observes;
+import javax.faces.view.ViewScoped;
+import javax.inject.Inject;
+import javax.inject.Named;
+import org.mxchange.jcontactsbusiness.events.branchoffice.added.ObservableBranchOfficeAddedEvent;
+import org.mxchange.jcontactsbusiness.exceptions.branchoffice.BranchOfficeNotFoundException;
+import org.mxchange.jcontactsbusiness.model.branchoffice.BranchOffice;
+import org.mxchange.jcontactsbusiness.model.branchoffice.BranchOfficeSessionBeanRemote;
+import org.mxchange.jjobs.beans.BaseJobsBean;
+
+/**
+ * A list bean for branch offices
+ * <p>
+ * @author Roland Häder<roland@mxchange.org>
+ */
+@Named ("branchOfficeListController")
+@ViewScoped
+public class JobsBranchOfficeListWebViewBean extends BaseJobsBean implements JobsBranchOfficeListWebViewController {
+
+ /**
+ * Serial number
+ */
+ private static final long serialVersionUID = 5_028_697_360_462L;
+
+ /**
+ * A list of all branch offices
+ */
+ private final List<BranchOffice> allBranchOffices;
+
+ /**
+ * EJB for administrative purposes
+ */
+ @EJB (lookup = "java:global/jjobs-ejb/branchOffice!org.mxchange.jcontactsbusiness.model.branchoffice.BranchOfficeSessionBeanRemote")
+ private BranchOfficeSessionBeanRemote branchOfficeBean;
+
+ /**
+ * A list of all branch offices (globally)
+ */
+ @Inject
+ @NamedCache (cacheName = "branchOfficeCache")
+ private transient Cache<Long, BranchOffice> branchOfficeCache;
+
+ /**
+ * A list of filtered branch offices
+ */
+ private List<BranchOffice> filteredBranchOffices;
+
+ /**
+ * Selected branch office instance
+ */
+ private BranchOffice selectedBranchOffice;
+
+ /**
+ * Default constructor
+ */
+ public JobsBranchOfficeListWebViewBean () {
+ // Call super constructor
+ super();
+
+ // Init list
+ this.allBranchOffices = new LinkedList<>();
+ }
+
+ /**
+ * Observes events being fired when a branch office has been added.
+ * <p>
+ * @param event Event being fired
+ * <p>
+ * @throws NullPointerException If the parameter or it's carried instance is
+ * null
+ * @throws IllegalArgumentException If the branchId is zero or lower
+ */
+ public void afterBranchOfficeAddedEvent (@Observes final ObservableBranchOfficeAddedEvent event) {
+ // Validate parameter
+ if (null == event) {
+ // Throw NPE
+ throw new NullPointerException("event is null"); //NOI18N
+ } else if (event.getBranchOffice() == null) {
+ // Throw NPE again
+ throw new NullPointerException("event.branchOffice is null"); //NOI18N
+ } else if (event.getBranchOffice().getBranchId() == null) {
+ // Throw it again
+ throw new NullPointerException("event.branchOffice.branchId is null"); //NOI18N
+ } else if (event.getBranchOffice().getBranchId() < 1) {
+ // Throw IAE
+ throw new IllegalArgumentException(MessageFormat.format("event.branchOffice.branchId={0} is not valid", event.getBranchOffice().getBranchId())); //NOI18N
+ }
+
+ // Add instance to cache
+ this.branchOfficeCache.put(event.getBranchOffice().getBranchId(), event.getBranchOffice());
+ this.allBranchOffices.add(event.getBranchOffice());
+ }
+
+ @Override
+ @SuppressWarnings ("ReturnOfCollectionOrArrayField")
+ public List<BranchOffice> allBranchOffices () {
+ return this.allBranchOffices;
+ }
+
+ @Override
+ public BranchOffice findBranchOfficeById (final Long branchOfficeId) throws BranchOfficeNotFoundException {
+ // Validate parameter
+ if (null == branchOfficeId) {
+ // Throw NPE
+ throw new NullPointerException("branchOfficeId is null"); //NOI18N
+ } else if (branchOfficeId < 1) {
+ // Throw IAE
+ throw new IllegalArgumentException(MessageFormat.format("branchOfficeId={0} is invalid", branchOfficeId)); //NOI18N
+ } else if (!this.branchOfficeCache.containsKey(branchOfficeId)) {
+ // Not found
+ throw new BranchOfficeNotFoundException(branchOfficeId);
+ }
+
+ // Get it from cache
+ final BranchOffice branchOffice = this.branchOfficeCache.get(branchOfficeId);
+
+ // Return it
+ return branchOffice;
+ }
+
+ /**
+ * Getter for a list of filtered branch offices
+ * <p>
+ * @return Filtered branch offices
+ */
+ @SuppressWarnings ("ReturnOfCollectionOrArrayField")
+ public List<BranchOffice> getFilteredBranchOffices () {
+ return this.filteredBranchOffices;
+ }
+
+ /**
+ * Setter for a list of filtered branch offices
+ * <p>
+ * @param filteredBranchOffices Filtered branch offices
+ */
+ @SuppressWarnings ("AssignmentToCollectionOrArrayFieldFromParameter")
+ public void setFilteredBranchOffices (final List<BranchOffice> filteredBranchOffices) {
+ this.filteredBranchOffices = filteredBranchOffices;
+ }
+
+ /**
+ * Getter for selected branch office
+ * <p>
+ * @return Selected branch office
+ */
+ public BranchOffice getSelectedBranchOffice () {
+ return this.selectedBranchOffice;
+ }
+
+ /**
+ * Setter for selected branch office
+ * <p>
+ * @param selectedBranchOffice Selected branch office
+ */
+ public void setSelectedBranchOffice (final BranchOffice selectedBranchOffice) {
+ this.selectedBranchOffice = selectedBranchOffice;
+ }
+
+ /**
+ * Initializer method
+ */
+ @PostConstruct
+ public void initializeList () {
+ // Is cache there?
+ if (!this.branchOfficeCache.iterator().hasNext()) {
+ // Get whole list
+ final List<BranchOffice> branchOffices = this.branchOfficeBean.allBranchOffices();
+
+ // Add all
+ for (final BranchOffice branchOffice : branchOffices) {
+ // Add it to cache
+ this.branchOfficeCache.put(branchOffice.getBranchId(), branchOffice);
+ }
+ }
+
+ // Is the list empty, but filled cache?
+ if (this.allBranchOffices.isEmpty() && this.branchOfficeCache.iterator().hasNext()) {
+ // Get iterator
+ final Iterator<Cache.Entry<Long, BranchOffice>> iterator = this.branchOfficeCache.iterator();
+
+ // Build up list
+ while (iterator.hasNext()) {
+ // GEt next element
+ final Cache.Entry<Long, BranchOffice> next = iterator.next();
+
+ // Add to list
+ this.allBranchOffices.add(next.getValue());
+ }
+
+ // Sort list
+ this.allBranchOffices.sort(new Comparator<BranchOffice>() {
+ @Override
+ public int compare (final BranchOffice o1, final BranchOffice o2) {
+ return o1.getBranchId() > o2.getBranchId() ? 1 : o1.getBranchId() < o2.getBranchId() ? -1 : 0;
+ }
+ });
+ }
+ }
+
+ @Override
+ public Boolean isEmailAddressRegistered (final String emailAddress) {
+ // Validate parameter
+ if (null == emailAddress) {
+ // Throw NPE
+ throw new NullPointerException("emailAddress is null"); //NOI18N
+ } else if (emailAddress.isEmpty()) {
+ // Throw IAE
+ throw new IllegalArgumentException("emailAddress is empty"); //NOI18N
+ }
+
+ // Default is not found
+ boolean isFound = false;
+
+ // Check all entries
+ for (final BranchOffice branchOffice : this.allBranchOffices()) {
+ // Is email address used?
+ if (Objects.equals(branchOffice.getBranchEmailAddress(), emailAddress)) {
+ // Found it
+ isFound = true;
+ break;
+ }
+ }
+
+ // Return flag
+ return isFound;
+ }
+
+ @Override
+ protected Object clone () throws CloneNotSupportedException {
+ return super.clone(); //To change body of generated methods, choose Tools | Templates.
+ }
+
+}
--- /dev/null
+/*
+ * Copyright (C) 2017, 2018 Free Software Foundation
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+package org.mxchange.jjobs.beans.business.branchoffice.list;
+
+import java.io.Serializable;
+import java.util.List;
+import org.mxchange.jcontactsbusiness.exceptions.branchoffice.BranchOfficeNotFoundException;
+import org.mxchange.jcontactsbusiness.model.branchoffice.BranchOffice;
+
+/**
+ * An interface for general branch office controller
+ * <p>
+ * @author Roland Häder<roland@mxchange.org>
+ */
+public interface JobsBranchOfficeListWebViewController extends Serializable {
+
+ /**
+ * Checks if given email address is already registered by an other branch
+ * office
+ * <p>
+ * @param emailAddress Email address
+ * <p>
+ * @return Whether the email address has been already registered
+ */
+ Boolean isEmailAddressRegistered (final String emailAddress);
+
+ /**
+ * Returns a list of all branch offices
+ * <p>
+ * @return A list of all branch offices
+ */
+ List<BranchOffice> allBranchOffices ();
+
+ /**
+ * Tries to find a branch office with given id number
+ * <p>
+ * @param branchOfficeId Branch office id
+ * <p>
+ * @return A branch office instance
+ * <p>
+ * @throws BranchOfficeNotFoundException If the branch office was not found
+ */
+ BranchOffice findBranchOfficeById (final Long branchOfficeId) throws BranchOfficeNotFoundException;
+
+}
* @param contact Contact instance
*/
private void copyContact (final Contact contact) {
- // Is the instance valid?
- if (null == contact) {
- // Throw NPE
- throw new NullPointerException("contact is null"); //NOI18N
- } else if (contact.getContactId() == null) {
- // Throw NPE
- throw new NullPointerException("contact.contactId is null"); //NOI18N
- } else if (contact.getContactId() < 1) {
- // Not valid id number
- throw new IllegalArgumentException(MessageFormat.format("contact.contactId={0} is not valid.", contact.getContactId())); //NOI18N
- }
-
// Copy all fields:
// - base data
this.setPersonalTitle(contact.getContactPersonalTitle());
* @param contact Contact instance to remove
*/
private void removeContact (final Contact contact) {
- // Is the instance valid?
- if (null == contact) {
- // Throw NPE
- throw new NullPointerException("contact is null"); //NOI18N
- } else if (contact.getContactId() == null) {
- // Throw NPE
- throw new NullPointerException("contact.contactId is null"); //NOI18N
- } else if (contact.getContactId() < 1) {
- // Not valid id number
- throw new IllegalArgumentException(MessageFormat.format("contact.contactId={0} is not valid.", contact.getContactId())); //NOI18N
- }
-
// Remove from general list
if (!this.contactCache.remove(contact.getContactId())) {
// Did not remove contact
* @param contact Contact instance to add uniquely
*/
private void uniqueAddContact (final Contact contact) {
- // Is the instance valid?
- if (null == contact) {
- // Throw NPE
- throw new NullPointerException("contact is null"); //NOI18N
- } else if (contact.getContactId() == null) {
- // Throw NPE
- throw new NullPointerException("contact.contactId is null"); //NOI18N
- } else if (contact.getContactId() < 1) {
- // Not valid id number
- throw new IllegalArgumentException(MessageFormat.format("contact.contactId={0} is not valid.", contact.getContactId())); //NOI18N
- }
-
// Get iterator from list
final Iterator<Cache.Entry<Long, Contact>> iterator = this.contactCache.iterator();
*/
package org.mxchange.jjobs.beans.helper;
-import java.text.DateFormat;
import java.text.MessageFormat;
import javax.enterprise.event.Event;
import javax.enterprise.inject.Any;
import org.mxchange.jcontactsbusiness.model.department.Department;
import org.mxchange.jcontactsbusiness.model.employee.Employable;
import org.mxchange.jcontactsbusiness.model.headquarter.Headquarter;
+import org.mxchange.jcountry.model.data.Country;
import org.mxchange.jjobs.beans.BaseJobsBean;
import org.mxchange.jjobs.beans.localization.JobsLocalizationSessionController;
import org.mxchange.jjobs.beans.user.JobsUserWebRequestController;
-import org.mxchange.jjobs.model.receipt.BillableReceipt;
import org.mxchange.jphone.events.fax.created.CreatedFaxNumberEvent;
import org.mxchange.jphone.events.fax.created.ObservableCreatedFaxNumberEvent;
import org.mxchange.jphone.events.landline.created.CreatedLandLineNumberEvent;
import org.mxchange.jphone.events.landline.created.ObservableCreatedLandLineNumberEvent;
import org.mxchange.jphone.events.mobile.created.CreatedMobileNumberEvent;
import org.mxchange.jphone.events.mobile.created.ObservableCreatedMobileNumberEvent;
+import org.mxchange.jphone.model.phonenumbers.DialableNumber;
import org.mxchange.jphone.model.phonenumbers.fax.DialableFaxNumber;
import org.mxchange.jphone.model.phonenumbers.landline.DialableLandLineNumber;
import org.mxchange.jphone.model.phonenumbers.mobile.DialableMobileNumber;
return sb.toString();
}
+ /**
+ * Returns the text representation of given country. If null is provided, an
+ * empty string is returned.
+ * <p>
+ * @param country Country instance
+ * <p>
+ * @return Country's text representation
+ */
+ public String renderCountry (final Country country) {
+ // Default is empty string, so let's get started
+ final StringBuilder sb = new StringBuilder(20);
+
+ // Is a country given?
+ if (country instanceof Country) {
+ // Yes, then render it
+ sb.append(this.getMessageFromBundle(country.getCountryI18nKey()));
+ sb.append(" ("); //NOI18N
+ sb.append(country.getCountryCode());
+ sb.append(")"); //NOI18N
+ }
+
+ // Return it
+ return sb.toString();
+ }
+
/**
* Returns the department's name and name of assigned company. If null is
* provided, an empty string is returned.
* <p>
* @param employee Employable instance
* <p>
- * @return Contact's full name
+ * @return A string representing an employee
*/
public String renderEmployee (final Employable employee) {
// Default is empty string, so let's get started
// Is employee set?
if (employee instanceof Employable) {
- // Then create name
- sb.append(employee.getEmployeeNumber());
-
- // Is a department found?
- if (employee.getEmployeeDepartment() instanceof Department) {
- // Then add it's name to it
- sb.append(" ("); //NOI18N
- sb.append(this.renderDepartment(employee.getEmployeeDepartment()));
- sb.append(")"); //NOI18N
+ // Is the number given?
+ if (employee.getEmployeeNumber() != null) {
+ // Then create name
+ sb.append(employee.getEmployeeNumber());
}
// Is contact data found?
final String contactName = this.renderContact(employee.getEmployeePersonalData());
// Is it given?
- if (contactName != null) {
+ if (contactName != null && !contactName.isEmpty()) {
+ // Only add braces when employee number is given
+ if (employee.getEmployeeNumber() != null) {
+ sb.append(" ("); //NOI18N
+ }
+
// Then add it
- sb.append(" ("); //NOI18N
sb.append(contactName);
+
+ // Only add braces when employee number is given
+ if (employee.getEmployeeNumber() != null) {
+ sb.append(")"); //NOI18N
+ }
+ }
+ }
+
+ // Is a department found?
+ if (employee.getEmployeeDepartment() instanceof Department) {
+ // Only add braces when employee number is given
+ if (employee.getEmployeeNumber() != null || employee.getEmployeePersonalData() instanceof Contact) {
+ sb.append(" ("); //NOI18N
+ }
+
+ // Add department name
+ sb.append(this.renderDepartment(employee.getEmployeeDepartment()));
+
+ // Only add braces when employee number is given
+ if (employee.getEmployeeNumber() != null || employee.getEmployeePersonalData() instanceof Contact) {
sb.append(")"); //NOI18N
}
}
}
/**
- * Returns the receipt. If null is provided, an empty string is returned.
+ * Renders given mobile number (land-line and fax number). If null is
+ * provided, an empty string is returned.
* <p>
- * @param receipt Receipt instance
+ * @param mobileNumber Mobile number to render
* <p>
- * @return Product name
+ * @return Mobile number
*/
- public String renderReceipt (final BillableReceipt receipt) {
+ public String renderMobileNumber (final DialableMobileNumber mobileNumber) {
// Default is empty string, so let's get started
- final StringBuilder sb = new StringBuilder(50);
-
- // Is receipt set?
- if (receipt instanceof BillableReceipt) {
- // Add relevant data
- sb.append(this.getMessageFromBundle("RECEIPT_ISSUED")).append(" "); //NOI18N
- sb.append(DateFormat.getInstance().format(receipt.getReceiptIssued())).append(", "); //NOI18N
- sb.append(this.getMessageFromBundle("PAYMENT_TYPE")).append(" "); //NOI18N
- sb.append(this.getMessageFromBundle(receipt.getReceiptPaymentType().getI18nKey()));
-
- // Is receipt number included?
- if (receipt.getReceiptNumber() != null) {
- // Append it
- sb.append(", ").append(this.getMessageFromBundle("RECEIPT_NUMBER")).append(" "); //NOI18N
- sb.append(receipt.getReceiptNumber());
- }
+ final StringBuilder sb = new StringBuilder(20);
- // Add company (over branch office)
+ // Is a phone number given?
+ if (mobileNumber instanceof DialableMobileNumber) {
+ // Yes, then render it
+ sb.append(mobileNumber.getMobileProvider().getProviderCountry().getCountryAbroadDialPrefix());
+ sb.append(mobileNumber.getMobileProvider().getProviderCountry().getCountryPhoneCode());
sb.append(" ("); //NOI18N
- sb.append(receipt.getReceiptBranchOffice().getBranchCompany().getCompanyName());
- sb.append(")"); //NOI18N
+ sb.append(mobileNumber.getMobileProvider().getProviderDialPrefix());
+ sb.append(") "); //NOI18N
+ sb.append(mobileNumber.getPhoneNumber());
+ }
+
+ // Return it
+ return sb.toString();
+ }
+
+ /**
+ * Renders given phone number (land-line and fax number). If null is
+ * provided, an empty string is returned.
+ * <p>
+ * @param number Phone number to render
+ * <p>
+ * @return Phone number
+ * <p>
+ * @throws IllegalArgumentException If a mobile number is provided
+ */
+ public String renderPhoneNumber (final DialableNumber number) {
+ // Validate parameter
+ if (number instanceof DialableMobileNumber) {
+ // Not allowed here
+ throw new IllegalArgumentException("Mobile numbers cannot be rendered with this method. Please use renderMobileNumber() instead."); //NOI18N
+ }
+
+ // Default is empty string, so let's get started
+ final StringBuilder sb = new StringBuilder(20);
+
+ // Is a phone number given?
+ if (number instanceof DialableNumber) {
+ // Yes, then render it
+ sb.append(number.getPhoneCountry().getCountryAbroadDialPrefix());
+ sb.append(number.getPhoneCountry().getCountryPhoneCode());
+ sb.append(" ("); //NOI18N
+ sb.append(number.getPhoneAreaCode());
+ sb.append(") "); //NOI18N
+ sb.append(number.getPhoneNumber());
}
// Return it
import javax.faces.convert.FacesConverter;
import org.mxchange.jcontactsbusiness.exceptions.branchoffice.BranchOfficeNotFoundException;
import org.mxchange.jcontactsbusiness.model.branchoffice.BranchOffice;
-import org.mxchange.jjobs.beans.business.branchoffice.JobsBranchOfficeWebRequestBean;
-import org.mxchange.jjobs.beans.business.branchoffice.JobsBranchOfficeWebRequestController;
+import org.mxchange.jjobs.beans.business.branchoffice.list.JobsBranchOfficeListWebViewBean;
+import org.mxchange.jjobs.beans.business.branchoffice.list.JobsBranchOfficeListWebViewController;
/**
* Converter for branch office id <-> valid basic company data instance
public class JobsBranchOfficeConverter implements Converter<BranchOffice> {
/**
- * Branch office EJB
+ * Branch office list controller
*/
- private static JobsBranchOfficeWebRequestController BRANCH_OFFICE_CONTROLLER;
+ private static JobsBranchOfficeListWebViewController BRANCH_OFFICE_LIST_CONTROLLER;
@Override
public BranchOffice getAsObject (final FacesContext context, final UIComponent component, final String submittedValue) {
// Is the instance there?
- if (null == BRANCH_OFFICE_CONTROLLER) {
+ if (null == BRANCH_OFFICE_LIST_CONTROLLER) {
// Get bean from CDI directly
- BRANCH_OFFICE_CONTROLLER = CDI.current().select(JobsBranchOfficeWebRequestBean.class).get();
+ BRANCH_OFFICE_LIST_CONTROLLER = CDI.current().select(JobsBranchOfficeListWebViewBean.class).get();
}
// Is the value null or empty?
final Long branchOfficeId = Long.valueOf(submittedValue);
// Try to get user instance from it
- branchOffice = BRANCH_OFFICE_CONTROLLER.findBranchOfficeById(branchOfficeId);
+ branchOffice = BRANCH_OFFICE_LIST_CONTROLLER.findBranchOfficeById(branchOfficeId);
} catch (final NumberFormatException ex) {
// Throw again
throw new ConverterException(ex);
@Override
public void destroy () {
- System.out.println("destroy!");
+ System.out.println("destroy!"); //NOI18N
}
@Override
final HttpServletResponse res = (HttpServletResponse) response;
// Is the request URI not starting with resource identifier?
- if (!req.getRequestURI().startsWith(req.getContextPath() + ResourceHandler.RESOURCE_IDENTIFIER)) {
+ if (!req.getPathInfo().startsWith(ResourceHandler.RESOURCE_IDENTIFIER)) {
+ // Set non-caching header
res.setHeader("Cache-Control", "no-cache, no-store, must-revalidate"); //NOI18N
res.setHeader("Pragma", "no-cache"); // //NOI18N
res.setDateHeader("Expires", 0); // //NOI18N
+
+ // Is AJAX given?
+ final Boolean isAjax = "true".equals(req.getParameter("javax.faces.partial.ajax")); //NOI18N
+
+ // Is AJAX?
+ if (isAjax) {
+ // Set Accept header
+ res.setHeader("Accept", "text/xml"); //NOI18N
+ }
}
// Continue filtering
@Override
public void init (final FilterConfig filterConfig) throws ServletException {
- System.out.println("init!");
+ System.out.println("init!"); //NOI18N
}
}
--- /dev/null
+/*
+ * Copyright (C) 2016 - 2018 Free Software Foundation
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+package org.mxchange.jjobs.validator.business.basicdata;
+
+import java.text.MessageFormat;
+import java.util.regex.Pattern;
+import javax.enterprise.inject.spi.CDI;
+import javax.faces.application.FacesMessage;
+import javax.faces.component.UIComponent;
+import javax.faces.context.FacesContext;
+import javax.faces.validator.FacesValidator;
+import javax.faces.validator.ValidatorException;
+import org.mxchange.jcoreee.validator.string.BaseStringValidator;
+import org.mxchange.jjobs.beans.business.branchoffice.list.JobsBranchOfficeListWebViewBean;
+import org.mxchange.jjobs.beans.business.branchoffice.list.JobsBranchOfficeListWebViewController;
+
+/**
+ * A validator for branch office email address validation
+ * <p>
+ * @author Roland Häder<roland@mxchange.org>
+ */
+@FacesValidator (value = "BranchOfficeEmailAddressValidator")
+public class JobsBranchOfficeEmailAddressValidator extends BaseStringValidator {
+
+ /**
+ * Branch office backing bean
+ */
+ private static JobsBranchOfficeListWebViewController BRANCH_OFFICE_LIST_CONTROLLER;
+
+ /**
+ * Email pattern
+ */
+ private static final String EMAIL_REGEX = "^([a-zA-Z0-9_\\-\\.]+)@((\\[[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.)|(([a-zA-Z0-9\\-]+\\.)+))([a-zA-Z]{2,4}|[0-9]{1,3})(\\]?)$"; //NOI18N
+
+ /**
+ * Pattern matcher
+ */
+ private static final Pattern PATTERN_MATCHER = Pattern.compile(JobsBranchOfficeEmailAddressValidator.EMAIL_REGEX);
+
+ /**
+ * Serial number
+ */
+ private static final long serialVersionUID = 187_536_745_607_196L;
+
+ /**
+ * Whether empty data is allowed
+ */
+ private Boolean allowEmptyRequiredData;
+
+ /**
+ * Default constructor
+ */
+ public JobsBranchOfficeEmailAddressValidator () {
+ this.allowEmptyRequiredData = Boolean.FALSE;
+ }
+
+ /**
+ * Setter for allowEmptyRequiredData flag
+ * <p>
+ * @param allowEmptyRequiredData Whether empty values are allowed
+ */
+ public void setAllowEmptyRequiredData (final Boolean allowEmptyRequiredData) {
+ this.allowEmptyRequiredData = allowEmptyRequiredData;
+ }
+
+ @Override
+ public void validate (final FacesContext context, final UIComponent component, final Object value) throws ValidatorException {
+ // The required field
+ final String[] requiredFields = {"emailAddress", "emailAddressRepeat", "resendEmailAddress"}; //NOI18N
+
+ // Pre-validation (example: not null, not a string, empty string ...)
+ super.preValidate(context, component, value, requiredFields, this.allowEmptyRequiredData);
+
+ // Is the email address empty and allowed?
+ if (null == value && this.allowEmptyRequiredData) {
+ // Then accept this here
+ return;
+ } else if (null == value) {
+ // Abort here
+ throw new ValidatorException(new FacesMessage("No empty email address allowed.")); //NOI18N
+ }
+
+ // Get string from object ... ;-)
+ // @TODO Add IDN support (GNU lib?) Search for emailAddressRepeat
+ final String emailAddress = String.valueOf(value).trim();
+
+ // Checks if the email address matches a regex ("low-level" check)
+ // @TODO Should also be done by <f:validatorRegex />)
+ final boolean matches = PATTERN_MATCHER.matcher(emailAddress).matches(); //NOI18N
+
+ // Is the email address valid?
+ if (!matches) {
+ // Generate message
+ String message = MessageFormat.format("Email address {0} does not match regular expression.", emailAddress); //NOI18N
+
+ // Not matching
+ throw new ValidatorException(new FacesMessage(FacesMessage.SEVERITY_WARN, message, message));
+ }
+
+ // Get client id (aka form id)
+ final String clientId = component.getClientId();
+
+ // Is the instance there?
+ if (null == BRANCH_OFFICE_LIST_CONTROLLER) {
+ // Get bean from CDI directly
+ BRANCH_OFFICE_LIST_CONTROLLER = CDI.current().select(JobsBranchOfficeListWebViewBean.class).get();
+ }
+
+ // Is it registered?
+ final Boolean isRegistered = BRANCH_OFFICE_LIST_CONTROLLER.isEmailAddressRegistered(emailAddress);
+
+ // Is the email address already registered?
+ if ((!clientId.endsWith("resendEmailAddress")) && (isRegistered)) { //NOI18N
+ // Generate message
+ final String message = MessageFormat.format("Email address {0} is already registered.", emailAddress); //NOI18N
+
+ // No, then abort here
+ throw new ValidatorException(new FacesMessage(FacesMessage.SEVERITY_INFO, message, message));
+ } else if ((clientId.endsWith("resendEmailAddress")) && (!isRegistered)) { //NOI18N
+ // Generate message
+ final String message = MessageFormat.format("Email address {0} is not registered.", emailAddress); //NOI18N
+
+ // No, then abort here
+ throw new ValidatorException(new FacesMessage(FacesMessage.SEVERITY_INFO, message, message));
+ }
+ }
+
+}
public class JobsBasicDataEmailAddressValidator extends BaseStringValidator {
/**
- * Branch office backing bean
+ * Basic company data backing bean
*/
private static JobsBasicDataListWebViewController BASIC_DATA_LIST_CONTROLLER;
import javax.faces.validator.FacesValidator;
import javax.faces.validator.ValidatorException;
import org.mxchange.jcoreee.validator.string.BaseStringValidator;
-import org.mxchange.jjobs.beans.business.branchoffice.JobsBranchOfficeWebRequestBean;
-import org.mxchange.jjobs.beans.business.branchoffice.JobsBranchOfficeWebRequestController;
+import org.mxchange.jjobs.beans.business.branchoffice.list.JobsBranchOfficeListWebViewBean;
+import org.mxchange.jjobs.beans.business.branchoffice.list.JobsBranchOfficeListWebViewController;
/**
* A validator for branch office email address validation
/**
* Branch office backing bean
*/
- private static JobsBranchOfficeWebRequestController BRANCH_OFFICE_CONTROLLER;
+ private static JobsBranchOfficeListWebViewController BRANCH_OFFICE_LIST_CONTROLLER;
/**
* Email pattern
final String clientId = component.getClientId();
// Is the instance there?
- if (null == BRANCH_OFFICE_CONTROLLER) {
+ if (null == BRANCH_OFFICE_LIST_CONTROLLER) {
// Get bean from CDI directly
- BRANCH_OFFICE_CONTROLLER = CDI.current().select(JobsBranchOfficeWebRequestBean.class).get();
+ BRANCH_OFFICE_LIST_CONTROLLER = CDI.current().select(JobsBranchOfficeListWebViewBean.class).get();
}
// Is it registered?
- final Boolean isRegistered = BRANCH_OFFICE_CONTROLLER.isEmailAddressRegistered(emailAddress);
+ final Boolean isRegistered = BRANCH_OFFICE_LIST_CONTROLLER.isEmailAddressRegistered(emailAddress);
// Is the email address already registered?
if ((!clientId.endsWith("resendEmailAddress")) && (isRegistered)) { //NOI18N
#@TODO Please fix German umlauts!
ADMIN_EMPTY_LIST_BRANCH_OFFICE_OPENING_TIMES=Es wurden noch keine Oeffnungszeiten fuer eine neue Filiale hinzugefuegt.
#@TODO Please fix German umlauts!
-ADMIN_LIST_BRANCH_OFFICE_OPENING_TIMES_HEADER=Oeffnungszeiten der neuen Filiale auflisten
+ADMIN_LIST_BRANCH_OFFICE_OPENING_TIMES_HEADER=Oeffnungszeiten der Filiale auflisten
#@TODO Please fix German umlauts!
ADMIN_ADD_BRANCH_OFFICE_OPENING_TIME_TITLE=Oeffnungszeit zur Filiale hinzufuegen
#@TODO Please fix German umlauts!
LABEL_PAYMENT_TYPES=Bezahlungsarten
BRANCH_OFFICE=Filiale:
USER_HEADER=Benutzer:
+ADMIN_SINGLE_BRANCH_OFFICE_DETAILS_HEADER=Details zu einer einzelnen Filiale
+ADMIN_BRANCH_OFFICE_DATA_TAB_TITLE=Grunddaten der Filiale
+ADMIN_BRANCH_OFFICE_ADDRESS_TAB_TITLE=Adressdaten der Filiale
+ADMIN_BRANCH_OFFICE_BASIC_DETAILS_HEADER=Grundaten zur Filiale (Id-Nummer {0}):
+BRANCH_OFFICE_ID_NUMBER_TITLE=Id-Nummer zum Eintrag der Filiale
+BRANCH_OFFICE_NUMBER_HEADER=Filialnummer:
+BRANCH_OFFICE_NUMBER_TITLE=Nummer der Filiale
+ASSIGNED_BASIC_DATA_HEADER=Grunddaten des Unternehmens:
+ASSIGNED_BASIC_DATA_TO_BRANCH_OFFICE_TITLE=Grunddaten des Unternehmens zur Filiale
+ASSIGNED_CONTACT_PERSON_HEADER=Kontaktperson:
+ASSIGNED_CONTACT_PERSON_TO_BRANCH_OFFICE_TITLE=Der Filiale zugewiesene Kontaktperson
+NO_CONTACT_EMPLOYEE_ASSIGNED_TO_BRANCH_OFFICE=Es ist keine Kontaktperson der Filiale zugewiesen.
+ASSIGNED_OWNER_EMPLOYEE_HEADER=Besitzer oder Leiter:
+ASSIGNED_OWNER_EMPLOYEE_TO_BRANCH_OFFICE_TITLE=Zugewiesener Besitzer oder Leiter der Filiale
+NO_OWNER_EMPLOYEE_ASSIGNED_TO_BRANCH_OFFICE=Es ist kein Besitzer oder Leiter der Filiale zugewiesen.
+ASSIGNED_USER_OWNER_HEADER=Besitzender Benutzer:
+ASSIGNED_USER_OWNER_TO_BRANCH_OFFICE_TITLE=Der Filiale zugewiesener "besitzender" Benutzer
+NO_USER_ASSIGNED_AS_OWNER_TO_BRANCH_OFFICE=Es ist kein "besitzender" Benutzer der Filiale zugewiesen.
+EMAIL_ADDRESS_HEADER=Email-Adresse:
+EMAIL_ADDRESS_OF_BRANCH_OFFICE_TITLE=Email-Adresse der Filiale
+BRANCH_OFFICE_HAS_NO_EMAIL_ADDRESS=Die Filiale hat keine Email-Adresse
+LANDLINE_NUMBER_HEADER=Festnetznummer:
+ASSIGNED_LANDLINE_NUMBER_OF_BRANCH_OFFICE_TITLE=Der Filiale zugewiesene Festnetznummer
+NO_LANDLINE_NUMBER_ASSIGNED_TO_BRANCH_OFFICE=Es ist keine Festnetznummer der Filiale zugewiesen.
+FAX_NUMBER_HEADER=Faxnummer:
+ASSIGNED_FAX_NUMBER_OF_BRANCH_OFFICE_TITLE=Der Filiale zugewiesene Faxnummer.
+NO_FAX_NUMBER_ASSIGNED_TO_BRANCH_OFFICE=Es ist keine Faxnummer der Filiale zugewiesen.
+ADMIN_BRANCH_OFFICE_ADDRESS_DETAILS_HEADER=Adressdaten der Filiale Id {0}:
+STREET_NAME_HEADER=Strassenname:
+STREET_NAME_OF_BRANCH_OFFICE_TITLE=Strassenname der Filiale
+HOUSE_NUMBER_HEADER=Hausnummer:
+HOUSE_NUMBER_OF_BRANCH_OFFICE_TITLE=Hausnummer der Filiale
+LAST_HOUSE_NUMBER_HEADER=Letzte Hausnummer:
+LAST_HOUSE_NUMBER_OF_BRANCH_OFFICE_TITLE=Letzte Hausnummer der Filiale
+HOUSE_NUMBER_EXTENSION_HEADER=Hausnummerzusatz:
+HOUSE_NUMBER_EXTENSION_OF_BRANCH_OFFICE_TITLE=Hausnummerzusatz der Filiale
+STORE_HEADER=Geschoss:
+STORE_OF_BRANCH_OFFICE_TITLE=Geschoss der Filiale
+SUITE_NUMBER_HEADER=Suite-Nummer:
+ZIP_CODE_HEADER=Postleitzahl:
+ZIP_CODE_OF_BRANCH_OFFICE_TITLE=Postleitzahl der Filiale
+CITY_HEADER=Stadt:
+CITY_OF_BRANCH_OFFICE_TITLE=Stadt der Filiale
+COUNTRY_HEADER=Land:
+COUNTRY_OF_BRANCH_OFFICE_TITLE=Land der Filiale
+#@TODO Please fix German umlauts!
+ADMIN_OPENING_TIMES_TAB_TITLE=Oeffnungszeiten
+TAX_NUMBER_HEADER=Steuernummer:
ADMIN_BRANCH_OFFICE_OPENING_TIMES_LEGEND=Opening times of branch office:
TABLE_SUMMARY_ADMIN_LIST_BRANCH_OFFICE_OPENING_TIMES=This table lists new opening times of this branch office.
TABLE_SUMMARY_ADMIN_LIST_BRANCH_OFFICES=This table lists branch offices.
-ADMIN_EMPTY_LIST_BRANCH_OFFICE_OPENING_TIMES=There are no opening times for a new branch office beging setup.
-ADMIN_LIST_BRANCH_OFFICE_OPENING_TIMES_HEADER=List opening times of a new branch office
+ADMIN_EMPTY_LIST_BRANCH_OFFICE_OPENING_TIMES=There are no opening times for a new branch office being setup.
+ADMIN_LIST_BRANCH_OFFICE_OPENING_TIMES_HEADER=List opening times of a branch office
ADMIN_ADD_BRANCH_OFFICE_OPENING_TIME_TITLE=Add opening time to branch office
BUTTON_ADMIN_ADD_BRANCH_OFFICE_OPENING_TIME=Add opening time to branch office
ADMIN_BRANCH_OFFICE_OPENING_TIME_LEGEND=Single opening time of branch office:
BUTTON_ADMIN_ADD_HEADQUARTER=Add headquarter
ADMIN_HEADQUARTER_OPENING_TIMES_LEGEND=Opening times of headquarter:
TABLE_SUMMARY_ADMIN_LIST_HEADQUARTER_OPENING_TIMES=This table lists new opening times for headquarter.
-ADMIN_EMPTY_LIST_HEADQUARTER_OPENING_TIMES=There are no opening times for a new headquarter beging setup.
+ADMIN_EMPTY_LIST_HEADQUARTER_OPENING_TIMES=There are no opening times for a new headquarter being setup.
ADMIN_LIST_HEADQUARTER_OPENING_TIMES_HEADER=List opening times of a new headquarter
ADMIN_ADD_HEADQUARTER_OPENING_TIME_TITLE=Add opening time to headquarter
BUTTON_ADMIN_ADD_HEADQUARTER_OPENING_TIME=Add opening time to headquarter
LABEL_PAYMENT_TYPES=Payment types
BRANCH_OFFICE=Branch office:
USER_HEADER=User:
+ADMIN_SINGLE_BRANCH_OFFICE_DETAILS_HEADER=Details of a single branch office
+ADMIN_BRANCH_OFFICE_DATA_TAB_TITLE=Branch office basic data
+ADMIN_BRANCH_OFFICE_ADDRESS_TAB_TITLE=Address data of branch office
+ADMIN_BRANCH_OFFICE_BASIC_DETAILS_HEADER=Basic branch office details (id number {0}):
+BRANCH_OFFICE_ID_NUMBER_TITLE=Id number of branch office record
+BRANCH_OFFICE_NUMBER_HEADER=Branch office number:
+BRANCH_OFFICE_NUMBER_TITLE=Number of branch office
+ASSIGNED_BASIC_DATA_HEADER=Basic data of company:
+ASSIGNED_BASIC_DATA_TO_BRANCH_OFFICE_TITLE=Basic company data to branch office
+ASSIGNED_CONTACT_PERSON_HEADER=Contact person:
+ASSIGNED_CONTACT_PERSON_TO_BRANCH_OFFICE_TITLE=Assigned contact person of branch office
+NO_CONTACT_EMPLOYEE_ASSIGNED_TO_BRANCH_OFFICE=No contact person is assigned to branch office.
+ASSIGNED_OWNER_EMPLOYEE_HEADER=Owner or leader:
+ASSIGNED_OWNER_EMPLOYEE_TO_BRANCH_OFFICE_TITLE=Assigned owner or leader of branch office
+NO_OWNER_EMPLOYEE_ASSIGNED_TO_BRANCH_OFFICE=No owner or leader assigned to branch office.
+ASSIGNED_USER_OWNER_HEADER=Owning user:
+ASSIGNED_USER_OWNER_TO_BRANCH_OFFICE_TITLE=Assigned "owning" user of branch office
+NO_USER_ASSIGNED_AS_OWNER_TO_BRANCH_OFFICE=No "owning" user assigned to branch office.
+EMAIL_ADDRESS_HEADER=Email address:
+EMAIL_ADDRESS_OF_BRANCH_OFFICE_TITLE=Email address of branch office
+BRANCH_OFFICE_HAS_NO_EMAIL_ADDRESS=Branch office has no email address.
+LANDLINE_NUMBER_HEADER=Land-line number:
+ASSIGNED_LANDLINE_NUMBER_OF_BRANCH_OFFICE_TITLE=Assigned land-line number of branch office
+NO_LANDLINE_NUMBER_ASSIGNED_TO_BRANCH_OFFICE=No land-line number is assigned to branch office.
+FAX_NUMBER_HEADER=Fax number:
+ASSIGNED_FAX_NUMBER_OF_BRANCH_OFFICE_TITLE=Assigned fax number of branch office.
+NO_FAX_NUMBER_ASSIGNED_TO_BRANCH_OFFICE=No fax number is assigned to branch office.
+ADMIN_BRANCH_OFFICE_ADDRESS_DETAILS_HEADER=Address data of branch office id number {0}:
+STREET_NAME_HEADER=Street name:
+STREET_NAME_OF_BRANCH_OFFICE_TITLE=Street name of branch office
+HOUSE_NUMBER_HEADER=House number:
+HOUSE_NUMBER_OF_BRANCH_OFFICE_TITLE=House number of branch office
+LAST_HOUSE_NUMBER_HEADER=Last house number:
+LAST_HOUSE_NUMBER_OF_BRANCH_OFFICE_TITLE=Last house number of branch office
+HOUSE_NUMBER_EXTENSION_HEADER=House number extension:
+HOUSE_NUMBER_EXTENSION_OF_BRANCH_OFFICE_TITLE=House number extension of branch office
+STORE_HEADER=Store:
+STORE_OF_BRANCH_OFFICE_TITLE=Store of branch office
+SUITE_NUMBER_HEADER=Suite number:
+ZIP_CODE_HEADER=ZIP code:
+ZIP_CODE_OF_BRANCH_OFFICE_TITLE=ZIP code of branch office
+CITY_HEADER=City:
+CITY_OF_BRANCH_OFFICE_TITLE=City of branch office
+COUNTRY_HEADER=Country:
+COUNTRY_OF_BRANCH_OFFICE_TITLE=Country of branch office
+ADMIN_OPENING_TIMES_TAB_TITLE=Opening times
+TAX_NUMBER_HEADER=Tax number:
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-->
-<facelet-taglib version="2.2"
- xmlns="http://xmlns.jcp.org/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-facelettaglibrary_2_2.xsd">
+<facelet-taglib
+ version="2.2"
+ xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-facelettaglibrary_2_2.xsd"
+>
<namespace>http://mxchange.org/jsf/core/links</namespace>
<tag>
<tag-name>outputUserProfileLink</tag-name>
xmlns:f="http://xmlns.jcp.org/jsf/core"
xmlns:h="http://xmlns.jcp.org/jsf/html"
xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
- xmlns:p="http://primefaces.org/ui">
+ xmlns:p="http://primefaces.org/ui"
+ >
<p:column>
<p:outputLabel for="contactId" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_ID}" />
<p:column>
<p:outputLabel for="contactCreated" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_CREATED}" />
- <h:outputText id="contactCreated" styleClass="table-data-field" value="#{beanHelper.contact.contactCreated.time}">
- <f:convertDateTime for="contactCreated" type="both" />
+ <h:outputText id="contactCreated" styleClass="table-data-field" value="#{beanHelper.contact.contactCreated}">
+ <f:convertDateTime type="both" />
</h:outputText>
</p:column>
<p:column>
<p:outputLabel for="contactUpdated" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_UPDATED}" />
- <h:outputText id="contactUpdated" styleClass="table-data-field" value="#{beanHelper.contact.contactUpdated.time}">
- <f:convertDateTime for="contactUpdated" type="both" />
+ <h:outputText id="contactUpdated" styleClass="table-data-field" value="#{beanHelper.contact.contactUpdated}">
+ <f:convertDateTime type="both" />
</h:outputText>
</p:column>
<p:column>
<p:outputLabel for="contactBirthday" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_BIRTHDAY}" />
- <h:outputText id="contactBirthday" styleClass="table-data-field" value="#{beanHelper.contact.contactBirthday.time}">
- <f:convertDateTime for="contactBirthday" type="date" />
+ <h:outputText id="contactBirthday" styleClass="table-data-field" value="#{beanHelper.contact.contactBirthday}">
+ <f:convertDateTime type="date" dateStyle="medium" />
</h:outputText>
</p:column>
<!-- @TODO maybe later add phone numbers as "main" numbers? //-->
<ui:composition
xmlns="http://www.w3.org/1999/xhtml"
- xmlns:f="http://xmlns.jcp.org/jsf/core"
xmlns:h="http://xmlns.jcp.org/jsf/html"
xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
- xmlns:p="http://primefaces.org/ui">
+ xmlns:p="http://primefaces.org/ui"
+ >
<p:column>
<p:outputLabel for="contactPersonalTitle" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_PERSONAL_TITLE}" />
xmlns:f="http://xmlns.jcp.org/jsf/core"
xmlns:h="http://xmlns.jcp.org/jsf/html"
xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
- xmlns:p="http://primefaces.org/ui">
+ xmlns:p="http://primefaces.org/ui"
+ >
<!--
@TODO title="#{msg.ADMIN_CONTACT_PERSONAL_DATA_LEGEND_TITLE}"
-->
<p:fieldset legend="#{msg.ADMIN_CONTACT_PERSONAL_DATA_LEGEND}" rendered="#{empty rendered or rendered}">
- <p:panelGrid layout="grid" columns="2" columnClasses="ui-grid-col-4,ui-grid-col-8" styleClass="table table-full ui-noborder">
+ <p:panelGrid
+ layout="grid"
+ columns="2"
+ columnClasses="ui-grid-col-4,ui-grid-col-8"
+ styleClass="ui-noborder"
+ >
<p:outputLabel for="personalTitle" value="#{msg.ADMIN_CONTACT_PERSONAL_TITLE}" />
<core:outputPersonalTitleSelectionBox targetController="#{adminContactController}" allowEmptyRequiredData="#{allowEmptyRequiredData}" />
value="#{adminContactController.houseNumber}"
validatorMessage="#{msg.ENTERED_HOUSE_NUMBER_INVALID}"
>
- <f:validateLongRange for="houseNumber" minimum="1" maximum="500" />
+ <f:validateLongRange minimum="1" maximum="500" />
</p:inputText>
<p:outputLabel for="houseNumberExtension" value="#{msg.ADMIN_DATA_HOUSE_NUMBER_EXTENSION}" />
<p:outputLabel for="zipCode" value="#{msg.ADMIN_DATA_ZIP_CODE}" />
<p:inputText id="zipCode" size="5" maxlength="6" value="#{adminContactController.zipCode}" validatorMessage="#{msg.ENTERED_ZIP_CODE_INVALID}">
- <f:validateLongRange for="zipCode" minimum="1" maximum="99999" />
+ <f:validateLongRange minimum="1" maximum="99999" />
</p:inputText>
<p:outputLabel for="city" value="#{msg.ADMIN_DATA_CITY}" />
<ui:composition
xmlns="http://www.w3.org/1999/xhtml"
xmlns:core="http://mxchange.org/jsf/core/widgets"
- 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:p="http://primefaces.org/ui">
+ xmlns:p="http://primefaces.org/ui"
+ >
<h:panelGroup styleClass="para" layout="block" rendered="#{empty rendered or rendered == true}">
<fieldset class="fieldset">
<ui:composition
xmlns="http://www.w3.org/1999/xhtml"
xmlns:core="http://mxchange.org/jsf/core/widgets"
- 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:p="http://primefaces.org/ui">
+ xmlns:p="http://primefaces.org/ui"
+ >
<h:panelGroup styleClass="para" layout="block" rendered="#{empty rendered or rendered == true}">
<fieldset class="fieldset">
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:p="http://primefaces.org/ui">
+ xmlns:p="http://primefaces.org/ui"
+ >
<h:panelGroup styleClass="para" layout="block" rendered="#{empty rendered or rendered == true}">
<fieldset class="fieldset">
</h:panelGroup>
<h:panelGroup styleClass="table-row" layout="block">
- <div class="table-left-medium">
- <p:outputLabel for="mobileProvider" value="#{msg.ADMIN_EDIT_MOBILE_PROVIDER}" />
- </div>
+ <p:outputLabel for="mobileProvider" value="#{msg.ADMIN_EDIT_MOBILE_PROVIDER}" />
- <div class="table-right-medium">
- <p:selectOneMenu
- id="mobileProvider"
- value="#{adminPhoneController.mobileProvider}"
- filter="true"
- filterMatchMode="contains"
- required="true"
- requiredMessage="#{msg.ADMIN_MOBILE_PROVIDER_REQUIRED}"
- >
- <f:converter converterId="MobileProviderConverter" />
- <f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
- <f:selectItems value="#{mobileProviderController.allMobileProviders()}" var="mobileProvider" itemValue="#{mobileProvider}" itemLabel="#{mobileProvider.providerCountry.countryExternalDialPrefix}#{mobileProvider.providerDialPrefix} (#{mobileProvider.providerName})" />
- </p:selectOneMenu>
- </div>
+ <p:selectOneMenu
+ id="mobileProvider"
+ value="#{adminPhoneController.mobileProvider}"
+ filter="true"
+ filterMatchMode="contains"
+ required="true"
+ requiredMessage="#{msg.ADMIN_MOBILE_PROVIDER_REQUIRED}"
+ >
+ <f:converter converterId="MobileProviderConverter" />
+ <f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
+ <f:selectItems value="#{mobileProviderController.allMobileProviders()}" var="mobileProvider" itemValue="#{mobileProvider}" itemLabel="#{mobileProvider.providerCountry.countryExternalDialPrefix}#{mobileProvider.providerDialPrefix} (#{mobileProvider.providerName})" />
+ </p:selectOneMenu>
</h:panelGroup>
<h:panelGroup styleClass="error-container" layout="block">
xmlns:f="http://xmlns.jcp.org/jsf/core"
xmlns:h="http://xmlns.jcp.org/jsf/html"
xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
- xmlns:p="http://primefaces.org/ui">
+ xmlns:p="http://primefaces.org/ui"
+ >
<!--
@TODO title="#{msg.ADMIN_USER_DATA_EMAIL_LEGEND_TITLE}"
-->
<ui:fragment rendered="#{not empty mode}">
<p:fieldset legend="#{msg.ADMIN_USER_DATA_EMAIL_LEGEND}">
- <p:panelGrid columns="2" columnClasses="ui-grid-col-4,ui-grid-col-8" styleClass="table table-full ui-noborder">
+ <p:panelGrid
+ columns="2"
+ columnClasses="ui-grid-col-4,ui-grid-col-8"
+ styleClass="ui-noborder"
+ >
<p:outputLabel for="userName" value="#{msg.ADMIN_PERSONAL_DATA_ENTER_USER_NAME}" />
<p:inputText id="userName" size="20" maxlength="255" value="#{adminUserController.userName}" required="true" requiredMessage="#{msg.ADMIN_USER_NAME_IS_REQUIRED}" />
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:p="http://primefaces.org/ui">
+ xmlns:p="http://primefaces.org/ui"
+ >
<ui:fragment rendered="#{empty rendered or rendered}">
<ul class="navbar-mini">
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:p="http://primefaces.org/ui">
+ xmlns:p="http://primefaces.org/ui"
+ >
<ui:fragment rendered="#{empty rendered or rendered}">
<ul class="navbar-mini">
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:p="http://primefaces.org/ui">
+ xmlns:p="http://primefaces.org/ui"
+ >
<ui:fragment rendered="#{empty rendered or rendered}">
<ul class="navbar-mini">
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:p="http://primefaces.org/ui">
+ xmlns:p="http://primefaces.org/ui"
+ >
<ui:fragment rendered="#{empty rendered or rendered}">
<ul class="navbar-mini">
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:p="http://primefaces.org/ui">
+ xmlns:p="http://primefaces.org/ui"
+ >
<ui:fragment rendered="#{empty rendered or rendered}">
<ul class="navbar-mini">
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:p="http://primefaces.org/ui">
+ xmlns:p="http://primefaces.org/ui"
+ >
<ui:fragment rendered="#{empty rendered or rendered}">
<ul class="navbar-mini">
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:p="http://primefaces.org/ui">
+ xmlns:p="http://primefaces.org/ui"
+ >
<ui:fragment rendered="#{empty rendered or rendered}">
<ul class="navbar-mini">
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:p="http://primefaces.org/ui">
+ xmlns:p="http://primefaces.org/ui"
+ >
<ui:fragment rendered="#{empty rendered or rendered}">
<ul class="navbar-mini">
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:p="http://primefaces.org/ui">
+ xmlns:p="http://primefaces.org/ui"
+ >
<ui:fragment rendered="#{empty rendered or rendered}">
<ul class="navbar-mini">
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:p="http://primefaces.org/ui">
+ xmlns:p="http://primefaces.org/ui"
+ >
<ui:fragment rendered="#{empty rendered or rendered}">
<ul class="navbar-mini">
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:p="http://primefaces.org/ui">
+ xmlns:p="http://primefaces.org/ui"
+ >
<ui:fragment rendered="#{empty rendered or rendered}">
<ul class="navbar-mini">
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:p="http://primefaces.org/ui">
+ xmlns:p="http://primefaces.org/ui"
+ >
<ui:fragment rendered="#{empty rendered or rendered}">
<ul class="navbar-mini">
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:p="http://primefaces.org/ui">
+ xmlns:p="http://primefaces.org/ui"
+ >
<ui:fragment rendered="#{empty rendered or rendered}">
<ul class="navbar-mini">
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:p="http://primefaces.org/ui">
+ xmlns:p="http://primefaces.org/ui"
+ >
<h:panelGroup styleClass="table" layout="block">
<h:panelGroup styleClass="table-header" layout="block" rendered="#{not empty renderHeader and renderHeader}">
<!--
@TODO: summary="#{msg.ADMIN_TABLE_SUMMARY_SHOW_FAX_NUMBER_DATA}"
-->
- <p:panelGrid columns="2" styleClass="table table-full" rendered="#{empty rendered or rendered == true}">
+ <p:panelGrid
+ columns="2"
+ rendered="#{empty rendered or rendered == true}"
+ >
<f:facet name="header">
<h:outputText value="#{msg.ADMIN_SHOW_FAX_NUMBER_DATA_HEADER}" />
</f:facet>
- <h:column>
+ <p:column>
<h:panelGroup>
<p:outputLabel for="faxNumberId" styleClass="table-data-label" value="#{msg.ADMIN_LABEL_ID_NUMBER}" />
<p:message for="faxNumberId" />
</h:panelGroup>
- </h:column>
+ </p:column>
- <h:column>
+ <p:column>
<p:outputLabel for="faxNumber" styleClass="table-data-label" value="#{msg.ADMIN_SHOW_FAX_NUMBER_COMPLETE}" />
- <h:outputText id="faxNumber" styleClass="table-data-field" value="#{faxNumber.phoneCountry.countryAbroadDialPrefix}#{faxNumber.phoneCountry.countryPhoneCode} (#{faxNumber.phoneAreaCode}) #{faxNumber.phoneNumber}" />
- </h:column>
+ <h:outputText id="faxNumber" styleClass="table-data-field" value="#{beanHelper.renderPhoneNumber(faxNumber)}" />
+ </p:column>
- <h:column>
+ <p:column>
<p:outputLabel for="faxCreated" styleClass="table-data-label" value="#{msg.ADMIN_SHOW_PHONE_CREATED}" />
- <h:outputText id="faxCreated" styleClass="table-data-field" value="#{faxNumber.phoneEntryCreated.time}">
- <f:convertDateTime for="contactCreated" type="both" />
+ <h:outputText id="faxCreated" styleClass="table-data-field" value="#{faxNumber.phoneEntryCreated}">
+ <f:convertDateTime type="both" />
</h:outputText>
- </h:column>
+ </p:column>
- <h:column>
+ <p:column>
<p:outputLabel for="faxUpdated" styleClass="table-data-label" value="#{msg.ADMIN_SHOW_PHONE_UPDATED}" />
- <h:outputText id="faxUpdated" styleClass="table-data-field" value="#{faxNumber.phoneEntryUpdated.time}">
- <f:convertDateTime for="contactUpdated" type="both" />
+ <h:outputText id="faxUpdated" styleClass="table-data-field" value="#{faxNumber.phoneEntryUpdated}">
+ <f:convertDateTime type="both" />
</h:outputText>
- </h:column>
+ </p:column>
- <h:column rendered="#{empty showAdminMiniLinks or showAdminMiniLinks == true}">
+ <p:column rendered="#{empty showAdminMiniLinks or showAdminMiniLinks == true}">
<p:outputLabel styleClass="table-data-label" value="#{msg.ADMIN_SHOW_ADMINISTRATIVE_LINKS}" />
<h:panelGroup styleClass="table-data-field" layout="block">
- <links:outputFaxNumberAdminMiniLinks faxNumber="#{faxNumber}" contact="#{contact}" renderShowLink="#{renderShowLink}" />
+ <links:outputFaxNumberAdminMiniLinks faxNumber="#{faxNumber}" contact="#{contact}" renderShowLink="#{renderShowLink == true}" />
</h:panelGroup>
- </h:column>
+ </p:column>
</p:panelGrid>
</ui:composition>
<!--
@TODO: summary="#{msg.ADMIN_TABLE_SUMMARY_SHOW_LAND_LINE_NUMBER_DATA}"
-->
- <p:panelGrid columns="2" styleClass="table table-full" rendered="#{empty rendered or rendered == true}">
+ <p:panelGrid
+ columns="2"
+ rendered="#{empty rendered or rendered == true}"
+ >
<f:facet name="header">
<h:outputText value="#{msg.ADMIN_SHOW_LAND_LINE_NUMBER_DATA_HEADER}" />
</f:facet>
- <h:column>
+ <p:column>
<h:panelGroup>
<p:outputLabel for="landLineNumberId" styleClass="table-data-label" value="#{msg.ADMIN_LABEL_ID_NUMBER}" />
<p:message for="landLineNumberId" />
</h:panelGroup>
- </h:column>
+ </p:column>
- <h:column>
+ <p:column>
<p:outputLabel for="landLineNumber" styleClass="table-data-label" value="#{msg.ADMIN_SHOW_LAND_LINE_NUMBER_COMPLETE}" />
- <h:outputText id="landLineNumber" styleClass="table-data-field" value="#{landLineNumber.phoneCountry.countryAbroadDialPrefix}#{landLineNumber.phoneCountry.countryPhoneCode} (#{landLineNumber.phoneAreaCode}) #{landLineNumber.phoneNumber}" />
- </h:column>
+ <h:outputText id="landLineNumber" styleClass="table-data-field" value="#{beanHelper.renderPhoneNumber(landLineNumber)}" />
+ </p:column>
- <h:column>
+ <p:column>
<p:outputLabel for="landLineCreated" styleClass="table-data-label" value="#{msg.ADMIN_SHOW_PHONE_CREATED}" />
- <h:outputText id="landLineCreated" styleClass="table-data-field" value="#{landLineNumber.phoneEntryCreated.time}">
- <f:convertDateTime for="contactCreated" type="both" />
+ <h:outputText id="landLineCreated" styleClass="table-data-field" value="#{landLineNumber.phoneEntryCreated}">
+ <f:convertDateTime type="both" />
</h:outputText>
- </h:column>
+ </p:column>
- <h:column>
+ <p:column>
<p:outputLabel for="landLineUpdated" styleClass="table-data-label" value="#{msg.ADMIN_SHOW_PHONE_UPDATED}" />
- <h:outputText id="landLineUpdated" styleClass="table-data-field" value="#{landLineNumber.phoneEntryUpdated.time}">
- <f:convertDateTime for="contactUpdated" type="both" />
+ <h:outputText id="landLineUpdated" styleClass="table-data-field" value="#{landLineNumber.phoneEntryUpdated}">
+ <f:convertDateTime type="both" />
</h:outputText>
- </h:column>
+ </p:column>
- <h:column rendered="#{empty showAdminMiniLinks or showAdminMiniLinks == true}">
+ <p:column rendered="#{empty showAdminMiniLinks or showAdminMiniLinks == true}">
<p:outputLabel styleClass="table-data-label" value="#{msg.ADMIN_SHOW_ADMINISTRATIVE_LINKS}" />
<h:panelGroup styleClass="table-data-field" layout="block">
- <links:outputLandLineNumberAdminMiniLinks landLineNumber="#{landLineNumber}" contact="#{contact}" renderShowLink="#{renderShowLink}" />
+ <links:outputLandLineNumberAdminMiniLinks landLineNumber="#{landLineNumber}" contact="#{contact}" renderShowLink="#{renderShowLink == true}" />
</h:panelGroup>
- </h:column>
+ </p:column>
</p:panelGrid>
</ui:composition>
<!--
@TODO: summary="#{msg.ADMIN_TABLE_SUMMARY_SHOW_MOBILE_NUMBER_DATA}"
-->
- <p:panelGrid columns="2" styleClass="table table-full" rendered="#{empty rendered or rendered == true}">
+ <p:panelGrid
+ columns="2"
+ rendered="#{empty rendered or rendered == true}"
+ >
<f:facet name="header">
<h:outputText value="#{msg.ADMIN_SHOW_MOBILE_NUMBER_DATA_HEADER}" />
</f:facet>
- <h:column>
+ <p:column>
<p:outputLabel for="mobileNumberId" styleClass="table-data-label" value="#{msg.ADMIN_LABEL_ID_NUMBER}" />
<h:outputText id="mobileNumberId" styleClass="table-data-field" value="#{mobileNumber.phoneId}" />
- </h:column>
+ </p:column>
- <h:column>
+ <p:column>
<p:outputLabel for="mobileProvider" styleClass="table-data-label" value="#{msg.ADMIN_SHOW_MOBILE_PROVIDER_NAME}" />
<p:link id="mobileProvider" outcome="admin_show_mobile_provider">
<h:outputText styleClass="table-data-field" value="#{mobileNumber.mobileProvider.providerName}" />
<f:param name="providerId" value="#{mobileNumber.mobileProvider.providerId}" />
</p:link>
- </h:column>
+ </p:column>
- <h:column>
+ <p:column>
<p:outputLabel for="mobileNumber" styleClass="table-data-label" value="#{msg.ADMIN_SHOW_MOBILE_NUMBER_COMPLETE}" />
- <h:outputText id="mobileNumber" styleClass="table-data-field" value="#{mobileNumber.mobileProvider.providerCountry.countryExternalDialPrefix}#{mobileNumber.mobileProvider.providerDialPrefix}-#{mobileNumber.phoneNumber}" />
- </h:column>
+ <h:outputText id="mobileNumber" styleClass="table-data-field" value="#{beanHelper.renderMobileNumber(mobileNumber)}" />
+ </p:column>
- <h:column>
+ <p:column>
<p:outputLabel for="mobileCreated" styleClass="table-data-label" value="#{msg.ADMIN_SHOW_PHONE_CREATED}" />
- <h:outputText id="mobileCreated" styleClass="table-data-field" value="#{mobileNumber.phoneEntryCreated.time}">
- <f:convertDateTime for="contactCreated" type="both" />
+ <h:outputText id="mobileCreated" styleClass="table-data-field" value="#{mobileNumber.phoneEntryCreated}">
+ <f:convertDateTime type="both" />
</h:outputText>
- </h:column>
+ </p:column>
- <h:column>
+ <p:column>
<p:outputLabel for="mobileUpdated" styleClass="table-data-label" value="#{msg.ADMIN_SHOW_PHONE_UPDATED}" />
- <h:outputText id="mobileUpdated" styleClass="table-data-field" value="#{mobileNumber.phoneEntryUpdated.time}">
- <f:convertDateTime for="contactUpdated" type="both" />
+ <h:outputText id="mobileUpdated" styleClass="table-data-field" value="#{mobileNumber.phoneEntryUpdated}">
+ <f:convertDateTime type="both" />
</h:outputText>
- </h:column>
+ </p:column>
- <h:column rendered="#{empty showAdminMiniLinks or showAdminMiniLinks == true}">
+ <p:column rendered="#{empty showAdminMiniLinks or showAdminMiniLinks == true}">
<p:outputLabel styleClass="table-data-label" value="#{msg.ADMIN_SHOW_ADMINISTRATIVE_LINKS}" />
<h:panelGroup styleClass="table-data-field" layout="block">
- <links:outputMobileNumberAdminMiniLinks mobileNumber="#{mobileNumber}" contact="#{contact}" renderShowLink="#{renderShowLink}" />
+ <links:outputMobileNumberAdminMiniLinks mobileNumber="#{mobileNumber}" contact="#{contact}" renderShowLink="#{renderShowLink == true}" />
</h:panelGroup>
- </h:column>
+ </p:column>
</p:panelGrid>
</ui:composition>
xmlns="http://www.w3.org/1999/xhtml"
xmlns:f="http://xmlns.jcp.org/jsf/core"
xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
- xmlns:p="http://primefaces.org/ui">
+ xmlns:p="http://primefaces.org/ui"
+ >
<p:selectOneMenu
id="#{id}"
xmlns:core="http://mxchange.org/jsf/core/widgets"
xmlns:f="http://java.sun.com/jsf/core"
xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
- xmlns:p="http://primefaces.org/ui">
+ xmlns:p="http://primefaces.org/ui"
+ >
- <p:panelGrid layout="grid" columns="3" styleClass="table table-full ui-noborder" rendered="#{empty rendered or rendered == true}">
+ <p:panelGrid
+ layout="grid"
+ columns="3"
+ styleClass="ui-noborder"
+ rendered="#{empty rendered or rendered == true}"
+ >
<core:outputCountrySelector id="faxCountry" styleClass="select" value="#{targetController.faxCountry}" />
<p:inputText id="faxAreaCode" size="5" maxlength="10" value="#{targetController.faxAreaCode}">
xmlns:core="http://mxchange.org/jsf/core/widgets"
xmlns:f="http://java.sun.com/jsf/core"
xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
- xmlns:p="http://primefaces.org/ui">
+ xmlns:p="http://primefaces.org/ui"
+ >
- <p:panelGrid layout="grid" columns="3" styleClass="table table-full ui-noborder" rendered="#{empty rendered or rendered == true}">
+ <p:panelGrid
+ layout="grid"
+ columns="3"
+ styleClass="ui-noborder"
+ rendered="#{empty rendered or rendered == true}"
+ >
<core:outputCountrySelector id="landLineCountry" styleClass="select" value="#{targetController.landLineCountry}" />
<p:inputText id="landLineAreaCode" size="5" maxlength="10" value="#{targetController.landLineAreaCode}">
xmlns="http://www.w3.org/1999/xhtml"
xmlns:f="http://java.sun.com/jsf/core"
xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
- xmlns:p="http://primefaces.org/ui">
+ xmlns:p="http://primefaces.org/ui"
+ >
<p:panelGrid layout="grid" columns="2" rendered="#{empty rendered or rendered == true}">
<p:selectOneMenu
xmlns="http://www.w3.org/1999/xhtml"
xmlns:f="http://java.sun.com/jsf/core"
xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
- xmlns:p="http://primefaces.org/ui">
+ xmlns:p="http://primefaces.org/ui"
+ >
<p:selectOneRadio
id="personalTitle"
--- /dev/null
+<?xml version="1.0" encoding="UTF-8" ?>
+<ui:composition
+ xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:h="http://xmlns.jcp.org/jsf/html"
+ xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+ xmlns:p="http://primefaces.org/ui"
+ >
+ <p:dataTable
+ id="#{id}"
+ var="openingTime"
+ value="#{value}"
+ rows="#{rows}"
+ reflow="true"
+ summary="#{summary}"
+ emptyMessage="#{emptyMessage}"
+ widgetVar="#{widgetWar}"
+ rendered="#{empty rendered or rendered}"
+ >
+
+ <f:facet name="header">
+ <h:outputText value="#{headerMessage}" />
+ </f:facet>
+
+ <p:column headerText="#{msg.ADMIN_START_WEEK_DAY}">
+ <h:outputText value="#{openingTime.openingStartDay.toString()}" />
+ </p:column>
+
+ <p:column headerText="#{msg.ADMIN_END_WEEK_DAY}">
+ <h:outputText value="#{openingTime.openingEndDay.toString()}" />
+ </p:column>
+
+ <p:column headerText="#{msg.ADMIN_START_TIME}">
+ <h:outputText value="#{openingTime.openingStartTime}">
+ <f:convertDateTime type="time" timeStyle="short" />
+ </h:outputText>
+ </p:column>
+
+ <p:column headerText="#{msg.ADMIN_END_TIME}">
+ <h:outputText value="#{openingTime.openingEndTime}">
+ <f:convertDateTime type="time" timeStyle="short" />
+ </h:outputText>
+ </p:column>
+ </p:dataTable>
+</ui:composition>
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:p="http://primefaces.org/ui">
+ xmlns:p="http://primefaces.org/ui"
+ >
<core:outputMessageBox id="nonpublic-user-profile" message="#{msg.USER_PROFILE_NOT_PUBLICLY_VISIBLE}" boxStyleClass="message-mini" messageStyleClass="notice" rendered="#{not empty user and not profileController.isProfileLinkVisibleByUser(user)}" />
xmlns:core="http://mxchange.org/jsf/core/widgets"
xmlns:f="http://java.sun.com/jsf/core"
xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
- xmlns:p="http://primefaces.org/ui">
+ xmlns:p="http://primefaces.org/ui"
+ >
<p:row rendered="#{empty rendered or rendered == true}">
<p:outputLabel for="faxNumber" value="#{labelMessage}" />
xmlns:core="http://mxchange.org/jsf/core/widgets"
xmlns:f="http://java.sun.com/jsf/core"
xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
- xmlns:p="http://primefaces.org/ui">
+ xmlns:p="http://primefaces.org/ui"
+ >
<p:row rendered="#{empty rendered or rendered == true}">
<p:outputLabel for="landLineNumber" value="#{labelMessage}" />
xmlns="http://www.w3.org/1999/xhtml"
xmlns:f="http://java.sun.com/jsf/core"
xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
- xmlns:p="http://primefaces.org/ui">
+ xmlns:p="http://primefaces.org/ui"
+ >
<p:row rendered="#{empty rendered or rendered == true}">
<p:outputLabel for="profileMode" value="#{labelMessage}" />
<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
- xmlns="http://www.w3.org/1999/xhtml"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
- xmlns:h="http://xmlns.jcp.org/jsf/html"
- xmlns:f="http://xmlns.jcp.org/jsf/core">
+<ui:composition
+ template="/WEB-INF/templates/admin/admin_base.tpl"
+ xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+ xmlns:h="http://xmlns.jcp.org/jsf/html"
+ >
<ui:define name="document_admin_title">
<h:outputText value="#{msg.PAGE_TITLE_ADMIN_FOO}" />
<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/#{userLoginController.baseTemplatePathName}_base.tpl"
- xmlns="http://www.w3.org/1999/xhtml"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
- xmlns:h="http://xmlns.jcp.org/jsf/html"
- xmlns:f="http://xmlns.jcp.org/jsf/core">
+<ui:composition
+ template="/WEB-INF/templates/#{userLoginController.baseTemplatePathName}_base.tpl"
+ xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+ xmlns:h="http://xmlns.jcp.org/jsf/html"
+ >
<ui:define name="document_guest_title">
<h:outputText value="#{msg.PAGE_TITLE_INDEX_FOO}" />
<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/guest/guest_base.tpl"
- xmlns="http://www.w3.org/1999/xhtml"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
- xmlns:h="http://xmlns.jcp.org/jsf/html"
- xmlns:f="http://xmlns.jcp.org/jsf/core">
+<ui:composition
+ template="/WEB-INF/templates/guest/guest_base.tpl"
+ xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+ xmlns:h="http://xmlns.jcp.org/jsf/html"
+ >
<ui:define name="document_guest_title">
<h:outputText value="#{msg.PAGE_TITLE_INDEX_FOO}" />
<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/login/user/user_base.tpl"
- xmlns="http://www.w3.org/1999/xhtml"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
- xmlns:h="http://xmlns.jcp.org/jsf/html"
- xmlns:f="http://xmlns.jcp.org/jsf/core">
+<ui:composition
+ template="/WEB-INF/templates/login/user/user_base.tpl"
+ xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+ xmlns:h="http://xmlns.jcp.org/jsf/html"
+ >
<ui:define name="document_login_title">
<h:outputText value="#{msg.PAGE_TITLE_LOGIN_FOO}" />
xmlns:f="http://xmlns.jcp.org/jsf/core"
xmlns:h="http://xmlns.jcp.org/jsf/html"
xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
- xmlns:p="http://primefaces.org/ui">
+ xmlns:p="http://primefaces.org/ui"
+ >
<h:panelGroup styleClass="para" layout="block">
<p:fieldset legend="#{msg.ADMIN_BASIC_DATA_LEGEND}">
- <p:panelGrid columns="2" columnClasses="ui-grid-col-4,ui-grid-col-8" styleClass="table table-full ui-noborder">
+ <p:panelGrid
+ columns="2"
+ columnClasses="ui-grid-col-4,ui-grid-col-8"
+ styleClass="ui-noborder"
+ >
<p:outputLabel for="companyName" value="#{msg.ADMIN_BASIC_DATA_COMPANY_NAME}" />
<p:inputText
id="companyName"
xmlns:validator="http://mxchange.org/jsf/core/validators"
xmlns:f="http://xmlns.jcp.org/jsf/core"
xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
- xmlns:p="http://primefaces.org/ui">
+ xmlns:p="http://primefaces.org/ui"
+ >
<p:fieldset legend="#{msg.ADMIN_BRANCH_OFFICE_DATA_LEGEND}">
- <p:panelGrid layout="grid" columns="2" columnClasses="ui-grid-col-4,ui-grid-col-8" styleClass="table table-full ui-noborder">
+ <p:panelGrid
+ layout="grid"
+ columns="2"
+ columnClasses="ui-grid-col-4,ui-grid-col-8"
+ styleClass="ui-noborder"
+ >
<p:outputLabel for="branchCompany" value="#{msg.ADMIN_ASSIGN_BASIC_DATA_BRANCH_OFFICE}" />
<p:selectOneMenu
id="branchCompany"
</p:selectOneMenu>
<p:outputLabel for="branchEmailAddress" value="#{msg.ADMIN_ENTER_BRANCH_OFFICE_EMAIL_ADDRESS}" />
- <p:inputText id="branchEmailAddress" size="20" maxlength="255" value="#{adminBranchOfficeController.branchEmailAddress}" validatorMessage="#{msg.ENTERED_EMAIL_ADDRESS_IS_INVALID}">
- <validator:basicDataEmailAddressValidator allowEmptyRequiredData="true" />
+ <p:inputText
+ id="branchEmailAddress"
+ size="40"
+ maxlength="255"
+ value="#{adminBranchOfficeController.branchEmailAddress}"
+ validatorMessage="#{msg.ENTERED_EMAIL_ADDRESS_IS_INVALID}"
+ >
+ <validator:branchOfficeEmailAddressValidator allowEmptyRequiredData="true" />
</p:inputText>
<p:outputLabel for="landLineCountry" value="#{msg.ADMIN_ENTER_BRANCH_OFFICE_LAND_LINE_NUMBER}" />
</p:fieldset>
<p:fieldset legend="#{msg.ADMIN_BRANCH_OFFICE_ADDRESS_LEGEND}">
- <p:panelGrid layout="grid" columns="2" columnClasses="ui-grid-col-4,ui-grid-col-8" styleClass="table table-full ui-noborder">
+ <p:panelGrid
+ layout="grid"
+ columns="2"
+ columnClasses="ui-grid-col-4,ui-grid-col-8"
+ styleClass="ui-noborder"
+ >
<p:outputLabel for="branchStreet" value="#{msg.ADMIN_DATA_STREET_NAME}" />
<p:inputText id="branchStreet" size="20" maxlength="255" value="#{adminBranchOfficeController.branchStreet}" required="true" requiredMessage="#{msg.ADMIN_BRANCH_OFFICE_STREET_NAME_REQUIRED}" />
<p:outputLabel for="branchHouseNumber" value="#{msg.ADMIN_DATA_HOUSE_NUMBER}" />
<p:inputText id="branchHouseNumber" size="3" maxlength="5" value="#{adminBranchOfficeController.branchHouseNumber}" validatorMessage="#{msg.ENTERED_HOUSE_NUMBER_INVALID}" required="true" requiredMessage="#{msg.ADMIN_BRANCH_OFFICE_HOUSE_NUMBER_REQUIRED}">
- <f:validateLongRange for="branchHouseNumber" minimum="1" maximum="500" />
+ <f:validateLongRange minimum="1" maximum="500" />
</p:inputText>
<p:outputLabel for="branchLastHouseNumber" value="#{msg.ADMIN_DATA_LAST_HOUSE_NUMBER}" />
<p:inputText id="branchLastHouseNumber" size="3" maxlength="5" value="#{adminBranchOfficeController.branchLastHouseNumber}" validatorMessage="#{msg.ENTERED_HOUSE_NUMBER_INVALID}">
- <f:validateLongRange for="branchLastHouseNumber" minimum="1" maximum="500" />
+ <f:validateLongRange minimum="1" maximum="500" />
</p:inputText>
<p:outputLabel for="branchHouseNumberExtension" value="#{msg.ADMIN_DATA_HOUSE_NUMBER_EXTENSION}" />
<p:outputLabel for="branchStore" value="#{msg.ADMIN_ENTER_DATA_STORE}" />
<p:inputText id="branchStore" size="3" maxlength="5" value="#{adminBranchOfficeController.branchStore}" validatorMessage="#{msg.ENTERED_STORE_INVALID}">
- <f:validateLongRange for="branchStore" minimum="-5" maximum="200" />
+ <f:validateLongRange minimum="-5" maximum="200" />
</p:inputText>
<p:outputLabel for="branchSuiteNumber" value="#{msg.ADMIN_ENTER_DATA_SUITE_NUMBER}" />
<p:inputText id="branchSuiteNumber" size="3" maxlength="5" value="#{adminBranchOfficeController.branchSuiteNumber}" validatorMessage="#{msg.ENTERED_SUITE_NUMBER_INVALID}">
- <f:validateLongRange for="branchSuiteNumber" minimum="1" maximum="500" />
+ <f:validateLongRange minimum="1" maximum="500" />
</p:inputText>
<p:outputLabel for="branchZipCode" value="#{msg.ADMIN_DATA_ZIP_CODE}" />
<p:inputText id="branchZipCode" size="5" maxlength="6" value="#{adminBranchOfficeController.branchZipCode}" required="true" requiredMessage="#{msg.ADMIN_BRANCH_OFFICE_ZIP_CODE_REQUIRED}">
- <f:validateLongRange for="branchZipCode" minimum="1" maximum="99999" />
+ <f:validateLongRange minimum="1" maximum="99999" />
</p:inputText>
<p:outputLabel for="branchCity" value="#{msg.ADMIN_DATA_CITY}" />
xmlns="http://www.w3.org/1999/xhtml"
xmlns:f="http://xmlns.jcp.org/jsf/core"
xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
- xmlns:p="http://primefaces.org/ui">
+ xmlns:p="http://primefaces.org/ui"
+ >
<p:fieldset legend="#{msg.ADMIN_BRANCH_OFFICE_OPENING_TIME_LEGEND}">
- <p:panelGrid layout="grid" columns="4" columnClasses="ui-grid-col-4,ui-grid-col-8" styleClass="table table-full ui-noborder">
+ <p:panelGrid
+ layout="grid"
+ columns="4"
+ columnClasses="ui-grid-col-4,ui-grid-col-8"
+ styleClass="ui-noborder">
<p:outputLabel for="openingStartDay" value="#{msg.ADMIN_START_WEEK_DAY}" />
<p:outputLabel for="openingEndDay" value="#{msg.ADMIN_END_WEEK_DAY}" />
<p:outputLabel for="openingStartTime" value="#{msg.ADMIN_START_TIME}" />
<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+@TODO summary="#{msg.ADMIN_TABLE_SUMMARY_SHOW_CONTACT_DATA_MINI}"
+-->
<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:p="http://primefaces.org/ui">
+ xmlns:p="http://primefaces.org/ui"
+ >
- <p:panelGrid id="show_contact" summary="#{msg.ADMIN_TABLE_SUMMARY_SHOW_CONTACT_DATA_MINI}" headerClass="table-header-column" styleClass="table table-full" columns="3" rendered="#{not empty beanHelper.contact}">
+ <p:panelGrid
+ id="show_contact"
+ columns="3"
+ rendered="#{not empty beanHelper.contact}"
+ >
<f:facet name="header">
<h:outputFormat value="#{msg.ADMIN_SHOW_CONTACT_HEADER}">
<f:param value="#{beanHelper.contact.contactId}" />
</h:outputFormat>
</f:facet>
- <h:column>
+ <p:column>
<p:outputLabel for="contactPersonalTitle" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_PERSONAL_TITLE}" />
<h:outputText id="contactPersonalTitle" styleClass="table-data-field" value="#{msg[beanHelper.contact.contactPersonalTitle.messageKey]}" />
- </h:column>
+ </p:column>
- <h:column>
+ <p:column>
<p:outputLabel for="contactFirstName" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_FIRST_NAME}" />
<h:outputText id="contactFirstName" styleClass="table-data-field" value="#{beanHelper.contact.contactFirstName}" />
- </h:column>
+ </p:column>
- <h:column>
+ <p:column>
<p:outputLabel for="contactFamilyName" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_FAMILY_NAME}" />
<h:outputText id="contactFamilyName" styleClass="table-data-field" value="#{beanHelper.contact.contactFamilyName}" />
- </h:column>
+ </p:column>
</p:panelGrid>
</ui:composition>
<!--
@TOD summary="#{msg.ADMIN_TABLE_SUMMARY_SHOW_CONTACT_DATA}"
-->
- <p:panelGrid id="show_contact" styleClass="table table-full" columns="3" rendered="#{not empty beanHelper.contact}">
+ <p:panelGrid
+ columns="3"
+ rendered="#{not empty beanHelper.contact}"
+ >
<f:facet name="header">
<h:outputFormat value="#{msg.ADMIN_SHOW_CONTACT_HEADER}">
<f:param value="#{beanHelper.contact.contactId}" />
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:p="http://primefaces.org/ui">
+ xmlns:p="http://primefaces.org/ui"
+ >
<h:panelGroup styleClass="para notice" layout="block">
<h:outputText value="#{msg.ADMIN_COUNTRY_DATA_MINIMUM_NOTICE}" />
<div class="table-right-medium">
<p:inputText id="countryExternalDialPrefix" size="2" maxlength="10" value="#{adminCountryController.countryExternalDialPrefix}" required="true" requiredMessage="#{msg.ADMIN_COUNTRY_EXTERNAL_DIAL_PREFIX_REQUIRED}">
- <f:validateLongRange for="countryExternalDialPrefix" minimum="0" maximum="99" />
+ <f:validateLongRange minimum="0" maximum="99" />
</p:inputText>
</div>
</h:panelGroup>
<div class="table-right-medium">
<p:inputText id="countryPhoneCode" size="2" maxlength="6" value="#{adminCountryController.countryPhoneCode}" required="true" requiredMessage="#{msg.ADMIN_COUNTRY_PHONE_CODE_REQUIRED}">
- <f:validateLongRange for="countryPhoneCode" minimum="0" maximum="99" />
+ <f:validateLongRange minimum="0" maximum="99" />
</p:inputText>
<h:outputText styleClass="small notice" value="#{msg.ADMIN_ENTER_COUNTRY_PHONE_CODE_EXAMPLE}" />
xmlns="http://www.w3.org/1999/xhtml"
xmlns:f="http://xmlns.jcp.org/jsf/core"
xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
- xmlns:p="http://primefaces.org/ui">
+ xmlns:p="http://primefaces.org/ui"
+ >
<p:fieldset legend="#{msg.ADMIN_DEPARTMENT_LEGEND}">
- <p:panelGrid layout="grid" columns="2" columnClasses="ui-grid-col-4,ui-grid-col-8" styleClass="table table-full ui-noborder">
+ <p:panelGrid
+ layout="grid"
+ columns="2"
+ columnClasses="ui-grid-col-4,ui-grid-col-8"
+ styleClass="ui-noborder"
+ >
<p:outputLabel for="departmentI18nKey" value="#{msg.ADMIN_ENTER_DEPARTMENT_I18N_KEY}" />
<p:inputText
id="departmentI18nKey"
>
<f:converter converterId="BranchOfficeConverter" />
<f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
- <f:selectItems value="#{branchOfficeController.allBranchOffices()}" var="branchOffice" itemValue="#{branchOffice}" itemLabel="#{beanHelper.renderBranchOffice(branchOffice)}" />
+ <f:selectItems value="#{branchOfficeListController.allBranchOffices()}" var="branchOffice" itemValue="#{branchOffice}" itemLabel="#{beanHelper.renderBranchOffice(branchOffice)}" />
</p:selectOneMenu>
<p:outputLabel for="departmentHeadquarter" value="#{msg.ADMIN_ASSIGN_DEPARTMENT_HEADQUARTER}" />
<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+@TODO title="#{msg.ADMIN_EMPLOYEE_GENERAL_LEGEND_TITLE}"
+-->
<ui:composition
xmlns="http://www.w3.org/1999/xhtml"
xmlns:core="http://mxchange.org/jsf/core/widgets"
xmlns:validator="http://mxchange.org/jsf/core/validators"
xmlns:f="http://xmlns.jcp.org/jsf/core"
xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
- xmlns:p="http://primefaces.org/ui">
+ xmlns:p="http://primefaces.org/ui"
+ >
- <!--
- @TODO title="#{msg.ADMIN_EMPLOYEE_GENERAL_LEGEND_TITLE}"
- -->
<p:fieldset legend="#{msg.ADMIN_EMPLOYEE_GENERAL_LEGEND}">
- <p:panelGrid layout="grid" columns="2" columnClasses="ui-grid-col-4,ui-grid-col-8" styleClass="table table-full ui-noborder">
+ <p:panelGrid
+ layout="grid"
+ columns="2"
+ columnClasses="ui-grid-col-4,ui-grid-col-8"
+ styleClass="ui-noborder"
+ >
<p:outputLabel for="employeeBasicData" value="#{msg.ADMIN_ASSIGN_EMPLOYEE_COMPANY}" />
<p:selectOneMenu
id="employeeBasicData"
>
<f:converter converterId="BranchOfficeConverter" />
<f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
- <f:selectItems value="#{branchOfficeController.allBranchOffices()}" var="branchOffice" itemValue="#{branchOffice}" itemLabel="#{beanHelper.renderBranchOffice(branchOffice)}" />
+ <f:selectItems value="#{branchOfficeListController.allBranchOffices()}" var="branchOffice" itemValue="#{branchOffice}" itemLabel="#{beanHelper.renderBranchOffice(branchOffice)}" />
</p:selectOneMenu>
<p:outputLabel for="employeePersonalData" value="#{msg.ADMIN_ASSIGN_EMPLOYEE_PERSONAL_DATA}" />
@TODO title="#{msg.ADMIN_EMPLOYEE_OTHER_LEGEND_TITLE}"
-->
<p:fieldset legend="#{msg.ADMIN_EMPLOYEE_OTHER_LEGEND}">
- <p:panelGrid layout="grid" columns="2" columnClasses="ui-grid-col-4,ui-grid-col-8" styleClass="table table-full ui-noborder">
+ <p:panelGrid
+ layout="grid"
+ columns="2"
+ columnClasses="ui-grid-col-4,ui-grid-col-8"
+ styleClass="ui-noborder"
+ >
<p:outputLabel for="employeePhoneExtension" value="#{msg.ADMIN_ENTER_PHONE_EXTENSION}" />
<p:inputText id="employeePhoneExtension" size="2" maxlength="10" value="#{adminEmployeeController.employeePhoneExtension}" />
xmlns:f="http://xmlns.jcp.org/jsf/core"
xmlns:h="http://xmlns.jcp.org/jsf/html"
xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
- xmlns:p="http://primefaces.org/ui">
+ xmlns:p="http://primefaces.org/ui"
+ >
<core:outputMessageBox id="error-helper-contact-add-fax" message="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.contact}" />
<h:form id="form_add_contact_fax" rendered="#{not empty beanHelper.contact}">
- <h:panelGroup styleClass="table table-full" layout="block">
+ <h:panelGroup layout="block">
<div class="table-header">
<h:outputText value="#{msg.ADMIN_ADD_CONTACT_FAX_NUMBER_FORM_TITLE}" />
</div>
<core:outputFaxInputTableRow targetController="#{adminContactPhoneController}" labelMessage="#{msg.ADMIN_PERSONAL_DATA_FAX_NUMBER}" />
- <div class="table-footer">
- <p:commandButton styleClass="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-
- <p:commandButton styleClass="submit" id="submit_add_link_contact_fax" type="submit" action="#{adminContactPhoneController.doLinkMainFaxNumber()}" value="#{msg.BUTTON_ADMIN_LINK_ADD_CONTACT_FAX_NUMBER}" />
- </div>
+ <p:panelGrid columns="2" layout="grid">
+ <p:commandButton
+ type="reset"
+ value="#{msg.BUTTON_RESET_FORM}"
+ />
+
+ <p:commandButton
+ process="@form"
+ type="submit"
+ action="#{adminContactPhoneController.doLinkMainFaxNumber()}"
+ value="#{msg.BUTTON_ADMIN_LINK_ADD_CONTACT_FAX_NUMBER}"
+ />
+ </p:panelGrid>
</h:panelGroup>
</h:form>
</ui:composition>
xmlns:validator="http://mxchange.org/jsf/core/validators"
xmlns:f="http://xmlns.jcp.org/jsf/core"
xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
- xmlns:p="http://primefaces.org/ui">
+ xmlns:p="http://primefaces.org/ui"
+ >
<p:fieldset legend="#{msg.ADMIN_HEADQUARTER_LEGEND}">
- <p:panelGrid layout="grid" columns="2" columnClasses="ui-grid-col-4,ui-grid-col-8" styleClass="table table-full ui-noborder">
+ <p:panelGrid
+ layout="grid"
+ columns="2"
+ columnClasses="ui-grid-col-4,ui-grid-col-8"
+ styleClass="ui-noborder"
+ >
<p:outputLabel for="headquarterCompanyName" value="#{msg.ADMIN_HEADQUARTER_COMPANY_NAME}" />
<p:inputText
id="headquarterCompanyName"
</p:fieldset>
<p:fieldset legend="#{msg.ADMIN_HEADQUARTER_ADDRESS_LEGEND}">
- <p:panelGrid layout="grid" columns="2" columnClasses="ui-grid-col-4,ui-grid-col-8" styleClass="table table-full ui-noborder">
+ <p:panelGrid
+ layout="grid"
+ columns="2"
+ columnClasses="ui-grid-col-4,ui-grid-col-8"
+ styleClass="ui-noborder"
+ >
<p:outputLabel for="headquarterStreet" value="#{msg.ADMIN_DATA_STREET_NAME}" />
<p:inputText id="headquarterStreet" size="20" maxlength="255" value="#{adminHeadquarterController.headquarterStreet}" required="true" requiredMessage="#{msg.ADMIN_HEADQUARTER_STREET_NAME_REQUIRED}" />
<p:outputLabel for="headquarterHouseNumber" value="#{msg.ADMIN_DATA_HOUSE_NUMBER}" />
<p:inputText id="headquarterHouseNumber" size="3" maxlength="5" value="#{adminHeadquarterController.headquarterHouseNumber}" validatorMessage="#{msg.ENTERED_HOUSE_NUMBER_INVALID}" required="true" requiredMessage="#{msg.ADMIN_HEADQUARTER_HOUSE_NUMBER_REQUIRED}">
- <f:validateLongRange for="headquarterHouseNumber" minimum="1" maximum="500" />
+ <f:validateLongRange minimum="1" maximum="500" />
</p:inputText>
<p:outputLabel for="headquarterHouseNumberExtension" value="#{msg.ADMIN_DATA_HOUSE_NUMBER_EXTENSION}" />
<p:outputLabel for="headquarterLastHouseNumber" value="#{msg.ADMIN_DATA_LAST_HOUSE_NUMBER}" />
<p:inputText id="headquarterLastHouseNumber" size="3" maxlength="5" value="#{adminHeadquarterController.headquarterLastHouseNumber}" validatorMessage="#{msg.ENTERED_HOUSE_NUMBER_INVALID}">
- <f:validateLongRange for="headquarterLastHouseNumber" minimum="1" maximum="500" />
+ <f:validateLongRange minimum="1" maximum="500" />
</p:inputText>
<p:outputLabel for="headquarterStore" value="#{msg.ADMIN_ENTER_DATA_STORE}" />
<p:inputText id="headquarterStore" size="3" maxlength="5" value="#{adminHeadquarterController.headquarterStore}" validatorMessage="#{msg.ENTERED_STORE_INVALID}">
- <f:validateLongRange for="headquarterStore" minimum="-5" maximum="200" />
+ <f:validateLongRange minimum="-5" maximum="200" />
</p:inputText>
<p:outputLabel for="headquarterSuiteNumber" value="#{msg.ADMIN_ENTER_DATA_SUITE_NUMBER}" />
<p:inputText id="headquarterSuiteNumber" size="3" maxlength="5" value="#{adminHeadquarterController.headquarterSuiteNumber}" validatorMessage="#{msg.ENTERED_SUITE_NUMBER_INVALID}">
- <f:validateLongRange for="headquarterSuiteNumber" minimum="1" maximum="500" />
+ <f:validateLongRange minimum="1" maximum="500" />
</p:inputText>
<p:outputLabel for="headquarterZipCode" value="#{msg.ADMIN_DATA_ZIP_CODE}" />
<p:inputText id="headquarterZipCode" size="5" maxlength="6" value="#{adminHeadquarterController.headquarterZipCode}" required="true" requiredMessage="#{msg.ADMIN_HEADQUARTER_ZIP_CODE_REQUIRED}">
- <f:validateLongRange for="headquarterZipCode" minimum="1" maximum="99999" />
+ <f:validateLongRange minimum="1" maximum="99999" />
</p:inputText>
<p:outputLabel for="headquarterCity" value="#{msg.ADMIN_DATA_CITY}" />
xmlns="http://www.w3.org/1999/xhtml"
xmlns:f="http://xmlns.jcp.org/jsf/core"
xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
- xmlns:p="http://primefaces.org/ui">
+ xmlns:p="http://primefaces.org/ui"
+ >
<p:fieldset legend="#{msg.ADMIN_BRANCH_OFFICE_OPENING_TIME_LEGEND}">
- <p:panelGrid layout="grid" columns="4" columnClasses="ui-grid-col-4,ui-grid-col-8" styleClass="table table-full ui-noborder">
+ <p:panelGrid
+ layout="grid"
+ columns="4"
+ columnClasses="ui-grid-col-4,ui-grid-col-8"
+ styleClass="ui-noborder"
+ >
<p:outputLabel for="openingStartDay" value="#{msg.ADMIN_START_WEEK_DAY}" />
<p:outputLabel for="openingEndDay" value="#{msg.ADMIN_END_WEEK_DAY}" />
<p:outputLabel for="openingStartTime" value="#{msg.ADMIN_START_TIME}" />
xmlns:f="http://xmlns.jcp.org/jsf/core"
xmlns:h="http://xmlns.jcp.org/jsf/html"
xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
- xmlns:p="http://primefaces.org/ui">
+ xmlns:p="http://primefaces.org/ui"
+ >
<core:outputMessageBox id="error-helper-contact-add-landline" message="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.contact}" />
<h:form id="form_add_contact_landline" rendered="#{not empty beanHelper.contact}">
- <h:panelGroup styleClass="table table-full" layout="block">
+ <h:panelGroup layout="block">
<div class="table-header">
<h:outputText value="#{msg.ADMIN_ADD_CONTACT_LAND_LINE_NUMBER_FORM_TITLE}" />
</div>
<core:outputLandLineInputTableRow targetController="#{adminPhoneController}" labelMessage="#{msg.ADMIN_PERSONAL_DATA_LAND_LINE_NUMBER}" />
- <div class="table-footer">
- <p:commandButton styleClass="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-
- <p:commandButton styleClass="submit" id="submit_add_link_contact_landline" type="submit" action="#{adminContactPhoneController.doLinkAddLandLineNumber(beanHelper.contact)}" value="#{msg.BUTTON_ADMIN_LINK_ADD_CONTACT_LAND_LINE_NUMBER}">
+ <p:panelGrid columns="2" layout="grid">
+ <p:commandButton
+ type="reset"
+ value="#{msg.BUTTON_RESET_FORM}"
+ />
+
+ <p:commandButton
+ process="@form"
+ type="submit"
+ action="#{adminContactPhoneController.doLinkAddLandLineNumber(beanHelper.contact)}"
+ value="#{msg.BUTTON_ADMIN_LINK_ADD_CONTACT_LAND_LINE_NUMBER}"
+ >
<f:param name="contactId" value="#{param.contactId}" />
</p:commandButton>
- </div>
+ </p:panelGrid>
</h:panelGroup>
</h:form>
</ui:composition>
xmlns:f="http://xmlns.jcp.org/jsf/core"
xmlns:h="http://xmlns.jcp.org/jsf/html"
xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
- xmlns:p="http://primefaces.org/ui">
+ xmlns:p="http://primefaces.org/ui"
+ >
<core:outputMessageBox id="error-handler-contact" message="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.contact}" />
<h:form id="form_add_contact_mobile" rendered="#{not empty beanHelper.contact}">
- <h:panelGroup styleClass="table table-full" layout="block">
+ <h:panelGroup layout="block">
<div class="table-header">
<h:outputText value="#{msg.ADMIN_ADD_CONTACT_MOBILE_NUMBER_FORM_TITLE}" />
</div>
<p:selectOneMenu styleClass="select" id="mobileNumber" value="#{adminPhoneController.mobileNumber}">
<f:converter converterId="MobileNumberConverter" />
<f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
- <f:selectItems value="#{adminPhoneController.allNonLinkedMobileNumbers()}" var="mobileNumber" itemValue="#{mobileNumber}" itemLabel="#{mobileNumber.mobileProvider.providerCountry.countryExternalDialPrefix} (#{mobileNumber.mobileProvider.providerDialPrefix}) #{mobileNumber.phoneNumber}" />
+ <f:selectItems value="#{adminPhoneController.allNonLinkedMobileNumbers()}" var="mobileNumber" itemValue="#{mobileNumber}" itemLabel="#{beanHelper.renderMobileNumber(mobileNumber)}" />
</p:selectOneMenu>
</div>
</h:panelGroup>
<p:outputLabel for="mobileNumber" value="#{msg.ADMIN_PERSONAL_DATA_MOBILE_NUMBER}" />
<core:inputMobileNumberPanelGrid targetController="#{adminPhoneController}" />
- <div class="table-footer">
- <p:commandButton styleClass="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-
- <p:commandButton styleClass="submit" id="submit_add_link_contact_mobile" type="submit" action="#{adminContactPhoneController.doLinkAddMobileNumber(beanHelper.contact)}" value="#{msg.BUTTON_ADMIN_LINK_ADD_CONTACT_MOBILE_NUMBER}">
+ <p:panelGrid columns="2" layout="grid">
+ <p:commandButton
+ type="reset"
+ value="#{msg.BUTTON_RESET_FORM}"
+ />
+
+ <p:commandButton
+ process="@form"
+ type="submit"
+ action="#{adminContactPhoneController.doLinkAddMobileNumber(beanHelper.contact)}"
+ value="#{msg.BUTTON_ADMIN_LINK_ADD_CONTACT_MOBILE_NUMBER}"
+ >
<f:param name="contactId" value="#{param.contactId}" />
</p:commandButton>
- </div>
+ </p:panelGrid>
</h:panelGroup>
</h:form>
</ui:composition>
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:p="http://primefaces.org/ui">
+ xmlns:p="http://primefaces.org/ui"
+ >
<h:panelGroup styleClass="para notice" layout="block">
<h:outputText value="#{msg.ADMIN_MOBILE_PROVIDER_MINIMUM_NOTICE}" />
<div class="table-right-medium">
<p:inputText id="providerDialPrefix" size="5" maxlength="20" value="#{adminMobileProviderController.providerDialPrefix}" required="true">
- <f:validateLongRange for="providerDialPrefix" minimum="0" maximum="9999" />
+ <f:validateLongRange minimum="0" maximum="9999" />
</p:inputText>
</div>
</h:panelGroup>
xmlns="http://www.w3.org/1999/xhtml"
xmlns:f="http://xmlns.jcp.org/jsf/core"
xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
- xmlns:p="http://primefaces.org/ui">
+ xmlns:p="http://primefaces.org/ui"
+ >
<p:fieldset legend="#{msg.ADMIN_OPENING_TIME_LEGEND}">
- <p:panelGrid layout="grid" columns="4" columnClasses="ui-grid-col-4,ui-grid-col-8" styleClass="table table-full ui-noborder">
+ <p:panelGrid
+ layout="grid"
+ columns="4"
+ columnClasses="ui-grid-col-4,ui-grid-col-8"
+ styleClass="ui-noborder"
+ >
<p:outputLabel for="openingStartDay" value="#{msg.ADMIN_START_WEEK_DAY}" />
<p:outputLabel for="openingEndDay" value="#{msg.ADMIN_END_WEEK_DAY}" />
<p:outputLabel for="openingStartTime" value="#{msg.ADMIN_START_TIME}" />
<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+@TODO summary="#{msg.ADMIN_TABLE_SUMMARY_SHOW_USER_DATA}"
+-->
<ui:composition
xmlns="http://www.w3.org/1999/xhtml"
xmlns:core="http://mxchange.org/jsf/core/widgets"
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:p="http://primefaces.org/ui">
+ xmlns:p="http://primefaces.org/ui"
+ >
- <!--
- @TODO summary="#{msg.ADMIN_TABLE_SUMMARY_SHOW_USER_DATA}"
- -->
- <p:panelGrid styleClass="table table-full" columns="3" rendered="#{not empty beanHelper.user}">
+ <p:panelGrid
+ columns="3"
+ rendered="#{not empty beanHelper.user}"
+ >
<f:facet name="header">
<h:outputFormat value="#{msg.ADMIN_SHOW_USER_HEADER}">
<f:param value="#{beanHelper.user.userName}" />
</h:outputFormat>
</f:facet>
- <h:column>
+ <p:column>
<p:outputLabel for="userId" styleClass="table-data-label" value="#{msg.ADMIN_USER_ID}" />
<h:outputText id="userId" styleClass="table-data-field" value="#{beanHelper.user.userId}" />
- </h:column>
+ </p:column>
<ui:fragment rendered="#{featureController.isFeatureEnabled('user_login_require_user_name')}">
- <h:column>
+ <p:column>
<p:outputLabel for="userName" styleClass="table-data-label" value="#{msg.ADMIN_USER_NAME}" />
<h:outputText id="userName" styleClass="table-data-field" value="#{beanHelper.user.userName}" />
- </h:column>
+ </p:column>
</ui:fragment>
- <h:column>
+ <p:column>
<p:outputLabel for="userCreated" styleClass="table-data-label" value="#{msg.ADMIN_USER_CREATED}" />
- <h:outputText id="userCreated" styleClass="table-data-field" value="#{beanHelper.user.userCreated.time}">
- <f:convertDateTime for="userCreated" type="both" />
+ <h:outputText id="userCreated" styleClass="table-data-field" value="#{beanHelper.user.userCreated}">
+ <f:convertDateTime type="both" />
</h:outputText>
- </h:column>
+ </p:column>
- <h:column>
+ <p:column>
<p:outputLabel for="userUpdated" styleClass="table-data-label" value="#{msg.ADMIN_USER_UPDATED}" />
- <h:outputText id="userUpdated" styleClass="table-data-field" value="#{beanHelper.user.userUpdated.time}">
- <f:convertDateTime for="userUpdated" type="both" />
+ <h:outputText id="userUpdated" styleClass="table-data-field" value="#{beanHelper.user.userUpdated}">
+ <f:convertDateTime type="both" />
</h:outputText>
- </h:column>
+ </p:column>
- <h:column>
+ <p:column>
<p:outputLabel for="userAccountStatus" styleClass="table-data-label" value="#{msg.ADMIN_USER_ACCOUNT_STATUS}" />
<h:outputText id="userAccountStatus" styleClass="table-data-field #{beanHelper.user.userAccountStatus.styleClass}" value="#{msg[beanHelper.user.userAccountStatus.messageKey]}" />
- </h:column>
+ </p:column>
- <h:column>
+ <p:column>
<p:outputLabel for="userProfileMode" styleClass="table-data-label" value="#{msg.ADMIN_USER_PROFILE_MODE}" />
<h:outputText id="userProfileMode" styleClass="table-data-field" value="#{msg[beanHelper.user.userProfileMode.messageKey]}" />
- </h:column>
+ </p:column>
- <h:column>
+ <p:column>
<p:outputLabel for="userLastLocked" styleClass="table-data-label" value="#{msg.ADMIN_USER_LAST_LOCKED}" />
- <h:outputText id="userLastLocked" styleClass="table-data-field" value="#{beanHelper.user.userLastLocked.time}">
- <f:convertDateTime for="userLastLocked" type="both" />
+ <h:outputText id="userLastLocked" styleClass="table-data-field" value="#{beanHelper.user.userLastLocked}">
+ <f:convertDateTime type="both" />
</h:outputText>
- </h:column>
+ </p:column>
- <h:column>
+ <p:column>
<p:outputLabel for="userLastLockedReason" styleClass="table-data-label" value="#{msg.ADMIN_USER_LAST_LOCKED_REASON}" />
<h:outputText id="userLastLockedReason" styleClass="table-data-field" value="#{beanHelper.user.userLastLockedReason}" />
- </h:column>
+ </p:column>
<core:outputContactDataGridColumns />
</p:panelGrid>
<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+@TODO summary="#{msg.ADMIN_TABLE_SUMMARY_SHOW_USER_DATA}"
+-->
<ui:composition
xmlns="http://www.w3.org/1999/xhtml"
xmlns:core="http://mxchange.org/jsf/core/widgets"
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:p="http://primefaces.org/ui">
+ xmlns:p="http://primefaces.org/ui"
+ >
- <!--
- @TODO summary="#{msg.ADMIN_TABLE_SUMMARY_SHOW_USER_DATA}"
- -->
- <p:panelGrid styleClass="table table-full" columns="2" rendered="#{not empty beanHelper.user}">
+ <p:panelGrid
+ columns="2"
+ rendered="#{not empty beanHelper.user}"
+ >
<f:facet name="header">
<h:outputFormat value="#{msg.ADMIN_SHOW_USER_HEADER}">
<f:param value="#{beanHelper.user.userName}" />
<p:column>
<p:outputLabel for="userCreated" styleClass="table-data-label" value="#{msg.ADMIN_USER_CREATED}" />
- <h:outputText id="userCreated" styleClass="table-data-field" value="#{beanHelper.user.userCreated.time}">
- <f:convertDateTime for="userCreated" type="both" />
+ <h:outputText id="userCreated" styleClass="table-data-field" value="#{beanHelper.user.userCreated}">
+ <f:convertDateTime type="both" />
</h:outputText>
</p:column>
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:p="http://primefaces.org/ui">
+ xmlns:p="http://primefaces.org/ui"
+ >
<h:panelGroup styleClass="para notice" layout="block">
<h:outputText value="#{msg.PERSONAL_DATA_MINIMUM_NOTICE}" />
<div class="table-right-medium">
<p:inputText id="houseNumber" size="3" maxlength="5" value="#{contactController.houseNumber}" required="true" requiredMessage="#{msg.GUEST_CONTACT_DATA_HOUSE_NUMBER_REQUIRED}" validatorMessage="#{msg.ENTERED_HOUSE_NUMBER_INVALID}">
- <f:validateLongRange for="houseNumber" minimum="1" maximum="500" />
+ <f:validateLongRange minimum="1" maximum="500" />
</p:inputText>
</div>
</h:panelGroup>
xmlns:validator="http://mxchange.org/jsf/core/validators"
xmlns:h="http://xmlns.jcp.org/jsf/html"
xmlns:f="http://xmlns.jcp.org/jsf/core"
- xmlns:p="http://primefaces.org/ui">
+ xmlns:p="http://primefaces.org/ui"
+ >
<h:panelGroup styleClass="table-row" layout="block">
<div class="table-left-medium">
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:p="http://primefaces.org/ui">
+ xmlns:p="http://primefaces.org/ui"
+ >
<div class="footer">
<ul class="navbar-horizontal">
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:p="http://primefaces.org/ui">
+ xmlns:p="http://primefaces.org/ui"
+ >
<div class="menu_outer">
<h:panelGroup styleClass="menu" layout="block">
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:p="http://primefaces.org/ui">
+ xmlns:p="http://primefaces.org/ui"
+ >
<h:panelGroup styleClass="para" layout="block">
<fieldset class="fieldset">
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:p="http://primefaces.org/ui">
+ xmlns:p="http://primefaces.org/ui"
+ >
<h:panelGroup id="user_login_content" layout="block" rendered="#{featureController.isFeatureEnabled('user_login_require_user_name')}">
<h:form id="form_user_login">
</h:panelGroup>
</fieldset>
- <div class="table-footer">
- <p:commandButton styleClass="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
- <p:commandButton styleClass="submit" type="submit" action="#{userLoginController.doUserLogin()}" value="#{msg.BUTTON_USER_LOGIN}" />
- </div>
+ <p:panelGrid columns="2" layout="grid">
+ <p:commandButton
+ type="reset"
+ value="#{msg.BUTTON_RESET_FORM}"
+ />
+
+ <p:commandButton
+ process="@form"
+ type="submit"
+ action="#{userLoginController.doUserLogin()}"
+ value="#{msg.BUTTON_USER_LOGIN}"
+ />
+ </p:panelGrid>
</h:panelGroup>
</h:form>
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:p="http://primefaces.org/ui">
+ xmlns:p="http://primefaces.org/ui"
+ >
<h:form id="form_register_page1" rendered="#{featureController.isFeatureEnabled('user_registration')}">
- <h:panelGroup styleClass="table table-full" layout="block">
+ <h:panelGroup layout="block">
<div class="table-header">
<h:outputText value="#{msg.GUEST_REGISTRATION_PAGE1_TITLE}" />
</div>
<ui:include src="/WEB-INF/templates/guest/guest_privacy_terms.tpl" />
- <div class="table-footer">
- <p:commandButton styleClass="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
- <p:commandButton styleClass="submit" type="submit" id="submit_continue_register_page1" value="#{msg.BUTTON_CONTINUE_REGISTER_PAGE2}" action="#{userRegistrationController.doRegisterMultiPage1()}" />
- </div>
+ <p:panelGrid columns="2" layout="grid">
+ <p:commandButton
+ type="reset"
+ value="#{msg.BUTTON_RESET_FORM}"
+ />
+
+ <p:commandButton
+ process="@form"
+ type="submit"
+ value="#{msg.BUTTON_CONTINUE_REGISTER_PAGE2}"
+ action="#{userRegistrationController.doRegisterMultiPage1()}"
+ />
+ </p:panelGrid>
</h:panelGroup>
</h:form>
</ui:composition>
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:p="http://primefaces.org/ui">
+ xmlns:p="http://primefaces.org/ui"
+ >
<h:form id="form_register_page2" rendered="#{featureController.isFeatureEnabled('user_registration')}">
- <h:panelGroup styleClass="table table-full" layout="block">
+ <h:panelGroup layout="block">
<div class="table-header">
<h:outputText value="#{msg.GUEST_REGISTRATION_PAGE2_TITLE}" />
</div>
<ui:include src="/WEB-INF/templates/contact/form_contact_data.tpl" />
- <div class="table-footer">
- <p:commandButton styleClass="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
- <p:commandButton styleClass="submit" type="submit" value="#{msg.BUTTON_FINISH_REGISTRATION}" action="#{userRegistrationController.doFinishRegistration()}" />
- </div>
+ <p:panelGrid columns="2" layout="grid">
+ <p:commandButton
+ type="reset"
+ value="#{msg.BUTTON_RESET_FORM}"
+ />
+
+ <p:commandButton
+ process="@form"
+ type="submit"
+ value="#{msg.BUTTON_FINISH_REGISTRATION}"
+ action="#{userRegistrationController.doFinishRegistration()}"
+ />
+ </p:panelGrid>
</h:panelGroup>
</h:form>
</ui:composition>
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:p="http://primefaces.org/ui">
+ xmlns:p="http://primefaces.org/ui"
+ >
<h:form id="form_register_single" rendered="#{featureController.isFeatureEnabled('user_registration')}">
- <h:panelGroup styleClass="table table-full" layout="block">
+ <h:panelGroup layout="block">
<div class="table-header">
<h:outputText value="#{msg.GUEST_REGISTRATION_TITLE}" />
</div>
<ui:include src="/WEB-INF/templates/guest/guest_privacy_terms.tpl" />
- <div class="table-footer">
- <p:commandButton styleClass="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
- <p:commandButton styleClass="submit" type="submit" id="submit_finish_registration_single" value="#{msg.BUTTON_FINISH_REGISTRATION}" action="#{userRegistrationController.doFinishRegistration()}" />
- </div>
+ <p:panelGrid columns="2" layout="grid">
+ <p:commandButton
+ type="reset"
+ value="#{msg.BUTTON_RESET_FORM}"
+ />
+
+ <p:commandButton
+ process="@form"
+ type="submit"
+ value="#{msg.BUTTON_FINISH_REGISTRATION}"
+ action="#{userRegistrationController.doFinishRegistration()}"
+ />
+ </p:panelGrid>
</h:panelGroup>
</h:form>
</ui:composition>
xmlns:validator="http://mxchange.org/jsf/core/validators"
xmlns:h="http://xmlns.jcp.org/jsf/html"
xmlns:f="http://xmlns.jcp.org/jsf/core"
- xmlns:p="http://primefaces.org/ui">
+ xmlns:p="http://primefaces.org/ui"
+ >
<h:panelGroup styleClass="table-row" layout="block">
<div class="table-left">
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:p="http://primefaces.org/ui">
+ xmlns:p="http://primefaces.org/ui"
+ >
<h:panelGroup styleClass="para" layout="block">
<fieldset class="fieldset">
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:p="http://primefaces.org/ui">
+ xmlns:p="http://primefaces.org/ui"
+ >
<div class="footer">
<ul class="navbar-horizontal">
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:p="http://primefaces.org/ui">
+ xmlns:p="http://primefaces.org/ui"
+ >
<div class="menu_outer">
<h:panelGroup styleClass="menu" layout="block">
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:p="http://primefaces.org/ui">
+ xmlns:p="http://primefaces.org/ui"
+ >
<h:form id="form-change-locale">
<p:outputPanel styleClass="ui-g">
</p:outputPanel>
<p:outputPanel styleClass="ui-g-12 ui-md-6">
- <p:commandButton styleClass="submit" type="submit" actionListener="#{localizationController.doChangeLocale()}" value="#{msg.BUTTON_CHANGE_LOCALE}" title="#{msg.BUTTON_CHANGE_LOCALE_TITLE}" />
+ <p:commandButton
+ process="@form"
+ type="submit"
+ actionListener="#{localizationController.doChangeLocale()}"
+ value="#{msg.BUTTON_CHANGE_LOCALE}"
+ title="#{msg.BUTTON_CHANGE_LOCALE_TITLE}"
+ />
</p:outputPanel>
</p:outputPanel>
</h:form>
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-->
-<facelet-taglib version="2.2"
- xmlns="http://xmlns.jcp.org/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-facelettaglibrary_2_2.xsd">
+<facelet-taglib
+ version="2.2"
+ xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-facelettaglibrary_2_2.xsd"
+>
<namespace>http://mxchange.org/jsf/core/validators</namespace>
<tag>
<tag-name>emailAddressValidator</tag-name>
<required>false</required>
</attribute>
</tag>
+ <tag>
+ <tag-name>branchOfficeEmailAddressValidator</tag-name>
+ <validator>
+ <validator-id>BranchOfficeEmailAddressValidator</validator-id>
+ </validator>
+ <attribute>
+ <description>Whether email address is allowed to be empty.</description>
+ <name>allowEmptyRequiredData</name>
+ <type>java.lang.Boolean</type>
+ <required>false</required>
+ </attribute>
+ </tag>
<tag>
<tag-name>employeeEmailAddressValidator</tag-name>
<validator>
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-->
-<facelet-taglib version="2.2"
- xmlns="http://xmlns.jcp.org/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-facelettaglibrary_2_2.xsd">
+<facelet-taglib
+ version="2.2"
+ xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-facelettaglibrary_2_2.xsd"
+>
<namespace>http://mxchange.org/jsf/core/widgets</namespace>
<tag>
<tag-name>outputMessageBox</tag-name>
<tag-name>outputAdminFaxPanelGrid</tag-name>
<description>This tag renders a full p:panelGrid for administrative purposes for fax data.</description>
<source>resources/tags/admin/panel_grids/fax/admin_fax_data.tpl</source>
- <attribute>
- <name>renderShowLink</name>
- <description>Whether this tag is used to show fax data (default true).</description>
- <required>false</required>
- <type>java.lang.Boolean</type>
- </attribute>
<attribute>
<name>faxNumber</name>
<description>The fax instance that provides the data for this tag.</description>
<required>false</required>
<type>java.lang.Boolean</type>
</attribute>
+ <attribute>
+ <name>renderShowLink</name>
+ <description>Whether this tag is used to show fax data (default true).</description>
+ <required>false</required>
+ <type>java.lang.Boolean</type>
+ </attribute>
<attribute>
<name>showAdminMiniLinks</name>
<description>Whether to show administrative links to other pages (default: true).</description>
<type>org.mxchange.jcoreee.bean.faces.BaseFacesBean</type>
</attribute>
</tag>
+ <tag>
+ <tag-name>outputOpeningTimesDataTable</tag-name>
+ <description>This tag renders a full p:dataTable for opening times.</description>
+ <source>resources/tags/opening_times/opening_times_data_table.tpl</source>
+ <attribute>
+ <name>id</name>
+ <description>An id string for this tag.</description>
+ <required>true</required>
+ <type>java.lang.String</type>
+ </attribute>
+ <attribute>
+ <name>value</name>
+ <description>A list of OpeningTime objects.</description>
+ <required>true</required>
+ <type>java.util.List</type>
+ </attribute>
+ <attribute>
+ <name>widgetVar</name>
+ <description>Identifier for this widget (e.g. JavaScript).</description>
+ <required>true</required>
+ <type>java.lang.String</type>
+ </attribute>
+ <attribute>
+ <name>summary</name>
+ <description>A string or EL code for table attribute of same name.</description>
+ <required>true</required>
+ <type>java.lang.String</type>
+ </attribute>
+ <attribute>
+ <name>emptyMessage</name>
+ <description>A string or EL code for a message shown when no row was found.</description>
+ <required>true</required>
+ <type>java.lang.String</type>
+ </attribute>
+ <attribute>
+ <name>headerMessage</name>
+ <description>A string or EL code for a message shown above table rows.</description>
+ <required>true</required>
+ <type>java.lang.String</type>
+ </attribute>
+ <attribute>
+ <name>rows</name>
+ <description>Rows to show each page.</description>
+ <required>true</required>
+ <type>java.lang.Long</type>
+ </attribute>
+ <attribute>
+ <name>rendered</name>
+ <description>Whether this tag is being rendered by JSF engine (default: true).</description>
+ <required>false</required>
+ <type>java.lang.Boolean</type>
+ </attribute>
+ </tag>
</facelet-taglib>
<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
- xmlns="http://www.w3.org/1999/xhtml"
- 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"
+ xmlns="http://www.w3.org/1999/xhtml"
+ 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:define name="document_admin_title">
<h:outputText value="#{msg.PAGE_TITLE_ADMIN_LOGOUT}" />
<h:outputText value="#{msg.ADMIN_LOGOUT_NOTICE}" />
</h:panelGroup>
- <div class="table-footer">
- <p:commandButton styleClass="submit" type="submit" action="#{userLoginController.doAdminLogout()}" value="#{msg.BUTTON_USER_LOGOUT}" />
- </div>
+ <p:panelGrid columns="2" layout="grid">
+ <p:commandButton
+ process="@form"
+ type="submit"
+ action="#{userLoginController.doAdminLogout()}"
+ value="#{msg.BUTTON_USER_LOGOUT}"
+ />
+ </p:panelGrid>
</h:panelGroup>
</h:form>
</ui:define>
<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
- xmlns="http://www.w3.org/1999/xhtml"
- xmlns:core="http://mxchange.org/jsf/core/widgets"
- xmlns:links="http://mxchange.org/jsf/core/links"
- 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"
+ xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:links="http://mxchange.org/jsf/core/links"
+ 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:define name="document_admin_title">
<h:outputText value="#{msg.PAGE_TITLE_ADMIN_LIST_BASIC_DATA}" />
</ui:define>
<ui:define name="content">
- <h:form id="form-list-basic-company-data">
+ <h:form id="form-list-basic-data">
<p:dataTable
id="basicDataList"
var="basicData"
value="#{basicDataListController.allBasicData}"
- tableStyleClass="table table-full"
paginator="true"
paginatorTemplate="{CurrentPageReport} {FirstPageLink} {PreviousPageLink} {PageLinks} {NextPageLink} {LastPageLink} {RowsPerPageDropdown}"
filteredValue="#{basicDataListController.filteredBasicData}"
rows="10"
+ rowKey="#{basicData.basicDataId}"
reflow="true"
resizableColumns="true"
rowsPerPageTemplate="5,10,20,50,100"
summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_BASIC_DATA}"
emptyMessage="#{msg.ADMIN_EMPTY_LIST_BASIC_DATA}"
widgetVar="basicDataList"
+ selectionMode="single"
+ selection="#{basicDataListController.selectedBasicData}"
+ skipChildren="true"
>
<f:facet name="header">
- <p:panelGrid columns="2" columnClasses="ui-grid-col-10,ui-grid-col-2" layout="grid" styleClass="ui-noborder ui-transparent-widget">
- <h:outputText value="#{msg.ADMIN_LIST_BASIC_DATA_HEADER}" />
+ <p:panelGrid
+ columns="3"
+ layout="grid"
+ columnClasses="ui-grid-col-4,ui-grid-col-6,ui-grid-col-2"
+ >
+ <p:spacer />
+
+ <p:panelGrid
+ columns="2"
+ columnClasses="ui-grid-4,ui-grid-8"
+ layout="grid"
+ styleClass="ui-noborder"
+ >
+ <p:outputLabel for="globalFilter" value="#{msg.SEARCH_ALL_FIELDS}" style="float: right" />
+ <p:inputText id="globalFilter" onkeyup="PF('basicDataList').filter()" placeholder="#{msg.ENTER_KEYWORD}"/>
+ </p:panelGrid>
+
+ <p:outputPanel>
+ <p:spacer height="4" />
+
+ <p:commandButton
+ id="toggler"
+ type="button"
+ value="#{msg.SELECT_SHOWN_COLUMNS}"
+ styleClass="column-selector"
+ />
- <h:panelGroup>
- <p:commandButton id="toggler" type="button" value="#{msg.SELECT_SHOWN_COLUMNS}" styleClass="column-selector" />
<p:columnToggler datasource="basicDataList" trigger="toggler" />
- </h:panelGroup>
+ </p:outputPanel>
</p:panelGrid>
</f:facet>
+ <p:ajax
+ event="rowSelect"
+ update=":master:form-list-basic-data:basic-data-details"
+ oncomplete="PF('basicDataDialog').show()"
+ />
+
<p:column headerText="#{msg.ID_NUMBER_HEADER}" sortBy="#{basicData.basicDataId}" filterable="false">
<p:link outcome="admin_show_basic_data" title="#{msg.ADMIN_LINK_SHOW_BASIC_DATA_TITLE}" value="#{basicData.basicDataId}">
<f:param name="basicDataId" value="#{basicData.basicDataId}" />
</p:link>
</p:column>
- <p:column headerText="#{msg.ADMIN_ASSIGNED_USER_HEADER}" sortBy="#{basicData.companyUserOwner}" filterBy="#{basicData.companyUserOwner}" filterMatchMode="in">
- <f:facet name="filter">
- <p:selectCheckboxMenu
- filter="true"
- filterMatchMode="contains"
- label="#{msg.LABEL_USERS}"
- onchange="PF('basicDataList').filter()"
- updateLabel="true"
- title="#{msg.FILTER_BY_MULTIPLE_USERS_TITLE}"
- >
- <f:converter converterId="UserConverter" />
- <f:selectItems value="#{userController.allUsers()}" var="user" itemValue="#{user}" itemLabel="#{user.userName}" />
- </p:selectCheckboxMenu>
- </f:facet>
-
- <p:link outcome="admin_show_user" title="#{msg.ADMIN_LINK_SHOW_BASIC_DATA_OWNER_USER_TITLE}" value="#{basicData.companyUserOwner.userId}" rendered="#{not empty basicData.companyUserOwner}">
- <f:param name="userId" value="#{basicData.companyUserOwner.userId}" />
- </p:link>
-
- <p:link outcome="admin_assign_basic_data_owner" title="#{msg.ADMIN_LINK_ASSIGN_BASIC_DATA_OWNER_USER_TITLE}" value="#{msg.ADMIN_LINK_ASSIGN}" rendered="#{empty basicData.companyUserOwner}">
- <f:param name="basicDataId" value="#{basicData.basicDataId}" />
- </p:link>
- </p:column>
-
<p:column headerText="#{msg.ADMIN_BASIC_DATA_COMPANY_NAME_HEADER}" sortBy="#{basicData.companyName}" filterBy="#{basicData.companyName}" filterMatchMode="contains">
<h:outputLink value="#{basicData.companyWebsiteUrl}" target="_blank" title="#{msg.LINK_COMPANY_WEBSITE_URL_TITLE}" rel="external" rendered="#{not empty basicData.companyWebsiteUrl}">
<h:outputText value="#{basicData.companyName}" />
</p:selectCheckboxMenu>
</f:facet>
- <p:link outcome="admin_show_employee" title="#{msg.ADMIN_LINK_SHOW_BASIC_DATA_CONTACT_PERSON_TITLE}" value="#{basicData.companyContactEmployee.employeeId}" rendered="#{not empty basicData.companyContactEmployee}">
+ <p:link outcome="admin_show_employee" title="#{msg.ADMIN_LINK_SHOW_BASIC_DATA_CONTACT_PERSON_TITLE}" value="#{beanHelper.renderEmployee(basicData.companyContactEmployee)}" rendered="#{not empty basicData.companyContactEmployee}">
<f:param name="employeeId" value="#{basicData.companyContactEmployee.employeeId}" />
</p:link>
</p:selectCheckboxMenu>
</f:facet>
- <p:link outcome="admin_show_employee" title="#{msg.ADMIN_LINK_SHOW_BASIC_DATA_COMPANY_FOUNDER_TITLE}" value="#{basicData.companyFounder.employeeId}" rendered="#{not empty basicData.companyFounder}">
+ <p:link outcome="admin_show_employee" title="#{msg.ADMIN_LINK_SHOW_BASIC_DATA_COMPANY_FOUNDER_TITLE}" value="#{beanHelper.renderEmployee(basicData.companyFounder)}" rendered="#{not empty basicData.companyFounder}">
<f:param name="employeeId" value="#{basicData.companyFounder.employeeId}" />
</p:link>
</p:link>
</p:column>
+ <p:column headerText="#{msg.ADMIN_ASSIGNED_USER_HEADER}" sortBy="#{basicData.companyUserOwner}" filterBy="#{basicData.companyUserOwner}" filterMatchMode="in">
+ <f:facet name="filter">
+ <p:selectCheckboxMenu
+ filter="true"
+ filterMatchMode="contains"
+ label="#{msg.LABEL_USERS}"
+ onchange="PF('basicDataList').filter()"
+ updateLabel="true"
+ title="#{msg.FILTER_BY_MULTIPLE_USERS_TITLE}"
+ >
+ <f:converter converterId="UserConverter" />
+ <f:selectItems value="#{userController.allUsers()}" var="user" itemValue="#{user}" itemLabel="#{user.userName}" />
+ </p:selectCheckboxMenu>
+ </f:facet>
+
+ <p:link outcome="admin_show_user" title="#{msg.ADMIN_LINK_SHOW_BASIC_DATA_OWNER_USER_TITLE}" value="#{beanHelper.renderUser(basicData.companyUserOwner)}" rendered="#{not empty basicData.companyUserOwner}">
+ <f:param name="userId" value="#{basicData.companyUserOwner.userId}" />
+ </p:link>
+
+ <p:link outcome="admin_assign_basic_data_owner" title="#{msg.ADMIN_LINK_ASSIGN_BASIC_DATA_OWNER_USER_TITLE}" value="#{msg.ADMIN_LINK_ASSIGN}" rendered="#{empty basicData.companyUserOwner}">
+ <f:param name="basicDataId" value="#{basicData.basicDataId}" />
+ </p:link>
+ </p:column>
+
+ <p:column headerText="#{msg.TAX_NUMBER_HEADER}" sortBy="#{basicData.companyTaxNumber}" filterBy="#{basicData.companyTaxNumber}" filterMatchMode="contains">
+ <h:outputText value="#{basicData.companyTaxNumber}" />
+ </p:column>
+
<p:column headerText="#{msg.ENTRY_CREATED_HEADER}" sortBy="#{basicData.companyCreated}">
- <h:outputText id="companyCreated" value="#{basicData.companyCreated.time}">
- <f:convertDateTime for="companyCreated" type="both" timeStyle="short" dateStyle="short" />
+ <h:outputText id="companyCreated" value="#{basicData.companyCreated}">
+ <f:convertDateTime type="both" timeStyle="short" dateStyle="short" />
</h:outputText>
</p:column>
<links:outputBasicDataAdminMiniLinks basicData="#{basicData}" />
</p:column>
</p:dataTable>
+
+ <p:dialog
+ dynamic="true"
+ modal="true"
+ resizable="false"
+ header="#{msg.ADMIN_SINGLE_BASIC_DATA_DETAILS_HEADER}"
+ hideEffect="fade"
+ showEffect="fade"
+ widgetVar="basicDataDialog"
+ position="top"
+ responsive="true"
+ >
+ <p:outputPanel id="basic-data-details">
+ <p:panelGrid columns="2" rendered="#{not empty basicDataListController.selectedBasicData}">
+ <f:facet name="header">
+ <h:outputFormat value="#{msg.ADMIN_BASIC_DATA_DETAILS_HEADER}">
+ <f:param value="#{basicDataListController.selectedBasicData.companyName}" />
+ <f:param value="#{basicDataListController.selectedBasicData.basicDataId}" />
+ </h:outputFormat>
+ </f:facet>
+
+ <p:outputLabel value="#{msg.ID_NUMBER_HEADER}" title="#{msg.BASIC_DATA_ID_NUMBER_TITLE}" />
+ <h:outputText value="#{basicDataListController.selectedBasicData.basicDataId}" />
+ </p:panelGrid>
+ </p:outputPanel>
+ </p:dialog>
</h:form>
<h:form>
- <p:panelGrid columns="1" styleClass="table table-full" layout="grid">
+ <p:panelGrid
+ columns="1"
+ layout="grid"
+ >
<f:facet name="header">
<h:outputText value="#{msg.ADMIN_ADD_BASIC_DATA_TITLE}" />
</f:facet>
<f:facet name="footer">
<p:panelGrid columns="2" layout="grid">
<p:commandButton
- styleClass="reset"
type="reset"
value="#{msg.BUTTON_RESET_FORM}"
/>
<p:commandButton
- styleClass="submit"
+ process="@form"
type="submit"
value="#{msg.BUTTON_ADMIN_ADD_BASIC_DATA}"
action="#{adminBasicCompanyDataController.addBusinessBasicData()}"
- update=":master:form-list-basic-company-data:basicDataList"
+ update=":master:form-list-basic-data:basicDataList"
/>
</p:panelGrid>
</f:facet>
<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
- xmlns="http://www.w3.org/1999/xhtml"
- xmlns:core="http://mxchange.org/jsf/core/widgets"
- xmlns:links="http://mxchange.org/jsf/core/links"
- 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"
+ xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:core="http://mxchange.org/jsf/core/widgets"
+ xmlns:links="http://mxchange.org/jsf/core/links"
+ 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:define name="document_admin_title">
<h:outputText value="#{msg.PAGE_TITLE_ADMIN_LIST_BRANCH_OFFICES}" />
<p:dataTable
id="branchOfficeList"
var="branchOffice"
- value="#{branchOfficeController.allBranchOffices()}"
- tableStyleClass="table table-full"
+ value="#{branchOfficeListController.allBranchOffices()}"
paginator="true"
paginatorTemplate="{CurrentPageReport} {FirstPageLink} {PreviousPageLink} {PageLinks} {NextPageLink} {LastPageLink} {RowsPerPageDropdown}"
- filteredValue="#{branchOfficeController.filteredBranchOffices}"
+ filteredValue="#{branchOfficeListController.filteredBranchOffices}"
rows="10"
+ rowKey="#{branchOffice.branchId}"
reflow="true"
resizableColumns="true"
rowsPerPageTemplate="5,10,20,50,100"
summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_BRANCH_OFFICES}"
emptyMessage="#{msg.ADMIN_EMPTY_LIST_BRANCH_OFFICES}"
widgetVar="branchOfficeList"
+ selectionMode="single"
+ selection="#{branchOfficeListController.selectedBranchOffice}"
+ skipChildren="true"
>
<f:facet name="header">
- <p:panelGrid columns="2" columnClasses="ui-grid-col-10,ui-grid-col-2" layout="grid" styleClass="ui-noborder ui-transparent-widget">
- <h:outputText value="#{msg.ADMIN_LIST_BRANCH_OFFICES_HEADER}" />
+ <p:panelGrid
+ columns="3"
+ layout="grid"
+ columnClasses="ui-grid-col-4,ui-grid-col-6,ui-grid-col-2"
+ >
+ <p:spacer />
+
+ <p:panelGrid
+ columns="2"
+ columnClasses="ui-grid-4,ui-grid-8"
+ layout="grid"
+ styleClass="ui-noborder"
+ >
+ <p:outputLabel for="globalFilter" value="#{msg.SEARCH_ALL_FIELDS}" style="float: right" />
+ <p:inputText id="globalFilter" onkeyup="PF('branchOfficeList').filter()" placeholder="#{msg.ENTER_KEYWORD}"/>
+ </p:panelGrid>
+
+ <p:outputPanel>
+ <p:spacer height="4" />
+
+ <p:commandButton
+ id="toggler"
+ type="button"
+ value="#{msg.SELECT_SHOWN_COLUMNS}"
+ styleClass="column-selector"
+ />
- <h:panelGroup>
- <p:commandButton id="toggler" type="button" value="#{msg.SELECT_SHOWN_COLUMNS}" styleClass="column-selector" />
<p:columnToggler datasource="branchOfficeList" trigger="toggler" />
- </h:panelGroup>
+ </p:outputPanel>
</p:panelGrid>
</f:facet>
+ <p:ajax
+ event="rowSelect"
+ update=":master:form-list-branch-offices:branchOffice-details"
+ oncomplete="PF('branchOfficeDialog').show()"
+ />
+
<p:column headerText="#{msg.ID_NUMBER_HEADER}" sortBy="#{branchOffice.branchId}" filterable="false">
<p:link outcome="admin_show_branch_office" title="#{msg.ADMIN_LINK_SHOW_BRANCH_OFFICE_TITLE}" value="#{branchOffice.branchId}">
<f:param name="branchId" value="#{branchOffice.branchId}" />
</p:link>
</p:column>
- <p:column headerText="#{msg.ADMIN_ASSIGNED_USER_HEADER}" sortBy="#{branchOffice.branchUserOwner}" filterBy="#{branchOffice.branchUserOwner}" filterMatchMode="in">
+ <p:column headerText="#{msg.ADMIN_BASIC_DATA_COMPANY_NAME_HEADER}" sortBy="#{branchOffice.branchCompany}" filterBy="#{branchOffice.branchCompany}" filterMatchMode="in">
<f:facet name="filter">
<p:selectCheckboxMenu
filter="true"
filterMatchMode="contains"
- label="#{msg.LABEL_USERS}"
+ label="#{msg.LABEL_COMPANIES}"
onchange="PF('branchOfficeList').filter()"
updateLabel="true"
- title="#{msg.FILTER_BY_MULTIPLE_USERS_TITLE}"
+ title="#{msg.FILTER_BY_MULTIPLE_COMPANIES_TITLE}"
>
- <f:converter converterId="UserConverter" />
- <f:selectItems value="#{userController.allUsers()}" var="user" itemValue="#{user}" itemLabel="#{user.userName}" />
+ <f:converter converterId="BasicCompanyDataConverter" />
+ <f:selectItems value="#{basicDataListController.allBasicData}" var="basicData" itemValue="#{basicData}" itemLabel="#{basicData.companyName}" />
</p:selectCheckboxMenu>
</f:facet>
- <p:link outcome="admin_show_user" title="#{msg.ADMIN_LINK_SHOW_BRANCH_OFFICE_OWNER_USER_TITLE}" value="#{branchOffice.branchUserOwner.userId}" rendered="#{not empty branchOffice.branchUserOwner}">
- <f:param name="userId" value="#{branchOffice.branchUserOwner.userId}" />
- </p:link>
-
- <p:link outcome="admin_assign_branch_office_owner" title="#{msg.ADMIN_LINK_ASSIGN_BRANCH_OFFICES_OWNER_USER_TITLE}" value="#{msg.ADMIN_LINK_ASSIGN}" rendered="#{empty branchOffice.branchUserOwner}">
- <f:param name="branchId" value="#{branchOffice.branchId}" />
+ <p:link outcome="admin_show_basic_data" value="#{beanHelper.renderBasicData(branchOffice.branchCompany)}" title="#{msg.ADMIN_LINK_SHOW_BASIC_DATA_TITLE}">
+ <f:param name="basicDataId" value="#{branchOffice.branchCompany.basicDataId}" />
</p:link>
</p:column>
- <p:column headerText="#{msg.ADMIN_BASIC_DATA_COMPANY_NAME_HEADER}" sortBy="#{branchOffice.branchCompany}" filterBy="#{branchOffice.branchCompany}" filterMatchMode="in">
+ <p:column headerText="#{msg.ADMIN_ASSIGNED_USER_HEADER}" sortBy="#{branchOffice.branchUserOwner}" filterBy="#{branchOffice.branchUserOwner}" filterMatchMode="in">
<f:facet name="filter">
<p:selectCheckboxMenu
filter="true"
filterMatchMode="contains"
- label="#{msg.LABEL_COMPANIES}"
+ label="#{msg.LABEL_USERS}"
onchange="PF('branchOfficeList').filter()"
updateLabel="true"
- title="#{msg.FILTER_BY_MULTIPLE_COMPANIES_TITLE}"
+ title="#{msg.FILTER_BY_MULTIPLE_USERS_TITLE}"
>
- <f:converter converterId="BasicCompanyDataConverter" />
- <f:selectItems value="#{basicDataListController.allBasicData}" var="basicData" itemValue="#{basicData}" itemLabel="#{basicData.companyName}" />
+ <f:converter converterId="UserConverter" />
+ <f:selectItems value="#{userController.allUsers()}" var="user" itemValue="#{user}" itemLabel="#{user.userName}" />
</p:selectCheckboxMenu>
</f:facet>
- <h:outputLink value="#{branchOffice.branchCompany.companyWebsiteUrl}" target="_blank" title="#{msg.LINK_COMPANY_WEBSITE_URL_TITLE}" rel="external" rendered="#{not empty branchOffice.branchCompany.companyWebsiteUrl}">
- <h:outputText value="#{beanHelper.renderBasicData(branchOffice.branchCompany)}" />
- </h:outputLink>
+ <p:link outcome="admin_show_user" title="#{msg.ADMIN_LINK_SHOW_BRANCH_OFFICE_OWNER_USER_TITLE}" value="#{beanHelper.renderUser(branchOffice.branchUserOwner)}" rendered="#{not empty branchOffice.branchUserOwner}">
+ <f:param name="userId" value="#{branchOffice.branchUserOwner.userId}" />
+ </p:link>
- <h:outputText value="#{beanHelper.renderBasicData(branchOffice.branchCompany)}" title="#{msg.NO_WEBSITE_URL_ENTERED}" rendered="#{empty branchOffice.branchCompany.companyWebsiteUrl}" />
+ <p:link outcome="admin_assign_branch_office_owner" title="#{msg.ADMIN_LINK_ASSIGN_BRANCH_OFFICES_OWNER_USER_TITLE}" value="#{msg.ADMIN_LINK_ASSIGN}" rendered="#{empty branchOffice.branchUserOwner}">
+ <f:param name="branchId" value="#{branchOffice.branchId}" />
+ </p:link>
</p:column>
<p:column headerText="#{msg.DATA_EMAIL_ADDRESS}" sortBy="#{branchOffice.branchEmailAddress}" filterBy="#{branchOffice.branchEmailAddress}" filterMatchMode="contains">
</p:selectCheckboxMenu>
</f:facet>
- <p:link outcome="admin_show_employee" title="#{msg.ADMIN_LINK_SHOW_BRANCH_OFFICE_CONTACT_PERSON_TITLE}" value="#{branchOffice.branchContactEmployee.employeeId}" rendered="#{not empty branchOffice.branchContactEmployee}">
+ <p:link outcome="admin_show_employee" title="#{msg.ADMIN_LINK_SHOW_BRANCH_OFFICE_CONTACT_PERSON_TITLE}" value="#{beanHelper.renderEmployee(branchOffice.branchContactEmployee)}" rendered="#{not empty branchOffice.branchContactEmployee}">
<f:param name="employeeId" value="#{branchOffice.branchContactEmployee.employeeId}" />
</p:link>
</p:column>
<p:column headerText="#{msg.ENTRY_CREATED_HEADER}" sortBy="#{branchOffice.branchCreated}" filterable="false">
- <h:outputText id="branchCreated" value="#{branchOffice.branchCreated.time}">
- <f:convertDateTime for="branchCreated" type="both" timeStyle="short" dateStyle="short" />
+ <h:outputText id="branchCreated" value="#{branchOffice.branchCreated}">
+ <f:convertDateTime type="both" timeStyle="short" dateStyle="short" />
</h:outputText>
</p:column>
<links:outputBranchOfficeAdminMiniLinks branchOffice="#{branchOffice}" />
</p:column>
</p:dataTable>
+
+ <p:dialog
+ dynamic="true"
+ modal="true"
+ resizable="false"
+ header="#{msg.ADMIN_SINGLE_BRANCH_OFFICE_DETAILS_HEADER}"
+ hideEffect="fade"
+ showEffect="fade"
+ widgetVar="branchOfficeDialog"
+ position="top"
+ responsive="true"
+ >
+ <p:outputPanel id="branchOffice-details">
+ <p:tabView>
+ <p:tab title="#{msg.ADMIN_BRANCH_OFFICE_DATA_TAB_TITLE}">
+ <p:panelGrid columns="2" rendered="#{not empty branchOfficeListController.selectedBranchOffice}">
+ <f:facet name="header">
+ <h:outputFormat value="#{msg.ADMIN_BRANCH_OFFICE_BASIC_DETAILS_HEADER}">
+ <f:param value="#{branchOfficeListController.selectedBranchOffice.branchId}" />
+ </h:outputFormat>
+ </f:facet>
+
+ <p:outputLabel value="#{msg.ID_NUMBER_HEADER}" title="#{msg.BRANCH_OFFICE_ID_NUMBER_TITLE}" />
+ <h:outputText value="#{branchOfficeListController.selectedBranchOffice.branchId}" />
+
+ <p:outputLabel value="#{msg.BRANCH_OFFICE_NUMBER_HEADER}" title="#{msg.BRANCH_OFFICE_NUMBER_TITLE}" />
+ <h:outputText value="#{branchOfficeListController.selectedBranchOffice.branchNumber}" />
+
+ <p:outputLabel value="#{msg.ASSIGNED_BASIC_DATA_HEADER}" title="#{msg.ASSIGNED_BASIC_DATA_TO_BRANCH_OFFICE_TITLE}" />
+ <p:link outcome="admin_show_basic_data" target="_blank" value="#{beanHelper.renderBasicData(branchOfficeListController.selectedBranchOffice.branchCompany)}" title="#{msg.ADMIN_LINK_SHOW_BASIC_DATA_TITLE}">
+ <f:param name="basicDataId" value="#{branchOfficeListController.selectedBranchOffice.branchCompany.basicDataId}" />
+ </p:link>
+
+ <p:outputLabel value="#{msg.ASSIGNED_CONTACT_PERSON_HEADER}" title="#{msg.ASSIGNED_CONTACT_PERSON_TO_BRANCH_OFFICE_TITLE}" />
+ <p:link outcome="admin_show_employee" target="_blank" title="#{msg.ADMIN_LINK_SHOW_BRANCH_OFFICE_CONTACT_PERSON_TITLE}" value="#{beanHelper.renderEmployee(branchOfficeListController.selectedBranchOffice.branchContactEmployee)}" rendered="#{not empty branchOfficeListController.selectedBranchOffice.branchContactEmployee}">
+ <f:param name="employeeId" value="#{branchOfficeListController.selectedBranchOffice.branchContactEmployee.employeeId}" />
+ </p:link>
+ <h:outputText value="#{msg.NO_CONTACT_EMPLOYEE_ASSIGNED_TO_BRANCH_OFFICE}" rendered="#{empty branchOfficeListController.selectedBranchOffice.branchContactEmployee}" />
+
+ <p:outputLabel value="#{msg.ASSIGNED_OWNER_EMPLOYEE_HEADER}" title="#{msg.ASSIGNED_OWNER_EMPLOYEE_TO_BRANCH_OFFICE_TITLE}" />
+ <p:link outcome="admin_show_employee" target="_blank" title="#{msg.ADMIN_LINK_SHOW_BRANCH_OFFICE_OWNER_EMPLOYEE_TITLE}" value="#{beanHelper.renderEmployee(branchOfficeListController.selectedBranchOffice.branchOwnerEmployee)}" rendered="#{not empty branchOfficeListController.selectedBranchOffice.branchOwnerEmployee}">
+ <f:param name="employeeId" value="#{branchOfficeListController.selectedBranchOffice.branchContactEmployee.employeeId}" />
+ </p:link>
+ <h:outputText value="#{msg.NO_OWNER_EMPLOYEE_ASSIGNED_TO_BRANCH_OFFICE}" rendered="#{empty branchOfficeListController.selectedBranchOffice.branchOwnerEmployee}" />
+
+ <p:outputLabel value="#{msg.ASSIGNED_USER_OWNER_HEADER}" title="#{msg.ASSIGNED_USER_OWNER_TO_BRANCH_OFFICE_TITLE}" />
+ <p:link outcome="admin_show_user" target="_blank" title="#{msg.ADMIN_LINK_SHOW_BRANCH_OFFICE_OWNER_USER_TITLE}" value="#{beanHelper.renderUser(branchOfficeListController.selectedBranchOffice.branchUserOwner)}" rendered="#{not empty branchOfficeListController.selectedBranchOffice.branchUserOwner}">
+ <f:param name="userId" value="#{branchOfficeListController.selectedBranchOffice.branchUserOwner.userId}" />
+ </p:link>
+ <h:outputText value="#{msg.NO_USER_ASSIGNED_AS_OWNER_TO_BRANCH_OFFICE}" rendered="#{empty branchOfficeListController.selectedBranchOffice.branchUserOwner}" />
+
+ <p:outputLabel value="#{msg.EMAIL_ADDRESS_HEADER}" title="#{msg.EMAIL_ADDRESS_OF_BRANCH_OFFICE_TITLE}" />
+ <h:outputLink value="mailto:#{branchOfficeListController.selectedBranchOffice.branchEmailAddress}" rendered="#{not empty branchOfficeListController.selectedBranchOffice.branchEmailAddress}" />
+ <h:outputText value="#{msg.BRANCH_OFFICE_HAS_NO_EMAIL_ADDRESS}" rendered="#{empty branchOfficeListController.selectedBranchOffice.branchEmailAddress}" />
+
+ <p:outputLabel value="#{msg.LANDLINE_NUMBER_HEADER}" title="#{msg.ASSIGNED_LANDLINE_NUMBER_OF_BRANCH_OFFICE_TITLE}" />
+ <p:link
+ outcome="admin_show_landline"
+ value="#{beanHelper.renderPhoneNumber(branchOfficeListController.selectedBranchOffice.branchLandLineNumber)}"
+ target="_blank"
+ title="#{msg.ADMIN_LINK_SHOW_LAND_LINE_NUMBER_TITLE}"
+ rendered="#{not empty branchOfficeListController.selectedBranchOffice.branchLandLineNumber}"
+ >
+ <f:param name="phoneId" value="#{branchOfficeListController.selectedBranchOffice.branchLandLineNumber.phoneId}" />
+ </p:link>
+ <h:outputText value="#{msg.NO_LANDLINE_NUMBER_ASSIGNED_TO_BRANCH_OFFICE}" rendered="#{empty branchOfficeListController.selectedBranchOffice.branchLandLineNumber}" />
+
+ <p:outputLabel value="#{msg.FAX_NUMBER_HEADER}" title="#{msg.ASSIGNED_FAX_NUMBER_OF_BRANCH_OFFICE_TITLE}" />
+ <p:link
+ outcome="admin_show_fax"
+ value="#{beanHelper.renderPhoneNumber(branchOfficeListController.selectedBranchOffice.branchFaxNumber)}"
+ target="_blank"
+ title="#{msg.ADMIN_LINK_SHOW_FAX_NUMBER_TITLE}"
+ rendered="#{not empty branchOfficeListController.selectedBranchOffice.branchFaxNumber}"
+ >
+ <f:param name="phoneId" value="#{branchOfficeListController.selectedBranchOffice.branchFaxNumber.phoneId}" />
+ </p:link>
+ <h:outputText value="#{msg.NO_FAX_NUMBER_ASSIGNED_TO_BRANCH_OFFICE}" rendered="#{empty branchOfficeListController.selectedBranchOffice.branchFaxNumber}" />
+ </p:panelGrid>
+ </p:tab>
+
+ <p:tab title="#{msg.ADMIN_BRANCH_OFFICE_ADDRESS_TAB_TITLE}">
+ <p:panelGrid columns="2" rendered="#{not empty branchOfficeListController.selectedBranchOffice}">
+ <f:facet name="header">
+ <h:outputFormat value="#{msg.ADMIN_BRANCH_OFFICE_ADDRESS_DETAILS_HEADER}">
+ <f:param value="#{branchOfficeListController.selectedBranchOffice.branchId}" />
+ </h:outputFormat>
+ </f:facet>
+
+ <p:outputLabel value="#{msg.STREET_NAME_HEADER}" title="#{msg.STREET_NAME_OF_BRANCH_OFFICE_TITLE}" />
+ <h:outputText value="#{branchOfficeListController.selectedBranchOffice.branchStreet}" />
+
+ <p:outputLabel value="#{msg.HOUSE_NUMBER_HEADER}" title="#{msg.HOUSE_NUMBER_OF_BRANCH_OFFICE_TITLE}" />
+ <h:outputText value="#{branchOfficeListController.selectedBranchOffice.branchHouseNumber}" />
+
+ <p:outputLabel value="#{msg.LAST_HOUSE_NUMBER_HEADER}" title="#{msg.LAST_HOUSE_NUMBER_OF_BRANCH_OFFICE_TITLE}" />
+ <h:outputText value="#{branchOfficeListController.selectedBranchOffice.branchLastHouseNumber}" />
+
+ <p:outputLabel value="#{msg.HOUSE_NUMBER_EXTENSION_HEADER}" title="#{msg.HOUSE_NUMBER_EXTENSION_OF_BRANCH_OFFICE_TITLE}" />
+ <h:outputText value="#{branchOfficeListController.selectedBranchOffice.branchHouseNumberExtension}" />
+
+ <p:outputLabel value="#{msg.STORE_HEADER}" title="#{msg.STORE_OF_BRANCH_OFFICE_TITLE}" />
+ <h:outputText value="#{branchOfficeListController.selectedBranchOffice.branchStore}" />
+
+ <p:outputLabel value="#{msg.SUITE_NUMBER_HEADER}" title="#{msg.SUITE_NUMBER_OF_BRANCH_OFFICE_TITLE}" />
+ <h:outputText value="#{branchOfficeListController.selectedBranchOffice.branchSuiteNumber}" />
+
+ <p:outputLabel value="#{msg.ZIP_CODE_HEADER}" title="#{msg.ZIP_CODE_OF_BRANCH_OFFICE_TITLE}" />
+ <h:outputText value="#{branchOfficeListController.selectedBranchOffice.branchZipCode}" />
+
+ <p:outputLabel value="#{msg.CITY_HEADER}" title="#{msg.CITY_OF_BRANCH_OFFICE_TITLE}" />
+ <h:outputText value="#{branchOfficeListController.selectedBranchOffice.branchCity}" />
+
+ <p:outputLabel value="#{msg.COUNTRY_HEADER}" title="#{msg.COUNTRY_OF_BRANCH_OFFICE_TITLE}" />
+ <h:outputText value="#{beanHelper.renderCountry(branchOfficeListController.selectedBranchOffice.branchCountry)}" />
+ </p:panelGrid>
+ </p:tab>
+
+ <p:tab title="#{msg.ADMIN_OPENING_TIMES_TAB_TITLE}">
+ <core:outputOpeningTimesDataTable
+ id="branchOpeningTimeDetailList"
+ value="#{branchOfficeListController.selectedBranchOffice.branchOpeningTimes}"
+ rows="10"
+ summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_BRANCH_OFFICE_OPENING_TIMES}"
+ emptyMessage="#{msg.ADMIN_EMPTY_LIST_BRANCH_OFFICE_OPENING_TIMES}"
+ widgetVar="branchOpeningTimeDetailList"
+ headerMessage="#{msg.ADMIN_LIST_BRANCH_OFFICE_OPENING_TIMES_HEADER}"
+ />
+ </p:tab>
+ </p:tabView>
+ </p:outputPanel>
+ </p:dialog>
</h:form>
- <h:form>
- <p:panelGrid columns="1" styleClass="table table-full" layout="grid">
+ <h:form id="form-add-branch-office">
+ <p:panelGrid
+ columns="1"
+ layout="grid"
+ >
<f:facet name="header">
<h:outputText value="#{msg.ADMIN_ADD_BRANCH_OFFICE_TITLE}" />
</f:facet>
<f:facet name="footer">
<p:panelGrid columns="2" layout="grid">
<p:commandButton
- styleClass="reset"
type="reset"
value="#{msg.BUTTON_RESET_FORM}"
/>
<p:commandButton
- styleClass="submit"
+ process="@form"
type="submit"
value="#{msg.BUTTON_ADMIN_ADD_BASIC_DATA}"
action="#{adminBranchOfficeController.addBranchOffice()}"
update=":master:form-list-branch-offices:branchOfficeList"
+ oncomplete="PF('branchOfficeList').filter()"
/>
</p:panelGrid>
</f:facet>
<h:form id="form-list-branch-opening-time">
<p:fieldset legend="#{msg.ADMIN_BRANCH_OFFICE_OPENING_TIMES_LEGEND}">
- <p:dataTable
+ <core:outputOpeningTimesDataTable
id="branchOpeningTimeList"
- var="openingTime"
value="#{adminBranchOfficeController.branchOpeningTimes}"
- tableStyleClass="table table-full"
rows="10"
- reflow="true"
summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_BRANCH_OFFICE_OPENING_TIMES}"
emptyMessage="#{msg.ADMIN_EMPTY_LIST_BRANCH_OFFICE_OPENING_TIMES}"
widgetVar="branchOpeningTimeList"
- >
-
- <f:facet name="header">
- <h:outputText value="#{msg.ADMIN_LIST_BRANCH_OFFICE_OPENING_TIMES_HEADER}" />
- </f:facet>
-
- <p:column headerText="#{msg.ADMIN_START_WEEK_DAY}">
- <h:outputText value="#{openingTime.openingStartDay.toString()}" />
- </p:column>
-
- <p:column headerText="#{msg.ADMIN_END_WEEK_DAY}">
- <h:outputText value="#{openingTime.openingEndDay.toString()}" />
- </p:column>
-
- <p:column headerText="#{msg.ADMIN_START_TIME}">
- <h:outputText value="#{openingTime.openingStartTime.time}">
- <f:convertDateTime type="time" timeStyle="short" />
- </h:outputText>
- </p:column>
-
- <p:column headerText="#{msg.ADMIN_END_TIME}">
- <h:outputText value="#{openingTime.openingEndTime.time}">
- <f:convertDateTime type="time" timeStyle="short" />
- </h:outputText>
- </p:column>
- </p:dataTable>
+ headerMessage="#{msg.ADMIN_LIST_BRANCH_OFFICE_OPENING_TIMES_HEADER}"
+ />
</p:fieldset>
</h:form>
<h:form id="form-admin-add-branch-opening-time">
- <p:panelGrid columns="1" styleClass="table table-full" layout="grid">
+ <p:panelGrid
+ columns="1"
+ layout="grid"
+ >
<f:facet name="header">
<h:outputText value="#{msg.ADMIN_ADD_BRANCH_OFFICE_OPENING_TIME_TITLE}" />
</f:facet>
<f:facet name="footer">
<p:panelGrid columns="2" layout="grid">
<p:commandButton
- styleClass="reset"
type="reset"
value="#{msg.BUTTON_RESET_FORM}"
/>
<p:commandButton
- styleClass="submit"
+ process="@form"
type="submit"
value="#{msg.BUTTON_ADMIN_ADD_BRANCH_OFFICE_OPENING_TIME}"
action="#{adminBranchOfficeController.addOpeningTime()}"
update=":master:form-list-branch-opening-time:branchOpeningTimeList"
+ oncomplete=""
/>
</p:panelGrid>
</f:facet>
<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
- xmlns="http://www.w3.org/1999/xhtml"
- xmlns:core="http://mxchange.org/jsf/core/widgets"
- 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"
+ xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:core="http://mxchange.org/jsf/core/widgets"
+ 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:define name="metadata">
<f:metadata>
<f:viewParam name="contactId" value="#{beanHelper.contact}" converter="ContactConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_CONTACT_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_CONTACT_ID_INVALID}" />
- <f:viewAction onPostback="true" action="#{beanHelper.notifyControllerContactConverted()}" />
+ <f:viewAction action="#{beanHelper.notifyControllerContactConverted()}" />
</f:metadata>
</ui:define>
<core:outputMessageBox id="error-handler-contact" message="#{msg.ERROR_CONTACT_ID_NOT_FOUND}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.contact}" />
<h:form id="form-admin-delete-user" rendered="#{not empty beanHelper.contact}">
+ <h:inputHidden value="#{adminContactController.contactId}" />
+
<h:panelGroup styleClass="table" layout="block">
<div class="table-header">
<h:outputFormat value="#{msg.ADMIN_DELETE_CONTACT_TITLE}">
<ui:include src="/WEB-INF/templates/admin/contact/admin_show_contact_data.tpl" />
- <div class="table-footer">
- <p:commandButton styleClass="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
- <p:commandButton styleClass="button-danger" type="submit" id="submit_delete_contact" value="#{msg.BUTTON_ADMIN_DELETE_CONTACT}" action="#{adminContactController.deleteContactData()}" />
- </div>
- </h:panelGroup>
+ <p:commandButton
+ process="@form"
+ type="submit"
+ value="#{msg.BUTTON_ADMIN_DELETE_CONTACT}"
+ action="#{adminContactController.deleteContactData()}"
+ />
+ </p:panelGrid>
</h:form>
</ui:define>
</ui:composition>
<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
- xmlns="http://www.w3.org/1999/xhtml"
- xmlns:core="http://mxchange.org/jsf/core/widgets"
- 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"
+ xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:core="http://mxchange.org/jsf/core/widgets"
+ 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:define name="metadata">
<f:metadata>
<f:viewParam name="contactId" value="#{beanHelper.contact}" converter="ContactConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_CONTACT_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_CONTACT_ID_INVALID}" />
- <f:viewAction onPostback="true" action="#{beanHelper.notifyControllerContactConverted()}" />
+ <f:viewAction action="#{beanHelper.notifyControllerContactConverted()}" />
</f:metadata>
</ui:define>
<ui:define name="content">
<core:outputMessageBox id="error-handler-contact" message="#{msg.ERROR_CONTACT_ID_NOT_FOUND}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.contact}" />
- <h:form id="form-admin-edit-user" rendered="#{not empty beanHelper.contact}">
- <h:panelGroup styleClass="table table-full" layout="block">
+ <h:form id="form-admin-edit-contact" rendered="#{not empty beanHelper.contact}">
+ <h:inputHidden value="#{adminContactController.contactId}" />
+
+ <h:panelGroup layout="block">
<div class="table-header">
<h:outputFormat value="#{msg.ADMIN_EDIT_CONTACT_TITLE}">
<f:param value="#{beanHelper.contact.contactId}" />
<core:outputAdminContactDataFormFields allowEmptyRequiredData="true" />
- <div class="table-footer">
- <p:commandButton styleClass="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
- <p:commandButton styleClass="submit" type="submit" id="submit_edit_contact" value="#{msg.BUTTON_ADMIN_EDIT_CONTACT}" action="#{adminContactController.editContactData()}" />
- </div>
+ <p:panelGrid columns="2" layout="grid">
+ <p:commandButton
+ type="reset"
+ value="#{msg.BUTTON_RESET_FORM}"
+ />
+
+ <p:commandButton
+ process="@form"
+ type="submit"
+ value="#{msg.BUTTON_ADMIN_EDIT_CONTACT}"
+ action="#{adminContactController.editContactData()}"
+ />
+ </p:panelGrid>
</h:panelGroup>
</h:form>
</ui:define>
<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
- xmlns="http://www.w3.org/1999/xhtml"
- xmlns:core="http://mxchange.org/jsf/core/widgets"
- 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"
+ xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:core="http://mxchange.org/jsf/core/widgets"
+ 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:define name="document_admin_title">
<h:outputText value="#{msg.PAGE_TITLE_ADMIN_EXPORT_CONTACT}" />
id="table_export_contacts"
var="contact"
value="#{contactController.allContacts()}"
- tableStyleClass="table table-full"
paginator="true"
rows="10"
emptyMessage="#{msg.ADMIN_EMPTY_LIST_CONTACT}"
</f:facet>
<h:outputText id="contactBirthday" value="#{contact.contactBirthday}">
- <f:convertDateTime for="contactBirthday" type="date" dateStyle="medium" />
+ <f:convertDateTime type="date" dateStyle="medium" />
</h:outputText>
</p:column>
<h:outputText value="#{msg.ADMIN_EXPORT_CONTACT_CREATED}" />
</f:facet>
- <h:outputText id="contactCreated" value="#{contact.contactCreated.time}">
- <f:convertDateTime for="contactCreated" type="both" timeStyle="short" dateStyle="short" locale="#{localizationController.locale}" />
+ <h:outputText id="contactCreated" value="#{contact.contactCreated}">
+ <f:convertDateTime type="both" timeStyle="short" dateStyle="short" locale="#{localizationController.locale}" />
</h:outputText>
</p:column>
</p:dataTable>
- <h:panelGroup styleClass="table table-full" layout="block">
+ <h:panelGroup layout="block">
<div class="table-header">
<h:outputText value="#{msg.ADMIN_EXPORT_CONTACTS_TITLE}" />
</div>
<h:outputText value="#{msg.ADMIN_EXPORT_CONTACTS_TIMEOUT_WARNING}" />
</div>
- <div class="table-footer">
- <p:commandButton styleClass="submit" type="submit" id="submit_export_contacts_xls" value="#{msg.BUTTON_ADMIN_EXPORT_CONTACTS_XLS}">
- <p:dataExporter type="xls" target="table_export_contacts" fileName="all_contacts" />
+ <p:panelGrid columns="2" layout="grid">
+ <p:commandButton
+ ajax="false"
+ process="@form"
+ type="submit"
+ value="#{msg.BUTTON_ADMIN_EXPORT_CONTACTS_XLS}"
+ >
+
+ <p:dataExporter
+ type="xls"
+ target="table_export_contacts"
+ fileName="all_contacts"
+ />
</p:commandButton>
- </div>
+ </p:panelGrid>
</h:panelGroup>
</h:form>
</ui:define>
<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
- xmlns="http://www.w3.org/1999/xhtml"
- xmlns:core="http://mxchange.org/jsf/core/widgets"
- xmlns:links="http://mxchange.org/jsf/core/links"
- 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"
+ xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:core="http://mxchange.org/jsf/core/widgets"
+ xmlns:links="http://mxchange.org/jsf/core/links"
+ 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:define name="document_admin_title">
<h:outputText value="#{msg.PAGE_TITLE_ADMIN_LIST_CONTACT}" />
id="contactList"
var="contact"
value="#{contactController.allContacts()}"
- tableStyleClass="table table-full"
paginator="true"
rows="10"
summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_CONTACT}"
<h:outputText value="#{msg.ENTRY_CREATED_HEADER}" />
</f:facet>
- <h:outputText id="contactCreated" value="#{contact.contactCreated.time}">
- <f:convertDateTime for="contactCreated" type="both" timeStyle="short" dateStyle="short" />
+ <h:outputText id="contactCreated" value="#{contact.contactCreated}">
+ <f:convertDateTime type="both" timeStyle="short" dateStyle="short" />
</h:outputText>
</p:column>
</h:form>
<h:form>
- <p:panelGrid layout="grid" columns="1" styleClass="table table-full">
+ <p:panelGrid
+ columns="1"
+ layout="grid"
+ >
<f:facet name="header">
<h:outputText value="#{msg.ADMIN_ADD_CONTACT_TITLE}" />
</f:facet>
value="#{msg.BUTTON_RESET_FORM}"
/>
<p:commandButton
- styleClass="submit"
+ process="@form"
type="submit"
value="#{msg.BUTTON_ADMIN_ADD_CONTACT}"
action="#{adminContactController.addContact()}"
<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
- xmlns="http://www.w3.org/1999/xhtml"
- xmlns:core="http://mxchange.org/jsf/core/widgets"
- xmlns:links="http://mxchange.org/jsf/core/links"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
- xmlns:h="http://xmlns.jcp.org/jsf/html"
- xmlns:f="http://xmlns.jcp.org/jsf/core">
+<ui:composition
+ template="/WEB-INF/templates/admin/admin_base.tpl"
+ xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:core="http://mxchange.org/jsf/core/widgets"
+ xmlns:links="http://mxchange.org/jsf/core/links"
+ xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+ xmlns:h="http://xmlns.jcp.org/jsf/html"
+ xmlns:f="http://xmlns.jcp.org/jsf/core"
+ >
<ui:define name="metadata">
<f:metadata>
<f:viewParam name="contactId" value="#{beanHelper.contact}" converter="ContactConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_CONTACT_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_CONTACT_ID_INVALID}" />
- <f:viewAction onPostback="true" action="#{beanHelper.notifyControllerContactConverted()}" />
+ <f:viewAction action="#{beanHelper.notifyControllerContactConverted()}" />
</f:metadata>
</ui:define>
<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
- xmlns="http://www.w3.org/1999/xhtml"
- xmlns:core="http://mxchange.org/jsf/core/widgets"
- 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"
+ xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:core="http://mxchange.org/jsf/core/widgets"
+ 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:define name="metadata">
<f:metadata>
<f:viewParam name="phoneId" value="#{beanHelper.faxNumber}" converter="FaxNumberConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_PHONE_ID_INVALID}" />
<f:viewParam name="contactId" value="#{beanHelper.contact}" converter="ContactConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_CONTACT_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_CONTACT_ID_INVALID}" />
- <f:viewAction onPostback="true" action="#{beanHelper.notifyControllerContactConverted()}" />
- <f:viewAction onPostback="true" action="#{beanHelper.notifyControllerFaxNumberConverted()}" />
+ <f:viewAction action="#{beanHelper.notifyControllerContactConverted()}" />
+ <f:viewAction action="#{beanHelper.notifyControllerFaxNumberConverted()}" />
</f:metadata>
</ui:define>
<core:outputMessageBox id="error-handler-contact" message="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.contact}" />
<h:form id="form_unlink_contact_fax" rendered="#{not empty beanHelper.faxNumber and not empty beanHelper.contact and beanHelper.contact.contactFaxNumber == beanHelper.faxNumber}">
+ <h:inputHidden value="#{adminContactPhoneController.contact}" />
+ <h:inputHidden value="#{adminContactPhoneController.phoneId}" />
+
<h:panelGroup styleClass="table" layout="block">
<div class="table-header">
<h:outputText value="#{msg.ADMIN_UNLINK_CONTACT_FAX_NUMBER_TITLE}" />
<core:outputAdminFaxPanelGrid faxNumber="#{beanHelper.faxNumber}" contact="#{beanHelper.contact}" renderShowLink="false" showAdminMiniLinks="false" />
</div>
- <div class="table-footer">
- <p:commandButton styleClass="button-warning" type="submit" id="submit_unlink_fax" value="#{msg.BUTTON_ADMIN_UNLINK_FAX_NUMBER}" action="#{adminContactPhoneController.unlinkFaxContactData()}" />
- </div>
+ <p:panelGrid columns="2" layout="grid">
+ <p:commandButton
+ process="@form"
+ type="submit"
+ value="#{msg.BUTTON_ADMIN_UNLINK_FAX_NUMBER}"
+ action="#{adminContactPhoneController.unlinkFaxContactData()}"
+ />
+ </p:panelGrid>
</h:panelGroup>
</h:form>
<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
- xmlns="http://www.w3.org/1999/xhtml"
- xmlns:core="http://mxchange.org/jsf/core/widgets"
- 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"
+ xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:core="http://mxchange.org/jsf/core/widgets"
+ 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:define name="metadata">
<f:metadata>
<core:outputAdminLandLinePanelGrid landLineNumber="#{beanHelper.landLineNumber}" contact="#{beanHelper.contact}" renderShowLink="false" showAdminMiniLinks="false" />
</div>
- <div class="table-footer">
- <p:commandButton styleClass="button-warning" type="submit" id="submit_unlink_landline" value="#{msg.BUTTON_ADMIN_UNLINK_LAND_LINE_NUMBER}" action="#{adminContactPhoneController.unlinkLandLineContactData()}" />
- </div>
+ <p:panelGrid columns="2" layout="grid">
+ <p:commandButton
+ process="@form"
+ type="submit"
+ value="#{msg.BUTTON_ADMIN_UNLINK_LAND_LINE_NUMBER}"
+ action="#{adminContactPhoneController.unlinkLandLineContactData()}"
+ />
+ </p:panelGrid>
</h:panelGroup>
</h:form>
<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
- xmlns="http://www.w3.org/1999/xhtml"
- xmlns:core="http://mxchange.org/jsf/core/widgets"
- 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"
+ xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:core="http://mxchange.org/jsf/core/widgets"
+ 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:define name="metadata">
<f:metadata>
<core:outputAdminMobilePanelGrid mobileNumber="#{beanHelper.mobileNumber}" contact="#{beanHelper.contact}" renderShowLink="false" showAdminMiniLinks="false" />
</div>
- <div class="table-footer">
- <p:commandButton styleClass="button-warning" type="submit" id="submit_unlink_mobile" value="#{msg.BUTTON_ADMIN_UNLINK_MOBILE_NUMBER}" action="#{adminContactPhoneController.unlinkMobileContactData()}" />
- </div>
+ <p:commandButton
+ process="@form"
+ type="submit"
+ value="#{msg.BUTTON_ADMIN_UNLINK_MOBILE_NUMBER}"
+ action="#{adminContactPhoneController.unlinkMobileContactData()}"
+ />
</h:panelGroup>
</h:form>
<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
- xmlns="http://www.w3.org/1999/xhtml"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
- xmlns:h="http://xmlns.jcp.org/jsf/html"
- xmlns:f="http://xmlns.jcp.org/jsf/core">
+<ui:composition
+ template="/WEB-INF/templates/admin/admin_base.tpl"
+ xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+ xmlns:h="http://xmlns.jcp.org/jsf/html"
+ >
<ui:define name="document_admin_title">
<h:outputText value="#{msg.PAGE_TITLE_ADMIN_DELETE_COUNTRY}" />
<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
- xmlns="http://www.w3.org/1999/xhtml"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
- xmlns:h="http://xmlns.jcp.org/jsf/html"
- xmlns:f="http://xmlns.jcp.org/jsf/core">
+<ui:composition
+ template="/WEB-INF/templates/admin/admin_base.tpl"
+ xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+ xmlns:h="http://xmlns.jcp.org/jsf/html"
+ >
<ui:define name="document_admin_title">
<h:outputText value="#{msg.PAGE_TITLE_ADMIN_EDIT_COUNTRY}" />
<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
- xmlns="http://www.w3.org/1999/xhtml"
- xmlns:links="http://mxchange.org/jsf/core/links"
- 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"
+ xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:links="http://mxchange.org/jsf/core/links"
+ 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:define name="document_admin_title">
<h:outputText value="#{msg.PAGE_TITLE_ADMIN_LIST_COUNTRY}" />
id="countryList"
var="country"
value="#{countryController.allCountries()}"
- tableStyleClass="table table-full"
paginator="true"
rows="10"
summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_COUNTRIES}"
</h:form>
<h:form>
- <h:panelGroup styleClass="table table-full" layout="block">
+ <h:panelGroup layout="block">
<div class="table-header">
<h:outputText value="#{msg.ADMIN_ADD_COUNTRY_TITLE}" />
</div>
<ui:include src="/WEB-INF/templates/admin/country/admin_form_country_data.tpl" />
- <div class="table-footer">
+ <p:panelGrid columns="2" layout="grid">
<p:commandButton
- styleClass="reset"
type="reset"
value="#{msg.BUTTON_RESET_FORM}"
/>
+
<p:commandButton
- styleClass="submit"
+ process="@form"
type="submit"
value="#{msg.BUTTON_ADMIN_ADD_COUNTRY}"
action="#{adminCountryController.addCountry()}"
update=":master:form-list-countries:countryList"
/>
- </div>
+ </p:panelGrid>
</h:panelGroup>
<div class="para notice">
<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
- xmlns="http://www.w3.org/1999/xhtml"
- xmlns:core="http://mxchange.org/jsf/core/widgets"
- xmlns:links="http://mxchange.org/jsf/core/links"
- 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"
+ xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:links="http://mxchange.org/jsf/core/links"
+ 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:define name="document_admin_title">
<h:outputText value="#{msg.PAGE_TITLE_ADMIN_LIST_DEPARTMENTS}" />
id="departmentList"
var="department"
value="#{departmentController.allDepartments()}"
- tableStyleClass="table table-full"
paginator="true"
paginatorTemplate="{CurrentPageReport} {FirstPageLink} {PreviousPageLink} {PageLinks} {NextPageLink} {LastPageLink} {RowsPerPageDropdown}"
filteredValue="#{departmentController.filteredDepartments}"
<h:outputText value="#{msg.ADMIN_LIST_DEPARTMENTS_HEADER}" />
<h:panelGroup>
- <p:commandButton id="toggler" type="button" value="#{msg.SELECT_SHOWN_COLUMNS}" styleClass="column-selector" />
+ <p:commandButton
+ id="toggler"
+ type="button"
+ value="#{msg.SELECT_SHOWN_COLUMNS}"
+ styleClass="column-selector"
+ />
+
<p:columnToggler datasource="departmentList" trigger="toggler" />
</h:panelGroup>
</p:panelGrid>
</p:link>
</p:column>
- <p:column headerText="#{msg.ADMIN_I18N_KEY_HEADER}" sortBy="#{department.departmentI18nKey}" filterBy="#{department.departmentI18nKey}" filterMatchMode="contains">
+ <p:column headerText="#{msg.ADMIN_I18N_KEY_HEADER}" sortBy="#{local[department.departmentI18nKey]}" filterBy="#{local[department.departmentI18nKey]}" filterMatchMode="contains">
<h:outputText value="#{local[department.departmentI18nKey]}" />
</p:column>
title="#{msg.FILTER_BY_MULTIPLE_EMPLOYEES_TITLE}"
>
<f:converter converterId="BranchOfficeConverter" />
- <f:selectItems value="#{branchOfficeController.allBranchOffices()}" var="branchOffice" itemValue="#{branchOffice}" itemLabel="#{beanHelper.renderBranchOffice(branchOffice)}" />
+ <f:selectItems value="#{branchOfficeListController.allBranchOffices()}" var="branchOffice" itemValue="#{branchOffice}" itemLabel="#{beanHelper.renderBranchOffice(branchOffice)}" />
</p:selectCheckboxMenu>
</f:facet>
</p:column>
<p:column headerText="#{msg.ENTRY_CREATED_HEADER}" sortBy="#{department.departmentCreated}" filterable="false">
- <h:outputText id="departmentCreated" value="#{department.departmentCreated.time}">
- <f:convertDateTime for="departmentCreated" type="both" timeStyle="short" dateStyle="short" />
+ <h:outputText id="departmentCreated" value="#{department.departmentCreated}">
+ <f:convertDateTime type="both" timeStyle="short" dateStyle="short" />
</h:outputText>
</p:column>
</h:form>
<h:form>
- <p:panelGrid columns="1" styleClass="table table-full" layout="grid">
+ <p:panelGrid
+ columns="1"
+ layout="grid"
+ >
<f:facet name="header">
<h:outputText value="#{msg.ADMIN_ADD_DEPARTMENT_TITLE}" />
</f:facet>
<f:facet name="footer">
<p:panelGrid columns="2" layout="grid">
<p:commandButton
- styleClass="reset"
type="reset"
value="#{msg.BUTTON_RESET_FORM}"
/>
<p:commandButton
- styleClass="submit"
+ process="@form"
type="submit"
value="#{msg.BUTTON_ADMIN_ADD_DEPARTMENT_DATA}"
action="#{adminDepartmentController.addDepartment()}"
<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
- xmlns="http://www.w3.org/1999/xhtml"
- xmlns:core="http://mxchange.org/jsf/core/widgets"
- xmlns:links="http://mxchange.org/jsf/core/links"
- 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"
+ xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:links="http://mxchange.org/jsf/core/links"
+ 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:define name="document_admin_title">
<h:outputText value="#{msg.PAGE_TITLE_ADMIN_LIST_EMPLOYEE}" />
var="employee"
value="#{employeeController.allEmployees()}"
filteredValue="#{employeeController.filteredEmployees}"
- tableStyleClass="table table-full"
paginator="true"
paginatorTemplate="{CurrentPageReport} {FirstPageLink} {PreviousPageLink} {PageLinks} {NextPageLink} {LastPageLink} {RowsPerPageDropdown}"
rows="10"
<h:outputText value="#{msg.ADMIN_LIST_EMPLOYEES_HEADER}" />
<h:panelGroup>
- <p:commandButton id="toggler" type="button" value="#{msg.SELECT_SHOWN_COLUMNS}" styleClass="column-selector" />
+ <p:commandButton
+ id="toggler"
+ type="button"
+ value="#{msg.SELECT_SHOWN_COLUMNS}"
+ styleClass="column-selector"
+ />
+
<p:columnToggler datasource="employeeList" trigger="toggler" />
</h:panelGroup>
</p:panelGrid>
title="#{msg.FILTER_BY_MULTIPLE_EMPLOYEES_TITLE}"
>
<f:converter converterId="BranchOfficeConverter" />
- <f:selectItems value="#{branchOfficeController.allBranchOffices()}" var="branchOffice" itemValue="#{branchOffice}" itemLabel="#{beanHelper.renderBranchOffice(branchOffice)}" />
+ <f:selectItems value="#{branchOfficeListController.allBranchOffices()}" var="branchOffice" itemValue="#{branchOffice}" itemLabel="#{beanHelper.renderBranchOffice(branchOffice)}" />
</p:selectCheckboxMenu>
</f:facet>
</p:column>
<p:column headerText="#{msg.ENTRY_CREATED_HEADER}" sortBy="#{employee.employeeCreated}" filterable="false">
- <h:outputText id="employeeCreated" value="#{employee.employeeCreated.time}">
- <f:convertDateTime for="employeeCreated" type="both" timeStyle="short" dateStyle="short" />
+ <h:outputText id="employeeCreated" value="#{employee.employeeCreated}">
+ <f:convertDateTime type="both" timeStyle="short" dateStyle="short" />
</h:outputText>
</p:column>
</h:form>
<h:form>
- <p:panelGrid layout="grid" columns="1" styleClass="table table-full">
+ <p:panelGrid
+ columns="1"
+ layout="grid"
+ >
<f:facet name="header">
<h:outputText value="#{msg.ADMIN_ADD_EMPLOYEE_TITLE}" />
</f:facet>
<h:outputText value="#{msg.ADMIN_ADD_EMPLOYEE_MINIMUM_DATA}" />
- <h:column>
+ <p:column>
<ui:include src="/WEB-INF/templates/admin/employee/admin_form_employee_data.tpl" />
- </h:column>
+ </p:column>
<f:facet name="footer">
<p:panelGrid columns="2" layout="grid">
<p:commandButton
- styleClass="reset"
type="reset"
value="#{msg.BUTTON_RESET_FORM}"
/>
<p:commandButton
- styleClass="submit"
+ process="@form"
type="submit"
value="#{msg.BUTTON_ADMIN_ADD_EMPLOYEE}"
action="#{adminEmployeeController.addEmployee()}"
<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
- xmlns="http://www.w3.org/1999/xhtml"
- xmlns:core="http://mxchange.org/jsf/core/widgets"
- 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"
+ xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:core="http://mxchange.org/jsf/core/widgets"
+ 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:define name="metadata">
<f:metadata>
<f:viewParam name="phoneId" value="#{beanHelper.faxNumber}" converter="FaxNumberConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_PHONE_ID_INVALID}" />
- <f:viewAction onPostback="true" action="#{beanHelper.notifyControllerFaxNumberConverted()}" />
+ <f:viewAction action="#{beanHelper.notifyControllerFaxNumberConverted()}" />
</f:metadata>
</ui:define>
<core:outputMessageBox id="error-handler-fax-number" message="#{msg.ERROR_BEAN_HELPER_FAX_NUMBER_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.faxNumber}" />
<h:form id="form_delete_fax" rendered="#{not empty beanHelper.faxNumber}">
+ <h:inputHidden value="#{adminPhoneController.phoneId}" />
+
<h:panelGroup styleClass="table" layout="block">
<div class="table-header">
<h:outputText value="#{msg.ADMIN_DELETE_FAX_TITLE}" />
<h:outputText value="#{msg.ADMIN_DELETE_FAX_DATA_NOTICE}" />
</div>
- <div class="table-footer">
- <p:commandButton styleClass="button-danger" type="submit" id="submit_delete_fax" value="#{msg.BUTTON_ADMIN_DELETE_FAX}" action="#{adminPhoneController.deleteFaxData()}" />
- </div>
+ <p:commandButton
+ process="@form"
+ type="submit"
+ value="#{msg.BUTTON_ADMIN_DELETE_FAX}"
+ action="#{adminPhoneController.deleteFaxData()}"
+ />
</h:panelGroup>
</h:form>
</ui:define>
<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
- xmlns="http://www.w3.org/1999/xhtml"
- xmlns:core="http://mxchange.org/jsf/core/widgets"
- 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"
+ xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:core="http://mxchange.org/jsf/core/widgets"
+ 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:define name="metadata">
<f:metadata>
<f:viewParam name="phoneId" value="#{beanHelper.faxNumber}" converter="FaxNumberConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_PHONE_ID_INVALID}" />
- <f:viewAction onPostback="true" action="#{beanHelper.notifyControllerFaxNumberConverted()}" />
+ <f:viewAction action="#{beanHelper.notifyControllerFaxNumberConverted()}" />
</f:metadata>
</ui:define>
<core:outputMessageBox id="error-handler-fax-number" message="#{msg.ERROR_BEAN_HELPER_FAX_NUMBER_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.faxNumber}" />
<h:form id="form_edit_fax" rendered="#{not empty beanHelper.faxNumber}">
- <h:panelGroup styleClass="table table-full" layout="block">
+ <h:inputHidden value="#{adminPhoneController.phoneId}" />
+
+ <h:panelGroup layout="block">
<div class="table-header">
<h:outputFormat value="#{msg.ADMIN_EDIT_FAX_NUMBER_TITLE}">
<f:param value="#{beanHelper.faxNumber.phoneId}" />
<core:outputAdminFaxDataFormFields faxNumber="#{beanHelper.faxNumber}" />
- <div class="table-footer">
- <p:commandButton styleClass="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
- <p:commandButton styleClass="submit" type="submit" id="submit_edit_fax" value="#{msg.BUTTON_ADMIN_EDIT_FAX_NUMBER}" action="#{adminPhoneController.doChangeFaxNumber()}" />
- </div>
+ <p:panelGrid columns="2" layout="grid">
+ <p:commandButton
+ type="reset"
+ value="#{msg.BUTTON_RESET_FORM}"
+ />
+
+ <p:commandButton
+ process="@form"
+ type="submit"
+ value="#{msg.BUTTON_ADMIN_EDIT_FAX_NUMBER}"
+ action="#{adminPhoneController.doChangeFaxNumber()}"
+ />
+ </p:panelGrid>
</h:panelGroup>
</h:form>
</ui:define>
<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
- xmlns="http://www.w3.org/1999/xhtml"
- xmlns:core="http://mxchange.org/jsf/core/widgets"
- 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"
+ xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:core="http://mxchange.org/jsf/core/widgets"
+ 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:define name="document_admin_title">
<h:outputText value="#{msg.PAGE_TITLE_ADMIN_LIST_CONTACT_FAX_NUMBER}" />
id="table_list_fax"
var="faxNumber"
value="#{phoneController.allFaxNumbers()}"
- tableStyleClass="table table-full"
paginator="true"
rows="10"
summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_FAXS}"
<p:outputLabel for="faxNumber" value="#{msg.ADMIN_SHOW_FAX_NUMBER}" />
</f:facet>
- <h:outputText id="faxNumber" value="#{faxNumber.phoneCountry.countryAbroadDialPrefix}#{faxNumber.phoneCountry.countryPhoneCode} (#{faxNumber.phoneAreaCode}) #{faxNumber.phoneNumber}" />
+ <h:outputText id="faxNumber" value="#{beanHelper.renderPhoneNumber(faxNumber)}" />
</p:column>
<p:column>
<h:outputText value="#{msg.ADMIN_SHOW_PHONE_CREATED}" />
</f:facet>
- <h:outputText value="#{faxNumber.phoneEntryCreated.time}">
+ <h:outputText value="#{faxNumber.phoneEntryCreated}">
<f:convertDateTime type="both" />
</h:outputText>
</p:column>
<h:outputText value="#{msg.ADMIN_SHOW_PHONE_UPDATED}" />
</f:facet>
- <h:outputText value="#{faxNumber.phoneEntryUpdated.time}">
+ <h:outputText value="#{faxNumber.phoneEntryUpdated}">
<f:convertDateTime type="both" />
</h:outputText>
</p:column>
<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
- xmlns="http://www.w3.org/1999/xhtml"
- xmlns:core="http://mxchange.org/jsf/core/widgets"
- 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"
+ xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:core="http://mxchange.org/jsf/core/widgets"
+ 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:define name="metadata">
<f:metadata>
<f:viewParam name="phoneId" value="#{beanHelper.faxNumber}" converter="FaxNumberConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_CONTACT_ID_INVALID}" />
- <f:viewAction onPostback="true" action="#{beanHelper.notifyControllerFaxNumberConverted()}" />
+ <f:viewAction action="#{beanHelper.notifyControllerFaxNumberConverted()}" />
</f:metadata>
</ui:define>
<ui:define name="content">
<core:outputAdminFaxPanelGrid faxNumber="#{beanHelper.faxNumber}" />
- <p:dataTable id="contact_fax_link" var="contact" value="#{contactPhoneController.allCurrentFaxNumberContacts()}" summary="#{msg.TABLE_SUMMARY_ADMIN_SHOW_ADMINISTRATIVE_LINKS}" tableStyleClass="table table-medium">
+ <p:dataTable
+ id="contact_fax_link"
+ var="contact"
+ value="#{contactPhoneController.allCurrentFaxNumberContacts()}"
+ summary="#{msg.TABLE_SUMMARY_ADMIN_SHOW_ADMINISTRATIVE_LINKS}"
+ >
<f:facet name="header">
<h:outputFormat value="#{msg.ADMIN_SHOW_FAX_NUMBER_LINKS_HEADER}">
<f:param value="#{beanHelper.faxNumber.phoneId}" />
<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
- xmlns="http://www.w3.org/1999/xhtml"
- xmlns:links="http://mxchange.org/jsf/core/links"
- 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"
+ xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:links="http://mxchange.org/jsf/core/links"
+ 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:define name="document_admin_title">
<h:outputText value="#{msg.PAGE_TITLE_ADMIN_LIST_HEADQUARTER}" />
id="headquarterList"
var="headquarter"
value="#{headquarterController.allHeadquarter()}"
- tableStyleClass="table table-full"
paginator="true"
paginatorTemplate="{CurrentPageReport} {FirstPageLink} {PreviousPageLink} {PageLinks} {NextPageLink} {LastPageLink} {RowsPerPageDropdown}"
filteredValue="#{headquarterController.filteredHeadquarter}"
<h:outputText value="#{msg.ADMIN_LIST_HEADQUARTER_HEADER}" />
<h:panelGroup>
- <p:commandButton id="toggler" type="button" value="#{msg.SELECT_SHOWN_COLUMNS}" styleClass="column-selector" />
+ <p:commandButton
+ id="toggler"
+ type="button"
+ value="#{msg.SELECT_SHOWN_COLUMNS}"
+ styleClass="column-selector"
+ />
+
<p:columnToggler datasource="headquarterList" trigger="toggler" />
</h:panelGroup>
</p:panelGrid>
</p:column>
<p:column headerText="#{msg.ENTRY_CREATED_HEADER}" sortBy="#{headquarter.headquarterCreated}" filterable="false">
- <h:outputText id="headquarterCreated" value="#{headquarter.headquarterCreated.time}">
- <f:convertDateTime for="headquarterCreated" type="both" timeStyle="short" dateStyle="short" />
+ <h:outputText id="headquarterCreated" value="#{headquarter.headquarterCreated}">
+ <f:convertDateTime type="both" timeStyle="short" dateStyle="short" />
</h:outputText>
</p:column>
</h:form>
<h:form>
- <p:panelGrid columns="1" styleClass="table table-full" layout="grid">
+ <p:panelGrid
+ columns="1"
+ layout="grid"
+ >
<f:facet name="header">
<h:outputText value="#{msg.ADMIN_ADD_HEADQUARTER_TITLE}" />
</f:facet>
/>
<p:commandButton
- styleClass="submit"
+ process="@form"
type="submit"
value="#{msg.BUTTON_ADMIN_ADD_HEADQUARTER}"
action="#{adminHeadquarterController.addHeadquarter()}"
id="headquarterOpeningTimeList"
var="openingTime"
value="#{adminHeadquarterController.headquarterOpeningTimes}"
- tableStyleClass="table table-full"
rows="10"
reflow="true"
summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_HEADQUARTER_OPENING_TIMES}"
</p:column>
<p:column headerText="#{msg.ADMIN_START_TIME}">
- <h:outputText value="#{openingTime.openingStartTime.time}">
+ <h:outputText value="#{openingTime.openingStartTime}">
<f:convertDateTime type="time" timeStyle="short" />
</h:outputText>
</p:column>
<p:column headerText="#{msg.ADMIN_END_TIME}">
- <h:outputText value="#{openingTime.openingEndTime.time}">
+ <h:outputText value="#{openingTime.openingEndTime}">
<f:convertDateTime type="time" timeStyle="short" />
</h:outputText>
</p:column>
</h:form>
<h:form id="form-admin-add-headquarter-opening-time">
- <p:panelGrid columns="1" styleClass="table table-full" layout="grid">
+ <p:panelGrid
+ columns="1"
+ layout="grid"
+ >
<f:facet name="header">
<h:outputText value="#{msg.ADMIN_ADD_HEADQUARTER_OPENING_TIME_TITLE}" />
</f:facet>
<f:facet name="footer">
<p:panelGrid columns="2" layout="grid">
<p:commandButton
- styleClass="reset"
type="reset"
value="#{msg.BUTTON_RESET_FORM}"
/>
<p:commandButton
- styleClass="submit"
+ process="@form"
type="submit"
value="#{msg.BUTTON_ADMIN_ADD_HEADQUARTER_OPENING_TIME}"
action="#{adminHeadquarterController.addOpeningTime()}"
<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
- xmlns="http://www.w3.org/1999/xhtml"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
- xmlns:h="http://xmlns.jcp.org/jsf/html"
- xmlns:f="http://xmlns.jcp.org/jsf/core">
+<ui:composition
+ template="/WEB-INF/templates/admin/admin_base.tpl"
+ xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+ xmlns:h="http://xmlns.jcp.org/jsf/html"
+ >
<ui:define name="document_admin_title">
<h:outputText value="#{msg.PAGE_TITLE_ADMIN_WELCOME}" />
<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
- xmlns="http://www.w3.org/1999/xhtml"
- xmlns:core="http://mxchange.org/jsf/core/widgets"
- 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"
+ xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:core="http://mxchange.org/jsf/core/widgets"
+ 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:define name="metadata">
<f:metadata>
<f:viewParam name="phoneId" value="#{beanHelper.landLineNumber}" converter="LandLineNumberConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_PHONE_ID_INVALID}" />
- <f:viewAction onPostback="true" action="#{beanHelper.notifyControllerLandLineNumberConverted()}" />
+ <f:viewAction action="#{beanHelper.notifyControllerLandLineNumberConverted()}" />
</f:metadata>
</ui:define>
<h:outputText value="#{msg.ADMIN_DELETE_LAND_LINE_DATA_NOTICE}" />
</div>
- <div class="table-footer">
- <p:commandButton styleClass="button-danger" type="submit" id="submit_delete_landline" value="#{msg.BUTTON_ADMIN_DELETE_LAND_LINE}" action="#{adminPhoneController.deleteLandLineData()}" />
- </div>
+ <p:commandButton
+ process="@form"
+ type="submit"
+ value="#{msg.BUTTON_ADMIN_DELETE_LAND_LINE}"
+ action="#{adminPhoneController.deleteLandLineData()}"
+ />
</h:panelGroup>
</h:form>
</ui:define>
<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
- xmlns="http://www.w3.org/1999/xhtml"
- xmlns:core="http://mxchange.org/jsf/core/widgets"
- 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"
+ xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:core="http://mxchange.org/jsf/core/widgets"
+ 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:define name="metadata">
<f:metadata>
<f:viewParam name="phoneId" value="#{beanHelper.landLineNumber}" converter="LandLineNumberConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_PHONE_ID_INVALID}" />
- <f:viewAction onPostback="true" action="#{beanHelper.notifyControllerLandLineNumberConverted()}" />
+ <f:viewAction action="#{beanHelper.notifyControllerLandLineNumberConverted()}" />
</f:metadata>
</ui:define>
<core:outputMessageBox id="error-handler-landline-number" message="#{msg.ERROR_BEAN_HELPER_LAND_LINE_NUMBER_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.landLineNumber}" />
<h:form id="form_edit_landline" rendered="#{not empty beanHelper.landLineNumber}">
- <h:panelGroup styleClass="table table-full" layout="block">
+ <h:panelGroup layout="block">
<div class="table-header">
<h:outputFormat value="#{msg.ADMIN_EDIT_LAND_LINE_NUMBER_TITLE}">
<f:param value="#{beanHelper.landLineNumber.phoneId}" />
<core:outputAdminLandLineDataFormFields landLineNumber="#{beanHelper.landLineNumber}" />
- <div class="table-footer">
- <p:commandButton styleClass="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
- <p:commandButton styleClass="submit" type="submit" id="submit_edit_landline" value="#{msg.BUTTON_ADMIN_EDIT_LAND_LINE_NUMBER}" action="#{adminPhoneController.doChangeLandLineNumber()}" />
- </div>
+ <p:panelGrid columns="2" layout="grid">
+ <p:commandButton
+ type="reset"
+ value="#{msg.BUTTON_RESET_FORM}"
+ />
+
+ <p:commandButton
+ process="@form"
+ type="submit"
+ value="#{msg.BUTTON_ADMIN_EDIT_LAND_LINE_NUMBER}"
+ action="#{adminPhoneController.doChangeLandLineNumber()}"
+ />
+ </p:panelGrid>
</h:panelGroup>
</h:form>
</ui:define>
<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
- xmlns="http://www.w3.org/1999/xhtml"
- xmlns:core="http://mxchange.org/jsf/core/widgets"
- 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"
+ xmlns="http://www.w3.org/1999/xhtml"
+ 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:define name="document_admin_title">
<h:outputText value="#{msg.PAGE_TITLE_ADMIN_LIST_CONTACT_LAND_LINE_NUMBER}" />
id="table_list_landline"
var="landLineNumber"
value="#{phoneController.allLandLineNumbers()}"
- tableStyleClass="table table-full"
paginator="true"
rows="10"
summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_LAND_LINES}"
<h:outputText value="#{msg.ADMIN_SHOW_LAND_LINE_NUMBER}" />
</f:facet>
- <h:outputText value="#{landLineNumber.phoneCountry.countryAbroadDialPrefix}#{landLineNumber.phoneCountry.countryPhoneCode} (#{landLineNumber.phoneAreaCode}) #{landLineNumber.phoneNumber}" />
+ <h:outputText value="#{beanHelper.renderPhoneNumber(landLineNumber)}" />
</p:column>
<p:column>
<h:outputText value="#{msg.ADMIN_SHOW_PHONE_CREATED}" />
</f:facet>
- <h:outputText value="#{landLineNumber.phoneEntryCreated.time}">
+ <h:outputText value="#{landLineNumber.phoneEntryCreated}">
<f:convertDateTime type="both" />
</h:outputText>
</p:column>
<h:outputText value="#{msg.ADMIN_SHOW_PHONE_UPDATED}" />
</f:facet>
- <h:outputText value="#{landLineNumber.phoneEntryUpdated.time}">
+ <h:outputText value="#{landLineNumber.phoneEntryUpdated}">
<f:convertDateTime type="both" />
</h:outputText>
</p:column>
<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
- xmlns="http://www.w3.org/1999/xhtml"
- xmlns:core="http://mxchange.org/jsf/core/widgets"
- 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"
+ xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:core="http://mxchange.org/jsf/core/widgets"
+ 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:define name="metadata">
<f:metadata>
<f:viewParam name="phoneId" value="#{beanHelper.landLineNumber}" converter="LandLineNumberConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" />
- <f:viewAction onPostback="true" action="#{beanHelper.notifyControllerLandLineNumberConverted()}" />
+ <f:viewAction action="#{beanHelper.notifyControllerLandLineNumberConverted()}" />
</f:metadata>
</ui:define>
<ui:define name="content">
<core:outputAdminLandLinePanelGrid landLineNumber="#{beanHelper.landLineNumber}" />
- <p:dataTable id="contact_landline_link" var="contact" value="#{contactPhoneController.allCurrentLandLineNumberContacts()}" summary="#{msg.TABLE_SUMMARY_ADMIN_SHOW_ADMINISTRATIVE_LINKS}" tableStyleClass="table table-medium">
+ <p:dataTable
+ id="contact_landline_link"
+ var="contact"
+ value="#{contactPhoneController.allCurrentLandLineNumberContacts()}"
+ summary="#{msg.TABLE_SUMMARY_ADMIN_SHOW_ADMINISTRATIVE_LINKS}"
+ >
<f:facet name="header">
<h:outputFormat value="#{msg.ADMIN_SHOW_LAND_LINE_NUMBER_LINKS_HEADER}">
<f:param value="#{beanHelper.landLineNumber.phoneId}" />
<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
- xmlns="http://www.w3.org/1999/xhtml"
- 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"
+ xmlns="http://www.w3.org/1999/xhtml"
+ 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:define name="document_admin_title">
<h:outputText value="#{msg.PAGE_TITLE_ADMIN_LIST_CONTACT_MOBILE_NUMBER}" />
id="table_list_mobiles"
var="mobile"
value="#{phoneController.allMobileNumbers()}"
- tableStyleClass="table table-full"
paginator="true"
rows="10"
summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_MOBILE_NUMBERS}"
<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
- xmlns="http://www.w3.org/1999/xhtml"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
- xmlns:h="http://xmlns.jcp.org/jsf/html"
- xmlns:f="http://xmlns.jcp.org/jsf/core">
+<ui:composition
+ template="/WEB-INF/templates/admin/admin_base.tpl"
+ xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+ xmlns:h="http://xmlns.jcp.org/jsf/html"
+ xmlns:f="http://xmlns.jcp.org/jsf/core"
+ >
<ui:define name="metadata">
<f:metadata>
<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
- xmlns="http://www.w3.org/1999/xhtml"
- xmlns:core="http://mxchange.org/jsf/core/widgets"
- 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"
+ xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:core="http://mxchange.org/jsf/core/widgets"
+ 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:define name="metadata">
<f:metadata>
<f:viewParam name="phoneId" value="#{beanHelper.mobileNumber}" converter="MobileNumberConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_PHONE_ID_INVALID}" />
- <f:viewAction onPostback="true" action="#{beanHelper.notifyControllerMobileNumberConverted()}" />
+ <f:viewAction action="#{beanHelper.notifyControllerMobileNumberConverted()}" />
</f:metadata>
</ui:define>
<h:outputText value="#{msg.ADMIN_DELETE_MOBILE_DATA_NOTICE}" />
</div>
- <div class="table-footer">
- <p:commandButton styleClass="button-danger" type="submit" id="submit_delete_mobile" value="#{msg.BUTTON_ADMIN_DELETE_MOBILE_NUMBER}" action="#{adminPhoneController.deleteMobileData()}" />
- </div>
+ <p:commandButton
+ process="@form"
+ type="submit"
+ value="#{msg.BUTTON_ADMIN_DELETE_MOBILE_NUMBER}"
+ action="#{adminPhoneController.deleteMobileData()}"
+ />
</h:panelGroup>
</h:form>
</ui:define>
<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
- xmlns="http://www.w3.org/1999/xhtml"
- xmlns:core="http://mxchange.org/jsf/core/widgets"
- 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"
+ xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:core="http://mxchange.org/jsf/core/widgets"
+ 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:define name="metadata">
<f:metadata>
<f:viewParam name="phoneId" value="#{beanHelper.mobileNumber}" converter="MobileNumberConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_PHONE_ID_INVALID}" />
- <f:viewAction onPostback="true" action="#{beanHelper.notifyControllerMobileNumberConverted()}" />
+ <f:viewAction action="#{beanHelper.notifyControllerMobileNumberConverted()}" />
</f:metadata>
</ui:define>
<core:outputMessageBox id="error-handler-mobile-number" message="#{msg.ERROR_BEAN_HELPER_MOBILE_NUMBER_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.mobileNumber}" />
<h:form id="form_edit_mobile" rendered="#{not empty beanHelper.mobileNumber}">
- <h:panelGroup styleClass="table table-full" layout="block">
+ <h:panelGroup layout="block">
<div class="table-header">
<h:outputFormat value="#{msg.ADMIN_EDIT_MOBILE_NUMBER_TITLE}">
<f:param value="#{beanHelper.mobileNumber.phoneId}" />
<core:outputAdminMobileDataFormFields mobileNumber="#{beanHelper.mobileNumber}" />
- <div class="table-footer">
- <p:commandButton styleClass="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
- <p:commandButton styleClass="submit" type="submit" id="submit_edit_mobile" value="#{msg.BUTTON_ADMIN_EDIT_MOBILE_NUMBER}" action="#{adminPhoneController.doUpdateMobileNumber()}" />
- </div>
+ <p:panelGrid columns="2" layout="grid">
+ <p:commandButton
+ type="reset"
+ value="#{msg.BUTTON_RESET_FORM}"
+ />
+
+ <p:commandButton
+ process="@form"
+ type="submit"
+ value="#{msg.BUTTON_ADMIN_EDIT_MOBILE_NUMBER}"
+ action="#{adminPhoneController.doUpdateMobileNumber()}"
+ />
+ </p:panelGrid>
</h:panelGroup>
</h:form>
</ui:define>
<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
- xmlns="http://www.w3.org/1999/xhtml"
- xmlns:core="http://mxchange.org/jsf/core/widgets"
- 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"
+ xmlns="http://www.w3.org/1999/xhtml"
+ 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:define name="document_admin_title">
<h:outputText value="#{msg.PAGE_TITLE_ADMIN_LIST_CONTACT_MOBILE_NUMBER}" />
id="mobileNumberList"
var="mobileNumber"
value="#{phoneController.allMobileNumbers()}"
- tableStyleClass="table table-full"
paginator="true"
rows="10"
summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_MOBILES}"
<h:outputText value="#{msg.ADMIN_SHOW_MOBILE_NUMBER_COMPLETE}" />
</f:facet>
- <h:outputText value="#{mobileNumber.mobileProvider.providerCountry.countryExternalDialPrefix}#{mobileNumber.mobileProvider.providerDialPrefix}-#{mobileNumber.phoneNumber}" />
+ <h:outputText value="#{beanHelper.renderMobileNumber(mobileNumber)}" />
</p:column>
<p:column>
<h:outputText value="#{msg.ADMIN_SHOW_PHONE_CREATED}" />
</f:facet>
- <h:outputText value="#{mobileNumber.phoneEntryCreated.time}">
+ <h:outputText value="#{mobileNumber.phoneEntryCreated}">
<f:convertDateTime type="both" />
</h:outputText>
</p:column>
<h:outputText value="#{msg.ADMIN_SHOW_PHONE_UPDATED}" />
</f:facet>
- <h:outputText value="#{mobileNumber.phoneEntryUpdated.time}">
+ <h:outputText value="#{mobileNumber.phoneEntryUpdated}">
<f:convertDateTime type="both" />
</h:outputText>
</p:column>
<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
- xmlns="http://www.w3.org/1999/xhtml"
- xmlns:core="http://mxchange.org/jsf/core/widgets"
- 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"
+ xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:core="http://mxchange.org/jsf/core/widgets"
+ 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:define name="metadata">
<f:metadata>
<f:viewParam name="phoneId" value="#{beanHelper.mobileNumber}" converter="MobileNumberConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_PHONE_ID_INVALID}" />
- <f:viewAction onPostback="true" action="#{beanHelper.notifyControllerMobileNumberConverted()}" />
+ <f:viewAction action="#{beanHelper.notifyControllerMobileNumberConverted()}" />
</f:metadata>
</ui:define>
<ui:define name="content">
<core:outputAdminMobilePanelGrid mobileNumber="#{beanHelper.mobileNumber}" />
- <p:dataTable id="contact_mobile_link" var="contact" value="#{contactPhoneController.allCurrentMobileNumberContacts()}" summary="#{msg.TABLE_SUMMARY_ADMIN_SHOW_ADMINISTRATIVE_LINKS}" tableStyleClass="table table-medium">
+ <p:dataTable
+ id="contact_mobile_link"
+ var="contact"
+ value="#{contactPhoneController.allCurrentMobileNumberContacts()}"
+ summary="#{msg.TABLE_SUMMARY_ADMIN_SHOW_ADMINISTRATIVE_LINKS}"
+ >
<f:facet name="header">
<h:outputFormat value="#{msg.ADMIN_SHOW_MOBILE_NUMBER_LINKS_HEADER}">
<f:param value="#{beanHelper.mobileNumber.phoneId}" />
<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
- xmlns="http://www.w3.org/1999/xhtml"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
- xmlns:h="http://xmlns.jcp.org/jsf/html"
- xmlns:f="http://xmlns.jcp.org/jsf/core">
+<ui:composition
+ template="/WEB-INF/templates/admin/admin_base.tpl"
+ xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+ xmlns:h="http://xmlns.jcp.org/jsf/html"
+ >
<ui:define name="document_admin_title">
<h:outputText value="#{msg.PAGE_TITLE_ADMIN_MOBILE_PROVIDER_DELETE}" />
<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
- xmlns="http://www.w3.org/1999/xhtml"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
- xmlns:h="http://xmlns.jcp.org/jsf/html"
- xmlns:f="http://xmlns.jcp.org/jsf/core">
+<ui:composition
+ template="/WEB-INF/templates/admin/admin_base.tpl"
+ xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+ xmlns:h="http://xmlns.jcp.org/jsf/html"
+ >
<ui:define name="document_admin_title">
<h:outputText value="#{msg.PAGE_TITLE_ADMIN_MOBILE_PROVIDER_EDIT}" />
<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
- xmlns="http://www.w3.org/1999/xhtml"
- xmlns:links="http://mxchange.org/jsf/core/links"
- 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"
+ xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:links="http://mxchange.org/jsf/core/links"
+ 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:define name="document_admin_title">
<h:outputText value="#{msg.PAGE_TITLE_ADMIN_MOBILE_PROVIDER_LIST}" />
id="mobileProviderList"
var="mobileProvider"
value="#{mobileProviderController.allMobileProviders()}"
- tableStyleClass="table table-full"
paginator="true"
paginatorTemplate="{CurrentPageReport} {FirstPageLink} {PreviousPageLink} {PageLinks} {NextPageLink} {LastPageLink} {RowsPerPageDropdown}"
filteredValue="#{mobileProviderController.filteredMobileProviders}"
<p:panelGrid columns="2" columnClasses="ui-grid-col-10,ui-grid-col-2" layout="grid" styleClass="ui-noborder ui-transparent-widget">
<h:outputText value="#{msg.ADMIN_LIST_MOBILE_PROVIDERS_HEADER}" />
- <p:commandButton id="toggler" type="button" value="#{msg.SELECT_SHOWN_COLUMNS}" styleClass="column-selector" />
+ <p:commandButton
+ id="toggler"
+ type="button"
+ value="#{msg.SELECT_SHOWN_COLUMNS}"
+ styleClass="column-selector"
+ />
+
<p:columnToggler datasource="mobileProviderList" trigger="toggler" />
</p:panelGrid>
</f:facet>
</p:column>
<p:column headerText="#{msg.ENTRY_CREATED_HEADER}" sortBy="#{mobileProvider.providerEntryCreated}">
- <h:outputText id="providerEntryCreated" value="#{mobileProvider.providerEntryCreated.time}">
- <f:convertDateTime for="providerEntryCreated" type="both" timeStyle="short" dateStyle="short" />
+ <h:outputText id="providerEntryCreated" value="#{mobileProvider.providerEntryCreated}">
+ <f:convertDateTime type="both" timeStyle="short" dateStyle="short" />
</h:outputText>
</p:column>
</h:form>
<h:form>
- <h:panelGroup styleClass="table table-full" layout="block">
+ <h:panelGroup layout="block">
<div class="table-header">
<h:outputText value="#{msg.ADMIN_ADD_MOBILE_PROVIDER_TITLE}" />
</div>
<ui:include src="/WEB-INF/templates/admin/mobile_provider/admin_form_mobile_provider.tpl" />
- <div class="table-footer">
+ <p:panelGrid columns="2" layout="grid">
<p:commandButton
- styleClass="reset"
type="reset"
value="#{msg.BUTTON_RESET_FORM}"
/>
+
<p:commandButton
- styleClass="submit"
+ process="@form"
type="submit"
value="#{msg.BUTTON_ADMIN_ADD_MOBILE_PROVIDER}"
action="#{adminMobileProviderController.addMobileProvider()}"
update=":master:form-list-mobile-provider:mobileProviderList"
/>
- </div>
+ </p:panelGrid>
</h:panelGroup>
<h:panelGroup styleClass="para notice" layout="block">
<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
- xmlns="http://www.w3.org/1999/xhtml"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
- xmlns:h="http://xmlns.jcp.org/jsf/html"
- xmlns:f="http://xmlns.jcp.org/jsf/core">
+<ui:composition
+ template="/WEB-INF/templates/admin/admin_base.tpl"
+ xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+ xmlns:h="http://xmlns.jcp.org/jsf/html"
+ >
<ui:define name="document_admin_title">
<h:outputText value="#{msg.PAGE_TITLE_ADMIN_SHOW_MOBILE_PROVIDER}" />
<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
- xmlns="http://www.w3.org/1999/xhtml"
- xmlns:core="http://mxchange.org/jsf/core/widgets"
- xmlns:links="http://mxchange.org/jsf/core/links"
- 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"
+ xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:links="http://mxchange.org/jsf/core/links"
+ 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:define name="document_admin_title">
<h:outputText value="#{msg.PAGE_TITLE_ADMIN_LIST_OPENING_TIMES}" />
id="openingTimeList"
var="openingTime"
value="#{openingTimeController.allOpeningTimes()}"
- tableStyleClass="table table-full"
paginator="true"
paginatorTemplate="{CurrentPageReport} {FirstPageLink} {PreviousPageLink} {PageLinks} {NextPageLink} {LastPageLink} {RowsPerPageDropdown}"
filteredValue="#{openingTimeController.filteredOpeningTimes}"
<h:outputText value="#{msg.ADMIN_LIST_OPENING_TIMES_HEADER}" />
<h:panelGroup>
- <p:commandButton id="toggler" type="button" value="#{msg.SELECT_SHOWN_COLUMNS}" styleClass="column-selector" />
+ <p:commandButton
+ id="toggler"
+ type="button"
+ value="#{msg.SELECT_SHOWN_COLUMNS}"
+ styleClass="column-selector"
+ />
+
<p:columnToggler datasource="openingTimeList" trigger="toggler" />
</h:panelGroup>
</p:panelGrid>
</p:column>
<p:column headerText="#{msg.ADMIN_START_TIME}" sortBy="#{openingTime.openingStartTime}" filterBy="#{openingTime.openingStartTime}" filterable="false">
- <h:outputText value="#{openingTime.openingStartTime.time}">
+ <h:outputText value="#{openingTime.openingStartTime}">
<f:convertDateTime type="time" timeStyle="short" />
</h:outputText>
</p:column>
<p:column headerText="#{msg.ADMIN_END_TIME}" sortBy="#{openingTime.openingEndTime}" filterBy="#{openingTime.openingEndTime}" filterable="false">
- <h:outputText value="#{openingTime.openingEndTime.time}">
+ <h:outputText value="#{openingTime.openingEndTime}">
<f:convertDateTime type="time" timeStyle="short" />
</h:outputText>
</p:column>
</h:form>
<h:form>
- <p:panelGrid columns="1" styleClass="table table-full" layout="grid">
+ <p:panelGrid
+ columns="1"
+ layout="grid"
+ >
<f:facet name="header">
<h:outputText value="#{msg.ADMIN_ADD_OPENING_TIME_TITLE}" />
</f:facet>
<f:facet name="footer">
<p:panelGrid columns="2" layout="grid">
<p:commandButton
- styleClass="reset"
type="reset"
value="#{msg.BUTTON_RESET_FORM}"
/>
<p:commandButton
- styleClass="submit"
+ process="@form"
type="submit"
value="#{msg.BUTTON_ADMIN_ADD_OPENING_TIME}"
action="#{adminOpeningTimeController.addOpeningTime()}"
<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
- xmlns="http://www.w3.org/1999/xhtml"
- xmlns:core="http://mxchange.org/jsf/core/widgets"
- 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"
+ xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:core="http://mxchange.org/jsf/core/widgets"
+ 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:define name="metadata">
<f:metadata>
<f:viewParam name="userId" value="#{beanHelper.user}" converter="UserConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_USER_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_USER_ID_INVALID}" />
- <f:viewAction onPostback="true" action="#{beanHelper.notifyControllerUserConverted()}" />
+ <f:viewAction action="#{beanHelper.notifyControllerUserConverted()}" />
</f:metadata>
</ui:define>
<ui:define name="content">
<core:outputMessageBox id="error-helper-user" message="#{msg.ERROR_USER_NOT_FOUND}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.user}" />
- <p:dataTable id="table_user_activity_log" var="userActivity" value="#{userActivityController.fetchCurrentUsersActivityLog()}" tableStyleClass="table table-full" paginator="true" rows="10" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_USER_ACTIVITY_LOG}" rendered="#{not empty beanHelper.user}">
+ <p:dataTable
+ id="table_user_activity_log"
+ var="userActivity"
+ value="#{userActivityController.fetchCurrentUsersActivityLog()}"
+ paginator="true"
+ rows="10"
+ summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_USER_ACTIVITY_LOG}"
+ rendered="#{not empty beanHelper.user}"
+ >
<p:column>
<f:facet name="header">
<h:outputText value="#{msg.ADMIN_LIST_USER_ID}" />
<h:outputText value="#{msg.ADMIN_LIST_USER_ACTIVITY_LOG_TIMESTAMP}" />
</f:facet>
- <h:outputText id="userCreated" value="#{userActivity.activityTimestamp.time}">
- <f:convertDateTime for="userCreated" type="both" timeStyle="short" dateStyle="short" />
+ <h:outputText id="userCreated" value="#{userActivity.activityTimestamp}">
+ <f:convertDateTime type="both" timeStyle="short" dateStyle="short" />
</h:outputText>
</p:column>
</p:dataTable>
<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
- xmlns="http://www.w3.org/1999/xhtml"
- xmlns:core="http://mxchange.org/jsf/core/widgets"
- 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"
+ xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:core="http://mxchange.org/jsf/core/widgets"
+ 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:define name="metadata">
<f:metadata>
<f:viewParam name="userId" value="#{beanHelper.user}" converter="UserConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_USER_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_USER_ID_INVALID}" />
- <f:viewAction onPostback="true" action="#{beanHelper.notifyControllerUserConverted()}" />
+ <f:viewAction action="#{beanHelper.notifyControllerUserConverted()}" />
</f:metadata>
</ui:define>
<core:outputMessageBox id="error-helper-user" message="#{msg.ERROR_USER_NOT_FOUND}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.user}" />
<h:form id="form-admin-delete-user" rendered="#{not empty beanHelper.user}">
- <h:panelGroup styleClass="table table-full" layout="block">
+ <h:panelGroup layout="block">
<div class="table-header">
<h:outputFormat value="#{msg.ADMIN_DELETE_USER_TITLE}">
<f:param value="#{beanHelper.user.userName}" />
</div>
</h:panelGroup>
- <div class="table-footer">
- <p:commandButton styleClass="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
- <p:commandButton styleClass="button-danger" type="submit" id="submit_delete_user" value="#{msg.BUTTON_ADMIN_DELETE_USER}" action="#{adminUserController.deleteUserData()}" />
- </div>
+ <p:commandButton
+ process="@form"
+ type="submit"
+ value="#{msg.BUTTON_ADMIN_DELETE_USER}"
+ action="#{adminUserController.deleteUserData()}"
+ />
</h:panelGroup>
</h:form>
</ui:define>
<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
- xmlns="http://www.w3.org/1999/xhtml"
- xmlns:core="http://mxchange.org/jsf/core/widgets"
- 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"
+ xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:core="http://mxchange.org/jsf/core/widgets"
+ 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:define name="metadata">
<f:metadata>
<f:viewParam name="userId" value="#{beanHelper.user}" converter="UserConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_USER_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_USER_ID_INVALID}" />
- <f:viewAction onPostback="true" action="#{beanHelper.notifyControllerUserConverted()}" />
+ <f:viewAction action="#{beanHelper.notifyControllerUserConverted()}" />
</f:metadata>
</ui:define>
<core:outputMessageBox id="error-helper-user" message="#{msg.ERROR_USER_NOT_FOUND}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.user}" />
<h:form id="form_edit_user" rendered="#{not empty beanHelper.user}">
- <h:panelGroup styleClass="table table-full" layout="block">
+ <h:panelGroup layout="block">
<div class="table-header">
<h:outputText value="#{msg.ADMIN_EDIT_USER_TITLE}" />
</div>
<core:outputAdminUserDataFormFields mode="edit" />
- <div class="table-footer">
- <p:commandButton styleClass="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
- <p:commandButton styleClass="submit" type="submit" id="submit_edit_user" value="#{msg.BUTTON_ADMIN_EDIT_USER}" action="#{adminUserController.editUserData()}" />
- </div>
+ <p:panelGrid columns="2" layout="grid">
+ <p:commandButton
+ type="reset"
+ value="#{msg.BUTTON_RESET_FORM}"
+ />
+
+ <p:commandButton
+ process="@form"
+ type="submit"
+ value="#{msg.BUTTON_ADMIN_EDIT_USER}"
+ action="#{adminUserController.editUserData()}"
+ />
+ </p:panelGrid>
</h:panelGroup>
</h:form>
</ui:define>
<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
- xmlns="http://www.w3.org/1999/xhtml"
- xmlns:core="http://mxchange.org/jsf/core/widgets"
- 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"
+ xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:core="http://mxchange.org/jsf/core/widgets"
+ 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:define name="document_admin_title">
<h:outputText value="#{msg.PAGE_TITLE_ADMIN_EXPORT_USER}" />
id="table_export_users"
var="user"
value="#{userController.allUsers()}"
- tableStyleClass="table table-full"
paginator="true"
rows="10"
summary="#{msg.TABLE_SUMMARY_ADMIN_EXPORT_USER}"
</f:facet>
<h:outputText id="contactBirthday" value="#{user.userContact.contactBirthday}">
- <f:convertDateTime for="contactBirthday" type="date" dateStyle="medium" />
+ <f:convertDateTime type="date" dateStyle="medium" />
</h:outputText>
</p:column>
<h:outputText value="#{msg.ADMIN_EXPORT_CONTACT_CREATED}" />
</f:facet>
- <h:outputText id="contactCreated" value="#{user.userContact.contactCreated.time}">
- <f:convertDateTime for="contactCreated" type="both" timeStyle="short" dateStyle="short" locale="#{localizationController.locale}" />
+ <h:outputText id="contactCreated" value="#{user.userContact.contactCreated}">
+ <f:convertDateTime type="both" timeStyle="short" dateStyle="short" locale="#{localizationController.locale}" />
</h:outputText>
</p:column>
</p:dataTable>
- <h:panelGroup styleClass="table table-full" layout="block">
+ <h:panelGroup layout="block">
<div class="table-header">
<h:outputText value="#{msg.ADMIN_EXPORT_USERS_TITLE}" />
</div>
<h:outputText value="#{msg.ADMIN_EXPORT_USERS_TIMEOUT_WARNING}" />
</div>
- <div class="table-footer">
- <p:commandButton styleClass="submit" type="submit" id="submit_export_users_xls" value="#{msg.BUTTON_ADMIN_EXPORT_USERS_XLS}">
- <p:dataExporter type="xls" target="table_export_users" fileName="all_users" />
- </p:commandButton>
- </div>
+ <p:commandButton
+ ajax="false"
+ process="@form"
+ type="submit"
+ value="#{msg.BUTTON_ADMIN_EXPORT_USERS_XLS}"
+ >
+
+ <p:dataExporter
+ type="xls"
+ target="table_export_users"
+ fileName="all_users"
+ />
+ </p:commandButton>
</h:panelGroup>
</h:form>
</ui:define>
<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
- xmlns="http://www.w3.org/1999/xhtml"
- xmlns:core="http://mxchange.org/jsf/core/widgets"
- xmlns:links="http://mxchange.org/jsf/core/links"
- 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"
+ xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:core="http://mxchange.org/jsf/core/widgets"
+ xmlns:links="http://mxchange.org/jsf/core/links"
+ 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:define name="document_admin_title">
<h:outputText value="#{msg.PAGE_TITLE_ADMIN_LIST_USER}" />
id="userList"
var="user"
value="#{userController.allUsers()}"
- tableStyleClass="table table-full"
paginator="true"
paginatorTemplate="{CurrentPageReport} {FirstPageLink} {PreviousPageLink} {PageLinks} {NextPageLink} {LastPageLink} {RowsPerPageDropdown}"
filteredValue="#{userController.filteredUsers}"
<p:panelGrid columns="2" columnClasses="ui-grid-col-10,ui-grid-col-2" layout="grid" styleClass="ui-noborder ui-transparent-widget">
<h:outputText value="#{msg.ADMIN_LIST_USERS_HEADER}" />
- <p:commandButton id="toggler" type="button" value="#{msg.SELECT_SHOWN_COLUMNS}" styleClass="column-selector" />
+ <p:commandButton
+ id="toggler"
+ type="button"
+ value="#{msg.SELECT_SHOWN_COLUMNS}"
+ styleClass="column-selector"
+ />
+
<p:columnToggler datasource="userList" trigger="toggler" />
</p:panelGrid>
</f:facet>
</p:column>
<p:column headerText="#{msg.ENTRY_CREATED_HEADER}" sortBy="#{user.userCreated}" filterable="false">
- <h:outputText id="userCreated" value="#{user.userCreated.time}">
- <f:convertDateTime for="userCreated" type="both" timeStyle="short" dateStyle="short" />
+ <h:outputText id="userCreated" value="#{user.userCreated}">
+ <f:convertDateTime type="both" timeStyle="short" dateStyle="short" />
</h:outputText>
</p:column>
</h:form>
<h:form>
- <p:panelGrid columns="1" styleClass="table table-full" layout="grid">
+ <p:panelGrid
+ columns="1"
+ layout="grid"
+ >
<f:facet name="header">
<h:outputText value="#{msg.ADMIN_ADD_USER_TITLE}" />
</f:facet>
@TODO title="#{msg.ADMIN_SELECT_USER_CONTACT_LEGEND_TITLE}"
-->
<p:fieldset legend="#{msg.ADMIN_SELECT_USER_CONTACT_LEGEND}">
- <p:panelGrid columns="2" columnClasses="ui-grid-col-3,ui-grid-col-9" styleClass="table table-full ui-noborder" layout="grid">
+ <p:panelGrid
+ columns="2"
+ columnClasses="ui-grid-col-3,ui-grid-col-9"
+ styleClass="ui-noborder"
+ layout="grid"
+ >
<p:outputLabel for="userContact" value="#{msg.ADMIN_SELECT_USER_CONTACT}" />
<p:selectOneMenu
id="userContact"
<f:facet name="footer">
<p:panelGrid columns="2" layout="grid">
- <p:commandButton styleClass="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+ <p:commandButton
+ type="reset"
+ value="#{msg.BUTTON_RESET_FORM}"
+ />
<p:commandButton
- styleClass="submit"
+ process="@form"
type="submit"
id="submit_add_user"
value="#{msg.BUTTON_ADMIN_ADD_USER}"
<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
- xmlns="http://www.w3.org/1999/xhtml"
- xmlns:core="http://mxchange.org/jsf/core/widgets"
- 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"
+ xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:core="http://mxchange.org/jsf/core/widgets"
+ 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:define name="metadata">
<f:metadata>
<f:viewParam name="userId" value="#{beanHelper.user}" converter="UserConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_USER_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_USER_ID_INVALID}" />
- <f:viewAction onPostback="true" action="#{beanHelper.notifyControllerUserConverted()}" />
+ <f:viewAction action="#{beanHelper.notifyControllerUserConverted()}" />
</f:metadata>
</ui:define>
<core:outputMessageBox id="error-helper-user" message="#{msg.ERROR_USER_NOT_FOUND}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.user}" />
<h:form id="form-admin-user-lock" rendered="#{not empty beanHelper.user and beanHelper.user.userAccountStatus == 'CONFIRMED'}">
- <h:panelGroup styleClass="table table-full" layout="block">
+ <h:panelGroup layout="block">
<div class="table-header">
<h:outputFormat value="#{msg.ADMIN_LOCK_USER_TITLE}">
<f:param value="#{beanHelper.user.userName}" />
</div>
</h:panelGroup>
- <div class="table-footer">
- <p:commandButton styleClass="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-
- <p:commandButton styleClass="submit" type="submit" action="#{adminUserController.lockUserAccount()}" value="#{msg.BUTTON_ADMIN_LOCK_USER_ACCOUNT}" />
- </div>
+ <p:panelGrid columns="2" layout="grid">
+ <p:commandButton
+ type="reset"
+ value="#{msg.BUTTON_RESET_FORM}"
+ />
+
+ <p:commandButton
+ process="@form"
+ type="submit"
+ action="#{adminUserController.lockUserAccount()}"
+ value="#{msg.BUTTON_ADMIN_LOCK_USER_ACCOUNT}"
+ />
+ </p:panelGrid>
</h:panelGroup>
</h:form>
<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
- xmlns="http://www.w3.org/1999/xhtml"
- xmlns:core="http://mxchange.org/jsf/core/widgets"
- 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"
+ xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:core="http://mxchange.org/jsf/core/widgets"
+ 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:define name="metadata">
<f:metadata>
<f:viewParam name="userId" value="#{beanHelper.user}" converter="UserConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_USER_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_USER_ID_INVALID}" />
- <f:viewAction onPostback="true" action="#{beanHelper.notifyControllerUserConverted()}" />
+ <f:viewAction action="#{beanHelper.notifyControllerUserConverted()}" />
</f:metadata>
</ui:define>
<core:outputMessageBox id="error-helper-user" message="#{msg.ERROR_USER_NOT_FOUND}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.user}" />
<h:form id="form-admin-user-resend" rendered="#{not empty beanHelper.user and beanHelper.user.userAccountStatus == 'UNCONFIRMED'}">
- <h:panelGroup styleClass="table table-full" layout="block">
+ <h:panelGroup layout="block">
<div class="table-header">
<h:outputFormat value="#{msg.ADMIN_RESEND_USER_CONFIRMATION_LINK_TITLE}">
<f:param value="#{beanHelper.user.userName}" />
<h:outputText styleClass="notice" value="#{msg.ADMIN_RESEND_USER_CONFIRMATION_LINK_NOTICE}" />
</h:panelGroup>
- <div class="table-footer">
- <p:commandButton styleClass="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+ <p:panelGrid columns="2" layout="grid">
+ <p:commandButton
+ type="reset"
+ value="#{msg.BUTTON_RESET_FORM}"
+ />
- <p:commandButton styleClass="submit" type="submit" action="#{adminUserController.resendConfirmationLink()}" value="#{msg.BUTTON_ADMIN_RESEND_USER_CONFIRMATION_LINK_ACCOUNT}" />
- </div>
+ <p:commandButton
+ process="@form"
+ type="submit"
+ action="#{adminUserController.resendConfirmationLink()}"
+ value="#{msg.BUTTON_ADMIN_RESEND_USER_CONFIRMATION_LINK_ACCOUNT}"
+ />
+ </p:panelGrid>
</h:panelGroup>
</h:form>
<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
- xmlns="http://www.w3.org/1999/xhtml"
- xmlns:core="http://mxchange.org/jsf/core/widgets"
- xmlns:links="http://mxchange.org/jsf/core/links"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
- xmlns:h="http://xmlns.jcp.org/jsf/html"
- xmlns:f="http://xmlns.jcp.org/jsf/core">
+<ui:composition
+ template="/WEB-INF/templates/admin/admin_base.tpl"
+ xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:core="http://mxchange.org/jsf/core/widgets"
+ xmlns:links="http://mxchange.org/jsf/core/links"
+ xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+ xmlns:h="http://xmlns.jcp.org/jsf/html"
+ xmlns:f="http://xmlns.jcp.org/jsf/core"
+ >
<ui:define name="metadata">
<f:metadata>
<f:viewParam name="userId" value="#{beanHelper.user}" converter="UserConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_USER_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_USER_ID_INVALID}" />
- <f:viewAction onPostback="true" action="#{beanHelper.notifyControllerUserConverted()}" />
+ <f:viewAction action="#{beanHelper.notifyControllerUserConverted()}" />
</f:metadata>
</ui:define>
<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
- xmlns="http://www.w3.org/1999/xhtml"
- xmlns:core="http://mxchange.org/jsf/core/widgets"
- 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"
+ xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:core="http://mxchange.org/jsf/core/widgets"
+ 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:define name="metadata">
<f:metadata>
<f:viewParam name="userId" value="#{beanHelper.user}" converter="UserConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_USER_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_USER_ID_INVALID}" />
- <f:viewAction onPostback="true" action="#{beanHelper.notifyControllerUserConverted()}" />
+ <f:viewAction action="#{beanHelper.notifyControllerUserConverted()}" />
</f:metadata>
</ui:define>
<core:outputMessageBox id="error-helper-user" message="#{msg.ERROR_USER_NOT_FOUND}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.user}" />
<h:form id="form-admin-user-unlock" rendered="#{not empty beanHelper.user and beanHelper.user.userAccountStatus == 'LOCKED'}">
- <h:panelGroup styleClass="table table-full" layout="block">
+ <h:panelGroup layout="block">
<div class="table-header">
<h:outputFormat value="#{msg.ADMIN_UNLOCK_USER_TITLE}">
<f:param value="#{beanHelper.user.userName}" />
</div>
<div class="table-data-field">
- <h:outputText id="userLastLocked" value="#{beanHelper.user.userLastLocked.time}">
- <f:convertDateTime for="userLastLocked" type="both" />
+ <h:outputText id="userLastLocked" value="#{beanHelper.user.userLastLocked}">
+ <f:convertDateTime type="both" />
</h:outputText>
</div>
</h:panelGroup>
</div>
</h:panelGroup>
- <div class="table-footer">
- <p:commandButton styleClass="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-
- <p:commandButton styleClass="submit" type="submit" action="#{adminUserController.unlockUserAccount()}" value="#{msg.BUTTON_ADMIN_UNLOCK_USER_ACCOUNT}" />
- </div>
+ <p:panelGrid columns="2" layout="grid">
+ <p:commandButton
+ type="reset"
+ value="#{msg.BUTTON_RESET_FORM}"
+ />
+
+ <p:commandButton
+ process="@form"
+ type="submit"
+ action="#{adminUserController.unlockUserAccount()}"
+ value="#{msg.BUTTON_ADMIN_UNLOCK_USER_ACCOUNT}"
+ />
+ </p:panelGrid>
</h:panelGroup>
</h:form>
<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/#{userLoginController.baseTemplatePathName}_base.tpl"
- xmlns="http://www.w3.org/1999/xhtml"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
- xmlns:h="http://xmlns.jcp.org/jsf/html"
- xmlns:f="http://xmlns.jcp.org/jsf/core">
+<ui:composition
+ template="/WEB-INF/templates/#{userLoginController.baseTemplatePathName}_base.tpl"
+ xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+ xmlns:h="http://xmlns.jcp.org/jsf/html"
+ >
<ui:define name="document_guest_title">
<h:outputText value="#{msg.PAGE_TITLE_EXCEPTION_THROWN}" />
<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/guest/guest_base.tpl"
- xmlns="http://www.w3.org/1999/xhtml"
- xmlns:core="http://mxchange.org/jsf/core/widgets"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
- xmlns:h="http://xmlns.jcp.org/jsf/html"
- xmlns:f="http://xmlns.jcp.org/jsf/core">
+<ui:composition
+ template="/WEB-INF/templates/guest/guest_base.tpl"
+ xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:core="http://mxchange.org/jsf/core/widgets"
+ xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+ xmlns:h="http://xmlns.jcp.org/jsf/html"
+ xmlns:f="http://xmlns.jcp.org/jsf/core"
+ >
<ui:define name="metadata">
<f:metadata>
<f:viewParam name="confirmKey" value="#{userConfirmationLinkController.confirmationKey}" />
- <f:viewAction onPostback="true" action="#{userConfirmationLinkController.maybeConfirmUserAccount()}" />
+ <f:viewAction action="#{userConfirmationLinkController.maybeConfirmUserAccount()}" />
</f:metadata>
</ui:define>
<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/guest/guest_base.tpl"
- xmlns="http://www.w3.org/1999/xhtml"
- xmlns:core="http://mxchange.org/jsf/core/widgets"
- xmlns:links="http://mxchange.org/jsf/core/links"
- 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/guest/guest_base.tpl"
+ xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:core="http://mxchange.org/jsf/core/widgets"
+ xmlns:links="http://mxchange.org/jsf/core/links"
+ 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:define name="document_guest_title">
<h:outputText value="#{msg.PAGE_TITLE_USER_LIST}" />
<ui:define name="content">
<core:outputMessageBox id="error-user-list-disabled" message="#{msg.ERROR_USER_LIST_DISABLED}" messageStyleClass="alert-danger" rendered="#{not featureController.isFeatureEnabled('user_list')}" />
- <h:panelGroup styleClass="table table-full" layout="block" rendered="#{featureController.isFeatureEnabled('user_list')}">
+ <h:panelGroup
+ layout="block"
+ rendered="#{featureController.isFeatureEnabled('user_list')}"
+ >
<div class="table-header">
<h:outputText value="#{msg.TABLE_HEADER_USER_LIST}" />
</div>
- <p:dataTable id="userList" var="user" value="#{userController.allUsers()}" tableStyleClass="table" paginator="true" rows="10" summary="#{msg.TABLE_SUMMARY_USER_LIST}">
+ <p:dataTable
+ id="userList"
+ var="user"
+ value="#{userController.allUsers()}"
+ paginator="true"
+ rows="10"
+ summary="#{msg.TABLE_SUMMARY_USER_LIST}"
+ >
<ui:fragment rendered="#{profileController.isProfileLinkVisibleByUser(user)}">
<p:column>
<f:facet name="header">
<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/guest/guest_base.tpl"
- xmlns="http://www.w3.org/1999/xhtml"
- xmlns:core="http://mxchange.org/jsf/core/widgets"
- 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/guest/guest_base.tpl"
+ xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:core="http://mxchange.org/jsf/core/widgets"
+ xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+ xmlns:h="http://xmlns.jcp.org/jsf/html"
+ xmlns:p="http://primefaces.org/ui"
+ >
<ui:define name="document_guest_title">
<h:outputText value="#{msg.PAGE_TITLE_USER_LOGIN}" />
<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/guest/guest_base.tpl"
- xmlns="http://www.w3.org/1999/xhtml"
- xmlns:core="http://mxchange.org/jsf/core/widgets"
- 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/guest/guest_base.tpl"
+ xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:core="http://mxchange.org/jsf/core/widgets"
+ 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:define name="document_guest_title">
<h:outputText value="#{msg.PAGE_TITLE_USER_LOST_PASSWORD}" />
</h:panelGroup>
</fieldset>
- <div class="table-footer">
- <p:commandButton styleClass="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
- <p:commandButton styleClass="submit" type="submit" value="#{msg.BUTTON_CONTINUE_STEP_2}" action="#{passwordRecoveryController.doLostPasswordStep2()}" />
- </div>
+ <p:panelGrid columns="2" layout="grid">
+ <p:commandButton
+ type="reset"
+ value="#{msg.BUTTON_RESET_FORM}"
+ />
+
+ <p:commandButton
+ process="@form"
+ type="submit"
+ value="#{msg.BUTTON_CONTINUE_STEP_2}"
+ action="#{passwordRecoveryController.doLostPasswordStep2()}"
+ />
+ </p:panelGrid>
</h:panelGroup>
</h:form>
</div>
<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/#{userLoginController.baseTemplatePathName}_base.tpl"
- xmlns="http://www.w3.org/1999/xhtml"
- xmlns:core="http://mxchange.org/jsf/core/widgets"
- 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/#{userLoginController.baseTemplatePathName}_base.tpl"
+ xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:core="http://mxchange.org/jsf/core/widgets"
+ 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:define name="metadata">
<f:metadata>
<f:viewParam name="userId" value="#{beanHelper.user}" converter="UserConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_USER_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_USER_ID_INVALID}" />
- <f:viewAction onPostback="true" action="#{beanHelper.notifyControllerUserConverted()}" />
+ <f:viewAction action="#{beanHelper.notifyControllerUserConverted()}" />
</f:metadata>
</ui:define>
<core:outputMessageBox id="error-user-profile-hidden" message="#{msg.ERROR_PROFILE_NOT_VISIBLE}" messageStyleClass="alert-danger" rendered="#{not profileController.isProfileLinkVisibleById(userController.userId)}" />
<ui:fragment rendered="#{profileController.isProfileLinkVisibleById(userController.userId)}">
- <p:panelGrid styleClass="table table-full">
+ <p:panelGrid>
<f:facet name="header">
<h:outputText value="#{msg.PUBLIC_USER_PROFILE}" />
</f:facet>
<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/guest/guest_base.tpl"
- xmlns="http://www.w3.org/1999/xhtml"
- xmlns:core="http://mxchange.org/jsf/core/widgets"
- 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/guest/guest_base.tpl"
+ xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:core="http://mxchange.org/jsf/core/widgets"
+ xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+ xmlns:h="http://xmlns.jcp.org/jsf/html"
+ xmlns:p="http://primefaces.org/ui"
+ >
<ui:define name="document_guest_title">
<h:outputText value="#{msg.PAGE_TITLE_USER_REGISTER}" />
<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/guest/guest_base.tpl"
- xmlns="http://www.w3.org/1999/xhtml"
- xmlns:core="http://mxchange.org/jsf/core/widgets"
- 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/guest/guest_base.tpl"
+ xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:core="http://mxchange.org/jsf/core/widgets"
+ xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+ xmlns:h="http://xmlns.jcp.org/jsf/html"
+ xmlns:p="http://primefaces.org/ui"
+ >
<ui:define name="document_guest_title">
<h:outputText value="#{msg.PAGE_TITLE_USER_REGISTER_DONE}" />
<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/guest/guest_base.tpl"
- xmlns="http://www.w3.org/1999/xhtml"
- xmlns:core="http://mxchange.org/jsf/core/widgets"
- 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/guest/guest_base.tpl"
+ xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:core="http://mxchange.org/jsf/core/widgets"
+ xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+ xmlns:h="http://xmlns.jcp.org/jsf/html"
+ xmlns:p="http://primefaces.org/ui"
+ >
<ui:define name="document_guest_title">
<h:outputText value="#{msg.PAGE_TITLE_USER_REGISTER_PAGE2}" />
<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/guest/guest_base.tpl"
- xmlns="http://www.w3.org/1999/xhtml"
- xmlns:core="http://mxchange.org/jsf/core/widgets"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
- xmlns:h="http://xmlns.jcp.org/jsf/html"
- xmlns:f="http://xmlns.jcp.org/jsf/core">
+<ui:composition
+ template="/WEB-INF/templates/guest/guest_base.tpl"
+ xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:core="http://mxchange.org/jsf/core/widgets"
+ xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+ xmlns:h="http://xmlns.jcp.org/jsf/html"
+ >
<ui:define name="document_guest_title">
<h:outputText value="#{msg.PAGE_TITLE_USER_RESEND_DONE}" />
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">
+ xmlns:p="http://primefaces.org/ui"
+ >
<ui:define name="document_guest_title">
<h:outputText value="#{msg.PAGE_TITLE_INDEX_RESEND_LINK}" />
<h:outputText value="#{msg.GUEST_RESEND_CONFIRMATION_LINK_NOTICE}" />
</h:panelGroup>
- <div class="table-footer">
- <p:commandButton styleClass="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
- <p:commandButton styleClass="submit" type="submit" id="submit_resend_link" value="#{msg.BUTTON_RESEND_CONFIRMATION_LINK}" action="#{userResendConfirmationController.doResendLink()}" />
- </div>
+ <p:panelGrid columns="2" layout="grid">
+ <p:commandButton
+ type="reset"
+ value="#{msg.BUTTON_RESET_FORM}"
+ />
+
+ <p:commandButton
+ process="@form"
+ type="submit"
+ value="#{msg.BUTTON_RESEND_CONFIRMATION_LINK}"
+ action="#{userResendConfirmationController.doResendLink()}"
+ />
+ </p:panelGrid>
</h:panelGroup>
</h:form>
</ui:define>
<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/#{userLoginController.baseTemplatePathName}_base.tpl"
- xmlns="http://www.w3.org/1999/xhtml"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
- xmlns:h="http://xmlns.jcp.org/jsf/html"
- xmlns:f="http://xmlns.jcp.org/jsf/core">
+<ui:composition
+ template="/WEB-INF/templates/#{userLoginController.baseTemplatePathName}_base.tpl"
+ xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+ xmlns:h="http://xmlns.jcp.org/jsf/html"
+ >
<ui:define name="document_guest_title">
<h:outputText value="#{msg.PAGE_TITLE_INDEX_IMPRINT}" />
<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/guest/guest_base.tpl"
- xmlns="http://www.w3.org/1999/xhtml"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
- xmlns:h="http://xmlns.jcp.org/jsf/html"
- xmlns:f="http://xmlns.jcp.org/jsf/core">
+<ui:composition
+ template="/WEB-INF/templates/guest/guest_base.tpl"
+ xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+ xmlns:h="http://xmlns.jcp.org/jsf/html"
+ >
<ui:define name="document_guest_title">
<h:outputText value="#{msg.PAGE_TITLE_INDEX_WELCOME}" />
<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/#{userLoginController.baseTemplatePathName}_base.tpl"
- xmlns="http://www.w3.org/1999/xhtml"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
- xmlns:h="http://xmlns.jcp.org/jsf/html"
- xmlns:f="http://xmlns.jcp.org/jsf/core">
+<ui:composition
+ template="/WEB-INF/templates/#{userLoginController.baseTemplatePathName}_base.tpl"
+ xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+ xmlns:h="http://xmlns.jcp.org/jsf/html"
+ >
<ui:define name="document_guest_title">
<h:outputText value="#{msg.PAGE_TITLE_INDEX_PRIVACY}" />
body {
- background-color: white;
- font-size: 14px;
- font-family: sans-serif;
- color: black;
+ font-size: 0.9em !important;
+ font-family: sans-serif !important;
margin: 0px;
}
overflow: auto;
}
-.table-footer {
- margin: 2px;
-}
-
.page-header a:link, .page-header a:visited {
color: white;
font-weight : bold;
text-decoration : underline;
}
-table, .table {
- margin: 0px;
- padding: 0px;
-}
-
-.table {
- width: 500px;
-}
-
-.table-footer {
- margin: 2px;
-}
-
-.table-full {
- margin: 0 auto;
- width: 100%;
-}
-
.table-row {
width: 100%;
min-height: 20px;
<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/#{userLoginController.baseTemplatePathName}_base.tpl"
- xmlns="http://www.w3.org/1999/xhtml"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
- xmlns:h="http://xmlns.jcp.org/jsf/html"
- xmlns:f="http://xmlns.jcp.org/jsf/core">
+<ui:composition
+ template="/WEB-INF/templates/#{userLoginController.baseTemplatePathName}_base.tpl"
+ xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+ xmlns:h="http://xmlns.jcp.org/jsf/html"
+ >
<ui:define name="document_guest_title">
<h:outputText value="#{msg.PAGE_TITLE_INDEX_TERMS}" />
<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/login/user/user_base.tpl"
- xmlns="http://www.w3.org/1999/xhtml"
- xmlns:core="http://mxchange.org/jsf/core/widgets"
- 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/login/user/user_base.tpl"
+ xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:core="http://mxchange.org/jsf/core/widgets"
+ xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+ xmlns:h="http://xmlns.jcp.org/jsf/html"
+ xmlns:p="http://primefaces.org/ui"
+ >
<ui:define name="document_login_title">
<h:outputText value="#{msg.PAGE_TITLE_LOGIN_CONTACT_DATA_SAVED}" />
<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/login/user/user_base.tpl"
- xmlns="http://www.w3.org/1999/xhtml"
- xmlns:core="http://mxchange.org/jsf/core/widgets"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
- xmlns:h="http://xmlns.jcp.org/jsf/html"
- xmlns:f="http://xmlns.jcp.org/jsf/core">
+<ui:composition
+ template="/WEB-INF/templates/login/user/user_base.tpl"
+ xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:core="http://mxchange.org/jsf/core/widgets"
+ xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+ xmlns:h="http://xmlns.jcp.org/jsf/html"
+ >
<ui:define name="document_login_title">
<h:outputText value="#{msg.PAGE_TITLE_USER_LOGIN_DATA_SAVED}" />
<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/login/user/user_base.tpl"
- xmlns="http://www.w3.org/1999/xhtml"
- 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/login/user/user_base.tpl"
+ xmlns="http://www.w3.org/1999/xhtml"
+ 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:define name="document_login_title">
<h:outputText value="#{msg.PAGE_TITLE_LOGIN_EDIT_USER_DATA}" />
<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/login/user/user_base.tpl"
- xmlns="http://www.w3.org/1999/xhtml"
- 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/login/user/user_base.tpl"
+ xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+ xmlns:h="http://xmlns.jcp.org/jsf/html"
+ xmlns:p="http://primefaces.org/ui"
+ >
<ui:define name="document_login_title">
<h:outputText value="#{msg.PAGE_TITLE_USER_LOGIN_HOME}" />
<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/login/user/user_base.tpl"
- xmlns="http://www.w3.org/1999/xhtml"
- 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/login/user/user_base.tpl"
+ xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+ xmlns:h="http://xmlns.jcp.org/jsf/html"
+ xmlns:p="http://primefaces.org/ui"
+ >
<ui:define name="document_login_title">
<h:outputText value="#{msg.PAGE_TITLE_LOGIN_USER_LOGOUT}" />
<h:outputText value="#{msg.LOGIN_USER_LOGOUT_NOTICE}" />
</h:panelGroup>
- <div class="table-footer">
- <p:commandButton styleClass="submit" type="submit" action="#{userLoginController.doUserLogout()}" value="#{msg.BUTTON_USER_LOGOUT}" />
- </div>
+ <p:commandButton
+ process="@form"
+ type="submit"
+ value="#{msg.BUTTON_USER_LOGOUT}"
+ action="#{userLoginController.doUserLogout()}"
+ />
</h:panelGroup>
</h:form>
<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/login/user/user_base.tpl"
- xmlns="http://www.w3.org/1999/xhtml"
- xmlns:core="http://mxchange.org/jsf/core/widgets"
- 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/login/user/user_base.tpl"
+ xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:core="http://mxchange.org/jsf/core/widgets"
+ xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+ xmlns:h="http://xmlns.jcp.org/jsf/html"
+ xmlns:p="http://primefaces.org/ui"
+ >
<ui:define name="document_login_title">
<h:outputText value="#{msg.PAGE_TITLE_USER_LOGIN_CHANGE_EMAIL_ADDRESS}" />
<ui:include src="/WEB-INF/templates/login/login_enter_current_password.tpl" />
- <div class="table-footer">
- <p:commandButton styleClass="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
- <p:commandButton styleClass="submit" type="submit" id="submit_change_email" value="#{msg.BUTTON_CHANGE_EMAIL_ADDRESS}" action="#{userEmailChangeController.doUserChangeEmailAddress()}" />
- </div>
+ <p:panelGrid columns="2" layout="grid">
+ <p:commandButton
+ type="reset"
+ value="#{msg.BUTTON_RESET_FORM}"
+ />
+
+ <p:commandButton
+ process="@form"
+ type="submit"
+ value="#{msg.BUTTON_CHANGE_EMAIL_ADDRESS}"
+ action="#{userEmailChangeController.doUserChangeEmailAddress()}"
+ />
+ </p:panelGrid>
</h:form>
</h:panelGroup>
<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/login/user/user_base.tpl"
- xmlns="http://www.w3.org/1999/xhtml"
- xmlns:core="http://mxchange.org/jsf/core/widgets"
- 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/login/user/user_base.tpl"
+ xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:core="http://mxchange.org/jsf/core/widgets"
+ xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+ xmlns:h="http://xmlns.jcp.org/jsf/html"
+ xmlns:p="http://primefaces.org/ui"
+ >
<ui:define name="document_login_title">
<h:outputText value="#{msg.PAGE_TITLE_USER_LOGIN_CHANGE_PASSWORD}" />
<ui:include src="/WEB-INF/templates/login/user/user_enter_current_password.tpl" />
- <div class="table-footer">
- <p:commandButton styleClass="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
- <p:commandButton styleClass="submit" type="submit" id="submit_change_password" value="#{msg.BUTTON_USER_CHANGE_PASSWORD}" action="#{userPasswordController.doChangePassword()}" />
- </div>
+ <p:panelGrid columns="2" layout="grid">
+ <p:commandButton
+ type="reset"
+ value="#{msg.BUTTON_RESET_FORM}"
+ />
+
+ <p:commandButton
+ process="@form"
+ type="submit"
+ value="#{msg.BUTTON_USER_CHANGE_PASSWORD}"
+ action="#{userPasswordController.doChangePassword()}"
+ />
+ </p:panelGrid>
</h:panelGroup>
</h:form>
</ui:fragment>
<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/login/user/user_base.tpl"
- xmlns="http://www.w3.org/1999/xhtml"
- xmlns:core="http://mxchange.org/jsf/core/widgets"
- 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/login/user/user_base.tpl"
+ xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:core="http://mxchange.org/jsf/core/widgets"
+ xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+ xmlns:h="http://xmlns.jcp.org/jsf/html"
+ xmlns:p="http://primefaces.org/ui"
+ >
<ui:define name="document_login_title">
<h:outputText value="#{msg.PAGE_TITLE_USER_LOGIN_CHANGE_PERSONAL_DATA}" />
<ui:include src="/WEB-INF/templates/user/user_not_logged_in.tpl" />
</ui:fragment>
- <h:panelGroup styleClass="table table-full" layout="block" rendered="#{userLoginController.isUserLoggedIn() and featureController.isFeatureEnabled('change_user_personal_data') and (not userLoginController.ifUserMustChangePassword() or not featureController.isFeatureEnabled('user_must_change_password'))}">
+ <h:panelGroup
+ layout="block"
+ rendered="#{userLoginController.isUserLoggedIn() and featureController.isFeatureEnabled('change_user_personal_data') and (not userLoginController.ifUserMustChangePassword() or not featureController.isFeatureEnabled('user_must_change_password'))}"
+ >
<div class="table-header">
<h:outputText value="#{msg.LOGIN_CHANGE_PERSONAL_DATA_TITLE}" />
</div>
<ui:include src="/WEB-INF/templates/guest/guest_privacy_terms.tpl" />
- <div class="table-footer">
- <p:commandButton styleClass="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
- <p:commandButton styleClass="submit" type="submit" id="submit_change_personal_data" value="#{msg.BUTTON_CHANGE_PERSONAL_DATA}" action="#{userController.doChangePersonalData()}" />
- </div>
+ <p:panelGrid columns="2" layout="grid">
+ <p:commandButton
+ type="reset"
+ value="#{msg.BUTTON_RESET_FORM}"
+ />
+
+ <p:commandButton
+ process="@form"
+ type="submit"
+ value="#{msg.BUTTON_CHANGE_PERSONAL_DATA}"
+ action="#{userController.doChangePersonalData()}"
+ />
+ </p:panelGrid>
</h:form>
</h:panelGroup>
</ui:define>
<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/login/user/user_base.tpl"
- xmlns="http://www.w3.org/1999/xhtml"
- xmlns:core="http://mxchange.org/jsf/core/widgets"
- 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/login/user/user_base.tpl"
+ xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:core="http://mxchange.org/jsf/core/widgets"
+ xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+ xmlns:h="http://xmlns.jcp.org/jsf/html"
+ xmlns:p="http://primefaces.org/ui"
+ >
<ui:define name="document_login_title">
<h:outputText value="#{msg.PAGE_TITLE_USER_LOGIN_CONTACT_DATA_SAVED}" />
<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/login/user/user_base.tpl"
- xmlns="http://www.w3.org/1999/xhtml"
- xmlns:core="http://mxchange.org/jsf/core/widgets"
- 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/login/user/user_base.tpl"
+ xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:core="http://mxchange.org/jsf/core/widgets"
+ xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+ xmlns:h="http://xmlns.jcp.org/jsf/html"
+ xmlns:p="http://primefaces.org/ui"
+ >
<ui:define name="document_login_title">
<h:outputText value="#{msg.PAGE_TITLE_LOGIN_USER_DATA_SAVED}" />
projects / jjobs-war.git / commitdiff