Please cherry-pick:

[jjobs-war.git] / web / user / login_add_addressbook.xhtml

diff --git a/web/user/login_add_addressbook.xhtml b/web/user/login_add_addressbook.xhtml
index a3d17464bc386a4c3e2334f5256197f6dcc6bdab..ffb94fcb88267f3bbaf7d559c362cb818940421c 100644 (file)
--- a/web/user/login_add_addressbook.xhtml
+++ b/web/user/login_add_addressbook.xhtml
@@ -8,7 +8,7 @@
          xmlns:f="http://xmlns.jcp.org/jsf/core"
          >
 
-       <ui:composition template="/WEB-INF/templates/login/login_base.tpl">
+       <ui:composition template="/WEB-INF/templates/login/user/user_base.tpl">
                <ui:define name="login_title">#{msg.PAGE_TITLE_LOGIN_ADD_ADDRESSBOOK}</ui:define>
 
                <ui:define name="content_header">
@@ -30,7 +30,7 @@
 
                                                        <div class="table_right">
                                                                <h:inputText styleClass="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" />
+                                                                       <f:validator for="addressbookName" validatorId="NameValidator" />
                                                                </h:inputText>
                                                        </div>
                                                </div>
@@ -44,7 +44,7 @@
                        </ui:fragment>
 
                        <ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">
-                               <ui:include id="login_only" src="/WEB-INF/templates/generic/user_not_logged_in.tpl" />
+                               <ui:include src="/WEB-INF/templates/user/user_not_logged_in.tpl" />
                        </ui:fragment>
                </ui:define>
        </ui:composition>