again some more h:outputText for better encapsulation of messages. and it makes more...

[addressbook-war.git] / web / admin / contact / admin_contact_edit.xhtml

diff --git a/web/admin/contact/admin_contact_edit.xhtml b/web/admin/contact/admin_contact_edit.xhtml
index 0ac502ada92c85d08c8dea858c15c28d2c339129..29e47b402b4ca0a19827444618af213633164b97 100644 (file)
--- a/web/admin/contact/admin_contact_edit.xhtml
+++ b/web/admin/contact/admin_contact_edit.xhtml
@@ -9,8 +9,8 @@
        >
 
        <f:metadata>
-               <f:viewParam name="contactId" value="#{adminHelper.contact}" converter="ContactConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_CONTACT_ID_NOT_SET}" />
-               <f:viewAction action="#{adminHelper.copyContactToController()}" />
+               <f:viewParam name="contactId" value="#{beanHelper.contact}" converter="ContactConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_CONTACT_ID_NOT_SET}" />
+               <f:viewAction action="#{beanHelper.copyContactToController()}" />
        </f:metadata>
 
        <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
@@ -21,18 +21,18 @@
                </ui:define>
 
                <ui:define name="content">
-                       <h:outputText styleClass="errors" value="#{msg.ERROR_CONTACT_ID_NOT_FOUND}" rendered="#{empty adminHelper.contact}" />
+                       <h:outputText styleClass="errors" value="#{msg.ERROR_CONTACT_ID_NOT_FOUND}" rendered="#{empty beanHelper.contact}" />
 
-                       <h:form id="admin_edit_user" rendered="#{not empty adminHelper.contact}">
+                       <h:form id="admin_edit_user" rendered="#{not empty beanHelper.contact}">
                                <div class="table">
                                        <div class="table_header">
                                                <h:outputFormat value="#{msg.ADMIN_EDIT_CONTACT_TITLE}">
-                                                       <f:param value="#{adminHelper.contact.contactId}" />
+                                                       <f:param value="#{beanHelper.contact.contactId}" />
                                                </h:outputFormat>
                                        </div>
 
                                        <div class="para notice">
-                                               #{msg.ADMIN_CONTACT_PERSONAL_DATA_MINIMUM_NOTICE}
+                                               <h:outputFormat value="#{msg.ADMIN_CONTACT_PERSONAL_DATA_MINIMUM_NOTICE}" />
                                        </div>
 
                                        <ui:include src="/WEB-INF/templates/admin/contact/admin_form_contact_data.tpl">
@@ -41,7 +41,7 @@
 
                                        <div class="table_footer">
                                                <h:commandButton styleClass="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-                                               <h:commandButton styleClass="submit" type="submit" id="register" value="#{msg.BUTTON_ADMIN_EDIT_CONTACT}" action="#{adminContactController.editContactData()}" />
+                                               <h:commandButton styleClass="submit" type="submit" id="edit_contact" value="#{msg.BUTTON_ADMIN_EDIT_CONTACT}" action="#{adminContactController.editContactData()}" />
                                        </div>
                                </div>
                        </h:form>