removed double-redundant XML parsing instructions, (X)HTML doesn't want it anyway

[addressbook-war.git] / web / guest / user / login.xhtml
diff --git a/web/guest/user/login.xhtml b/web/guest/user/login.xhtml

index 15006b004be92461791460ed0d762e79439eada2..69b69113f593c1a98380d1abbd2d86babf3f2045 100644 (file)
--- a/web/guest/user/login.xhtml
+++ b/web/guest/user/login.xhtml
@@ -1,12 +1,11 @@
-<?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:ui="http://xmlns.jcp.org/jsf/facelets"
+       xmlns:h="http://xmlns.jcp.org/jsf/html"
+       xmlns:f="http://xmlns.jcp.org/jsf/core"
+       >
  
         <ui:composition template="/WEB-INF/templates/guest/guest_base.tpl" id="user_login">
                 <ui:define name="guest_title">#{msg.PAGE_TITLE_USER_LOGIN}</ui:define>
@@ -16,18 +15,24 @@
                 </ui:define>
  
                 <ui:define name="content">
-                       <div class="para">
-                               <!-- TODO Internatialize this somehow //-->
-                               Noch kein Benutzerkonto? Einfach <h:link id="user_register" outcome="user_register" title="Als Benutzer anmelden">hier</h:link> anmelden.
-                       </div>
+                       <ui:fragment rendered="#{userController.isUserNameRequired()}">
+                               <div class="para">
+                                       <!-- TODO Internatialize this somehow //-->
+                                       Noch kein Benutzerkonto? Einfach <h:link id="user_register" outcome="user_register" title="Als Benutzer anmelden">hier</h:link> anmelden.
+                               </div>
  
-                       <div class="para">
-                               <ui:include id="login_form" src="/WEB-INF/templates/guest/user/guest_login_form.tpl" />
-                       </div>
+                               <div class="para">
+                                       <ui:include src="/WEB-INF/templates/guest/user/guest_login_form.tpl" />
+                               </div>
  
-                       <div class="para">
-                               <h:link id="user_lost_password" outcome="user_lost_passwd" title="#{msg.LINK_TITLE_GUEST_LOGIN_LOST_PASSWORD}" value="#{msg.LINK_GUEST_LOGIN_LOST_PASSWORD}" />
-                       </div>
+                               <div class="para">
+                                       <h:link id="user_lost_password" outcome="user_lost_passwd" title="#{msg.LINK_TITLE_GUEST_LOGIN_LOST_PASSWORD}" value="#{msg.LINK_GUEST_LOGIN_LOST_PASSWORD}" />
+                               </div>
+                       </ui:fragment>
+
+                       <ui:fragment rendered="#{not userController.isUserNameRequired()}">
+                               <h:outputText styleClass="errors" value="#{msg.ERROR_GUEST_USER_LOGIN_DEACTIVATED}" />
+                       </ui:fragment>
                 </ui:define>
         </ui:composition>
  </html>