[livejournal] r20612: LJSUP-10472: Changing display of setting...

U   trunk/cgi-bin/LJ/Widget/EntryForm.pm
U   trunk/htdocs/stc/entry.css

Modified: trunk/cgi-bin/LJ/Widget/EntryForm.pm
===================================================================
--- trunk/cgi-bin/LJ/Widget/EntryForm.pm	2011-11-23 13:16:36 UTC (rev 20611)
+++ trunk/cgi-bin/LJ/Widget/EntryForm.pm	2011-11-23 13:51:51 UTC (rev 20612)
@@ -498,13 +498,6 @@
         'default' => "$year-$mon-$mday",
         'disabled' => $opts->{'disabled_save'}
     });
-    my $datetimeonly = LJ::html_datetime({
-        'name' => "date_ymd",
-        'notime' => 1,
-        'default' => "$year-$mon-$mday",
-        'disabled' => $opts->{'disabled_save'}
-    });
-
     $datetime .= "<span class='float-left'>&nbsp;&nbsp;</span>";
     $datetime .= LJ::html_text({
         size => 2,
@@ -515,7 +508,6 @@
         tabindex => $self->tabindex,
         disabled => $opts->{'disabled_save'}
     }) . "<span class='float-left'>:</span>";
-
     $datetime .= LJ::html_text({
         size => 2,
         class => 'text',
@@ -525,6 +517,21 @@
         tabindex => $self->tabindex,
         disabled => $opts->{'disabled_save'}
     });
+    my $datetimeonly = LJ::html_datetime({
+        'name' => "date_ymd",
+        'notime' => 1,
+        'default' => "$year-$mon-$mday",
+        'disabled' => $opts->{'disabled_save'}
+    });
+    my $time = LJ::html_text({
+        size => 4,
+        class => 'text input-time',
+        maxlength => 5,
+        value => "$hour:$min",
+        name => "time",
+        tabindex => $self->tabindex,
+        disabled => $opts->{'disabled_save'}
+    });
 
     # JavaScript sets this value, so we know that the time we get is correct
     # but always trust the time if we've been through the form already
@@ -586,10 +593,9 @@
             <span class="wrap entrydate-wrap-until">
                 <span class="wrap-select">$datetimeonly</span>
                 $date_diff_input
-                <span class="wrap-calendar"><a id="currentdate-date" href="#">$monthlong $mday, $year</a><i class='i-calendar'></i></span>
+                <span class="wrap-calendar">$datetimeonly<i class='i-calendar'></i></span>
                 <span class='datetime'>
-                    <input type='text' name='time' value='$hour:$min' class='input-num' maxlength='5' />
-                    <?de $BML::ML{'entryform.date.24hournote'} de?>
+                    $time <?de $BML::ML{'entryform.date.24hournote'} de?>
                 </span>
                 $help_icon
             </span>

Modified: trunk/htdocs/stc/entry.css
===================================================================
--- trunk/htdocs/stc/entry.css	2011-11-23 13:16:36 UTC (rev 20611)
+++ trunk/htdocs/stc/entry.css	2011-11-23 13:51:51 UTC (rev 20612)
@@ -223,11 +223,6 @@
 				margin-left: 10px;
 				vertical-align: middle;
 				}
-				#updateForm #metainfo LI .datetime .input-num {
-					width: 38px;
-					padding: 2px 1px;
-					text-align: center;
-					}
 				#updateForm #metainfo LI .datetime .de {
 					white-space: nowrap;
 					font-size: 11px;
@@ -270,6 +265,11 @@
 	float: left;
 	margin-bottom: 2px;
 	}
+#updateForm #metainfo LI .datetime .input-time {
+	float: none;
+	width: 38px;
+	text-align: center;
+	}
 #updateForm #metainfo LI .de {
 	white-space: nowrap;
 	font-size: 11px;