]> git.mxchange.org Git - jjobs-war.git/commitdiff
renamed controller as there are now 2 logins
authorRoland Häder <roland@mxchange.org>
Tue, 3 May 2016 11:45:08 +0000 (13:45 +0200)
committerRoland Haeder <roland@mxchange.org>
Thu, 5 May 2016 18:35:48 +0000 (20:35 +0200)
Signed-off-by: Roland Häder <roland@mxchange.org>
27 files changed:
src/java/org/mxchange/jjobs/beans/addressbook/JobsAddressbookWebSessionBean.java
src/java/org/mxchange/jjobs/beans/contact/JobsContactWebSessionBean.java
src/java/org/mxchange/jjobs/beans/email_address/JobsEmailChangeWebSessionBean.java
src/java/org/mxchange/jjobs/beans/email_address/JobsEmailChangeWebSessionController.java
src/java/org/mxchange/jjobs/beans/login/JobsUserLoginWebSessionBean.java
src/java/org/mxchange/jjobs/beans/profile/JobsUserProfileWebRequestBean.java
src/java/org/mxchange/jjobs/validators/password/JobsUserPasswordValidator.java
web/WEB-INF/templates.dist/guest_login_page.xhtml
web/WEB-INF/templates/guest/guest_login_form.tpl
web/WEB-INF/templates/login/login_base.tpl
web/WEB-INF/templates/login/login_enter_current_password.tpl
web/imprint.xhtml
web/login/login_add_addressbook.xhtml
web/login/login_change_email_address.xhtml
web/login/login_change_password.xhtml
web/login/login_change_personal_data.xhtml
web/login/login_contact_data_saved.xhtml
web/login/login_data_saved.xhtml
web/login/login_edit_user_data.xhtml
web/login/login_index.xhtml
web/login/login_own_addressbooks.xhtml
web/login/login_user_data_saved.xhtml
web/privacy.xhtml
web/terms.xhtml
web/user/show_addressbook.xhtml
web/user/user_list.xhtml
web/user/user_profile.xhtml

index 1a4419142180706d1f4a8e8a2c1d517888dd64b3..2077651e0a418a70b7945b84361718f57d77326a 100644 (file)
@@ -100,7 +100,7 @@ public class JobsAddressbookWebSessionBean implements JobsAddressbookWebSessionC
         * Login controller
         */
        @Inject
