diff --git a/xwiki-platform-core/xwiki-platform-administration/xwiki-platform-administration-test/xwiki-platform-administration-test-docker/src/test/it/org/xwiki/administration/test/ui/RegisterIT.java b/xwiki-platform-core/xwiki-platform-administration/xwiki-platform-administration-test/xwiki-platform-administration-test-docker/src/test/it/org/xwiki/administration/test/ui/RegisterIT.java index 9ce64e18065e..db104a5c051e 100644 --- a/xwiki-platform-core/xwiki-platform-administration/xwiki-platform-administration-test/xwiki-platform-administration-test-docker/src/test/it/org/xwiki/administration/test/ui/RegisterIT.java +++ b/xwiki-platform-core/xwiki-platform-administration/xwiki-platform-administration-test/xwiki-platform-administration-test-docker/src/test/it/org/xwiki/administration/test/ui/RegisterIT.java @@ -243,7 +243,8 @@ void registerJohnSmith(boolean isModal, boolean closedWiki, boolean withRegistra { AbstractRegistrationPage registrationPage = setUp(testUtils, isModal, closedWiki, withRegistrationConfig); registrationPage.fillInJohnSmithValues(); - assertTrue(validateAndRegister(testUtils, isModal, registrationPage)); + assertTrue(validateAndRegister(testUtils, isModal, registrationPage), String.format("isModal: %s close " + + "wiki: %s withRegistrationConfig: %s", isModal, closedWiki, withRegistrationConfig)); tryToLoginAsJohnSmith(testUtils, AbstractRegistrationPage.JOHN_SMITH_PASSWORD, registrationPage); } @@ -345,7 +346,6 @@ void registerWikiSyntaxName(boolean isModal, boolean closedWiki, boolean withReg AbstractRegistrationPage.JOHN_SMITH_USERNAME, password, password, "wiki@example.com"); assertTrue(validateAndRegister(testUtils, isModal, registrationPage), String.format("isModal: %s close " + "wiki: %s withRegistrationConfig: %s", isModal, closedWiki, withRegistrationConfig)); - // TODO: looks like a pretty strange behavior, there might be a message box title missing somewhere String messagePrefix = closedWiki ? "" : "Information "; diff --git a/xwiki-platform-core/xwiki-platform-administration/xwiki-platform-administration-ui/src/main/resources/XWiki/Registration.xml b/xwiki-platform-core/xwiki-platform-administration/xwiki-platform-administration-ui/src/main/resources/XWiki/Registration.xml index 957d4d847c11..f677d13a6dce 100644 --- a/xwiki-platform-core/xwiki-platform-administration/xwiki-platform-administration-ui/src/main/resources/XWiki/Registration.xml +++ b/xwiki-platform-core/xwiki-platform-administration/xwiki-platform-administration-ui/src/main/resources/XWiki/Registration.xml @@ -155,31 +155,7 @@ * Removing or renaming any of these fields will result in undefined behavior. * *### - #set($fields = []) - ## - ## The first name field, no checking. - #set($field = - {'name' : 'register_first_name', - 'label' : $services.localization.render('core.register.firstName'), - 'params' : { - 'type' : 'text', - 'size' : '60', - 'autocomplete' : 'given-name' - } - }) - #set($discard = $fields.add($field)) - ## - ## The last name field, no checking. - #set($field = - {'name' : 'register_last_name', - 'label' : $services.localization.render('core.register.lastName'), - 'params' : { - 'type' : 'text', - 'size' : '60', - 'autocomplete' : 'family-name' - } - }) - #set($discard = $fields.add($field)) + #set($mainFields = []) ## ## The user name field, mandatory and programmatically checked to make sure the username doesn't exist. #set($field = @@ -201,7 +177,7 @@ } } }) - #set($discard = $fields.add($field)) + #set($discard = $mainFields.add($field)) ## Make sure the chosen user name is not already taken ## This macro is called by programmaticValidation for xwikiname (above) #macro (nameAvailable, $name) @@ -212,7 +188,7 @@ ## ##The password field, mandatory and must be at least 6 characters long. ##The confirm password field, mandatory, must match password field, and must also be 6+ characters long. - #definePasswordFields($fields, 'register_password', 'register2_password', $registrationConfig.passwordOptions) + #definePasswordFields($mainFields, 'register_password', 'register2_password', $registrationConfig.passwordOptions) ## ## The email address field, regex checked with an email pattern. Mandatory if registration uses email verification #set($field = @@ -233,7 +209,7 @@ #if($registrationConfig.useEmailVerification) #set($field.validate.mandatory = {'failureMessage' : $services.localization.render('core.validation.required.message')}) #end - #set($discard = $fields.add($field)) + #set($discard = $mainFields.add($field)) ## #********* ## Uncomment this code to see an example of how you can easily add a field to the registration page @@ -259,7 +235,7 @@ }, 'doAfterRegistration' : '#saveFavoriteColor()' }) - #set($discard = $fields.add($field)) + #set($discard = $mainFields.add($field)) ## Save the user's favorite color on their user page. #macro(saveFavoriteColor) #set($xwikiname = $request.get('xwikiname')) @@ -270,6 +246,31 @@ $userDoc.saveWithProgrammingRights("Saved favorite color from registration form.") #end *********### + #set($aboutYouFields = []) + ## + ## The first name field, no checking. + #set($field = + {'name' : 'register_first_name', + 'label' : $services.localization.render('core.register.firstName'), + 'params' : { + 'type' : 'text', + 'size' : '60', + 'autocomplete' : 'given-name' + } + }) + #set($discard = $aboutYouFields.add($field)) + ## + ## The last name field, no checking. + #set($field = + {'name' : 'register_last_name', + 'label' : $services.localization.render('core.register.lastName'), + 'params' : { + 'type' : 'text', + 'size' : '60', + 'autocomplete' : 'family-name' + } + }) + #set($discard = $aboutYouFields.add($field)) ## ## To disable the CAPTCHA on this page, comment out the next entry. ## The CAPTCHA, not really an input field but still defined the same way. @@ -283,10 +284,11 @@ ## Also, not filled back in if there is an error ('noReturn'). #set($field = {'name' : 'captcha_placeholder', - 'label' : $services.localization.render('core.captcha.instruction'), + 'label' : $services.localization.render('core.captcha.label') 'skipLabelFor' : true, 'type' : 'html', - 'html' : "$!{services.captcha.default.display()}", + 'html' : "<span class='xHint'>$escapetool.xml($services.localization.render('core.captcha.instruction')) + </span> $!{services.captcha.default.display()}", 'validate' : { 'programmaticValidation' : { 'code' : '#if (!$services.captcha.default.isValid())failed#end', @@ -295,7 +297,7 @@ }, 'noReturn' : true }) - #set($discard = $fields.add($field)) + #set($discard = $aboutYouFields.add($field)) #end ## Pass the redirect parameter on so that the login page may redirect to the right place. ## Not necessary in Firefox 3.0.10 or Opera 9.64, I don't know about IE or Safari. @@ -305,7 +307,10 @@ 'type' : 'hidden' } }) - #set($discard = $fields.add($field)) + #set($discard = $aboutYouFields.add($field)) + #set($fields = []) + #set($discard = $fields.addAll($mainFields)) + #set($discard = $fields.addAll($aboutYouFields)) ## ####################################################################### ## The Code. @@ -365,7 +370,11 @@ #end </div> ## Note that the macro inject the form_token field. - #generateHtml($fields, $request) + #generateHtml($mainFields, $request, 'false') + <h2>$services.localization.render('core.register.aboutYou')</h2> + #generateHtml($aboutYouFields, $request, 'false') + <input type="hidden" name="form_token" value="$services.csrf.getToken()" /> + #generateJavascript($fields) <p class="buttons"> <span class="buttonwrapper"> <input type="submit" value="$services.localization.render('core.register.submit')" class="button"/> @@ -452,7 +461,9 @@ #set($redirect = $registrationConfig.defaultRedirect) #end ## Display a "registration successful" message - + ## Define some strings which may be used by the welcome message + #set($firstName = $escapetool.xml($!request.get('register_first_name'))) + #set($lastName = $escapetool.xml($!request.get('register_last_name'))) #evaluate($registrationConfig.registrationSuccessMessage) ## Empty line prevents message from being forced into a <p> block. @@ -470,6 +481,14 @@ <span class="buttonwrapper"> <input type="submit" value="$services.localization.render('login')" class="button"/> </span> + #set ($mainPage = $services.wiki.currentWikiDescriptor.mainPageReference) + #if ($xwiki.checkAccess($mainPage, 'view')) + <span class="buttonwrapper"> + <a href="$!xwiki.getURL($mainPage)" rel="home" class="button secondary"> + $services.localization.render('core.register.successful.backtohome') + </a> + </span> + #end </div> </form> ## We don't want autoLogin if we are administrators adding users... @@ -487,6 +506,16 @@ ## #end## createUser Macro {{/velocity}} + + registration_success_hero.svg + image/svg+xml + UTF-8 + xwiki:XWiki.Admin + 1.2 + + <svg data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" width="680.83858" height="584.23207" viewBox="0 0 680.83858 584.23207" xmlns:xlink="http://www.w3.org/1999/xlink"><path id="b9ccae5a-ffdd-4f5c-9c1e-05af9f0f3372-177" data-name="Path 438" d="M310.70569,694.02818a24.21459,24.21459,0,0,0,23.38269-4.11877c8.18977-6.87441,10.758-18.196,12.8467-28.68191l6.17973-31.01657-12.9377,8.90837c-9.30465,6.40641-18.81826,13.01866-25.26011,22.29785s-9.25223,21.94707-4.07792,31.988" transform="translate(-259.58071 -157.88396)" fill="#e6e6e6"/><path id="f4ad1d06-bd03-4ced-a5c4-c19a65ab4ee5-178" data-name="Path 439" d="M312.7034,733.73874c-1.62839-11.86368-3.30382-23.88078-2.15884-35.87167,1.01467-10.64932,4.26373-21.04881,10.87831-29.57938a49.20592,49.20592,0,0,1,12.62466-11.44039c1.26215-.79648,2.42409,1.20354,1.16733,1.997a46.77949,46.77949,0,0,0-18.50446,22.32562c-4.02857,10.24607-4.67545,21.41582-3.98154,32.3003.41944,6.58218,1.31074,13.1212,2.20588,19.65251a1.19817,1.19817,0,0,1-.808,1.42251,1.16348,1.16348,0,0,1-1.42253-.808Z" transform="translate(-259.58071 -157.88396)" fill="#f2f2f2"/><path id="baf785f8-b4c6-42cf-85bd-8a16037845f7-179" data-name="Path 442" d="M324.42443,714.70229a17.82513,17.82513,0,0,0,15.53141,8.01862c7.8644-.37318,14.41806-5.85973,20.31713-11.07027l17.452-15.4088-11.54987-.55281c-8.30619-.39784-16.82672-.771-24.73813,1.79338s-15.20758,8.72639-16.654,16.91541" transform="translate(-259.58071 -157.88396)" fill="#e6e6e6"/><path id="a14e4330-7125-4e03-a856-d6453c34f6cc-180" data-name="Path 443" d="M308.10042,740.55843c7.83972-13.87142,16.93234-29.28794,33.1808-34.21552a37.02609,37.02609,0,0,1,13.95545-1.441c1.48189.128,1.11179,2.41174-.367,2.28454a34.39833,34.39833,0,0,0-22.27164,5.89215c-6.27994,4.27453-11.16975,10.21755-15.30781,16.51907-2.53511,3.86051-4.80576,7.88445-7.07642,11.903C309.48824,742.78513,307.36641,741.85759,308.10042,740.55843Z" transform="translate(-259.58071 -157.88396)" fill="#f2f2f2"/><path id="ac20a106-7eb8-4a45-8835-674ef3bf3222-181" data-name="Path 141" d="M935.3957,569.31654H503.18092a5.03014,5.03014,0,0,1-5.02359-5.02359V162.90754a5.03017,5.03017,0,0,1,5.02359-5.02358H935.3957a5.03017,5.03017,0,0,1,5.02359,5.02358V564.292a5.02922,5.02922,0,0,1-5.02359,5.02359Z" transform="translate(-259.58071 -157.88396)" fill="#fff"/><path id="a8878079-c7cd-406f-a434-8b15b914b9b4-182" data-name="Path 141" d="M935.3957,569.31654H503.18092a5.03014,5.03014,0,0,1-5.02359-5.02359V162.90754a5.03017,5.03017,0,0,1,5.02359-5.02358H935.3957a5.03017,5.03017,0,0,1,5.02359,5.02358V564.292a5.02922,5.02922,0,0,1-5.02359,5.02359ZM503.18092,159.88944a3.01808,3.01808,0,0,0-3.01152,3.01151V564.292a3.01808,3.01808,0,0,0,3.01152,3.01152H935.3957a3.01717,3.01717,0,0,0,3.01153-3.01152V162.90754a3.01809,3.01809,0,0,0-3.01153-3.01151Z" transform="translate(-259.58071 -157.88396)" fill="#cacaca"/><path id="af64f961-e9a2-4c53-a333-5060c7f850d2-183" data-name="Path 142" d="M707.41023,262.18528a3.41053,3.41053,0,0,0,0,6.82105H894.55305a3.41053,3.41053,0,0,0,0-6.82105Z" transform="translate(-259.58071 -157.88396)" fill="#e4e4e4"/><path id="baad4cfb-158d-4439-9cc3-22475bf47b22-184" data-name="Path 143" d="M707.41023,282.65037a3.41054,3.41054,0,0,0,0,6.82106h95.54019a3.41054,3.41054,0,0,0,0-6.82106Z" transform="translate(-259.58071 -157.88396)" fill="#e4e4e4"/><path id="f3456279-91e5-49ad-aa43-9838b26fb6ca-185" data-name="Path 142" d="M543.84146,392.7046a3.41054,3.41054,0,0,0,0,6.82106h350.8937a3.41054,3.41054,0,0,0,0-6.82106Z" transform="translate(-259.58071 -157.88396)" fill="#e4e4e4"/><path id="a3288adf-49f8-485f-8ae9-1e4f1a13d849-186" data-name="Path 143" d="M543.84146,413.1697a3.41054,3.41054,0,0,0,0,6.82106H803.13254a3.41054,3.41054,0,0,0,0-6.82106Z" transform="translate(-259.58071 -157.88396)" fill="#e4e4e4"/><path id="e63a5b48-5a7d-40a2-b9b0-6adec326348a-187" data-name="Path 142" d="M543.84146,433.17177a3.41054,3.41054,0,0,0,0,6.82106h350.8937a3.41054,3.41054,0,0,0,0-6.82106Z" transform="translate(-259.58071 -157.88396)" fill="#e4e4e4"/><path id="a1c669b4-dfc3-4cfa-a7be-66b71399844d-188" data-name="Path 143" d="M543.84146,453.63687a3.41054,3.41054,0,0,0,0,6.82106H803.13254a3.41054,3.41054,0,0,0,0-6.82106Z" transform="translate(-259.58071 -157.88396)" fill="#e4e4e4"/><path id="bfec50d1-ffb1-4de6-a9ef-a1085e40e016-189" data-name="Path 142" d="M543.84146,474.17177a3.41054,3.41054,0,0,0,0,6.82106h350.8937a3.41054,3.41054,0,0,0,0-6.82106Z" transform="translate(-259.58071 -157.88396)" fill="#e4e4e4"/><path id="bc9696ec-ec99-41d5-9116-3ad9737a38ac-190" data-name="Path 143" d="M543.84146,494.63687a3.41054,3.41054,0,0,0,0,6.82106H803.13254a3.41054,3.41054,0,0,0,0-6.82106Z" transform="translate(-259.58071 -157.88396)" fill="#e4e4e4"/><path d="M599.41943,324.82812a49,49,0,1,1,48.99952-49A49.05567,49.05567,0,0,1,599.41943,324.82812Z" transform="translate(-259.58071 -157.88396)" fill="#3e79bc"/><path d="M450.67833,510.10041a12.24754,12.24754,0,0,0-14.953-11.36231l-16.19641-22.82521-16.27138,6.45945,23.32519,31.91237a12.31392,12.31392,0,0,0,24.09559-4.1843Z" transform="translate(-259.58071 -157.88396)" fill="#a0616a"/><path d="M419.11211,508.40888l-49.00774-63.57777L388.46714,387.12c1.34563-14.50936,10.425-18.56089,10.81135-18.72645l.5893-.25281,15.979,42.6119-11.73235,31.28625,28.79671,48.4319Z" transform="translate(-259.58071 -157.88396)" fill="#3f3d56"/><path d="M589.30794,312.41993a12.24758,12.24758,0,0,0-10.17219,15.78672l-21.50463,17.91269,7.69816,15.72326,30.01343-25.72272a12.31392,12.31392,0,0,0-6.03477-23.69995Z" transform="translate(-259.58071 -157.88396)" fill="#a0616a"/><path d="M590.06206,344.02244l-59.59835,53.77665-58.95815-13.84578c-14.57-.21979-19.31136-8.9587-19.50629-9.33113l-.29761-.568,41.2489-19.22578,32.0997,9.27828,46.06046-32.45509Z" transform="translate(-259.58071 -157.88396)" fill="#3f3d56"/><polygon points="227.248 568.437 243.261 568.436 250.878 506.672 227.245 506.673 227.248 568.437" fill="#a0616a"/><path d="M483.39733,721.74476h50.32614a0,0,0,0,1,0,0V741.189a0,0,0,0,1,0,0h-36.207a14.11914,14.11914,0,0,1-14.11914-14.11914v-5.32505A0,0,0,0,1,483.39733,721.74476Z" transform="translate(757.57348 1305.02654) rotate(179.99738)" fill="#2f2e41"/><polygon points="163.247 568.437 179.26 568.436 186.878 506.672 163.245 506.673 163.247 568.437" fill="#a0616a"/><path d="M419.397,721.74476H469.7231a0,0,0,0,1,0,0V741.189a0,0,0,0,1,0,0h-36.207A14.11914,14.11914,0,0,1,419.397,727.06981v-5.32505a0,0,0,0,1,0,0Z" transform="translate(629.57273 1305.02946) rotate(179.99738)" fill="#2f2e41"/><polygon points="157.552 342.991 158.858 434.42 160.165 554.584 188.899 551.972 203.267 386.094 221.553 551.972 251.218 551.972 254.206 384.788 243.757 348.216 157.552 342.991" fill="#2f2e41"/><path d="M473.37417,513.1531c-31.26533.00239-60.04471-14.14839-60.43319-14.34263l-.32273-.16136-2.62373-62.96637c-.76082-2.22509-15.74263-46.13091-18.28-60.08625-2.57083-14.13882,34.68842-26.54742,39.213-27.99853l1.02678-11.37405,41.75366-4.49918,5.292,14.5536,14.97942,5.6168a7.40924,7.40924,0,0,1,4.59212,8.7043l-8.32539,33.85619,20.33325,112.01266-4.37755.18946C495.709,511.39658,484.38425,513.1525,473.37417,513.1531Z" transform="translate(-259.58071 -157.88396)" fill="#3f3d56"/><circle cx="454.46738" cy="294.45965" r="30.06284" transform="matrix(0.87745, -0.47966, 0.47966, 0.87745, -345.12824, 96.19037)" fill="#a0616a"/><path d="M430.1166,323.56132c5.72926,6.10289,16.36927,2.82672,17.1158-5.51069a10.07153,10.07153,0,0,0-.01268-1.94523c-.38544-3.69311-2.519-7.046-2.008-10.94542a5.73974,5.73974,0,0,1,1.05046-2.687c4.56548-6.11359,15.28263,2.73444,19.59138-2.8,2.642-3.39359-.46364-8.73664,1.56381-12.52956,2.67591-5.006,10.60183-2.53654,15.57222-5.27809,5.53017-3.05032,5.1994-11.53517,1.55907-16.6961-4.43955-6.294-12.22348-9.65241-19.91044-10.13643s-15.32094,1.59394-22.4974,4.39069c-8.15392,3.17767-16.23969,7.56925-21.25749,14.739-6.10218,8.71919-6.68942,20.44132-3.6376,30.63677C419.10222,311.0013,425.43805,318.57766,430.1166,323.56132Z" transform="translate(-259.58071 -157.88396)" fill="#2f2e41"/><path d="M641.58071,741.9626h-381a1,1,0,0,1,0-2h381a1,1,0,0,1,0,2Z" transform="translate(-259.58071 -157.88396)" fill="#cacaca"/><path d="M596.58984,294.33545a3.488,3.488,0,0,1-2.38134-.93555l-16.15723-15.00732a3.49994,3.49994,0,0,1,4.76367-5.12891l13.68555,12.71192,27.07666-27.07618a3.5,3.5,0,1,1,4.94922,4.9502l-29.46094,29.46094A3.49275,3.49275,0,0,1,596.58984,294.33545Z" transform="translate(-259.58071 -157.88396)" fill="#fff"/></svg> + 8462 + XWiki.Registration @@ -763,4 +792,109 @@ XWiki.XWikiGuest + + XWiki.Registration + 0 + XWiki.UIExtensionClass + 5f751597-be0d-4010-ad85-57f4b6c4bd18 + + XWiki.UIExtensionClass + + + + + + + + + 0 + content + 3 + Extension Content + 10 + 40 + 0 + com.xpn.xwiki.objects.classes.TextAreaClass + + + 0 + extensionPointId + 1 + Extension Point ID + 30 + 0 + com.xpn.xwiki.objects.classes.StringClass + + + 0 + name + 2 + Extension ID + 30 + 0 + com.xpn.xwiki.objects.classes.StringClass + + + 0 + parameters + 4 + Extension Parameters + 10 + 40 + 0 + com.xpn.xwiki.objects.classes.TextAreaClass + + + 0 + 0 + select + 0 + scope + 5 + Extension Scope + 0 + + |, + 1 + 0 + wiki=Current Wiki|user=Current User|global=Global + com.xpn.xwiki.objects.classes.StaticListClass + + + + {{velocity}}{{html clean="false"}} +## If xredirect is not set +#if (!$request.xredirect) + ## Define redirect URL value using current document relative request URL + #set($redirectURL = $escapetool.url($xwiki.relativeRequestURL)) +## If xredirect is already set +#else + ## Reuse the current value in the login link + #set($redirectURL = $escapetool.url($request.xredirect)) +#end +#if ($xcontext.user == 'XWiki.XWikiGuest' && !$xcontext.inactiveUserReference) +<li> + <a href="$xwiki.getURL('XWiki.XWikiLogin', 'login', "xredirect=$redirectURL&loginLink=1")" id="tmLogin" rel="nofollow">$escapetool.xml($services.localization.render('login'))</a> +</li> +#end +#if ($xcontext.user == 'XWiki.XWikiGuest' && !$xcontext.inactiveUserReference && $xwiki.hasAccessLevel('register', 'XWiki.XWikiPreferences')) +<li> +<a href="$xwiki.getURL('XWiki.XWikiRegister', 'register', "xredirect=$redirectURL")" id="tmRegister" rel="nofollow">$escapetool.xml($services.localization.render('register'))</a> +</li> +#end +{{/html}}{{/velocity}} + + + org.xwiki.platform.topmenu.right + + + org.xwiki.plaform.registration + + + order=40000 + + + wiki + + diff --git a/xwiki-platform-core/xwiki-platform-administration/xwiki-platform-administration-ui/src/main/resources/XWiki/RegistrationConfig.xml b/xwiki-platform-core/xwiki-platform-administration/xwiki-platform-administration-ui/src/main/resources/XWiki/RegistrationConfig.xml index 6d9b5914c331..57dc2dd59b5b 100644 --- a/xwiki-platform-core/xwiki-platform-administration/xwiki-platform-administration-ui/src/main/resources/XWiki/RegistrationConfig.xml +++ b/xwiki-platform-core/xwiki-platform-administration/xwiki-platform-administration-ui/src/main/resources/XWiki/RegistrationConfig.xml @@ -522,9 +522,30 @@ 0 - #set($message = $services.localization.render('core.register.successful', 'xwiki/2.1', ['USERLINK', $userName])) + #set($discard = $xwiki.ssx.use("XWiki.RegistrationConfig")) +#set($displayName = "$!firstName $!lastName") +#set($noReadableName = ($!firstName == "") || ($!lastName == "")) +#if($noReadableName) + #set($displayName = $userName) +#end +#set($headline = $services.localization.render('core.register.successful.welcome', [$displayName])) #set($userLink = $xwiki.getUserName("$userSpace$userName")) -{{info}}$message.replace('USERLINK', "{{html clean=false}}$userLink{{/html}}"){{/info}} +#set($successAndLogin = $services.localization.render('core.register.successful.successandlogin')) +[[image:registration_success_hero.svg||data-xwiki-image-style-alignment="center" height="50vh"]] + +{{html}} +<div class="registration-success-headline"> + <h2>$escapetool.xml($headline) </h2> + #if(!$noReadableName) + <p class="registration-success-subtitle"> + ($escapetool.xml($userName)) + </p> + #end +</div> +<p class="registration-success-hint"> + $escapetool.xml($successAndLogin) +</p> +{{/html}} 0 @@ -533,4 +554,138 @@ {{translation key="core.register.welcome"/}} + + XWiki.RegistrationConfig + 0 + XWiki.StyleSheetExtension + 6e9139ba-c4ac-4243-9ca7-9e935b0cc730 + + XWiki.StyleSheetExtension + + + + + + + + + 0 + long + 0 + select + forbidden + 0 + 0 + cache + 5 + Caching policy + 0 + + |, + 1 + 0 + long|short|default|forbid + com.xpn.xwiki.objects.classes.StaticListClass + + + PureText + 0 + PureText + code + 2 + Code + 0 + 20 + 50 + 0 + com.xpn.xwiki.objects.classes.TextAreaClass + + + 0 + 0 + select + forbidden + 0 + 0 + contentType + 6 + Content Type + 0 + + |, + 1 + 0 + CSS|LESS + com.xpn.xwiki.objects.classes.StaticListClass + + + 0 + name + 1 + Name + 30 + 0 + com.xpn.xwiki.objects.classes.StringClass + + + 0 + select + yesno + parse + 4 + Parse content + 0 + com.xpn.xwiki.objects.classes.BooleanClass + + + 0 + 0 + select + forbidden + 0 + 0 + use + 3 + Use this extension + 0 + + |, + 1 + 0 + currentPage|onDemand|always + com.xpn.xwiki.objects.classes.StaticListClass + + + + long + + + .registration-success-headline { + display: flex; + align-items: baseline; + justify-content: center; +} + +.registration-success-headline > .registration-success-subtitle { + display: block; +} + +.registration-success-hint { + display: block; + text-align: center; +} + +/* Resize the hero image displayed when the registration is successful so that the buttons are always on screen without + needing to scroll. */ +img.wikigeneratedid { + height: 50vh; +} + + + + + + onDemand + + diff --git a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/drawer.vm b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/drawer.vm index be12627a0a0a..e63018881ee3 100644 --- a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/drawer.vm +++ b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/drawer.vm @@ -41,21 +41,6 @@ aria-label="$escapetool.xml($services.localization.render('core.menu.drawer.labe #elseif($xcontext.user == 'XWiki.XWikiGuest' && $xcontext.inactiveUserReference) $!xwiki.getUserName($xcontext.inactiveUserReference, false) $logoutLink - #else - ## If xredirect is not set - #if (!$request.xredirect) - ## Define redirect URL value using current document relative request URL - #set($redirectURL = $escapetool.url($xwiki.relativeRequestURL)) - ## If xredirect is already set - #else - ## Reuse the current value in the login link - #set($redirectURL = $escapetool.url($request.xredirect)) - #end - - $services.icon.renderHTML('log-in') $escapetool.xml($services.localization.render('login')) - #if ($xwiki.hasAccessLevel('register', 'XWiki.XWikiPreferences')) - $services.icon.renderHTML('log-in') $escapetool.xml($services.localization.render('register')) - #end #end ## ## UIX diff --git a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/less/action-menus.less b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/less/action-menus.less index e0e7b00dcd88..180f97d2cbf8 100644 --- a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/less/action-menus.less +++ b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/less/action-menus.less @@ -79,6 +79,16 @@ } } } +// Authentication buttons ======================================================== +// Reduce the spacing between both items if there's both +li:has(#tmLogin) + li #tmRegister { + padding-right: 8px; +} +li:has(+ li #tmRegister) #tmLogin { + padding-left: 8px; +} + +// Quick search ======================================================== #globalsearch { display: flex; diff --git a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/less/drawer.less b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/less/drawer.less index a2799f7a504f..9f39be8b4cdb 100644 --- a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/less/drawer.less +++ b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/less/drawer.less @@ -191,7 +191,7 @@ margin: 12px 0; } -// Special styling for login/logout/register ============================= -#tmLogin, #tmLogout, #tmRegister { +// Special styling for logout ============================= +#tmLogout { font-style: italic; } diff --git a/xwiki-platform-core/xwiki-platform-oldcore/src/main/resources/ApplicationResources.properties b/xwiki-platform-core/xwiki-platform-oldcore/src/main/resources/ApplicationResources.properties index 5e39c4ab3554..7398bda6b982 100644 --- a/xwiki-platform-core/xwiki-platform-oldcore/src/main/resources/ApplicationResources.properties +++ b/xwiki-platform-core/xwiki-platform-oldcore/src/main/resources/ApplicationResources.properties @@ -1681,7 +1681,10 @@ core.register.invalidUsername=Invalid username provided. Please use only letters core.register.mailSenderWronglyConfigured=The user has been created but the validation email has not been sent. Please check the Mail Sending Configuration and consider recreating the user. core.register.invalidCaptcha=Incorrect CAPTCHA answer. core.register.registerFailed=Registration has failed due to unknown reasons. (Error code: {0}) -core.register.successful={0} ({1}): Registration successful. +core.register.successful.welcome=Welcome {0} +core.register.successful.successandlogin=Registration successful. You can now log into your account. +core.register.successful.backtohome=Back to Home +core.register.aboutYou = About you core.register.firstName=First Name core.register.lastName=Last Name core.register.username=Username @@ -1707,6 +1710,7 @@ core.validation.valid.message=Ok. # Captcha core.captcha.captchaAnswerIsWrong=Incorrect answer, please try again. +core.captcha.label=CAPTCHA core.captcha.instruction=Please validate the CAPTCHA to prove you are not a robot # History @@ -5655,6 +5659,11 @@ platform.index.spaceIndex=Space Index platform.index.spaceIndexDescription=Pages in the {0} space: platform.index.spaceIndexDocumentListCreate=Create a new page +####################################### +## until 16.10.0RC1 +####################################### +core.register.successful={0} ({1}): Registration successful. + ## Used to indicate where deprecated keys end #@deprecatedend diff --git a/xwiki-platform-core/xwiki-platform-test/xwiki-platform-test-ui/src/main/java/org/xwiki/test/ui/po/BasePage.java b/xwiki-platform-core/xwiki-platform-test/xwiki-platform-test-ui/src/main/java/org/xwiki/test/ui/po/BasePage.java index db0ef0374ada..0ba6fd8a2443 100644 --- a/xwiki-platform-core/xwiki-platform-test/xwiki-platform-test-ui/src/main/java/org/xwiki/test/ui/po/BasePage.java +++ b/xwiki-platform-core/xwiki-platform-test/xwiki-platform-test-ui/src/main/java/org/xwiki/test/ui/po/BasePage.java @@ -426,7 +426,6 @@ public boolean hasLoginLink() */ public LoginPage login() { - getDrawerMenu().toggle(); this.loginLink.click(); return new LoginPage(); } @@ -511,7 +510,6 @@ public void logout() */ public RegistrationPage register() { - getDrawerMenu().toggle(); this.registerLink.click(); return new RegistrationPage(); } diff --git a/xwiki-platform-core/xwiki-platform-test/xwiki-platform-test-ui/src/main/java/org/xwiki/test/ui/po/RegistrationPage.java b/xwiki-platform-core/xwiki-platform-test/xwiki-platform-test-ui/src/main/java/org/xwiki/test/ui/po/RegistrationPage.java index 3eb0ef141f2e..780e9c665dfe 100644 --- a/xwiki-platform-core/xwiki-platform-test/xwiki-platform-test-ui/src/main/java/org/xwiki/test/ui/po/RegistrationPage.java +++ b/xwiki-platform-core/xwiki-platform-test/xwiki-platform-test-ui/src/main/java/org/xwiki/test/ui/po/RegistrationPage.java @@ -61,9 +61,12 @@ public void clickRegister() */ public Optional getRegistrationSuccessMessage() { - List infos = getDriver().findElements(By.className("infomessage")); + List infos = getDriver().findElements( + By.xpath("//*[contains(@class, 'infomessage') or" + + " contains(@class, 'registration-success-headline')]")); for (WebElement info : infos) { - if (info.getText().contains("Registration successful.")) { + if (info.getText().contains("Registration successful.") || + info.getText().contains("Welcome ")) { return Optional.of(info.getText().replaceAll("\n", " ")); } } diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/register_macros.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/register_macros.vm index 4aacec73774f..16e6d170fc3a 100644 --- a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/register_macros.vm +++ b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/register_macros.vm @@ -19,7 +19,7 @@ ## --------------------------------------------------------------------------- ## Defines what server generated error messages should look like ## The error message when a field is entered incorrectly -#set ($failureMessageParams = {'class': 'LV_validation_message LV_invalid'}) +#set ($failureMessageParams = {'class': 'LV_invalid'}) ## 'LV_validation_message LV_invalid' depends on this: $xwiki.get('ssfx').use('uicomponents/widgets/validation/livevalidation.css', true) ## @@ -114,8 +114,12 @@ $xwiki.get('ssfx').use('uicomponents/widgets/validation/livevalidation.css', tru * * @param $fields The array of fields to use for generating HTML code. * @param $request The request that is made by submitting the form. + * @param $isOnlyBlock Whether the fields are the only block of the form *# -#macro (generateHtml, $fields, $request) +#macro (generateHtml, $fields, $request, $isOnlyBlock) + #if(!$isOnlyBlock) + #set($isOnlyBlock = 'true') + #end ## Put the same values back into the fields (if is there any problem with a field from the request that is made). #getParams($fields, $request)
@@ -158,12 +162,67 @@ $xwiki.get('ssfx').use('uicomponents/widgets/validation/livevalidation.css', tru #end #end /> - #if ($field.error) - $field.error + + $services.icon.renderHTML('accept') ## + $services.icon.renderHTML('cross') ## + ## Add the proper content to the validation string if it's a failure on initialisation + ## If it's a regex validation, we also want to make sure to keep it shown at all times, we still put the + ## message. Note that the class displaying the state of this validation will change though. + #if($field.error && $field.error == $!validation.failureMessage || + $!extraValidationClass.toString().contains('regex')) + $!validation.failureMessage + #end + + #end + #set($extraValidationClass = '') + #if ($field.validate.mandatory) + #set($extraValidationClass = 'mandatory') + #set($validation = $field.validate.mandatory) + $validationContainer + #end + #if ($field.validate.mustMatch) + #set($extraValidationClass = 'must-match') + #set($validation = $field.validate.mustMatch) + $validationContainer + #end + #if ($field.validate.programmaticValidation) + #set($extraValidationClass = 'programmatic-validation') + #set($validation = $field.validate.programmaticValidation) + $validationContainer + #end + #if ($field.validate.regex) + #set($extraValidationClass = 'regex') + #set($validation = $field.validate.regex) + $validationContainer + #end + #foreach ($regex in $field.validate.regexes) + #set($extraValidationClass = 'regex-'+ $foreach.count) + #set($validation = $regex) + $validationContainer #end #end @@ -172,8 +231,10 @@ $xwiki.get('ssfx').use('uicomponents/widgets/validation/livevalidation.css', tru #end #end
- - #generateJavascript($fields) + #if ($isOnlyBlock == 'true') + + #generateJavascript($fields) + #end #end ## #macro (validateRegexJS $regex $fieldName) @@ -190,7 +251,12 @@ $xwiki.get('ssfx').use('uicomponents/widgets/validation/livevalidation.css', tru #set ($failMessage = $regex.failureMessage) #end #if ($pattern != '' && $failMessage != '' && !$regex.noscript) - ${fieldName}Validator.add(Validate.Format, {pattern: $pattern, failureMessage: "$failMessage"}); + ## We assume here that the field uses either `regex` or `regexes`, not both at the same time. + #if(!$validate.regex) + ${fieldName}Validator.add(Validate.Format, {pattern: $pattern, failureMessage: "$failMessage", identifier: 'regex-'+ $foreach.count}); + #else + ${fieldName}Validator.add(Validate.Format, {pattern: $pattern, failureMessage: "$failMessage", identifier: 'regex'}); + #end #end #end #* @@ -225,15 +291,15 @@ $xwiki.get('ssfx').use('uicomponents/widgets/validation/livevalidation.css', tru #if ($validate.mandatory) #set ($mandatory = $validate.mandatory) #if ($mandatory.failureMessage && !$mandatory.noscript) - ${fieldName}Validator.add(Validate.Presence, {failureMessage: "$!mandatory.failureMessage"}); + ${fieldName}Validator.add(Validate.Presence, {failureMessage: "$!mandatory.failureMessage", identifier: 'mandatory'}); #end #end ## #if ($validate.mustMatch) #set ($mustMatch = $validate.mustMatch) #if ($mustMatch.name && $mustMatch.failureMessage && !$mustMatch.noscript) - ${fieldName}Validator.add(Validate.Confirmation, {match: $$("input[name=$!mustMatch.name]")[0], - failureMessage: "$!mustMatch.failureMessage"}); + ${fieldName}Validator.add(Validate.Confirmation, {match: $$("input[name=$!mustMatch.name]")[0], + failureMessage: "$!mustMatch.failureMessage", identifier: 'must-match'}); #end #end ## diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-war/src/main/webapp/resources/uicomponents/widgets/validation/livevalidation.css b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-war/src/main/webapp/resources/uicomponents/widgets/validation/livevalidation.css index 3cbffc34b1fe..649e91d3ab99 100644 --- a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-war/src/main/webapp/resources/uicomponents/widgets/validation/livevalidation.css +++ b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-war/src/main/webapp/resources/uicomponents/widgets/validation/livevalidation.css @@ -3,7 +3,6 @@ font-size: 0.8em; line-height: 1.8em; margin: 0 0 0 0.5em; - position: absolute; } .LV_valid { @@ -14,3 +13,19 @@ color: $theme.notificationErrorColor; } +.LV_validation_message_valid_icon, +.LV_validation_message_invalid_icon { + display: none; + margin-right: .5rem; +} + +.LV_valid .LV_validation_message_valid_icon, +.LV_invalid .LV_validation_message_invalid_icon { + display: unset; +} + +/* We don't want to display anything when some kind of validations are successful.*/ +.LV_valid.mandatory, +.LV_valid.must-match { + display: none; +} \ No newline at end of file diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-war/src/main/webapp/resources/uicomponents/widgets/validation/livevalidation_prototype.js b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-war/src/main/webapp/resources/uicomponents/widgets/validation/livevalidation_prototype.js index 962cc6ad75e0..2739d54c2d5a 100644 --- a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-war/src/main/webapp/resources/uicomponents/widgets/validation/livevalidation_prototype.js +++ b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-war/src/main/webapp/resources/uicomponents/widgets/validation/livevalidation_prototype.js @@ -100,17 +100,15 @@ LiveValidation.prototype = { // hooks beforeValidation: function(){}, beforeValid: function(){}, - onValid: function(){ this.insertMessage(this.createMessageSpan()); this.addFieldClass(); }, + onValid: function(){this.addFieldClass(); }, afterValid: function(){}, beforeInvalid: function(){}, - onInvalid: function(){ this.insertMessage(this.createMessageSpan()); this.addFieldClass(); }, + onInvalid: function(){this.addFieldClass(); }, afterInvalid: function(){}, afterValidation: function(){}, }, optionsObj || {}); var node = this.options.insertAfterWhatNode || this.element; this.options.insertAfterWhatNode = $(node); - this.messageHolder = this.createMessageSpan(); - this.options.insertAfterWhatNode.up().appendChild(this.messageHolder); Object.extend(this, this.options); // copy the options to the actual object // add to form if it has been provided if(this.form){ @@ -171,18 +169,36 @@ LiveValidation.prototype = { } } this.validations = []; - this.removeMessageAndFieldClass(); + this.removeFieldClass(); }, /** - * adds a validation to perform to a LiveValidation object + * adds a validation to perform on a LiveValidation object * * @param validationFunction {Function} - validation function to be used (ie Validate.Presence ) * @param validationParamsObj {Object} - parameters for doing the validation, if wanted or necessary * @return {Object} - the LiveValidation object itself so that calls can be chained */ add: function(validationFunction, validationParamsObj){ - this.validations.push( { type: validationFunction, params: validationParamsObj || {} } ); + let validationMessageHolder; + /* The identifier helps us give specific behaviour to different kinds of validations. The user expectations change + * depending on the validation type, and this identifier makes sure we can retrieve the right message from the set + * of messages in the template. */ + if (validationParamsObj.identifier) { + validationMessageHolder = this.options.insertAfterWhatNode.up().querySelector("." + validationParamsObj.identifier); + /* We use the failure message as a fallback for the success message for regexes. This ensures that the regex stays + * shown to the user at all times. */ + if (validationParamsObj.identifier.includes("regex") && validationParamsObj.validMessage == null) { + validationParamsObj.validMessage = validationParamsObj.failureMessage; + } + } else { + /* If we don't have an identifier for the validation, this is a legacy use of the livevalidation. + We create a message holder from scratch to make it compatible with the way the new implementation works. */ + validationMessageHolder = this.createMessageSpan(); + this.options.insertAfterWhatNode.up().appendChild(validationMessageHolder); + } + /* We add one validation object to the list of validations for the current field. */ + this.validations.push( { type: validationFunction, params: validationParamsObj || {}, messageHolder: validationMessageHolder } ); return this; }, @@ -204,7 +220,6 @@ LiveValidation.prototype = { * makes the validation wait the alotted time from the last keystroke */ deferValidation: function(e){ - if(this.wait >= 300) this.removeMessageAndFieldClass(); if(this.timeout) clearTimeout(this.timeout); this.timeout = setTimeout(this.validate.bind(this), this.wait); }, @@ -222,7 +237,7 @@ LiveValidation.prototype = { */ doOnFocus: function(){ this.focused = true; - this.removeMessageAndFieldClass(); + this.removeFieldClass(); }, /** @@ -264,11 +279,11 @@ LiveValidation.prototype = { doValidations: function(){ this.validationFailed = false; for(var i = 0, len = this.validations.length; i < len; ++i){ - this.validationFailed = !this.validateElement(this.validations[i].type, this.validations[i].params); - if(this.validationFailed) return false; + let isValid = this.validateElement(this.validations[i].type, this.validations[i].params); + this.insertMessage(this.validations[i], isValid); + this.validationFailed = this.validationFailed || !isValid; } - this.message = this.validMessage; - return true; + return !this.validationFailed; }, /** @@ -364,50 +379,64 @@ LiveValidation.prototype = { /** Message insertion methods **************************** * - * These are only used in the onValid and onInvalid callback functions and so if you overide the default callbacks, - * you must either impliment your own functions to do whatever you want, or call some of these from them if you + * These are only used in the onValid and onInvalid callback functions and so if you override the default callbacks, + * you must either implement your own functions to do whatever you want, or call some of these from them if you * want to keep some of the functionality */ /** - * makes a span containg the passed or failed message + * makes a span to contain the passed or failed message * - * @return {HTMLSpanObject} - a span element with the message in it + * @return {HTMLSpanObject} - an empty span element to contain the message. */ createMessageSpan: function(){ var span = document.createElement('span'); + span.classList.add(this.messageClass); span.setAttribute('aria-live', 'polite'); return span; }, - + /** - * inserts the element to contain the message in place of the element that already exists (if it does) - * - * @param elementToInsert {HTMLElementObject} - an element node to insert - */ - insertMessageHolder: function(elementToInsert){ - var className = this.validationFailed ? this.invalidClass : this.validClass; - $(elementToInsert).addClassName(this.messageClass + ' ' + className); - var parent = this.options.insertAfterWhatNode.up(); - var nxtSibling = this.options.insertAfterWhatNode.next(); - if (nxtSibling) { - parent.insertBefore(elementToInsert, nxtSibling); - }else{ - parent.appendChild(elementToInsert); + * inserts the message in its container. + */ + insertMessage: function(validation, isValid) { + let messageHolder = validation.messageHolder; + if(validation.params.validMessage=="" && !validation.params.validMessage) return; // dont insert anything if validMessage is an empty string + if( (this.displayMessageWhenEmpty && (this.elementType == LiveValidation.CHECKBOX || this.element.value == '')) || + this.element.value != '' || + validation.params.identifier.includes("regex")){ + this.removeMessageClass(messageHolder); + /* If the isValid state is null, we assume that the validation did not occur yet. We do not add any class that + * would give a false hint towards a result. */ + if(isValid != null) { + this.addMessageClass(messageHolder, isValid); + } + // We change just the lastChild textContent. This last child is a text node. This allows to not remove the icons. + let validMessage = validation.params.validMessage ? validation.params.validMessage : this.options.validMessage; + let newMessageContent = isValid ? validMessage : validation.params.failureMessage; + if (messageHolder.lastChild != null) { + messageHolder.lastChild.textContent = newMessageContent; + } else { + messageHolder.textContent = newMessageContent; + } + } }, /** - * inserts the message in its container of the message that already exists (if it does) + * Add a class for the holder of the validation message. */ - insertMessage: function() { - this.removeMessage(); - if(!this.validationFailed && !this.validMessage) return; // dont insert anything if validMesssage has been set to false or empty string - if( (this.displayMessageWhenEmpty && (this.elementType == LiveValidation.CHECKBOX || this.element.value == '')) || this.element.value != '' ){ - var className = this.validationFailed ? this.invalidClass : this.validClass; - this.messageHolder.addClassName(this.messageClass + ' ' + className); - this.messageHolder.textContent = this.message; - } + removeMessageClass: function(messageHolder) { + messageHolder.removeClassName(this.invalidClass); + messageHolder.removeClassName(this.validClass); + }, + + /** + * Add a class for the holder of the validation message. + */ + addMessageClass: function(messageHolder, isValid) { + let className = isValid ? this.validClass : this.invalidClass; + messageHolder.addClassName(className); }, /** @@ -425,15 +454,18 @@ LiveValidation.prototype = { }, /** - * removes the message element if it exists + * Empties out the message elements if they exist */ removeMessage: function(){ - this.messageHolder.className = 'message-holder'; - this.messageHolder.textContent = ''; + for (let i = 0; i < this.validations.length; i++) { + let messageHolder = this.validations[i].messageHolder; + this.removeMessageClass(messageHolder); + messageHolder.lastChild.textContent = ''; + } }, /** - * removes the class that has been applied to the field to indicte if valid or not + * removes the class that has been applied to the field to indicate if valid or not */ removeFieldClass: function(){ this.element.removeClassName(this.invalidFieldClass);