diff options
| -rw-r--r-- | include/datetime.php | 4 | ||||
| -rw-r--r-- | mod/events.php | 14 |
2 files changed, 11 insertions, 7 deletions
diff --git a/include/datetime.php b/include/datetime.php index 8f2ec311a..a5b388e76 100644 --- a/include/datetime.php +++ b/include/datetime.php @@ -122,14 +122,14 @@ function datesel($pre,$ymin,$ymax,$allow_blank,$y,$m,$d) { } $o .= "</select> <select name=\"{$pre}month\" class=\"{$pre}month\" size=\"1\">"; - for($x = 0; $x <= 12; $x ++) { + for($x = (($allow_blank) ? 0 : 1); $x <= 12; $x ++) { $sel = (($x == $m) ? " selected=\"selected\" " : ""); $y = (($x) ? $x : ''); $o .= "<option value=\"$x\" $sel>$y</option>"; } $o .= "</select> <select name=\"{$pre}day\" class=\"{$pre}day\" size=\"1\">"; - for($x = 0; $x <= 31; $x ++) { + for($x = (($allow_blank) ? 0 : 1); $x <= 31; $x ++) { $sel = (($x == $d) ? " selected=\"selected\" " : ""); $y = (($x) ? $x : ''); $o .= "<option value=\"$x\" $sel>$y</option>"; diff --git a/mod/events.php b/mod/events.php index da076313a..3888d6fe3 100644 --- a/mod/events.php +++ b/mod/events.php @@ -158,19 +158,23 @@ function events_content(&$a) { } if($mode === 'edit' || $mode === 'new') { + $htpl = get_markup_template('profed_head.tpl'); + $a->page['htmlhead'] .= replace_macros($htpl,array('$baseurl' => $a->get_baseurl())); + $tpl = get_markup_template('event_form.tpl'); $year = datetime_convert('UTC', date_default_timezone_get(), 'now', 'Y'); - + $month = datetime_convert('UTC', date_default_timezone_get(), 'now', 'm'); + $day = datetime_convert('UTC', date_default_timezone_get(), 'now', 'd'); $o .= replace_macros($tpl,array( '$post' => $a->get_baseurl() . '/events', '$e_text' => t('Event details'), - '$s_text' => t('Starting date/time:'), - '$s_dsel' => datesel('start',$year+5,$year,false,$year,0,0), + '$s_text' => t('Start: year-month-day hour:minute'), + '$s_dsel' => datesel('start',$year+5,$year,false,$year,$month,$day), '$s_tsel' => timesel('start',0,0), - '$f_text' => t('Finish date/time:'), - '$f_dsel' => datesel('start',$year+5,$year,false,$year,0,0), + '$f_text' => t('Finish: year-month-day hour:minute'), + '$f_dsel' => datesel('start',$year+5,$year,false,$year,$month,$day), '$f_tsel' => timesel('start',0,0), '$d_text' => t('Description:'), '$d_orig' => '', |