Uploaded image for project: 'Confluence Data Center'
  1. Confluence Data Center
  2. CONFSERVER-27002

A closing div tag for sign up section is wrongly placed in login.vm

    XMLWordPrintable

Details

    • Bug
    • Resolution: Fixed
    • Low
    • 5.0
    • 4.3, 4.3.1, 4.3.2
    • None

    Description

      A closing </div> tag for sign up section (i.e. <div class="signup-section">) is wrongly placed in login.vm. It should be inside the #if ($showSignup), before #end tag.

      The extra closing </div> tag will only show if the sign up section is disabled. The extra tag will make customized layouts into a mess.

      In login.vm:

      Unable to find source-code formatter for language: xhtml. Available languages are: actionscript, ada, applescript, bash, c, c#, c++, cpp, css, erlang, go, groovy, haskell, html, java, javascript, js, json, lua, none, nyan, objc, perl, php, python, r, rainbow, ruby, scala, sh, sql, swift, visualbasic, xml, yaml
                  #if ($showSignup)
                  <div class="signup-section">
      	            #applyDecorator("form-aui")
      	                #decoratorParam("formName" "signupform")
      	                #decoratorParam("submitAction" "$req.contextPath/dosignup.action")
      	                #decoratorParam("editAction" "$req.contextPath/signup.action")
      	                #decoratorParam("editMode" "true")
      	                #decoratorParam("formStyle" "login-form-container signup")
      	
      	                <h2>
      	                    $action.getText("sign.up")
      	                </h2>
      					
      	                <fieldset class="right-aligned-form-fields">
      	                    #assistiveLegend("accessibility.signup.legend")
      	                    #bodytag( "TextField" "label='fullname.name.bothcaps'" "name='fullName'" "theme='aui'" )
      	                        #param("longField" "true")
      	                    #end
      	                    #bodytag( "TextField" "label='email.name'" "name='email'" "theme='aui'" )
      	                        #param("type" "email")
      	                        #param("longField" "true")
      	                    #end
      	                    #bodytag( "TextField" "label='username.name'" "name='username'" "theme='aui'" )
      	                    #end
      	                    #bodytag( "Password" "label='password.name'" "name='password'" "theme='aui'" )
      	                    #end
      	                    #bodytag( "Password" "label='confirm.password.name'" "name='confirm'" "theme='aui'" )
      	                    #end
      	                    #tag( "Hidden" "name='token'" "value='$!action.token'" )
      	                    #if ($action.captchaManager.showCaptchaForCurrentUser())
      	                        <div class="field-group">
      	                            #captchaImage()
      	                            <br/><input type='text' name='captchaResponse' value=''>
      	                        </div>
      	                        #fielderror('captcha')
      	                    #end
      	
      	                    <div class="field-group form-buttons compact-form-buttons">
      	                        #tag ("Submit" "value='sign.up'" "align='center'" "theme='notable'" "template='submit.vm'")
      	                    </div>
      	                </fieldset>
      	            #end
                  #end
                  </div>
      

      The </div> at the end of the line should be placed before the last #end tag, like this:

      Unable to find source-code formatter for language: xhtml. Available languages are: actionscript, ada, applescript, bash, c, c#, c++, cpp, css, erlang, go, groovy, haskell, html, java, javascript, js, json, lua, none, nyan, objc, perl, php, python, r, rainbow, ruby, scala, sh, sql, swift, visualbasic, xml, yaml
                  #if ($showSignup)
                  <div class="signup-section">
      	            #applyDecorator("form-aui")
      	                #decoratorParam("formName" "signupform")
      	                #decoratorParam("submitAction" "$req.contextPath/dosignup.action")
      	                #decoratorParam("editAction" "$req.contextPath/signup.action")
      	                #decoratorParam("editMode" "true")
      	                #decoratorParam("formStyle" "login-form-container signup")
      	
      	                <h2>
      	                    $action.getText("sign.up")
      	                </h2>
      					
      	                <fieldset class="right-aligned-form-fields">
      	                    #assistiveLegend("accessibility.signup.legend")
      	                    #bodytag( "TextField" "label='fullname.name.bothcaps'" "name='fullName'" "theme='aui'" )
      	                        #param("longField" "true")
      	                    #end
      	                    #bodytag( "TextField" "label='email.name'" "name='email'" "theme='aui'" )
      	                        #param("type" "email")
      	                        #param("longField" "true")
      	                    #end
      	                    #bodytag( "TextField" "label='username.name'" "name='username'" "theme='aui'" )
      	                    #end
      	                    #bodytag( "Password" "label='password.name'" "name='password'" "theme='aui'" )
      	                    #end
      	                    #bodytag( "Password" "label='confirm.password.name'" "name='confirm'" "theme='aui'" )
      	                    #end
      	                    #tag( "Hidden" "name='token'" "value='$!action.token'" )
      	                    #if ($action.captchaManager.showCaptchaForCurrentUser())
      	                        <div class="field-group">
      	                            #captchaImage()
      	                            <br/><input type='text' name='captchaResponse' value=''>
      	                        </div>
      	                        #fielderror('captcha')
      	                    #end
      	
      	                    <div class="field-group form-buttons compact-form-buttons">
      	                        #tag ("Submit" "value='sign.up'" "align='center'" "theme='notable'" "template='submit.vm'")
      	                    </div>
      	                </fieldset>
      	            #end
                  </div>
                  #end
      

      Workaround
      Open <confluence-install/confluence/login.vm and change the code as explained above

      Attachments

        Activity

          People

            shaffenden Steve Haffenden (Inactive)
            asanusi AmaliaA
            Votes:
            3 Vote for this issue
            Watchers:
            3 Start watching this issue

            Dates

              Created:
              Updated:
              Resolved: