madeon (madeon) wrote in changelog,
madeon
madeon
changelog

[livejournal] r20056: LJSUP-9307: Widget changes

Committer: sbelyaev
LJSUP-9307: Widget changes
U   branches/delayed_entries/bin/upgrading/en.dat
U   branches/delayed_entries/cgi-bin/LJ/Widget/EntryForm.pm
U   branches/delayed_entries/htdocs/editjournal.bml
Modified: branches/delayed_entries/bin/upgrading/en.dat
===================================================================
--- branches/delayed_entries/bin/upgrading/en.dat	2011-09-16 06:44:30 UTC (rev 20055)
+++ branches/delayed_entries/bin/upgrading/en.dat	2011-09-16 06:57:35 UTC (rev 20056)
@@ -1358,7 +1358,7 @@
 
 entryform.postto.select=Select a community
 
-entryform.post=Publish
+entryform.post=Publish:
 
 entryform.post.right.now=Now
 

Modified: branches/delayed_entries/cgi-bin/LJ/Widget/EntryForm.pm
===================================================================
--- branches/delayed_entries/cgi-bin/LJ/Widget/EntryForm.pm	2011-09-16 06:44:30 UTC (rev 20055)
+++ branches/delayed_entries/cgi-bin/LJ/Widget/EntryForm.pm	2011-09-16 06:57:35 UTC (rev 20056)
@@ -2,6 +2,7 @@
 
 use strict;
 use base 'LJ::Widget';
+use LJ::Widget::Calendar;
 
 sub set_data {
     my ($self, $opts, $head, $onload, $errors) = @_;
@@ -441,6 +442,7 @@
     # Date / Time
     my ($year, $mon, $mday, $hour, $min) = split(/\D/, $opts->{'datetime'});
     my $monthlong = LJ::Lang::month_long($mon);
+    
     # date entry boxes / formatting note
     my $datetime = LJ::html_datetime({
         'name' => "date_ymd",
@@ -475,10 +477,10 @@
     my $date_diff = ($opts->{'mode'} eq "edit" || $opts->{'spellcheck_html'}) ?
         1 : 0;
 
-    $datetime .= LJ::html_hidden("date_diff", $date_diff);
+    my $date_diff_input = LJ::html_hidden("date_diff", $date_diff);
 
     # but if we don't have JS, give a signal to trust the given time
-    $datetime .= "<noscript>" .  LJ::html_hidden("date_diff_nojs", "1") .
+    $date_diff_input .= "<noscript>" .  LJ::html_hidden("date_diff_nojs", "1") .
         "</noscript>";
 
     my $timeZones = option($remote);
@@ -487,7 +489,7 @@
     $out .= qq{
         <li class='pkg'>
             <span id='currentdate'>
-                <label class='title'>$BML::ML{'entryform.post'}</label>
+                <label class='title'>$BML::ML{'entryform.post.test'}</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>
@@ -497,9 +499,13 @@
             <span id='modifydate'>
                 <label class='title'>$BML::ML{'entryform.postponed.until'}</label>
                 <span class='wrap'>
-                    <a href="#">$monthlong $mday, $year</a><i class='i-calendar'></i>
+                    <input type="hidden" name="date_ymd_mm" value="$mon" />
+                    <input type="hidden" name="date_ymd_dd" value="$mday" />
+                    <input type="hidden" name="date_ymd_yyyy" value="$year" />
+                    $date_diff_input
+                    <span class="wrap-calendar"><a id="currentdate-date" href="#">$monthlong $mday, $year</a><i class='i-calendar'></i></span>
                     <span class='datetime'>
-                        <input type='text' value='$hour' class='input-num' /> : <input type='text' value='$min' class='input-num' />
+                        <input type='text' name='hour' value='$hour' class='input-num' /> : <input type='text' value='$min' name='min' class='input-num' />
                         <?de $BML::ML{'entryform.date.24hournote'} de?>
                     </span>
                     <span class='timezone'>$timeZones</span>
@@ -545,6 +551,7 @@
                 </label>
                 <span class='wrap'>
                     $pickw_select
+                    <a href='javascript:void(0);' id='lj_userpicselect'> </a>
                     $userpics_help
                 </span>
             </li>
@@ -575,6 +582,7 @@
 
     my $out = '';
 
+    $out .= LJ::Widget::Calendar->render();
     $out .= $self->render_userpics_block;
     $out .= $self->render_metainfo_block;
     $out .= $self->render_infobox_block;

Modified: branches/delayed_entries/htdocs/editjournal.bml
===================================================================
--- branches/delayed_entries/htdocs/editjournal.bml	2011-09-16 06:44:30 UTC (rev 20055)
+++ branches/delayed_entries/htdocs/editjournal.bml	2011-09-16 06:57:35 UTC (rev 20056)
@@ -382,7 +382,7 @@
             ###
 
             my $auth = "<li class='pkg'><label for='' class='title'>$ML{'.auth.poster'}</label>";
-            $auth   .= "<span class='wrap'><span id='poster' class='float-left'>";
+            $auth   .= "<span class='wrap'><span id='poster'>";
             $auth   .= $usejournal ? LJ::ljuser($res{'events_1_poster'}) . " in community " . LJ::ljuser($usejournal)
                                    :  LJ::ljuser($remote);
             $auth .= LJ::html_hidden("usejournal", $usejournal);

Tags: bml, dat, livejournal, madeon, pm
Subscribe
  • Post a new comment

    Error

    Anonymous comments are disabled in this journal

    default userpic

    Your reply will be screened

    Your IP address will be recorded 

  • 0 comments