diff --git a/resources/static/dialog/js/modules/actions.js b/resources/static/dialog/js/modules/actions.js index fddee337aa73cc653c90d7a4fe6b3b45d252473e..d778612926b9bf767ff915901ce709ea3de474b4 100644 --- a/resources/static/dialog/js/modules/actions.js +++ b/resources/static/dialog/js/modules/actions.js @@ -33,11 +33,12 @@ BrowserID.Modules.Actions = (function() { } function startRegCheckService(options, verifier, message, password) { - var controller = startService("check_registration", _.extend(options, { + var controller = startService("check_registration", { verifier: verifier, verificationMessage: message, - password: password - })); + password: password, + siteName: options.siteName + }); controller.startCheck(); } diff --git a/resources/static/dialog/views/set_password.ejs b/resources/static/dialog/views/set_password.ejs index 8f08142034da05352c7c7e28531913562497405a..bdc85b723db7453a30aeb8d591067aa6804f41d9 100644 --- a/resources/static/dialog/views/set_password.ejs +++ b/resources/static/dialog/views/set_password.ejs @@ -55,7 +55,7 @@ <p class="submit cf buttonrow"> <button id="<%= password_reset ? "password_reset" : "verify_user" %>"> - <%= gettext(password_reset ? 'reset password' : 'done') %> + <%= password_reset ? gettext('reset password') : gettext('done') %> </button> <% if(cancelable) { %> diff --git a/resources/views/dialog.ejs b/resources/views/dialog.ejs index 9da0ca5f249e676e5f012313fd4c2fb0a9328684..3402c4dbd759ccd1ba850d1f02f760d01d1f0a8b 100644 --- a/resources/views/dialog.ejs +++ b/resources/views/dialog.ejs @@ -12,7 +12,9 @@ <div id="signIn"> <div class="table"> - <div class="vertical contents"> + <div class="vertical"> + <div class="contents"> + </div> </div> </div> <div class="arrowContainer">