Committer: skomarov
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/stc/entry.css U branches/delayed_entries/htdocs/stc/ie.css 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-19 09:03:44 UTC (rev 20070)
+++ branches/delayed_entries/cgi-bin/LJ/Widget/EntryForm.pm 2011-09-19 09:33:57 UTC (rev 20071)
@@ -380,7 +380,7 @@
my $errors = $self->errors;
my $onload = $self->onload;
- $out .= "<ul id='metainfo'>";
+ $out .= "<div id='metainfo-wrap'><ul id='metainfo'>";
# login info
$out .= $opts->{'auth'};
if ($opts->{'mode'} eq "update") {
@@ -486,29 +486,24 @@
my $timeZones = option($remote);
my $help_icon = LJ::help_icon("24hourshelp");
- $out .= qq{
- <li class='pkg'>
- <span id='currentdate'>};
-
if ( $opts->{'mode'} eq "edit" ) {
- $out .= qq{ <label class='title'>$BML::ML{'entryform.date'}</label>
+ $out .= qq{ <li class='pkg' id='currentdate'><label class='title'>$BML::ML{'entryform.date'}</label>
<span class='wrap'>
$monthlong, $mday, $year, $hour:$min
<a href='javascript:void(0)' onclick='editdate();' id='currentdate-edit'>$BML::ML{'entryform.date.edit'}</a>
$help_icon
</span>
- </span> };
+ </li> };
} else {
- $out .= qq{ <label class='title'>$BML::ML{'entryform.post'}</label>
+ $out .= qq{ <li class='pkg' id='currentdate'><label class='title'>$BML::ML{'entryform.post'}</label>
<span class='wrap'>
$BML::ML{'entryform.post.right.now'}
<a href='javascript:void(0)' onclick='editdate();' id='currentdate-edit'>$BML::ML{'entryform.date.edit'}</a>
$help_icon
</span>
- </span>};
+ </li>};
}
- $out .= qq{ <span id='modifydate'>
- <label class='title'>$BML::ML{'entryform.postponed.until'}</label>
+ $out .= qq{ <li class='pkg' id='modifydate'><label class='title'>$BML::ML{'entryform.postponed.until'}</label>
<span class='wrap'>
<input type="hidden" name="date_ymd_mm" value="$mon" />
<input type="hidden" name="date_ymd_dd" value="$mday" />
@@ -521,8 +516,7 @@
</span>
<span class='timezone'>$timeZones</span>
</span>
- </span>
- </li>
+ </li>
<li>
<noscript>
<p id='time-correct' class='small'>
@@ -571,7 +565,7 @@
$$onload .= " insertViewThumbs();" if $self->should_show_userpicselect;
}
- $out .= "</ul>";
+ $out .= "</ul></div>";
}
sub render_infobox_block {
Modified: branches/delayed_entries/htdocs/stc/entry.css
===================================================================
--- branches/delayed_entries/htdocs/stc/entry.css 2011-09-19 09:03:44 UTC (rev 20070)
+++ branches/delayed_entries/htdocs/stc/entry.css 2011-09-19 09:33:57 UTC (rev 20071)
@@ -134,78 +134,82 @@
/* Metainfo
----------------------------------------------- */
-#updateForm #metainfo {
+#updateForm #metainfo-wrap {
float: left;
- width: 61%;
- margin: -3px 10px 20px 0;
}
- #updateForm #metainfo LI {
- padding: 0;
- margin: 0 0 10px 0;
- list-style: none;
- line-height: 22px;
+ #updateForm #metainfo {
+ display: table;
+ margin: -3px 10px 20px 0;
}
- #updateForm #metainfo LI .title {
- float: left;
- min-width: 8.5em;
- padding: 3px 7px 0 0;
- text-align: right;
- line-height: 20px;
- font-size: 14px;
+ #updateForm #metainfo LI {
+ display: table-row;
+ padding: 0;
+ margin: 0 0 10px 0;
+ list-style: none;
+ line-height: 22px;
}
- #updateForm #metainfo LI .wrap {
- display: block;
- overflow: hidden;
- padding: 3px;
- }
- #updateForm #metainfo LI .current-username {
- line-height: 20px;
- font-size: 14px;
- }
- #updateForm #metainfo LI .select {
- float: none;
- display: inline-block;
- vertical-align: top;
- }
- #updateForm #metainfo LI .select-timezone {
- width: 133px;
- font-size: 12px;
- }
- #updateForm #metainfo LI .helplink {
- float: none;
- display: inline-block;
- margin: 4px 0 0 4px;
- border: none;
- vertical-align: top;
- }
- #updateForm #metainfo LI #modifydate .wrap {
- padding-top: 1px;
- }
- #updateForm #metainfo LI .i-calendar {
- display: inline-block;
- width: 10px;
- height: 10px;
- margin-left: 5px;
- background: url(/img/widget/wishlist/date-icon.gif?ver=1) no-repeat;
- vertical-align: moddle;
- cursor: pointer;
- }
- #updateForm #metainfo LI .datetime {
- margin-left: 10px;
- }
- #updateForm #metainfo LI .datetime .input-num {
- width: 22px;
- padding: 2px 1px;
- text-align: center;
+ #updateForm #metainfo LI .title {
+ display: table-cell;
+ padding: 3px 7px 0 0;
+ vertical-align: top;
+ text-align: right;
+ line-height: 20px;
+ font-size: 14px;
}
- #updateForm #metainfo LI .datetime .de {
- white-space: nowrap;
- font-size: 11px;
+ #updateForm #metainfo LI .wrap {
+ display: table-cell;
+ padding: 3px;
+ vertical-align: top;
}
- #updateForm #metainfo LI .timezone {
- display: block;
- padding-top: 5px;
- }
+ #updateForm #metainfo LI .current-username {
+ line-height: 20px;
+ font-size: 14px;
+ }
+ #updateForm #metainfo LI .select {
+ float: none;
+ display: inline-block;
+ vertical-align: top;
+ }
+ #updateForm #metainfo LI .select-timezone {
+ width: 133px;
+ font-size: 12px;
+ }
+ #updateForm #metainfo LI .helplink {
+ float: none;
+ display: inline-block;
+ margin: 4px 0 0 4px;
+ border: none;
+ vertical-align: top;
+ }
+ #updateForm #metainfo LI #modifydate .wrap {
+ padding-top: 1px;
+ }
+ #updateForm #metainfo LI .i-calendar {
+ display: inline-block;
+ width: 10px;
+ height: 10px;
+ margin-left: 5px;
+ background: url(/img/widget/wishlist/date-icon.gif?ver=1) no-repeat;
+ vertical-align: moddle;
+ cursor: pointer;
+ }
+ #updateForm #metainfo LI .datetime {
+ margin-left: 10px;
+ vertical-align: middle;
+ }
+ #updateForm #metainfo LI .datetime .input-num {
+ width: 22px;
+ padding: 2px 1px;
+ text-align: center;
+ }
+ #updateForm #metainfo LI .datetime .de {
+ white-space: nowrap;
+ font-size: 11px;
+ }
+ #updateForm #metainfo LI .timezone {
+ display: block;
+ padding-top: 5px;
+ }
/* Options
----------------------------------------------- */
Modified: branches/delayed_entries/htdocs/stc/ie.css
===================================================================
--- branches/delayed_entries/htdocs/stc/ie.css 2011-09-19 09:03:44 UTC (rev 20070)
+++ branches/delayed_entries/htdocs/stc/ie.css 2011-09-19 09:33:57 UTC (rev 20071)
@@ -532,6 +532,14 @@
behavior: expression((this.runtimeStyle.behavior="none")&&(this.pngSet?this.pngSet=true:(this.nodeName == "IMG" && this.src.toLowerCase().indexOf('.png')>-1?(this.runtimeStyle.backgroundImage = "none", this.runtimeStyle.filter = "progid:DXImageTransform.Microsoft.AlphaImageLoader(src='" + this.src + "', sizingMethod='image')", this.src = "transparent.gif"):(this.origBg = this.origBg? this.origBg : this.currentStyle.backgroundImage.toString().replace('url("','').replace('")',''), this.runtimeStyle.filter = "progid:DXImageTransform.Microsoft.AlphaImageLoader(src='" + this.origBg + "', sizingMethod='crop')", this.runtimeStyle.backgroundImage = "none")),this.pngSet=true));
}
+#updateForm #metainfo LI .title {
+ display: inline-block;
+ min-width: 8.5em;
+ }
+#updateForm #metainfo LI .wrap {
+ overflow: hidden;
+ zoom: 1;
+ }
/* LJ like buttons
-----------------------------------------------*/
Modified: branches/delayed_entries/htdocs/update.bml
===================================================================
--- branches/delayed_entries/htdocs/update.bml 2011-09-19 09:03:44 UTC (rev 20070)
+++ branches/delayed_entries/htdocs/update.bml 2011-09-19 09:33:57 UTC (rev 20071)
@@ -253,18 +253,22 @@
}
# table with username/password fields
$auth .= "<li id='altlogin_wrapper' class='pkg' style='display: $altlogin_display;'>\n";
- $auth .= "<label for='altlogin_username' class='left'>$ML{'.username'}</label>\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 .= "<label for='altlogin_password' class='left'>$ML{'.password'}</label>\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',
'name' => 'password', 'tabindex' => '6', 'size' => '15', 'maxlength' => '30' }) . "\n";
# posted with a user, but no password
if ($did_post && $auth_missing) {
$auth .= "<br /><?inerr $ML{'.error.nopass'} inerr?>";
}
+ $auth .= "</span>\n";
$auth .= "</li>\n\n";
# if they submit the form and are spellchecking, remember
