Committer: dpetrov
LJSUP-9820: There is no field "password" on update.bml when you try change userU branches/delayed_entries/cgi-bin/LJ/Widget/EntryForm.pm U branches/delayed_entries/htdocs/js/entry.js U branches/delayed_entries/htdocs/update.bml
Modified: branches/delayed_entries/cgi-bin/LJ/Widget/EntryForm.pm =================================================================== --- branches/delayed_entries/cgi-bin/LJ/Widget/EntryForm.pm 2011-09-20 03:02:14 UTC (rev 20073) +++ branches/delayed_entries/cgi-bin/LJ/Widget/EntryForm.pm 2011-09-20 03:14:05 UTC (rev 20074) @@ -546,7 +546,7 @@ ); my $userpics_help = LJ::help_icon_html("userpics", "", " "); - my $userpic_display = $self->altlogin ? 'none' : 'block'; + my $userpic_display = $self->altlogin ? 'none' : ''; my $style = "display: $userpic_display;"; $out .= qq{ Modified: branches/delayed_entries/htdocs/js/entry.js =================================================================== --- branches/delayed_entries/htdocs/js/entry.js 2011-09-20 03:02:14 UTC (rev 20073) +++ branches/delayed_entries/htdocs/js/entry.js 2011-09-20 03:14:05 UTC (rev 20074) @@ -19,7 +19,7 @@ calVal = modifyDate.find('.wrap a'); currentDate.hide(); - modifyDate.css('display', 'inline'); + modifyDate.css('display', ''); f = document.updateForm; var month = f.date_ymd_mm.selectedIndex || f.date_ymd_mm.value; @@ -346,11 +346,13 @@ return false; } - var altlogin_wrapper = $('altlogin_wrapper'); - if(! altlogin_wrapper){ + var altlogin_wrapper = $('altlogin_wrapper_login'), + altlogin_wrapper = $('altlogin_wrapper_password'); + if (!altlogin_wrapper_login || !altlogin_wrapper_password) { return false; } - altlogin_wrapper.style.display = 'block'; + altlogin_wrapper_login.style.display = ''; + altlogin_wrapper_password.style.display = ''; var remotelogin = $('remotelogin'); if(! remotelogin){ @@ -425,7 +427,7 @@ } function defaultDate(){ - $('currentdate').style.display = 'block'; + $('currentdate').style.display = ''; $('modifydate').style.display = 'none'; } Modified: branches/delayed_entries/htdocs/update.bml =================================================================== --- branches/delayed_entries/htdocs/update.bml 2011-09-20 03:02:14 UTC (rev 20073) +++ branches/delayed_entries/htdocs/update.bml 2011-09-20 03:14:05 UTC (rev 20074) @@ -213,9 +213,9 @@ my $altlogin_display = 'none'; my $remotelogin_display = 'none'; if ($auth_as_remote) { - $remotelogin_display = 'block'; + $remotelogin_display = ''; } else { - $altlogin_display = 'block'; + $altlogin_display = ''; } # Check for errors, store in hash to render later @@ -252,14 +252,14 @@ $auth .= "</li>\n\n"; } # table with username/password fields - $auth .= "<li id='altlogin_wrapper' class='pkg' style='display: $altlogin_display;'>\n"; + $auth .= "<li id='altlogin_wrapper_login' class='pkg' style='display: $altlogin_display;'>\n"; $auth .= "<label for='altlogin_username' class='title'>$ML{'.username'}</label>\n"; $auth .= "<span class='wrap'>\n"; $auth .= LJ::html_text({ 'name' => 'user', 'id' => 'altlogin_username', 'class' => 'text', 'size' => '15', 'maxlength' => '15', 'tabindex' => '5', 'value' => $POST{'user'} || $GET{'user'} }) . "\n"; $auth .= "</span>\n"; $auth .= "</li>\n"; - $auth .= "<li id='altlogin_wrapper' class='pkg' style='display: $altlogin_display;'>\n"; + $auth .= "<li id='altlogin_wrapper_password' class='pkg' style='display: $altlogin_display;'>\n"; $auth .= "<label for='altlogin_password' class='title'>$ML{'.password'}</label>\n"; $auth .= "<span class='wrap'>\n"; $auth .= LJ::html_text({ 'type' => 'password', 'id' => 'altlogin_password', 'class' => 'text',