Remove unnecessary items from login screen on kerberos authentication.

Also make sure some items in the top banner are also not visible in certain cases.
zanata · Oct 23, 2013 · 20cf804 · 20cf804
1 parent 8bdfd01
commit 20cf804
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 5 deletions.
diff --git a/zanata-war/src/main/webapp/WEB-INF/template/banner.xhtml b/zanata-war/src/main/webapp/WEB-INF/template/banner.xhtml
@@ -40,7 +40,8 @@
         propagation="none" styleClass="is-hidden--s button"
         rendered="#{applicationConfiguration.internalAuth}"/>
 
-      <s:fragment rendered="#{not applicationConfiguration.internalAuth}">
+      <s:fragment
+        rendered="#{not applicationConfiguration.internalAuth and not empty applicationConfiguration.registerPath}">
         <a id="register_link" href="#{applicationConfiguration.registerPath}"
           class="is-hidden--s button">#{messages['jsf.Signup']}</a>
       </s:fragment>

diff --git a/zanata-war/src/main/webapp/account/login.xhtml b/zanata-war/src/main/webapp/account/login.xhtml
@@ -49,7 +49,8 @@
                     class="l--float-left">#{messages['jsf.Password']}</label>
                   <span class="txt--meta l--float-right">
                     <s:link view="/account/password_reset_request.xhtml"
-                      propagation="none" tabindex="3">
+                      propagation="none" tabindex="3"
+                      rendered="#{applicationConfiguration.internalAuth}">
                       #{messages['jsf.ForgotYourPassword']}
                     </s:link>
                   </span>
@@ -62,9 +63,17 @@
                     action="#{loginAction.login}"
                     value="#{messages['jsf.Login']}"
                     styleClass="button--primary"/>
-                  <span class="l--push-h-quarter">or</span>
-                  <s:link view="/account/register.xhtml"
-                    value="#{messages['jsf.Signup']}"/>
+                  <s:fragment
+                    rendered="#{applicationConfiguration.internalAuth}">
+                    <span class="l--push-h-quarter">or</span>
+                    <s:link view="/account/register.xhtml"
+                      value="#{messages['jsf.Signup']}" />
+                  </s:fragment>
+                  <s:fragment
+                    rendered="#{not applicationConfiguration.internalAuth and not empty applicationConfiguration.registerPath}">
+                    <s:link view="#{applicationConfiguration.registerPath}"
+                      value="#{messages['jsf.Signup']}" />
+                  </s:fragment>
                 </div>
               </h:form>
             </s:div>