tinymce for event fields

diff --git a/include/datetime.php b/include/datetime.php
index 8f2ec311a019a775853bc786abc3448777736bcf..a5b388e767794326ee44aa894fc13561d627cbbf 100644 (file)
--- 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 da076313ad15b5bb2bb56e823679c5c391997a97..3888d6fe3670f56b2de8ad79e89f3bf8c0565aa0 100644 (file)
--- 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' => '',