-       private JobsUserLoginWebSessionController loginController;
+       private JobsUserLoginWebSessionController userLoginController;
 
        /**
         * A list of all user's address books
@@ -127,7 +127,7 @@ public class JobsAddressbookWebSessionBean implements JobsAddressbookWebSessionC
        @Override
        public String addAddressbook () {
                // Is this name already used?
-               if (!this.loginController.isUserLoggedIn()) {
+               if (!this.userLoginController.isUserLoggedIn()) {
                        // Not logged in
                        throw new FaceletException("This method can only be called as logged-in user."); //NOI18N
                } else if (this.getAddressbookName() == null) {
@@ -142,7 +142,7 @@ public class JobsAddressbookWebSessionBean implements JobsAddressbookWebSessionC
                }
 
                // Create address book instance with name
-               Addressbook book = new UserAddressbook(this.getAddressbookName(), this.loginController.getLoggedInUser());
+               Addressbook book = new UserAddressbook(this.getAddressbookName(), this.userLoginController.getLoggedInUser());
 
                try {
                        // Register this address book
@@ -204,10 +204,10 @@ public class JobsAddressbookWebSessionBean implements JobsAddressbookWebSessionC
                } else if (event.getLoggedInUser()== null) {
                        // user is null
                        throw new NullPointerException("event.user is null"); //NOI18N
-               } else if (!event.getLoggedInUser().equals(this.loginController.getLoggedInUser())) {
+               } else if (!event.getLoggedInUser().equals(this.userLoginController.getLoggedInUser())) {
                        // Not matching
-                       throw new IllegalStateException("event.user and loginController.loggedInUser don't match."); //NOI18N
-               } else if (!this.loginController.isUserLoggedIn()) {
+                       throw new IllegalStateException("event.user and userLoginController.loggedInUser don't match."); //NOI18N
+               } else if (!this.userLoginController.isUserLoggedIn()) {
                        // Not logged in
                        throw new FaceletException("This method can only be called as logged-in user."); //NOI18N
                }
@@ -219,7 +219,7 @@ public class JobsAddressbookWebSessionBean implements JobsAddressbookWebSessionC
        @Override
        public List<Addressbook> allAddressbooks () {
                // Is the user logged in?
-               if (!this.loginController.isUserLoggedIn()) {
+               if (!this.userLoginController.isUserLoggedIn()) {
                        // Not logged in
                        throw new FaceletException("This method can only be called as logged-in user."); //NOI18N
                }
@@ -230,7 +230,7 @@ public class JobsAddressbookWebSessionBean implements JobsAddressbookWebSessionC
        @Override
        public List<AddressbookEntry> allEntries (final Addressbook addressbook) {
                // Is the user logged in?
-               if (!this.loginController.isUserLoggedIn()) {
+               if (!this.userLoginController.isUserLoggedIn()) {
                        // Not logged in
                        throw new FaceletException("This method can only be called as logged-in user."); //NOI18N
                }
@@ -256,11 +256,13 @@ public class JobsAddressbookWebSessionBean implements JobsAddressbookWebSessionC
        }
 
        @Override
+       @SuppressWarnings ("ReturnOfDateField")
        public Calendar getAddressbookCreated () {
                return this.addressbookCreated;
        }
 
        @Override
+       @SuppressWarnings ("AssignmentToDateFieldFromParameter")
        public void setAddressbookCreated (final Calendar addressbookCreated) {
                this.addressbookCreated = addressbookCreated;
        }
@@ -298,7 +300,7 @@ public class JobsAddressbookWebSessionBean implements JobsAddressbookWebSessionC
        @Override
        public boolean hasCreatedAddressbooks () {
                // Is the user logged in?
-               if (!this.loginController.isUserLoggedIn()) {
+               if (!this.userLoginController.isUserLoggedIn()) {
                        // Not logged in
                        throw new FaceletException("This method can only be called as logged-in user."); //NOI18N
                }
@@ -316,7 +318,7 @@ public class JobsAddressbookWebSessionBean implements JobsAddressbookWebSessionC
                this.usersAddressbooks = new LinkedList<>();
 
                // Is the user logged-in?
-               if (this.loginController.isUserLoggedIn()) {
+               if (this.userLoginController.isUserLoggedIn()) {
                        // Initialize list
                        this.initAddressbookList();
                }
@@ -370,13 +372,13 @@ public class JobsAddressbookWebSessionBean implements JobsAddressbookWebSessionC
        @Override
        public boolean isOwnAddressbook () {
                // Is the user logged in?
-               if (!this.loginController.isUserLoggedIn()) {
+               if (!this.userLoginController.isUserLoggedIn()) {
                        // No, then no own address book
                        throw new IllegalStateException("isOwnAddressbook() has been invoked for a guest account"); //NOI18N
                }
 
                // Is same user?
-               return Objects.equals(this.getAddressbookUser(), this.loginController.getLoggedInUser());
+               return Objects.equals(this.getAddressbookUser(), this.userLoginController.getLoggedInUser());
        }
 
        @Override
@@ -416,7 +418,7 @@ public class JobsAddressbookWebSessionBean implements JobsAddressbookWebSessionC
         */
        private void initAddressbookList () {
                // Get user instance
-               User user = this.loginController.getLoggedInUser();
+               User user = this.userLoginController.getLoggedInUser();
 
                // Fill list with entries
                this.usersAddressbooks = this.addressbookBean.getUsersAddressbookList(user);
index be0be4d9d94655b19a4788eb13cbc1b977d2acc8..d6227306c9c56bea74197afaa7f0733eca733821 100644 (file)
@@ -169,12 +169,6 @@ public class JobsContactWebSessionBean implements JobsContactWebSessionControlle
         */
        private boolean isLandLineUnlinked;
 
-       /**
-        * Login bean (controller)
-        */
-       @Inject
-       private JobsUserLoginWebSessionController loginController;
-
        /**
         * Phone number area code
         */
@@ -195,6 +189,12 @@ public class JobsContactWebSessionBean implements JobsContactWebSessionControlle
         */
        private String street;
 
+       /**
+        * Login bean (controller)
+        */
+       @Inject
+       private JobsUserLoginWebSessionController userLoginController;
+
        /**
         * ZIP code
         */
@@ -297,7 +297,6 @@ public class JobsContactWebSessionBean implements JobsContactWebSessionControlle
 
                // Debug message
                //* NOISY-DEBUG: */ System.out.println(MessageFormat.format("ContactWebBean:afterRegistration: registeredContact={0}", registeredContact)); //NOI18N
-
                // Copy all data from registered->user
                this.copyContact(registeredContact);
 
@@ -469,24 +468,24 @@ public class JobsContactWebSessionBean implements JobsContactWebSessionControlle
        @Override
        public String doChangePersonalContactData () {
                // This method shall only be called if the user is logged-in
-               if (!this.loginController.isUserLoggedIn()) {
+               if (!this.userLoginController.isUserLoggedIn()) {
                        // Not logged-in
                        throw new IllegalStateException("User is not logged-in"); //NOI18N
                } else if (!this.isRequiredChangePersonalDataSet()) {
                        // Not all required fields are set
                        throw new FaceletException("Not all required fields are set."); //NOI18N
-               } else if (!this.loginController.ifCurrentPasswordMatches()) {
+               } else if (!this.userLoginController.ifCurrentPasswordMatches()) {
                        // Password not matching
-                       throw new FaceletException(new UserPasswordMismatchException(this.loginController.getLoggedInUser()));
+                       throw new FaceletException(new UserPasswordMismatchException(this.userLoginController.getLoggedInUser()));
                }
 
                // Get contact instance
-               Contact contact = this.loginController.getLoggedInUser().getUserContact();
+               Contact contact = this.userLoginController.getLoggedInUser().getUserContact();
 
                // It should be there, so run some tests on it
-               assert (contact instanceof Contact) : "Instance loginController.loggedInUser.userContact is null"; //NOI18N
-               assert (contact.getContactId() instanceof Long) : "Instance loginController.userContact.contactId is null"; //NOI18N
-               assert (contact.getContactId() > 0) : MessageFormat.format("Instance loginController.userContact.contactId={0} is invalid", contact.getContactId()); //NOI18N
+               assert (contact instanceof Contact) : "Instance userLoginController.loggedInUser.userContact is null"; //NOI18N
+               assert (contact.getContactId() instanceof Long) : "Instance userLoginController.userContact.contactId is null"; //NOI18N
+               assert (contact.getContactId() > 0) : MessageFormat.format("Instance userLoginController.userContact.contactId={0} is invalid", contact.getContactId()); //NOI18N
 
                // Update all fields
                contact.setContactGender(this.getGender());
index dcdba2e9434d5b7651c025b4fae80311c9e1ba8a..096bf19e0f82bffc34730763bb5dca3bafc619cc 100644 (file)
@@ -27,12 +27,12 @@ import javax.naming.Context;
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
 import org.mxchange.jcontacts.contact.Contact;
+import org.mxchange.jjobs.beans.login.JobsUserLoginWebSessionController;
 import org.mxchange.jusercore.exceptions.UserPasswordMismatchException;
 import org.mxchange.jusercore.model.email_address.ChangeableEmailAddress;
 import org.mxchange.jusercore.model.email_address.EmailAddressChange;
 import org.mxchange.jusercore.model.email_address.EmailChangeSessionBeanRemote;
 import org.mxchange.jusercore.model.user.User;
-import org.mxchange.jjobs.beans.login.JobsUserLoginWebSessionController;
 
 /**
  * A web session bean for changing email addresses
@@ -51,12 +51,12 @@ public class JobsEmailChangeWebSessionBean implements JobsEmailChangeWebSessionC
        /**
         * Email address 1 (changing)
         */
-       private String emailAddress1;
+       private String emailAddress;
 
        /**
         * Email address 2 (repeat in changing)
         */
-       private String emailAddress2;
+       private String emailAddressRepeat;
 
        /**
         * Local list of already queued email addresses
@@ -72,7 +72,7 @@ public class JobsEmailChangeWebSessionBean implements JobsEmailChangeWebSessionC
         * Login bean (controller)
         */
        @Inject
-       private JobsUserLoginWebSessionController loginController;
+       private JobsUserLoginWebSessionController userLoginController;
 
        /**
         * Default constructor
@@ -97,33 +97,33 @@ public class JobsEmailChangeWebSessionBean implements JobsEmailChangeWebSessionC
        @Override
        public String doChangeEmailAddress () {
                // This method shall only be called if the user is logged-in
-               if (!this.loginController.isUserLoggedIn()) {
+               if (!this.userLoginController.isUserLoggedIn()) {
                        // Not logged-in
                        throw new IllegalStateException("User is not logged-in"); //NOI18N
                } else if (!this.isRequiredChangeEmailAddressSet()) {
                        // Not all required fields are set
                        throw new FaceletException("Not all required fields are set."); //NOI18N
-               } else if (!Objects.equals(this.getEmailAddress1(), this.getEmailAddress2())) {
+               } else if (!Objects.equals(this.getEmailAddress(), this.getEmailAddressRepeat())) {
                        // Email address 1+2 mismatch
                        throw new FaceletException("Email address 1/2 are mismatching."); //NOI18N
-               } else if (!this.loginController.ifCurrentPasswordMatches()) {
+               } else if (!this.userLoginController.ifCurrentPasswordMatches()) {
                        // Password not matching
-                       throw new FaceletException(new UserPasswordMismatchException(this.loginController.getLoggedInUser()));
+                       throw new FaceletException(new UserPasswordMismatchException(this.userLoginController.getLoggedInUser()));
                }
 
                // Get user instance
-               User user = this.loginController.getLoggedInUser();
+               User user = this.userLoginController.getLoggedInUser();
 
                // It should be there, so run some tests on it
-               assert (user instanceof User) : "Instance loginController.loggedInUser is null"; //NOI18N
-               assert (user.getUserId() instanceof Long) : "Instance loginController.loggedInUser.userId is null"; //NOI18N
-               assert (user.getUserId() > 0) : MessageFormat.format("loginController.loggedInUser.userId={0} is invalid", user.getUserId()); //NOI18N
-               assert (user.getUserContact() instanceof Contact) : "Instance loginController.loggedInUser.userContact is null"; //NOI18N
-               assert (user.getUserContact().getContactId() instanceof Long) : "Instance loginController.userContact.contactId is null"; //NOI18N
-               assert (user.getUserContact().getContactId() > 0) : MessageFormat.format("Instance loginController.userContact.contactId={0} is invalid", user.getUserContact().getContactId()); //NOI18N
+               assert (user instanceof User) : "Instance userLoginController.loggedInUser is null"; //NOI18N
+               assert (user.getUserId() instanceof Long) : "Instance userLoginController.loggedInUser.userId is null"; //NOI18N
+               assert (user.getUserId() > 0) : MessageFormat.format("userLoginController.loggedInUser.userId={0} is invalid", user.getUserId()); //NOI18N
+               assert (user.getUserContact() instanceof Contact) : "Instance userLoginController.loggedInUser.userContact is null"; //NOI18N
+               assert (user.getUserContact().getContactId() instanceof Long) : "Instance userLoginController.userContact.contactId is null"; //NOI18N
+               assert (user.getUserContact().getContactId() > 0) : MessageFormat.format("Instance userLoginController.userContact.contactId={0} is invalid", user.getUserContact().getContactId()); //NOI18N
 
                // Get dummy email address
-               String dummyEmail = this.getEmailAddress1();
+               String dummyEmail = this.getEmailAddress();
 
                // Unset all so the user is forced to re-enter it
                this.clear();
@@ -145,29 +145,29 @@ public class JobsEmailChangeWebSessionBean implements JobsEmailChangeWebSessionC
        }
 
        @Override
-       public String getEmailAddress1 () {
-               return this.emailAddress1;
+       public String getEmailAddress () {
+               return this.emailAddress;
        }
 
        @Override
-       public void setEmailAddress1 (final String emailAddress1) {
-               this.emailAddress1 = emailAddress1;
+       public void setEmailAddress (final String emailAddress) {
+               this.emailAddress = emailAddress;
        }
 
        @Override
-       public String getEmailAddress2 () {
-               return this.emailAddress2;
+       public String getEmailAddressRepeat () {
+               return this.emailAddressRepeat;
        }
 
        @Override
-       public void setEmailAddress2 (final String emailAddress2) {
-               this.emailAddress2 = emailAddress2;
+       public void setEmailAddressRepeat (final String emailAddressRepeat) {
+               this.emailAddressRepeat = emailAddressRepeat;
        }
 
        @Override
        public boolean isRequiredChangeEmailAddressSet () {
-               return ((this.getEmailAddress1() != null) &&
-                               (this.getEmailAddress2() != null));
+               return ((this.getEmailAddress() != null) &&
+                               (this.getEmailAddressRepeat() != null));
        }
 
        /**
@@ -175,8 +175,8 @@ public class JobsEmailChangeWebSessionBean implements JobsEmailChangeWebSessionC
         */
        private void clear () {
                // Clear fields
-               this.setEmailAddress1(null);
-               this.setEmailAddress2(null);
+               this.setEmailAddress(null);
+               this.setEmailAddressRepeat(null);
        }
 
        /**
@@ -186,7 +186,7 @@ public class JobsEmailChangeWebSessionBean implements JobsEmailChangeWebSessionC
         * <p>
         * @param emailAddress Email address to verify
         * <p>
-        * @return Whether the email address in field emailAddress1 is already queued
+        * @return Whether the email address in field emailAddress is already queued
         */
        private boolean isEmailAddressQueued (final String emailAddress) {
                // It should be there
index c3eef31dcdedb8a9b56aa2e2252ef07e1b232170..8f25eb4dce985cc7dde803706a24d2034cc9f226 100644 (file)
@@ -30,28 +30,28 @@ public interface JobsEmailChangeWebSessionController extends Serializable {
         * <p>
         * @return Email address
         */
-       String getEmailAddress1 ();
+       String getEmailAddress ();
 
        /**
         * Setter for email address 1 (changing)
         * <p>
         * @param emailAddress1 Email address 1
         */
-       void setEmailAddress1 (final String emailAddress1);
+       void setEmailAddress (final String emailAddress1);
 
        /**
         * Getter for email address 2 (repeat changing)
         * <p>
         * @return Email address 2
         */
-       String getEmailAddress2 ();
+       String getEmailAddressRepeat ();
 
        /**
         * Setter for email address 2 (repeat changing)
         * <p>
         * @param emailAddress2 Email address 2
         */
-       void setEmailAddress2 (final String emailAddress2);
+       void setEmailAddressRepeat (final String emailAddress2);
 
        /**
         * Checks whether all required are set for changing email address
index 97dd8ec573842d7da6ecce4538037031087a0d46..d9281d9965fe4b0a3e1de66d40467254af5545e0 100644 (file)
@@ -26,6 +26,7 @@ import javax.inject.Named;
 import javax.naming.Context;
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
+import org.mxchange.jjobs.beans.user.JobsUserWebSessionController;
 import org.mxchange.jusercore.container.login.LoginContainer;
 import org.mxchange.jusercore.container.login.UserLoginContainer;
 import org.mxchange.jusercore.events.login.UserLoggedInEvent;
@@ -39,7 +40,6 @@ import org.mxchange.jusercore.model.user.User;
 import org.mxchange.jusercore.model.user.UserUtils;
 import org.mxchange.jusercore.model.user.profilemodes.ProfileMode;
 import org.mxchange.jusercore.model.user.status.UserAccountStatus;
-import org.mxchange.jjobs.beans.user.JobsUserWebSessionController;
 
 /**
  * A web bean for user registration
@@ -141,7 +141,7 @@ public class JobsUserLoginWebSessionBean implements JobsUserLoginWebSessionContr
 
        @Override
        public String getCurrentPassword () {
-               return currentPassword;
+               return this.currentPassword;
        }
 
        @Override
index 0267f9313f429f38c1f29a94d87183096f471b8a..84c9cf6b2127c5e634a253453da8d6682be19bbf 100644 (file)
@@ -21,11 +21,11 @@ import javax.enterprise.context.RequestScoped;
 import javax.faces.view.facelets.FaceletException;
 import javax.inject.Inject;
 import javax.inject.Named;
+import org.mxchange.jjobs.beans.login.JobsUserLoginWebSessionController;
+import org.mxchange.jjobs.beans.user.JobsUserWebSessionController;
 import org.mxchange.jusercore.exceptions.UserNotFoundException;
 import org.mxchange.jusercore.model.user.User;
 import org.mxchange.jusercore.model.user.profilemodes.ProfileMode;
-import org.mxchange.jjobs.beans.login.JobsUserLoginWebSessionController;
-import org.mxchange.jjobs.beans.user.JobsUserWebSessionController;
 
 /**
  * A web request bean for user profiles
@@ -42,16 +42,16 @@ public class JobsUserProfileWebRequestBean implements JobsUserProfileWebRequestC
        private static final long serialVersionUID = 187_687_145_286_710L;
 
        /**
-        * Login controller
+        * User controller
         */
        @Inject
-       private JobsUserLoginWebSessionController loginController;
+       private JobsUserWebSessionController userController;
 
        /**
-        * User controller
+        * Login controller
         */
        @Inject
-       private JobsUserWebSessionController userController;
+       private JobsUserLoginWebSessionController userLoginController;
 
        @Override
        public boolean isProfileLinkVisibleById (final Long userId) {
@@ -111,6 +111,7 @@ public class JobsUserProfileWebRequestBean implements JobsUserProfileWebRequestC
                // Check all conditions (except for admin)
                // TODO: Add admin role somehow?
                return ((profileMode.equals(ProfileMode.PUBLIC)) ||
-                               (this.loginController.isUserLoggedIn()) && (profileMode.equals(ProfileMode.MEMBERS)));
+                               (this.userLoginController.isUserLoggedIn()) && (profileMode.equals(ProfileMode.MEMBERS)));
        }
+
 }
index 636136e598edb791786b1575b66e58b5dbf3ce56..31a435d32e7cc38a0b7855fc8b04106b3df25fab 100644 (file)
@@ -56,7 +56,7 @@ public class JobsUserPasswordValidator extends BaseStringValidator implements Va
        /**
         * User login controller
         */
-       private JobsUserLoginWebSessionController loginController;
+       private JobsUserLoginWebSessionController userLoginController;
 
        /**
         * Default constructor
@@ -87,10 +87,10 @@ public class JobsUserPasswordValidator extends BaseStringValidator implements Va
                super.preValidate(context, component, value, requiredFields, false);
 
                // value is known to be an entered password, so instance login container
-               LoginContainer container = new UserLoginContainer(this.loginController.getLoggedInUser(), (String) value);
+               LoginContainer container = new UserLoginContainer(this.userLoginController.getLoggedInUser(), (String) value);
 
                // Test it here
-               if (!UserUtils.ifPasswordMatches(container, this.loginController.getLoggedInUser())) {
+               if (!UserUtils.ifPasswordMatches(container, this.userLoginController.getLoggedInUser())) {
                        // Password mismatches
                        throw new ValidatorException(new FacesMessage(FacesMessage.SEVERITY_ERROR, "Password mismatching.", "The password the user has entered does not match the stored password.")); //NOI18N
                }
@@ -98,4 +98,5 @@ public class JobsUserPasswordValidator extends BaseStringValidator implements Va
                // Trace message
                this.loggerBeanLocal.logTrace("validate: EXIT!"); //NOI18N
        }
+
 }
index c7a2b9be0cbe747c3f1cf1cf3a174edf77486fb6..2e7bc380f8d842da02a633c71e2dbc264eea1c09 100644 (file)
@@ -1,22 +1,22 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html
-       lang="#{localizationController.language}" xml:lang="#{localizationController.language}"
-       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/#{loginController.templateType}/#{loginController.templateType}_base.tpl">
-               <ui:define name="guest_title">#{msg.PAGE_TITLE_INDEX_FOO}</ui:define>
-
-               <ui:define name="content_header">
-                       #{msg.CONTENT_TITLE_INDEX_FOO}
-               </ui:define>
-
-               <ui:define name="content">
-                       Here goes your content.
-               </ui:define>
-       </ui:composition>
-</html>
+<?xml version="1.0" encoding="UTF-8" ?>\r
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">\r
+<html\r
+       lang="#{localizationController.language}" xml:lang="#{localizationController.language}"\r
+       xmlns="http://www.w3.org/1999/xhtml"\r
+         xmlns:ui="http://xmlns.jcp.org/jsf/facelets"\r
+         xmlns:h="http://xmlns.jcp.org/jsf/html"\r
+         xmlns:f="http://xmlns.jcp.org/jsf/core"\r
+         >\r
+\r
+       <ui:composition template="/WEB-INF/templates/#{userLoginController.templateType}/#{userLoginController.templateType}_base.tpl">\r
+               <ui:define name="guest_title">#{msg.PAGE_TITLE_INDEX_FOO}</ui:define>\r
+\r
+               <ui:define name="content_header">\r
+                       #{msg.CONTENT_TITLE_INDEX_FOO}\r
+               </ui:define>\r
+\r
+               <ui:define name="content">\r
+                       Here goes your content.\r
+               </ui:define>\r
+       </ui:composition>\r
+</html>\r
index f6384692912d185d67f819b3d9afc30647419745..229dbda5f206267b1a12c5faba2a75964c88f70b 100644 (file)
@@ -1,49 +1,49 @@
-<?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://java.sun.com/jsf/html"
-       xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
-       <div id="user_login_content">
-               <h:form id="login_form">
-                       <div class="table">
-                               <div class="table_header">
-                                       #{msg.GUEST_ENTER_LOGIN_DATA_TITLE}
-                               </div>
-
-                               <fieldset id="login_data">
-                                       <legend title="#{msg.GUEST_ENTER_LOGIN_DATA_LEGEND_TITLE}">#{msg.GUEST_ENTER_LOGIN_DATA_LEGEND}</legend>
-
-                                       <div class="table_row">
-                                               <div class="table_left">
-                                                       <h:outputLabel for="userName" value="#{msg.ENTER_USER_NAME}" />
-                                               </div>
-
-                                               <div class="table_right">
-                                                       <h:inputText class="input" id="userName" value="#{userController.userName}" size="10" maxlength="20" required="true" requiredMessage="#{msg.LOGIN_NO_USER_NAME_MESSAGE}" />
-                                               </div>
-                                       </div>
-
-                                       <div class="clear"></div>
-
-                                       <div class="table_row">
-                                               <div class="table_left">
-                                                       <h:outputLabel for="userPassword" value="#{msg.ENTER_PASSWORD}" />
-                                               </div>
-
-                                               <div class="table_right">
-                                                       <h:inputSecret class="input" id="userPassword" value="#{userController.userPassword}" size="10" maxlength="255" required="true" requiredMessage="#{msg.LOGIN_NO_PASSWORD_MESSAGE}" />
-                                               </div>
-                                       </div>
-
-                                       <div class="clear"></div>
-                               </fieldset>
-
-                               <div class="table_footer">
-                                       <h:commandButton class="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-                                       <h:commandButton class="submit" type="submit" action="#{loginController.doLogin()}" value="#{msg.BUTTON_USER_LOGIN}" />
-                               </div>
-                       </div>
-               </h:form>
-       </div>
-</ui:composition>
+<?xml version="1.0" encoding="UTF-8" ?>\r
+<ui:composition\r
+       xmlns="http://www.w3.org/1999/xhtml"\r
+       xmlns:f="http://java.sun.com/jsf/core"\r
+       xmlns:h="http://java.sun.com/jsf/html"\r
+       xmlns:ui="http://xmlns.jcp.org/jsf/facelets">\r
+       <div id="user_login_content">\r
+               <h:form id="login_form">\r
+                       <div class="table">\r
+                               <div class="table_header">\r
+                                       #{msg.GUEST_ENTER_LOGIN_DATA_TITLE}\r
+                               </div>\r
+\r
+                               <fieldset id="login_data">\r
+                                       <legend title="#{msg.GUEST_ENTER_LOGIN_DATA_LEGEND_TITLE}">#{msg.GUEST_ENTER_LOGIN_DATA_LEGEND}</legend>\r
+\r
+                                       <div class="table_row">\r
+                                               <div class="table_left">\r
+                                                       <h:outputLabel for="userName" value="#{msg.ENTER_USER_NAME}" />\r
+                                               </div>\r
+\r
+                                               <div class="table_right">\r
+                                                       <h:inputText class="input" id="userName" value="#{userController.userName}" size="10" maxlength="20" required="true" requiredMessage="#{msg.LOGIN_NO_USER_NAME_MESSAGE}" />\r
+                                               </div>\r
+                                       </div>\r
+\r
+                                       <div class="clear"></div>\r
+\r
+                                       <div class="table_row">\r
+                                               <div class="table_left">\r
+                                                       <h:outputLabel for="userPassword" value="#{msg.ENTER_PASSWORD}" />\r
+                                               </div>\r
+\r
+                                               <div class="table_right">\r
+                                                       <h:inputSecret class="input" id="userPassword" value="#{userController.userPassword}" size="10" maxlength="255" required="true" requiredMessage="#{msg.LOGIN_NO_PASSWORD_MESSAGE}" />\r
+                                               </div>\r
+                                       </div>\r
+\r
+                                       <div class="clear"></div>\r
+                               </fieldset>\r
+\r
+                               <div class="table_footer">\r
+                                       <h:commandButton class="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />\r
+                                       <h:commandButton class="submit" type="submit" action="#{userLoginController.doLogin()}" value="#{msg.BUTTON_USER_LOGIN}" />\r
+                               </div>\r
+                       </div>\r
+               </h:form>\r
+       </div>\r
+</ui:composition>\r
index dafc778692108fb3ae5f4c43c7fe87dc1a97f7f4..ae982adcffe88b7e18e79262f82e9dd9c6008142 100644 (file)
@@ -1,22 +1,22 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition
-       template="/WEB-INF/templates/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="title">#{msg.PAGE_TITLE_LOGIN_AREA} - <ui:insert name="login_title" class="login_title" /></ui:define>
-
-       <ui:define name="menu">
-               <ui:fragment rendered="#{loginController.isUserLoggedIn()}">
-                       <ui:include id="menu" class="login_menu" src="/WEB-INF/templates/login/login_menu.tpl" />
-               </ui:fragment>
-               <ui:fragment rendered="#{not loginController.isUserLoggedIn()}">
-                       <h:outputText class="errors" value="#{msg.USER_NOT_LOGGED_IN}" />
-               </ui:fragment>
-       </ui:define>
-
-       <ui:define name="footer">
-               <ui:include id="footer" class="login_footer" src="/WEB-INF/templates/login/login_footer.tpl" />
-       </ui:define>
-</ui:composition>
+<?xml version="1.0" encoding="UTF-8" ?>\r
+<ui:composition\r
+       template="/WEB-INF/templates/base.tpl"\r
+       xmlns="http://www.w3.org/1999/xhtml"\r
+       xmlns:ui="http://xmlns.jcp.org/jsf/facelets"\r
+       xmlns:h="http://xmlns.jcp.org/jsf/html">\r
+\r
+       <ui:define name="title">#{msg.PAGE_TITLE_LOGIN_AREA} - <ui:insert name="login_title" class="login_title" /></ui:define>\r
+\r
+       <ui:define name="menu">\r
+               <ui:fragment rendered="#{userLoginController.isUserLoggedIn()}">\r
+                       <ui:include id="menu" class="login_menu" src="/WEB-INF/templates/login/login_menu.tpl" />\r
+               </ui:fragment>\r
+               <ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">\r
+                       <h:outputText class="errors" value="#{msg.USER_NOT_LOGGED_IN}" />\r
+               </ui:fragment>\r
+       </ui:define>\r
+\r
+       <ui:define name="footer">\r
+               <ui:include id="footer" class="login_footer" src="/WEB-INF/templates/login/login_footer.tpl" />\r
+       </ui:define>\r
+</ui:composition>\r
index df4f36f37372448601c180f7929578aa15eb4595..392dcbcb5c4f01b8b6a66652f7cf1082bce6ba82 100644 (file)
@@ -14,9 +14,9 @@
                                </div>
 
                                <div class="table_right">
-                                       <h:inputSecret class="input" id="currentPassword" size="10" maxlength="255" value="#{loginController.currentPassword}" required="true" validatorMessage="#{msg.ERROR_CURRENT_PASSWORD_MISMATCHING}">
+                                       <h:inputSecret class="input" id="currentPassword" size="10" maxlength="255" value="#{userLoginController.currentPassword}" required="true" validatorMessage="#{msg.ERROR_CURRENT_PASSWORD_MISMATCHING}">
                                                <h:message for="currentPassword" class="errors" />
-                                               <!-- <f:validator for="currentPassword" validatorId="JobsUserPasswordValidator" /> //-->
+                                               <!-- <f:validator for="currentPassword" validatorId="RecruiterUserPasswordValidator" /> //-->
                                        </h:inputSecret>
                                </div>
 
index 115f6ff36ac98c5ba4dcd354e8e4758f813b0a5d..fea8034371f079764c6b07f676b77242e7773319 100644 (file)
@@ -1,22 +1,22 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html
-       lang="#{localizationController.language}" xml:lang="#{localizationController.language}"
-       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/#{loginController.templateType}/#{loginController.templateType}_base.tpl">
-               <ui:define name="guest_title">#{msg.PAGE_TITLE_INDEX_IMPRINT}</ui:define>
-
-               <ui:define name="content_header">
-                       #{msg.CONTENT_TITLE_INDEX_IMPRINT}
-               </ui:define>
-
-               <ui:define name="content">
-                       TODO: Hier kommt das Impressum hin!
-               </ui:define>
-       </ui:composition>
-</html>
+<?xml version="1.0" encoding="UTF-8" ?>\r
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">\r
+<html\r
+       lang="#{localizationController.language}" xml:lang="#{localizationController.language}"\r
+       xmlns="http://www.w3.org/1999/xhtml"\r
+       xmlns:ui="http://xmlns.jcp.org/jsf/facelets"\r
+       xmlns:h="http://xmlns.jcp.org/jsf/html"\r
+       xmlns:f="http://xmlns.jcp.org/jsf/core"\r
+       >\r
+\r
+       <ui:composition template="/WEB-INF/templates/#{userLoginController.templateType}/#{userLoginController.templateType}_base.tpl">\r
+               <ui:define name="guest_title">#{msg.PAGE_TITLE_INDEX_IMPRINT}</ui:define>\r
+\r
+               <ui:define name="content_header">\r
+                       #{msg.CONTENT_TITLE_INDEX_IMPRINT}\r
+               </ui:define>\r
+\r
+               <ui:define name="content">\r
+                       TODO: Hier kommt das Impressum hin!\r
+               </ui:define>\r
+       </ui:composition>\r
+</html>\r
index 7f1c85799f9d7c6c4ccb93a506e4222979ae8f07..a19db8a9b17396e5941b4df186c2f13031decf9e 100644 (file)
@@ -1,51 +1,51 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html
-       lang="#{localizationController.language}" xml:lang="#{localizationController.language}"
-       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/login_base.tpl">
-               <ui:define name="login_title">#{msg.PAGE_TITLE_LOGIN_ADD_ADDRESSBOOK}</ui:define>
-
-               <ui:define name="content_header">
-                       #{msg.CONTENT_TITLE_LOGIN_ADD_ADDRESSBOOK}
-               </ui:define>
-
-               <ui:define name="content">
-                       <ui:fragment rendered="#{loginController.isUserLoggedIn()}">
-                               <h:form id="add_addressbook" acceptcharset="utf-8">
-                                       <div class="table">
-                                               <div class="table_header">
-                                                       #{msg.FORM_LOGIN_ADD_ADDRESSBOOK_TITLE}
-                                               </div>
-
-                                               <div class="table_row">
-                                                       <div class="table_left">
-                                                               <h:outputLabel for="addressbookName" value="#{msg.LOGIN_ENTER_ADDRESSBOOK_NAME}"/>
-                                                       </div>
-
-                                                       <div class="table_right">
-                                                               <h:inputText class="input" id="addressbookName" value="#{addressbookController.addressbookName}" maxlength="50" size="20" title="#{msg.LOGIN_ENTER_ADDRESSBOOK_NAME_TITLE}" required="true" requiredMessage="#{msg.LOGIN_ADDRESSBOOK_NAME_REQUIRED_MESSAGE}">
-                                                                       <f:validator for="addressbookName" validatorId="AddressbookNameValidator" />
-                                                               </h:inputText>
-                                                       </div>
-                                               </div>
-
-                                               <div class="table_footer">
-                                                       <h:commandButton class="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-                                                       <h:commandButton class="submit" type="submit" id="register" value="#{msg.BUTTON_LOGIN_ADD_ADDRESSBOOK}" action="#{addressbookController.addAddressbook()}" />
-                                               </div>
-                                       </div>
-                               </h:form>
-                       </ui:fragment>
-
-                       <ui:fragment rendered="#{not loginController.isUserLoggedIn()}">
-                               <ui:include id="login_only" src="/WEB-INF/templates/generic/user_not_logged_in.tpl" />
-                       </ui:fragment>
-               </ui:define>
-       </ui:composition>
-</html>
+<?xml version="1.0" encoding="UTF-8" ?>\r
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">\r
+<html\r
+       lang="#{localizationController.language}" xml:lang="#{localizationController.language}"\r
+       xmlns="http://www.w3.org/1999/xhtml"\r
+         xmlns:ui="http://xmlns.jcp.org/jsf/facelets"\r
+         xmlns:h="http://xmlns.jcp.org/jsf/html"\r
+         xmlns:f="http://xmlns.jcp.org/jsf/core"\r
+         >\r
+\r
+       <ui:composition template="/WEB-INF/templates/login/login_base.tpl">\r
+               <ui:define name="login_title">#{msg.PAGE_TITLE_LOGIN_ADD_ADDRESSBOOK}</ui:define>\r
+\r
+               <ui:define name="content_header">\r
+                       #{msg.CONTENT_TITLE_LOGIN_ADD_ADDRESSBOOK}\r
+               </ui:define>\r
+\r
+               <ui:define name="content">\r
+                       <ui:fragment rendered="#{userLoginController.isUserLoggedIn()}">\r
+                               <h:form id="add_addressbook" acceptcharset="utf-8">\r
+                                       <div class="table">\r
+                                               <div class="table_header">\r
+                                                       #{msg.FORM_LOGIN_ADD_ADDRESSBOOK_TITLE}\r
+                                               </div>\r
+\r
+                                               <div class="table_row">\r
+                                                       <div class="table_left">\r
+                                                               <h:outputLabel for="addressbookName" value="#{msg.LOGIN_ENTER_ADDRESSBOOK_NAME}"/>\r
+                                                       </div>\r
+\r
+                                                       <div class="table_right">\r
+                                                               <h:inputText class="input" id="addressbookName" value="#{addressbookController.addressbookName}" maxlength="50" size="20" title="#{msg.LOGIN_ENTER_ADDRESSBOOK_NAME_TITLE}" required="true" requiredMessage="#{msg.LOGIN_ADDRESSBOOK_NAME_REQUIRED_MESSAGE}">\r
+                                                                       <f:validator for="addressbookName" validatorId="AddressbookNameValidator" />\r
+                                                               </h:inputText>\r
+                                                       </div>\r
+                                               </div>\r
+\r
+                                               <div class="table_footer">\r
+                                                       <h:commandButton class="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />\r
+                                                       <h:commandButton class="submit" type="submit" id="register" value="#{msg.BUTTON_LOGIN_ADD_ADDRESSBOOK}" action="#{addressbookController.addAddressbook()}" />\r
+                                               </div>\r
+                                       </div>\r
+                               </h:form>\r
+                       </ui:fragment>\r
+\r
+                       <ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">\r
+                               <ui:include id="login_only" src="/WEB-INF/templates/generic/user_not_logged_in.tpl" />\r
+                       </ui:fragment>\r
+               </ui:define>\r
+       </ui:composition>\r
+</html>\r
index 702312d826943741b59b002f82352d34f232b737..2f0541fd4e18d0eb33f058154edcc9c77e110dc1 100644 (file)
@@ -16,7 +16,7 @@
                </ui:define>
 
                <ui:define name="content">
-                       <ui:fragment rendered="#{loginController.isUserLoggedIn()}">
+                       <ui:fragment rendered="#{userLoginController.isUserLoggedIn()}">
                                <div class="table">
                                        <div class="table_header">
                                                #{msg.LOGIN_CHANGE_EMAIL_ADDRESS_TITLE}
 
                                                                <div class="table_row">
                                                                        <div class="table_left">
-                                                                               <h:outputLabel for="emailAddress1" value="#{msg.LOGIN_CHANGE_EMAIL_ENTER_EMAIL1}" />
+                                                                               <h:outputLabel for="emailAddress" value="#{msg.LOGIN_CHANGE_EMAIL_ENTER_EMAIL}" />
                                                                        </div>
 
                                                                        <div class="table_right">
-                                                                               <h:inputText class="input" id="emailAddress1" size="20" maxlength="255" value="#{emailChangeController.emailAddress1}" required="true" />
+                                                                               <h:inputText class="input" id="emailAddress" size="20" maxlength="255" value="#{emailChangeController.emailAddress}" required="true" />
                                                                        </div>
 
                                                                        <div class="clear"></div>
 
                                                                <div class="table_row">
                                                                        <div class="table_left">
-                                                                               <h:outputLabel for="emailAddress2" value="#{msg.LOGIN_CHANGE_EMAIL_ENTER_EMAIL2}" />
+                                                                               <h:outputLabel for="emailAddressRepeat" value="#{msg.LOGIN_CHANGE_EMAIL_ENTER_EMAIL_REPEAT}" />
                                                                        </div>
 
                                                                        <div class="table_right">
-                                                                               <h:inputText class="input" id="emailAddress2" size="20" maxlength="255" value="#{emailChangeController.emailAddress2}" required="true" />
+                                                                               <h:inputText class="input" id="emailAddressRepeat" size="20" maxlength="255" value="#{emailChangeController.emailAddressRepeat}" required="true" />
                                                                        </div>
 
                                                                        <div class="clear"></div>
@@ -75,7 +75,7 @@
                                </div>
                        </ui:fragment>
 
-                       <ui:fragment rendered="#{not loginController.isUserLoggedIn()}">
+                       <ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">
                                <ui:include id="login_only" src="/WEB-INF/templates/generic/user_not_logged_in.tpl" />
                        </ui:fragment>
                </ui:define>
index bfd384d44e63cdf2e20e50e91a732843222dd847..efcdce2b08b0d906ee590be4538576416990a218 100644 (file)
@@ -1,71 +1,71 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html
-       lang="#{localizationController.language}" xml:lang="#{localizationController.language}"
-       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/login_base.tpl">
-               <ui:define name="login_title">#{msg.PAGE_TITLE_LOGIN_CHANGE_PASSWORD}</ui:define>
-
-               <ui:define name="content_header">
-                       #{msg.CONTENT_TITLE_LOGIN_CHANGE_PASSWORD}
-               </ui:define>
-
-               <ui:define name="content">
-                       <ui:fragment rendered="#{loginController.isUserLoggedIn()}">
-                               <div class="table">
-                                       <div class="table_header">
-                                               #{msg.LOGIN_CHANGE_PASSWORD_TITLE}
-                                       </div>
-
-                                       <h:form id="login_form">
-                                               <div class="para">
-                                                       <fieldset id="change_password">
-                                                               <legend title="#{msg.LOGIN_CHANGE_PASSWORD_LEGEND_TITLE}">#{msg.LOGIN_CHANGE_PASSWORD_LEGEND}</legend>
-
-                                                               <div class="table_row">
-                                                                       <div class="table_left">
-                                                                               <h:outputLabel for="password1" value="#{msg.GUEST_REGISTRATION_ENTER_PASSWORD1}" />
-                                                                       </div>
-
-                                                                       <div class="table_right">
-                                                                               <h:inputSecret class="input" id="password1" size="10" maxlength="255" value="#{loginController.userPassword}" required="true" />
-                                                                       </div>
-
-                                                                       <div class="clear"></div>
-                                                               </div>
-
-                                                               <div class="table_row">
-                                                                       <div class="table_left">
-                                                                               <h:outputLabel for="password2" value="#{msg.GUEST_REGISTRATION_ENTER_PASSWORD2}" />
-                                                                       </div>
-
-                                                                       <div class="table_right">
-                                                                               <h:inputSecret class="input" id="password2" size="10" maxlength="255" value="#{loginController.userPasswordRepeat}" required="true" />
-                                                                       </div>
-
-                                                                       <div class="clear"></div>
-                                                               </div>
-                                                       </fieldset>
-                                               </div>
-
-                                               <ui:include src="/WEB-INF/templates/login/login_enter_current_password.tpl" />
-
-                                               <div class="table_footer">
-                                                       <h:commandButton class="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-                                                       <h:commandButton class="submit" type="submit" id="change_password" value="#{msg.BUTTON_CHANGE_PASSWORD}" action="#{userController.changePassword()}" />
-                                               </div>
-                                       </h:form>
-                               </div>
-                       </ui:fragment>
-
-                       <ui:fragment rendered="#{not loginController.isUserLoggedIn()}">
-                               <ui:include id="login_only" src="/WEB-INF/templates/generic/user_not_logged_in.tpl" />
-                       </ui:fragment>
-               </ui:define>
-       </ui:composition>
-</html>
+<?xml version="1.0" encoding="UTF-8" ?>\r
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">\r
+<html\r
+       lang="#{localizationController.language}" xml:lang="#{localizationController.language}"\r
+       xmlns="http://www.w3.org/1999/xhtml"\r
+         xmlns:ui="http://xmlns.jcp.org/jsf/facelets"\r
+         xmlns:h="http://xmlns.jcp.org/jsf/html"\r
+         xmlns:f="http://xmlns.jcp.org/jsf/core"\r
+         >\r
+\r
+       <ui:composition template="/WEB-INF/templates/login/login_base.tpl">\r
+               <ui:define name="login_title">#{msg.PAGE_TITLE_LOGIN_CHANGE_PASSWORD}</ui:define>\r
+\r
+               <ui:define name="content_header">\r
+                       #{msg.CONTENT_TITLE_LOGIN_CHANGE_PASSWORD}\r
+               </ui:define>\r
+\r
+               <ui:define name="content">\r
+                       <ui:fragment rendered="#{userLoginController.isUserLoggedIn()}">\r
+                               <div class="table">\r
+                                       <div class="table_header">\r
+                                               #{msg.LOGIN_CHANGE_PASSWORD_TITLE}\r
+                                       </div>\r
+\r
+                                       <h:form id="login_form">\r
+                                               <div class="para">\r
+                                                       <fieldset id="change_password">\r
+                                                               <legend title="#{msg.LOGIN_CHANGE_PASSWORD_LEGEND_TITLE}">#{msg.LOGIN_CHANGE_PASSWORD_LEGEND}</legend>\r
+\r
+                                                               <div class="table_row">\r
+                                                                       <div class="table_left">\r
+                                                                               <h:outputLabel for="password1" value="#{msg.GUEST_REGISTRATION_ENTER_PASSWORD1}" />\r
+                                                                       </div>\r
+\r
+                                                                       <div class="table_right">\r
+                                                                               <h:inputSecret class="input" id="password1" size="10" maxlength="255" value="#{userLoginController.userPassword}" required="true" />\r
+                                                                       </div>\r
+\r
+                                                                       <div class="clear"></div>\r
+                                                               </div>\r
+\r
+                                                               <div class="table_row">\r
+                                                                       <div class="table_left">\r
+                                                                               <h:outputLabel for="password2" value="#{msg.GUEST_REGISTRATION_ENTER_PASSWORD2}" />\r
+                                                                       </div>\r
+\r
+                                                                       <div class="table_right">\r
+                                                                               <h:inputSecret class="input" id="password2" size="10" maxlength="255" value="#{userLoginController.userPasswordRepeat}" required="true" />\r
+                                                                       </div>\r
+\r
+                                                                       <div class="clear"></div>\r
+                                                               </div>\r
+                                                       </fieldset>\r
+                                               </div>\r
+\r
+                                               <ui:include src="/WEB-INF/templates/login/login_enter_current_password.tpl" />\r
+\r
+                                               <div class="table_footer">\r
+                                                       <h:commandButton class="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />\r
+                                                       <h:commandButton class="submit" type="submit" id="change_password" value="#{msg.BUTTON_CHANGE_PASSWORD}" action="#{userController.changePassword()}" />\r
+                                               </div>\r
+                                       </h:form>\r
+                               </div>\r
+                       </ui:fragment>\r
+\r
+                       <ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">\r
+                               <ui:include id="login_only" src="/WEB-INF/templates/generic/user_not_logged_in.tpl" />\r
+                       </ui:fragment>\r
+               </ui:define>\r
+       </ui:composition>\r
+</html>\r
index e4c482c9b25bb0ba13943ceea40308a5cd3fa143..bf66c33f7336cb621822cdb8dc83010c50027a4c 100644 (file)
@@ -16,7 +16,7 @@
                </ui:define>
 
                <ui:define name="content">
-                       <ui:fragment rendered="#{loginController.isUserLoggedIn()}">
+                       <ui:fragment rendered="#{userLoginController.isUserLoggedIn()}">
                                <div class="table">
                                        <div class="table_header">
                                                #{msg.LOGIN_CHANGE_PERSONAL_DATA_TITLE}
@@ -37,7 +37,7 @@
                                </div>
                        </ui:fragment>
 
-                       <ui:fragment rendered="#{not loginController.isUserLoggedIn()}">
+                       <ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">
                                <ui:include id="login_only" src="/WEB-INF/templates/generic/user_not_logged_in.tpl" />
                        </ui:fragment>
                </ui:define>
index 25b69679991123806b0d98f19cbf3307395c208f..8f52ddfe0ef3a1a8c2dbee685ea9d6e9d11cbd51 100644 (file)
@@ -1,30 +1,30 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html
-       lang="#{localizationController.language}" xml:lang="#{localizationController.language}"
-       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/login_base.tpl">
-               <ui:define name="login_title">#{msg.PAGE_TITLE_LOGIN_CONTACT_DATA_SAVED}</ui:define>
-
-               <ui:define name="content_header">
-                       #{msg.CONTENT_TITLE_LOGIN_CONTACT_DATA_SAVED}
-               </ui:define>
-
-               <ui:define name="content">
-                       <ui:fragment rendered="#{loginController.isUserLoggedIn()}">
-                               <ui:include id="message_box" src="/WEB-INF/templates/generic/message_box.tpl">
-                                       <ui:param name="message" value="#{msg.LOGIN_MESSAGE_DATA_SAVED}" />
-                               </ui:include>
-                       </ui:fragment>
-
-                       <ui:fragment rendered="#{not loginController.isUserLoggedIn()}">
-                               <ui:include id="login_only" src="/WEB-INF/templates/generic/user_not_logged_in.tpl" />
-                       </ui:fragment>
-               </ui:define>
-       </ui:composition>
-</html>
+<?xml version="1.0" encoding="UTF-8" ?>\r
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">\r
+<html\r
+       lang="#{localizationController.language}" xml:lang="#{localizationController.language}"\r
+       xmlns="http://www.w3.org/1999/xhtml"\r
+         xmlns:ui="http://xmlns.jcp.org/jsf/facelets"\r
+         xmlns:h="http://xmlns.jcp.org/jsf/html"\r
+         xmlns:f="http://xmlns.jcp.org/jsf/core"\r
+         >\r
+\r
+       <ui:composition template="/WEB-INF/templates/login/login_base.tpl">\r
+               <ui:define name="login_title">#{msg.PAGE_TITLE_LOGIN_CONTACT_DATA_SAVED}</ui:define>\r
+\r
+               <ui:define name="content_header">\r
+                       #{msg.CONTENT_TITLE_LOGIN_CONTACT_DATA_SAVED}\r
+               </ui:define>\r
+\r
+               <ui:define name="content">\r
+                       <ui:fragment rendered="#{userLoginController.isUserLoggedIn()}">\r
+                               <ui:include id="message_box" src="/WEB-INF/templates/generic/message_box.tpl">\r
+                                       <ui:param name="message" value="#{msg.LOGIN_MESSAGE_DATA_SAVED}" />\r
+                               </ui:include>\r
+                       </ui:fragment>\r
+\r
+                       <ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">\r
+                               <ui:include id="login_only" src="/WEB-INF/templates/generic/user_not_logged_in.tpl" />\r
+                       </ui:fragment>\r
+               </ui:define>\r
+       </ui:composition>\r
+</html>\r
index 0fd6316a08ad40c7d5595c0376007e18b5ce4e06..53ca4ea36de3f8e2af1679efb59c33436b3b751f 100644 (file)
@@ -1,30 +1,30 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html
-       lang="#{localizationController.language}" xml:lang="#{localizationController.language}"
-       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/login_base.tpl">
-               <ui:define name="login_title">#{msg.PAGE_TITLE_LOGIN_DATA_SAVED}</ui:define>
-
-               <ui:define name="content_header">
-                       #{msg.CONTENT_TITLE_LOGIN_DATA_SAVED}
-               </ui:define>
-
-               <ui:define name="content">
-                       <ui:fragment rendered="#{loginController.isUserLoggedIn()}">
-                               <ui:include id="message_box" src="/WEB-INF/templates/generic/message_box.tpl">
-                                       <ui:param name="message" value="#{msg.LOGIN_MESSAGE_DATA_SAVED}" />
-                               </ui:include>
-                       </ui:fragment>
-
-                       <ui:fragment rendered="#{not loginController.isUserLoggedIn()}">
-                               <ui:include id="login_only" src="/WEB-INF/templates/generic/user_not_logged_in.tpl" />
-                       </ui:fragment>
-               </ui:define>
-       </ui:composition>
-</html>
+<?xml version="1.0" encoding="UTF-8" ?>\r
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">\r
+<html\r
+       lang="#{localizationController.language}" xml:lang="#{localizationController.language}"\r
+       xmlns="http://www.w3.org/1999/xhtml"\r
+         xmlns:ui="http://xmlns.jcp.org/jsf/facelets"\r
+         xmlns:h="http://xmlns.jcp.org/jsf/html"\r
+         xmlns:f="http://xmlns.jcp.org/jsf/core"\r
+         >\r
+\r
+       <ui:composition template="/WEB-INF/templates/login/login_base.tpl">\r
+               <ui:define name="login_title">#{msg.PAGE_TITLE_LOGIN_DATA_SAVED}</ui:define>\r
+\r
+               <ui:define name="content_header">\r
+                       #{msg.CONTENT_TITLE_LOGIN_DATA_SAVED}\r
+               </ui:define>\r
+\r
+               <ui:define name="content">\r
+                       <ui:fragment rendered="#{userLoginController.isUserLoggedIn()}">\r
+                               <ui:include id="message_box" src="/WEB-INF/templates/generic/message_box.tpl">\r
+                                       <ui:param name="message" value="#{msg.LOGIN_MESSAGE_DATA_SAVED}" />\r
+                               </ui:include>\r
+                       </ui:fragment>\r
+\r
+                       <ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">\r
+                               <ui:include id="login_only" src="/WEB-INF/templates/generic/user_not_logged_in.tpl" />\r
+                       </ui:fragment>\r
+               </ui:define>\r
+       </ui:composition>\r
+</html>\r
index 8cd727cbbea7285a88ecce46ae21c27d7c69603f..661befaeeef0f3557a9106ec7c5dddbd646a040b 100644 (file)
@@ -1,50 +1,50 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html
-       lang="#{localizationController.language}" xml:lang="#{localizationController.language}"
-       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/login_base.tpl">
-               <ui:define name="login_title">#{msg.PAGE_TITLE_LOGIN_EDIT_USER_DATA}</ui:define>
-
-               <ui:define name="content_header">
-                       #{msg.CONTENT_TITLE_LOGIN_EDIT_USER_DATA}
-               </ui:define>
-
-               <ui:define name="content">
-                       <ui:fragment rendered="#{loginController.isUserLoggedIn()}">
-                               <div class="table">
-                                       <div class="table_header">
-                                               #{msg.LOGIN_EDIT_USER_DATA_TITLE}
-                                       </div>
-
-                                       <div class="para notice">
-                                               <h:outputText value="#{msg.LOGIN_CHOOSE_PERSONAL_DATA_EMAIL_PASSWORD_NOTICE}" />
-                                       </div>
-
-                                       <div class="para">
-                                               <ul>
-                                                       <li>
-                                                               <h:link title="#{msg.LINK_LOGIN_CHANGE_PERSONAL_DATA_TITLE}" outcome="login_change_personal_data" value="#{msg.LINK_LOGIN_CHANGE_PERSONAL_DATA}" />
-                                                       </li>
-                                                       <li>
-                                                               <h:link title="#{msg.LINK_LOGIN_CHANGE_EMAIL_ADDRESS_TITLE}" outcome="login_change_email_address" value="#{msg.LINK_LOGIN_CHANGE_EMAIL_ADDRESS}" />
-                                                       </li>
-                                                       <li>
-                                                               <h:link title="#{msg.LINK_LOGIN_CHANGE_PASSWORD_TITLE}" outcome="login_change_password" value="#{msg.LINK_LOGIN_CHANGE_PASSWORD}" />
-                                                       </li>
-                                               </ul>
-                                       </div>
-                               </div>
-                       </ui:fragment>
-
-                       <ui:fragment rendered="#{not loginController.isUserLoggedIn()}">
-                               <ui:include id="login_only" src="/WEB-INF/templates/generic/user_not_logged_in.tpl" />
-                       </ui:fragment>
-               </ui:define>
-       </ui:composition>
-</html>
+<?xml version="1.0" encoding="UTF-8" ?>\r
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">\r
+<html\r
+       lang="#{localizationController.language}" xml:lang="#{localizationController.language}"\r
+       xmlns="http://www.w3.org/1999/xhtml"\r
+         xmlns:ui="http://xmlns.jcp.org/jsf/facelets"\r
+         xmlns:h="http://xmlns.jcp.org/jsf/html"\r
+         xmlns:f="http://xmlns.jcp.org/jsf/core"\r
+         >\r
+\r
+       <ui:composition template="/WEB-INF/templates/login/login_base.tpl">\r
+               <ui:define name="login_title">#{msg.PAGE_TITLE_LOGIN_EDIT_USER_DATA}</ui:define>\r
+\r
+               <ui:define name="content_header">\r
+                       #{msg.CONTENT_TITLE_LOGIN_EDIT_USER_DATA}\r
+               </ui:define>\r
+\r
+               <ui:define name="content">\r
+                       <ui:fragment rendered="#{userLoginController.isUserLoggedIn()}">\r
+                               <div class="table">\r
+                                       <div class="table_header">\r
+                                               #{msg.LOGIN_EDIT_USER_DATA_TITLE}\r
+                                       </div>\r
+\r
+                                       <div class="para notice">\r
+                                               <h:outputText value="#{msg.LOGIN_CHOOSE_PERSONAL_DATA_EMAIL_PASSWORD_NOTICE}" />\r
+                                       </div>\r
+\r
+                                       <div class="para">\r
+                                               <ul>\r
+                                                       <li>\r
+                                                               <h:link title="#{msg.LINK_LOGIN_CHANGE_PERSONAL_DATA_TITLE}" outcome="login_change_personal_data" value="#{msg.LINK_LOGIN_CHANGE_PERSONAL_DATA}" />\r
+                                                       </li>\r
+                                                       <li>\r
+                                                               <h:link title="#{msg.LINK_LOGIN_CHANGE_EMAIL_ADDRESS_TITLE}" outcome="login_change_email_address" value="#{msg.LINK_LOGIN_CHANGE_EMAIL_ADDRESS}" />\r
+                                                       </li>\r
+                                                       <li>\r
+                                                               <h:link title="#{msg.LINK_LOGIN_CHANGE_PASSWORD_TITLE}" outcome="login_change_password" value="#{msg.LINK_LOGIN_CHANGE_PASSWORD}" />\r
+                                                       </li>\r
+                                               </ul>\r
+                                       </div>\r
+                               </div>\r
+                       </ui:fragment>\r
+\r
+                       <ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">\r
+                               <ui:include id="login_only" src="/WEB-INF/templates/generic/user_not_logged_in.tpl" />\r
+                       </ui:fragment>\r
+               </ui:define>\r
+       </ui:composition>\r
+</html>\r
index ef4281d86e9add780d9be0fd84a13ceb557263fa..d0c5d23e48342489b256753b6b65d9dbcc89a0ff 100644 (file)
@@ -1,28 +1,28 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html
-       lang="#{localizationController.language}" xml:lang="#{localizationController.language}"
-       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/login_base.tpl">
-               <ui:define name="login_title">#{msg.PAGE_TITLE_LOGIN_HOME}</ui:define>
-
-               <ui:define name="content_header">
-                       #{msg.CONTENT_TITLE_LOGIN_HOME}
-               </ui:define>
-
-               <ui:define name="content">
-                       <ui:fragment rendered="#{loginController.isUserLoggedIn()}">
-                               Here goes your content.
-                       </ui:fragment>
-
-                       <ui:fragment rendered="#{not loginController.isUserLoggedIn()}">
-                               <ui:include id="login_only" src="/WEB-INF/templates/generic/user_not_logged_in.tpl" />
-                       </ui:fragment>
-               </ui:define>
-       </ui:composition>
-</html>
+<?xml version="1.0" encoding="UTF-8" ?>\r
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">\r
+<html\r
+       lang="#{localizationController.language}" xml:lang="#{localizationController.language}"\r
+       xmlns="http://www.w3.org/1999/xhtml"\r
+         xmlns:ui="http://xmlns.jcp.org/jsf/facelets"\r
+         xmlns:h="http://xmlns.jcp.org/jsf/html"\r
+         xmlns:f="http://xmlns.jcp.org/jsf/core"\r
+         >\r
+\r
+       <ui:composition template="/WEB-INF/templates/login/login_base.tpl">\r
+               <ui:define name="login_title">#{msg.PAGE_TITLE_LOGIN_HOME}</ui:define>\r
+\r
+               <ui:define name="content_header">\r
+                       #{msg.CONTENT_TITLE_LOGIN_HOME}\r
+               </ui:define>\r
+\r
+               <ui:define name="content">\r
+                       <ui:fragment rendered="#{userLoginController.isUserLoggedIn()}">\r
+                               Here goes your content.\r
+                       </ui:fragment>\r
+\r
+                       <ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">\r
+                               <ui:include id="login_only" src="/WEB-INF/templates/generic/user_not_logged_in.tpl" />\r
+                       </ui:fragment>\r
+               </ui:define>\r
+       </ui:composition>\r
+</html>\r
index bd8e7360eeca30afc2e9aad54a59dd91cb136adb..e8b263894199677659cc6587ce38fdb206913d97 100644 (file)
@@ -1,67 +1,67 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html
-       lang="#{localizationController.language}" xml:lang="#{localizationController.language}"
-       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/login_base.tpl">
-               <ui:define name="login_title">#{msg.PAGE_TITLE_LOGIN_OWN_ADDRESSBOOKS}</ui:define>
-
-               <ui:define name="content_header">
-                       #{msg.CONTENT_TITLE_LOGIN_OWN_ADDRESSBOOKS}
-               </ui:define>
-
-               <ui:define name="content">
-                       <h:outputText rendered="#{loginController.isUserLoggedIn()}">
-                               <div class="table">
-                                       <div class="table_header">
-                                               #{msg.TABLE_HEADER_LIST_OWN_ADDRESSBOOKS}
-                                       </div>
-
-                                       <div class="para">
-                                               <h:dataTable id="table_own_addressbooks" var="addressbook" value="#{addressbookController.allAddressbooks()}" styleClass="table" headerClass="table_data_column" summary="#{msg.TABLE_SUMMARY_LOGIN_LIST_OWN_ADDRESSBOOKS}" rendered="#{addressbookController.hasCreatedAddressbooks()}">
-                                                       <h:column>
-                                                               <f:facet name="header">#{msg.ADDRESSBOOK_NAME}</f:facet>
-
-                                                               <h:link outcome="user_show_addressbook" title="#{msg.LINK_SHOW_ADDRESSBOOK_TITLE}">
-                                                                       <f:param name="addressbookId" value="#{addressbook.addressbookId}" />
-                                                                       <h:outputText id="addressbookName" value="#{addressbook.addressbookName}" title="#{msg.ADDRESSBOOK_NAME_TITLE}" />
-                                                               </h:link>
-                                                       </h:column>
-
-                                                       <h:column>
-                                                               <f:facet name="header">#{msg.ADDRESSBOOK_TOTAL_ENTRIES}</f:facet>
-
-                                                               <h:link outcome="show_addressbook_entries" title="#{msg.LINK_SHOW_ADDRESSBOOK_ENTRIES_TITLE}">
-                                                                       <f:param name="addressbookId" value="#{addressbook.addressbookId}" />
-                                                                       <h:outputText id="addressbookEntries" value="#{addressbookController.allEntriesSize(addressbook)}" title="#{msg.ADDRESSBOOK_TOTAL_ENTRIES_TITLE}" />
-                                                               </h:link>
-                                                       </h:column>
-
-                                                       <h:column>
-                                                               <f:facet name="header">#{msg.ADDRESSBOOK_CREATED}</f:facet>
-
-                                                               <h:outputFormat id="addressbookCreated" value="#{addressbook.addressbookCreated.time}" title="#{msg.ADDRESSBOOK_CREATED_TITLE}">
-                                                                       <f:convertDateTime for="addressbookCreated" type="both" timeStyle="short" dateStyle="medium" />
-                                                               </h:outputFormat>
-                                                       </h:column>
-                                               </h:dataTable>
-                                       </div>
-
-                                       <div class="table_footer">
-                                               <h:link id="add_first_addressbook" outcome="login_add_addressbook" value="#{msg.LINK_LOGIN_ADD_FIRST_ADDRESSBOOK}" title="#{msg.LINK_LOGIN_ADD_FIRST_ADDRESSBOOK_TITLE}" rendered="#{addressbookController.hasCreatedAddressbooks() == false}" />
-                                               <h:link id="add_additional_addressbook" outcome="login_add_addressbook" value="#{msg.LINK_LOGIN_ADD_ADDITIONAL_ADDRESSBOOK}" title="#{msg.LINK_LOGIN_ADD_ADDITIONAL_ADDRESSBOOK_TITLE}" rendered="#{addressbookController.hasCreatedAddressbooks()}" />
-                                       </div>
-                               </div>
-                       </h:outputText>
-
-                       <h:outputText rendered="#{not loginController.isUserLoggedIn()}">
-                               <ui:include id="login_only" src="/WEB-INF/templates/generic/user_not_logged_in.tpl" />
-                       </h:outputText>
-               </ui:define>
-       </ui:composition>
-</html>
+<?xml version="1.0" encoding="UTF-8" ?>\r
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">\r
+<html\r
+       lang="#{localizationController.language}" xml:lang="#{localizationController.language}"\r
+       xmlns="http://www.w3.org/1999/xhtml"\r
+         xmlns:ui="http://xmlns.jcp.org/jsf/facelets"\r
+         xmlns:h="http://xmlns.jcp.org/jsf/html"\r
+         xmlns:f="http://xmlns.jcp.org/jsf/core"\r
+         >\r
+\r
+       <ui:composition template="/WEB-INF/templates/login/login_base.tpl">\r
+               <ui:define name="login_title">#{msg.PAGE_TITLE_LOGIN_OWN_ADDRESSBOOKS}</ui:define>\r
+\r
+               <ui:define name="content_header">\r
+                       #{msg.CONTENT_TITLE_LOGIN_OWN_ADDRESSBOOKS}\r
+               </ui:define>\r
+\r
+               <ui:define name="content">\r
+                       <h:outputText rendered="#{userLoginController.isUserLoggedIn()}">\r
+                               <div class="table">\r
+                                       <div class="table_header">\r
+                                               #{msg.TABLE_HEADER_LIST_OWN_ADDRESSBOOKS}\r
+                                       </div>\r
+\r
+                                       <div class="para">\r
+                                               <h:dataTable id="table_own_addressbooks" var="addressbook" value="#{addressbookController.allAddressbooks()}" styleClass="table" headerClass="table_data_column" summary="#{msg.TABLE_SUMMARY_LOGIN_LIST_OWN_ADDRESSBOOKS}" rendered="#{addressbookController.hasCreatedAddressbooks()}">\r
+                                                       <h:column>\r
+                                                               <f:facet name="header">#{msg.ADDRESSBOOK_NAME}</f:facet>\r
+\r
+                                                               <h:link outcome="user_show_addressbook" title="#{msg.LINK_SHOW_ADDRESSBOOK_TITLE}">\r
+                                                                       <f:param name="addressbookId" value="#{addressbook.addressbookId}" />\r
+                                                                       <h:outputText id="addressbookName" value="#{addressbook.addressbookName}" title="#{msg.ADDRESSBOOK_NAME_TITLE}" />\r
+                                                               </h:link>\r
+                                                       </h:column>\r
+\r
+                                                       <h:column>\r
+                                                               <f:facet name="header">#{msg.ADDRESSBOOK_TOTAL_ENTRIES}</f:facet>\r
+\r
+                                                               <h:link outcome="show_addressbook_entries" title="#{msg.LINK_SHOW_ADDRESSBOOK_ENTRIES_TITLE}">\r
+                                                                       <f:param name="addressbookId" value="#{addressbook.addressbookId}" />\r
+                                                                       <h:outputText id="addressbookEntries" value="#{addressbookController.allEntriesSize(addressbook)}" title="#{msg.ADDRESSBOOK_TOTAL_ENTRIES_TITLE}" />\r
+                                                               </h:link>\r
+                                                       </h:column>\r
+\r
+                                                       <h:column>\r
+                                                               <f:facet name="header">#{msg.ADDRESSBOOK_CREATED}</f:facet>\r
+\r
+                                                               <h:outputFormat id="addressbookCreated" value="#{addressbook.addressbookCreated.time}" title="#{msg.ADDRESSBOOK_CREATED_TITLE}">\r
+                                                                       <f:convertDateTime for="addressbookCreated" type="both" timeStyle="short" dateStyle="medium" />\r
+                                                               </h:outputFormat>\r
+                                                       </h:column>\r
+                                               </h:dataTable>\r
+                                       </div>\r
+\r
+                                       <div class="table_footer">\r
+                                               <h:link id="add_first_addressbook" outcome="login_add_addressbook" value="#{msg.LINK_LOGIN_ADD_FIRST_ADDRESSBOOK}" title="#{msg.LINK_LOGIN_ADD_FIRST_ADDRESSBOOK_TITLE}" rendered="#{addressbookController.hasCreatedAddressbooks() == false}" />\r
+                                               <h:link id="add_additional_addressbook" outcome="login_add_addressbook" value="#{msg.LINK_LOGIN_ADD_ADDITIONAL_ADDRESSBOOK}" title="#{msg.LINK_LOGIN_ADD_ADDITIONAL_ADDRESSBOOK_TITLE}" rendered="#{addressbookController.hasCreatedAddressbooks()}" />\r
+                                       </div>\r
+                               </div>\r
+                       </h:outputText>\r
+\r
+                       <h:outputText rendered="#{not userLoginController.isUserLoggedIn()}">\r
+                               <ui:include id="login_only" src="/WEB-INF/templates/generic/user_not_logged_in.tpl" />\r
+                       </h:outputText>\r
+               </ui:define>\r
+       </ui:composition>\r
+</html>\r
index e42c555fdb1a25dad37bb18457fd9e61899923ba..da19945649e24f83b14aadd4d8656ee0cf80b83e 100644 (file)
@@ -1,30 +1,30 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html
-       lang="#{localizationController.language}" xml:lang="#{localizationController.language}"
-       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/login_base.tpl">
-               <ui:define name="login_title">#{msg.PAGE_TITLE_LOGIN_USER_DATA_SAVED}</ui:define>
-
-               <ui:define name="content_header">
-                       #{msg.CONTENT_TITLE_LOGIN_USER_DATA_SAVED}
-               </ui:define>
-
-               <ui:define name="content">
-                       <ui:fragment rendered="#{loginController.isUserLoggedIn()}">
-                               <ui:include id="message_box" src="/WEB-INF/templates/generic/message_box.tpl">
-                                       <ui:param name="message" value="#{msg.LOGIN_MESSAGE_DATA_SAVED}" />
-                               </ui:include>
-                       </ui:fragment>
-
-                       <ui:fragment rendered="#{not loginController.isUserLoggedIn()}">
-                               <ui:include id="login_only" src="/WEB-INF/templates/generic/user_not_logged_in.tpl" />
-                       </ui:fragment>
-               </ui:define>
-       </ui:composition>
-</html>
+<?xml version="1.0" encoding="UTF-8" ?>\r
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">\r
+<html\r
+       lang="#{localizationController.language}" xml:lang="#{localizationController.language}"\r
+       xmlns="http://www.w3.org/1999/xhtml"\r
+         xmlns:ui="http://xmlns.jcp.org/jsf/facelets"\r
+         xmlns:h="http://xmlns.jcp.org/jsf/html"\r
+         xmlns:f="http://xmlns.jcp.org/jsf/core"\r
+         >\r
+\r
+       <ui:composition template="/WEB-INF/templates/login/login_base.tpl">\r
+               <ui:define name="login_title">#{msg.PAGE_TITLE_LOGIN_USER_DATA_SAVED}</ui:define>\r
+\r
+               <ui:define name="content_header">\r
+                       #{msg.CONTENT_TITLE_LOGIN_USER_DATA_SAVED}\r
+               </ui:define>\r
+\r
+               <ui:define name="content">\r
+                       <ui:fragment rendered="#{userLoginController.isUserLoggedIn()}">\r
+                               <ui:include id="message_box" src="/WEB-INF/templates/generic/message_box.tpl">\r
+                                       <ui:param name="message" value="#{msg.LOGIN_MESSAGE_DATA_SAVED}" />\r
+                               </ui:include>\r
+                       </ui:fragment>\r
+\r
+                       <ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">\r
+                               <ui:include id="login_only" src="/WEB-INF/templates/generic/user_not_logged_in.tpl" />\r
+                       </ui:fragment>\r
+               </ui:define>\r
+       </ui:composition>\r
+</html>\r
index aaaafb9349c8e1e737b370d3cee1514fbe2c4b6e..4d2112831e09e82c951e177011837a369c8f3a85 100644 (file)
@@ -1,22 +1,22 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html
-       lang="#{localizationController.language}" xml:lang="#{localizationController.language}"
-       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/#{loginController.templateType}/#{loginController.templateType}_base.tpl">
-               <ui:define name="guest_title">#{msg.PAGE_TITLE_INDEX_PRIVACY}</ui:define>
-
-               <ui:define name="content_header">
-                       #{msg.CONTENT_TITLE_INDEX_PRIVACY}
-               </ui:define>
-
-               <ui:define name="content">
-                       Hier kommen die Datenschutzbestimmungen hin.
-               </ui:define>
-       </ui:composition>
-</html>
+<?xml version="1.0" encoding="UTF-8" ?>\r
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">\r
+<html\r
+       lang="#{localizationController.language}" xml:lang="#{localizationController.language}"\r
+       xmlns="http://www.w3.org/1999/xhtml"\r
+       xmlns:ui="http://xmlns.jcp.org/jsf/facelets"\r
+       xmlns:h="http://xmlns.jcp.org/jsf/html"\r
+       xmlns:f="http://xmlns.jcp.org/jsf/core"\r
+       >\r
+\r
+       <ui:composition template="/WEB-INF/templates/#{userLoginController.templateType}/#{userLoginController.templateType}_base.tpl">\r
+               <ui:define name="guest_title">#{msg.PAGE_TITLE_INDEX_PRIVACY}</ui:define>\r
+\r
+               <ui:define name="content_header">\r
+                       #{msg.CONTENT_TITLE_INDEX_PRIVACY}\r
+               </ui:define>\r
+\r
+               <ui:define name="content">\r
+                       Hier kommen die Datenschutzbestimmungen hin.\r
+               </ui:define>\r
+       </ui:composition>\r
+</html>\r
index 3c66fbbd5edd7d57a0d4928a7135ebb9c7208d15..a7a2ac9c3db5c0c7a365ae2f67fd71187b7632a0 100644 (file)
@@ -1,22 +1,22 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html
-       lang="#{localizationController.language}" xml:lang="#{localizationController.language}"
-       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/#{loginController.templateType}/#{loginController.templateType}_base.tpl">
-               <ui:define name="guest_title">#{msg.PAGE_TITLE_INDEX_TERMS}</ui:define>
-
-               <ui:define name="content_header">
-                       #{msg.CONTENT_TITLE_INDEX_TERMS}
-               </ui:define>
-
-               <ui:define name="content">
-                       Hier kommen die allgemeinen Geschäftsbedingungen hin.
-               </ui:define>
-       </ui:composition>
-</html>
+<?xml version="1.0" encoding="UTF-8" ?>\r
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">\r
+<html\r
+       lang="#{localizationController.language}" xml:lang="#{localizationController.language}"\r
+       xmlns="http://www.w3.org/1999/xhtml"\r
+       xmlns:ui="http://xmlns.jcp.org/jsf/facelets"\r
+       xmlns:h="http://xmlns.jcp.org/jsf/html"\r
+       xmlns:f="http://xmlns.jcp.org/jsf/core"\r
+       >\r
+\r
+       <ui:composition template="/WEB-INF/templates/#{userLoginController.templateType}/#{userLoginController.templateType}_base.tpl">\r
+               <ui:define name="guest_title">#{msg.PAGE_TITLE_INDEX_TERMS}</ui:define>\r
+\r
+               <ui:define name="content_header">\r
+                       #{msg.CONTENT_TITLE_INDEX_TERMS}\r
+               </ui:define>\r
+\r
+               <ui:define name="content">\r
+                       Hier kommen die allgemeinen Geschäftsbedingungen hin.\r
+               </ui:define>\r
+       </ui:composition>\r
+</html>\r
index 620e57964cf5002077e8ec1706acac0484da6dda..fc088fa237ff4e510d84e49a09822e241275c247 100644 (file)
@@ -1,56 +1,56 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html
-       lang="#{localizationController.language}" xml:lang="#{localizationController.language}"
-       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">
-
-       <f:metadata>
-               <f:viewParam id="addressbookId" name="addressbookId" value="#{addressbookController.addressbookId}" required="true" requiredMessage="#{msg.PARAMETER_ADDRESSBOOK_ID_MISSING}" converterMessage="#{msg.PARAMETER_ADDRESSBOOK_ID_INVALID}" validatorMessage="#{msg.PARAMETER_ADDRESSBOOK_ID_NOT_FOUND}">
-                       <f:convertNumber for="addressbookId" type="number" minIntegerDigits="1" maxIntegerDigits="20" />
-                       <f:validator for="addressbookId" validatorId="AddressbookIdValidator" />
-               </f:viewParam>
-       </f:metadata>
-
-       <ui:composition template="/WEB-INF/templates/#{loginController.templateType}/#{loginController.templateType}_base.tpl">
-               <ui:define name="login_title">#{msg.PAGE_TITLE_USER_SHOW_ADDRESSBOOK}</ui:define>
-               <ui:define name="guest_title">#{msg.PAGE_TITLE_INDEX_SHOW_ADDRESSBOOK}</ui:define>
-
-               <ui:define name="content_header">
-                       #{msg.CONTENT_TITLE_USER_SHOW_ADDRESSBOOK}
-               </ui:define>
-
-               <ui:define name="content">
-                       <h:panelGrid headerClass="table_header" styleClass="table" columns="2" rendered="#{addressbookController.loadAddressbook()}">
-                               <f:facet name="header">#{msg.TABLE_HEADER_SHOW_ADDRESSBOOK}</f:facet>
-
-                               <h:outputLabel for="addressbookName" class="table_label">#{msg.ADDRESSBOOK_NAME}</h:outputLabel>
-                               <h:outputText id="addressbookName" value="#{addressbookController.addressbookName}" />
-
-                               <h:outputLabel for="userProfileLink" class="table_label">#{msg.ADDRESSBOOK_OWNER}</h:outputLabel>
-                               <ui:include src="/WEB-INF/templates/generic/user_profile_link.tpl">
-                                       <ui:param name="user" value="#{addressbookController.addressbookUser}" />
-                               </ui:include>
-
-                               <h:outputLabel for="addressbookCreated" class="table_label">#{msg.ADDRESSBOOK_CREATED}</h:outputLabel>
-                               <h:outputFormat id="addressbookCreated" value="#{addressbookController.addressbook.addressbookCreated.time}" title="#{msg.ADDRESSBOOK_CREATED_TITLE}">
-                                       <f:convertDateTime for="addressbookCreated" type="both" timeStyle="short" dateStyle="medium" />
-                               </h:outputFormat>
-
-                               <h:outputLabel for="addressbookStatus" class="table_label">#{msg.ADDRESSBOOK_STATUS}</h:outputLabel>
-                               <h:outputText id="addressbookStatus" value="#{msg[addressbookController.addressbook.addressbookStatus.messageKey]}" title="#{msg.ADDRESSBOOK_STATUS_TITLE}" />
-
-                               <f:facet name="footer">
-                                       <h:outputText id="ownProfileInvible" class="notice" value="#{msg.USER_NOT_LOGGED_IN}" rendered="#{not loginController.isUserLoggedIn()}" />
-                                       <h:outputText id="ownProfileInvible" class="notice" value="#{msg.LOGIN_OWN_PROFILE_INVISIBLE}" rendered="#{loginController.isUserLoggedIn() and loginController.isInvisible()}" />
-
-                                       <ui:fragment rendered="#{loginController.isUserLoggedIn() and not loginController.isInvisible()}">
-                                               <h:outputText value="Bla bla" rendered="#{addressbookController.isOtherAddressbook()}" />
-                                       </ui:fragment>
-                               </f:facet>
-                       </h:panelGrid>
-               </ui:define>
-       </ui:composition>
-</html>
+<?xml version="1.0" encoding="UTF-8" ?>\r
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">\r
+<html\r
+       lang="#{localizationController.language}" xml:lang="#{localizationController.language}"\r
+       xmlns="http://www.w3.org/1999/xhtml"\r
+         xmlns:ui="http://xmlns.jcp.org/jsf/facelets"\r
+         xmlns:h="http://xmlns.jcp.org/jsf/html"\r
+         xmlns:f="http://xmlns.jcp.org/jsf/core">\r
+\r
+       <f:metadata>\r
+               <f:viewParam id="addressbookId" name="addressbookId" value="#{addressbookController.addressbookId}" required="true" requiredMessage="#{msg.PARAMETER_ADDRESSBOOK_ID_MISSING}" converterMessage="#{msg.PARAMETER_ADDRESSBOOK_ID_INVALID}" validatorMessage="#{msg.PARAMETER_ADDRESSBOOK_ID_NOT_FOUND}">\r
+                       <f:convertNumber for="addressbookId" type="number" minIntegerDigits="1" maxIntegerDigits="20" />\r
+                       <f:validator for="addressbookId" validatorId="AddressbookIdValidator" />\r
+               </f:viewParam>\r
+       </f:metadata>\r
+\r
+       <ui:composition template="/WEB-INF/templates/#{userLoginController.templateType}/#{userLoginController.templateType}_base.tpl">\r
+               <ui:define name="login_title">#{msg.PAGE_TITLE_USER_SHOW_ADDRESSBOOK}</ui:define>\r
+               <ui:define name="guest_title">#{msg.PAGE_TITLE_INDEX_SHOW_ADDRESSBOOK}</ui:define>\r
+\r
+               <ui:define name="content_header">\r
+                       #{msg.CONTENT_TITLE_USER_SHOW_ADDRESSBOOK}\r
+               </ui:define>\r
+\r
+               <ui:define name="content">\r
+                       <h:panelGrid headerClass="table_header" styleClass="table" columns="2" rendered="#{addressbookController.loadAddressbook()}">\r
+                               <f:facet name="header">#{msg.TABLE_HEADER_SHOW_ADDRESSBOOK}</f:facet>\r
+\r
+                               <h:outputLabel for="addressbookName" class="table_label">#{msg.ADDRESSBOOK_NAME}</h:outputLabel>\r
+                               <h:outputText id="addressbookName" value="#{addressbookController.addressbookName}" />\r
+\r
+                               <h:outputLabel for="userProfileLink" class="table_label">#{msg.ADDRESSBOOK_OWNER}</h:outputLabel>\r
+                               <ui:include src="/WEB-INF/templates/generic/user_profile_link.tpl">\r
+                                       <ui:param name="user" value="#{addressbookController.addressbookUser}" />\r
+                               </ui:include>\r
+\r
+                               <h:outputLabel for="addressbookCreated" class="table_label">#{msg.ADDRESSBOOK_CREATED}</h:outputLabel>\r
+                               <h:outputFormat id="addressbookCreated" value="#{addressbookController.addressbook.addressbookCreated.time}" title="#{msg.ADDRESSBOOK_CREATED_TITLE}">\r
+                                       <f:convertDateTime for="addressbookCreated" type="both" timeStyle="short" dateStyle="medium" />\r
+                               </h:outputFormat>\r
+\r
+                               <h:outputLabel for="addressbookStatus" class="table_label">#{msg.ADDRESSBOOK_STATUS}</h:outputLabel>\r
+                               <h:outputText id="addressbookStatus" value="#{msg[addressbookController.addressbook.addressbookStatus.messageKey]}" title="#{msg.ADDRESSBOOK_STATUS_TITLE}" />\r
+\r
+                               <f:facet name="footer">\r
+                                       <h:outputText id="ownProfileInvible" class="notice" value="#{msg.USER_NOT_LOGGED_IN}" rendered="#{not userLoginController.isUserLoggedIn()}" />\r
+                                       <h:outputText id="ownProfileInvible" class="notice" value="#{msg.LOGIN_OWN_PROFILE_INVISIBLE}" rendered="#{userLoginController.isUserLoggedIn() and userLoginController.isInvisible()}" />\r
+\r
+                                       <ui:fragment rendered="#{userLoginController.isUserLoggedIn() and not userLoginController.isInvisible()}">\r
+                                               <h:outputText value="Bla bla" rendered="#{addressbookController.isOtherAddressbook()}" />\r
+                                       </ui:fragment>\r
+                               </f:facet>\r
+                       </h:panelGrid>\r
+               </ui:define>\r
+       </ui:composition>\r
+</html>\r
index 51c91050160d170e412dbbba8b4c1419dcc53bf4..ef70326c17f966b93c44c6d346d7e50ef450c1d0 100644 (file)
@@ -1,39 +1,39 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html
-       lang="#{localizationController.language}" xml:lang="#{localizationController.language}"
-       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/#{loginController.templateType}/#{loginController.templateType}_base.tpl">
-               <ui:define name="login_title">#{msg.PAGE_TITLE_USER_LIST}</ui:define>
-
-               <ui:define name="content_header">
-                       #{msg.CONTENT_TITLE_USER_LIST}
-               </ui:define>
-
-               <ui:define name="content">
-                       <div class="table_big">
-                               <div class="table_header">
-                                       #{msg.TABLE_HEADER_USER_LIST}
-                               </div>
-
-                               <h:dataTable id="userList" var="user" value="#{userController.allVisibleUsers()}" headerClass="table_header_column25" summary="#{msg.TABLE_SUMMARY_USER_LIST}" rendered="#{userController.isVisibleUserFound()}">
-                                       <h:column>
-                                               <f:facet name="header">#{msg.USER_NAME}</f:facet>
-                                               <ui:include src="/WEB-INF/templates/generic/user_profile_link.tpl">
-                                                       <ui:param name="user" value="#{user}" />
-                                               </ui:include>
-                                       </h:column>
-
-                                       <h:column>
-                                               <f:facet name="header">#{msg.USER_CREATED}</f:facet>
-                                               <h:outputFormat id="userCreated" value="#{user.userCreated.time}" title="#{msg.USER_CREATED_TITLE}" />
-                                       </h:column>
-                               </h:dataTable>
-                       </div>
-               </ui:define>
-       </ui:composition>
-</html>
+<?xml version="1.0" encoding="UTF-8" ?>\r
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">\r
+<html\r
+       lang="#{localizationController.language}" xml:lang="#{localizationController.language}"\r
+       xmlns="http://www.w3.org/1999/xhtml"\r
+         xmlns:ui="http://xmlns.jcp.org/jsf/facelets"\r
+         xmlns:h="http://xmlns.jcp.org/jsf/html"\r
+         xmlns:f="http://xmlns.jcp.org/jsf/core">\r
+\r
+       <ui:composition template="/WEB-INF/templates/#{userLoginController.templateType}/#{userLoginController.templateType}_base.tpl">\r
+               <ui:define name="login_title">#{msg.PAGE_TITLE_USER_LIST}</ui:define>\r
+\r
+               <ui:define name="content_header">\r
+                       #{msg.CONTENT_TITLE_USER_LIST}\r
+               </ui:define>\r
+\r
+               <ui:define name="content">\r
+                       <div class="table_big">\r
+                               <div class="table_header">\r
+                                       #{msg.TABLE_HEADER_USER_LIST}\r
+                               </div>\r
+\r
+                               <h:dataTable id="userList" var="user" value="#{userController.allVisibleUsers()}" headerClass="table_header_column25" summary="#{msg.TABLE_SUMMARY_USER_LIST}" rendered="#{userController.isVisibleUserFound()}">\r
+                                       <h:column>\r
+                                               <f:facet name="header">#{msg.USER_NAME}</f:facet>\r
+                                               <ui:include src="/WEB-INF/templates/generic/user_profile_link.tpl">\r
+                                                       <ui:param name="user" value="#{user}" />\r
+                                               </ui:include>\r
+                                       </h:column>\r
+\r
+                                       <h:column>\r
+                                               <f:facet name="header">#{msg.USER_CREATED}</f:facet>\r
+                                               <h:outputFormat id="userCreated" value="#{user.userCreated.time}" title="#{msg.USER_CREATED_TITLE}" />\r
+                                       </h:column>\r
+                               </h:dataTable>\r
+                       </div>\r
+               </ui:define>\r
+       </ui:composition>\r
+</html>\r
index 0e58740f74be2d62b7ab4408ad718016186c0287..b6936170bc6ea28873e342e9c8a54b2224127bbf 100644 (file)
@@ -1,48 +1,48 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html
-       lang="#{localizationController.language}" xml:lang="#{localizationController.language}"
-       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:c="http://xmlns.jcp.org/jsp/jstl/core">
-
-       <f:metadata>
-               <f:viewParam id="userId" name="userId" value="#{userController.userId}" required="true" requiredMessage="#{msg.PARAMETER_USER_ID_MISSING}" converterMessage="#{msg.PARAMETER_USER_ID_INVALID}" validatorMessage="#{msg.PARAMETER_USER_ID_NOT_FOUND}">
-                       <f:convertNumber for="userId" type="number" minIntegerDigits="1" maxIntegerDigits="20" />
-                       <f:validator for="userId" validatorId="UserIdValidator" />
-               </f:viewParam>
-       </f:metadata>
-
-       <ui:composition template="/WEB-INF/templates/#{loginController.templateType}/#{loginController.templateType}_base.tpl">
-               <ui:define name="login_title">#{msg.PAGE_TITLE_LOGIN_USER_PROFILE}</ui:define>
-               <ui:define name="guest_title">#{msg.PAGE_TITLE_INDEX_USER_PROFILE}</ui:define>
-
-               <ui:define name="content_header">
-                       #{msg.CONTENT_TITLE_INDEX_USER_PROFILE}
-               </ui:define>
-
-               <ui:define name="content">
-                       <c:choose>
-                               <c:when test="#{userController.isUserIdEmpty()}">
-                                       <ui:include src="/WEB-INF/templates/generic/userid_error.tpl" />
-                               </c:when>
-
-                               <c:when test="#{profileController.isProfileLinkVisibleById(userController.userId)}">
-                                       <div align="center">
-                                               <h:panelGrid styleClass="table" headerClass="table_header" footerClass="table_footer">
-                                                       <f:facet name="header">
-                                                               #{msg.PUBLIC_USER_PROFILE}
-                                                       </f:facet>
-                                               </h:panelGrid>
-                                       </div>
-                               </c:when>
-
-                               <c:otherwise>
-                                       #{msg.ERROR_PROFILE_NOT_VISIBLE}
-                               </c:otherwise>
-                       </c:choose>
-               </ui:define>
-       </ui:composition>
-</html>
+<?xml version="1.0" encoding="UTF-8" ?>\r
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">\r
+<html\r
+       lang="#{localizationController.language}" xml:lang="#{localizationController.language}"\r
+       xmlns="http://www.w3.org/1999/xhtml"\r
+         xmlns:ui="http://xmlns.jcp.org/jsf/facelets"\r
+         xmlns:h="http://xmlns.jcp.org/jsf/html"\r
+         xmlns:f="http://xmlns.jcp.org/jsf/core"\r
+         xmlns:c="http://xmlns.jcp.org/jsp/jstl/core">\r
+\r
+       <f:metadata>\r
+               <f:viewParam id="userId" name="userId" value="#{userController.userId}" required="true" requiredMessage="#{msg.PARAMETER_USER_ID_MISSING}" converterMessage="#{msg.PARAMETER_USER_ID_INVALID}" validatorMessage="#{msg.PARAMETER_USER_ID_NOT_FOUND}">\r
+                       <f:convertNumber for="userId" type="number" minIntegerDigits="1" maxIntegerDigits="20" />\r
+                       <f:validator for="userId" validatorId="UserIdValidator" />\r
+               </f:viewParam>\r
+       </f:metadata>\r
+\r
+       <ui:composition template="/WEB-INF/templates/#{userLoginController.templateType}/#{userLoginController.templateType}_base.tpl">\r
+               <ui:define name="login_title">#{msg.PAGE_TITLE_LOGIN_USER_PROFILE}</ui:define>\r
+               <ui:define name="guest_title">#{msg.PAGE_TITLE_INDEX_USER_PROFILE}</ui:define>\r
+\r
+               <ui:define name="content_header">\r
+                       #{msg.CONTENT_TITLE_INDEX_USER_PROFILE}\r
+               </ui:define>\r
+\r
+               <ui:define name="content">\r
+                       <c:choose>\r
+                               <c:when test="#{userController.isUserIdEmpty()}">\r
+                                       <ui:include src="/WEB-INF/templates/generic/userid_error.tpl" />\r
+                               </c:when>\r
+\r
+                               <c:when test="#{profileController.isProfileLinkVisibleById(userController.userId)}">\r
+                                       <div align="center">\r
+                                               <h:panelGrid styleClass="table" headerClass="table_header" footerClass="table_footer">\r
+                                                       <f:facet name="header">\r
+                                                               #{msg.PUBLIC_USER_PROFILE}\r
+                                                       </f:facet>\r
+                                               </h:panelGrid>\r
+                                       </div>\r
+                               </c:when>\r
+\r
+                               <c:otherwise>\r
+                                       #{msg.ERROR_PROFILE_NOT_VISIBLE}\r
+                               </c:otherwise>\r
+                       </c:choose>\r
+               </ui:define>\r
+       </ui:composition>\r
+</html>\r