[livejournal] r20057: LJSUP-9307: Delayed entries and sticky p...

LJSUP-9307: Delayed entries and sticky posts

U   branches/delayed_entries/bin/upgrading/en.dat
U   branches/delayed_entries/cgi-bin/LJ/Widget/EntryForm.pm
U   branches/delayed_entries/htdocs/stc/entry.css

Modified: branches/delayed_entries/bin/upgrading/en.dat
===================================================================
--- branches/delayed_entries/bin/upgrading/en.dat	2011-09-16 06:57:35 UTC (rev 20056)
+++ branches/delayed_entries/bin/upgrading/en.dat	2011-09-16 07:25:38 UTC (rev 20057)
@@ -1362,7 +1362,7 @@
 
 entryform.post.right.now=Now
 
-entryform.postponed.until=Postpone untill
+entryform.postponed.until=Postpone untill:
 
 entryform.preview=Preview
 

Modified: branches/delayed_entries/cgi-bin/LJ/Widget/EntryForm.pm
===================================================================
--- branches/delayed_entries/cgi-bin/LJ/Widget/EntryForm.pm	2011-09-16 06:57:35 UTC (rev 20056)
+++ branches/delayed_entries/cgi-bin/LJ/Widget/EntryForm.pm	2011-09-16 07:25:38 UTC (rev 20057)
@@ -488,15 +488,26 @@
 
     $out .= qq{
         <li class='pkg'>
-            <span id='currentdate'>
-                <label class='title'>$BML::ML{'entryform.post.test'}</label>
+            <span id='currentdate'>};
+
+    if ( $opts->{'mode'} eq "edit" ) {
+        $out .= qq{ <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> };
+    } else {
+        $out .= qq{ <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>
-            <span id='modifydate'>
+            </span>};
+    }
+    $out .= qq{ <span id='modifydate'>
                 <label class='title'>$BML::ML{'entryform.postponed.until'}</label>
                 <span class='wrap'>
                     <input type="hidden" name="date_ymd_mm" value="$mon" />

Modified: branches/delayed_entries/htdocs/stc/entry.css
===================================================================
--- branches/delayed_entries/htdocs/stc/entry.css	2011-09-16 06:57:35 UTC (rev 20056)
+++ branches/delayed_entries/htdocs/stc/entry.css	2011-09-16 07:25:38 UTC (rev 20057)
@@ -199,6 +199,7 @@
 				text-align: center;
 				}
 			#updateForm #metainfo LI .datetime .de {
+				white-space: nowrap;
 				font-size: 11px;
 				}
 		#updateForm #metainfo LI .timezone {