<div class="menu_outer">
<div class="menu">
<div class="menu_header">
- #{msg.MENU_HOME_TITLE}
+ <h:outputText value="#{msg.MENU_HOME_TITLE}" />
</div>
<ul>
</ul>
<div class="menu_header">
- #{msg.MENU_USER_TITLE}
+ <h:outputText value="#{msg.MENU_USER_TITLE}" />
</div>
<ul>
- <ui:fragment rendered="#{userController.isUserNameRequired()}">
+ <ui:fragment rendered="#{featureController.isFeatureEnabled('user_name_required')}">
<li>
<h:link title="#{msg.LINK_GUEST_LOGIN_TITLE}" outcome="user_login" value="#{msg.LINK_GUEST_LOGIN}" />
</li>
</ui:fragment>
- <li>
- <h:link title="#{msg.LINK_GUEST_REGISTER_TITLE}" outcome="user_register" value="#{msg.LINK_GUEST_REGISTER}" />
- </li>
-
-<<<<<<< HEAD
- <li>
- <h:link title="#{msg.LINK_GUEST_PASSWORD_TITLE}" outcome="user_lost_passwd" value="#{msg.LINK_GUEST_PASSWORD}" />
- </li>
+ <ui:fragment rendered="#{featureController.isFeatureEnabled('user_registration')}">
+ <li>
+ <h:link title="#{msg.LINK_GUEST_REGISTER_TITLE}" outcome="user_register" value="#{msg.LINK_GUEST_REGISTER}" />
+ </li>
+ </ui:fragment>
- <li>
- <h:link title="#{msg.LINK_GUEST_RESEND_LINK_TITLE}" outcome="user_resend_link" value="#{msg.LINK_GUEST_RESEND_LINK}" />
- </li>
-=======
- <ui:fragment rendered="#{userController.isUserNameRequired()}">
+ <ui:fragment rendered="#{featureController.isFeatureEnabled('user_name_required') and featureController.isFeatureEnabled('user_password_recovery')}">
<li>
- <h:link title="#{msg.LINK_GUEST_PASSWORD_TITLE}" outcome="user_lost_passwd" value="#{msg.LINK_GUEST_PASSWORD}" />
+ <h:link title="#{msg.LINK_GUEST_PASSWORD_TITLE}" outcome="user_lost_password" value="#{msg.LINK_GUEST_PASSWORD}" />
</li>
</ui:fragment>
- <ui:fragment rendered="#{registerController.isResendConfirmationLinkEnabled()}">
+ <ui:fragment rendered="#{featureController.isFeatureEnabled('user_resend_confirmation_link')}">
<li>
<h:link title="#{msg.LINK_GUEST_RESEND_LINK_TITLE}" outcome="user_resend_link" value="#{msg.LINK_GUEST_RESEND_LINK}" />
</li>
</ui:fragment>
->>>>>>> 4a789c7... Rewritten a lot:
</ul>
</div>
</div>