diff options
| -rwxr-xr-x | mod/events.php | 2 | ||||
| -rwxr-xr-x | view/tpl/event_form.tpl | 20 |
2 files changed, 18 insertions, 4 deletions
diff --git a/mod/events.php b/mod/events.php index f3bf97141..e5250e8f8 100755 --- a/mod/events.php +++ b/mod/events.php @@ -470,6 +470,7 @@ function events_content(&$a) { $shour = ((x($orig_event)) ? datetime_convert('UTC', $tz, $sdt, 'H') : 0); $sminute = ((x($orig_event)) ? datetime_convert('UTC', $tz, $sdt, 'i') : 0); $stext = datetime_convert('UTC',$tz,$sdt); + $stext = substr($stext,0,14) . "00:00"; $fyear = datetime_convert('UTC', $tz, $fdt, 'Y'); $fmonth = datetime_convert('UTC', $tz, $fdt, 'm'); @@ -478,6 +479,7 @@ function events_content(&$a) { $fhour = ((x($orig_event)) ? datetime_convert('UTC', $tz, $fdt, 'H') : 0); $fminute = ((x($orig_event)) ? datetime_convert('UTC', $tz, $fdt, 'i') : 0); $ftext = datetime_convert('UTC',$tz,$fdt); + $ftext = substr($ftext,0,14) . "00:00"; $f = get_config('system','event_input_format'); if(! $f) diff --git a/view/tpl/event_form.tpl b/view/tpl/event_form.tpl index 611bf6006..95ebe0351 100755 --- a/view/tpl/event_form.tpl +++ b/view/tpl/event_form.tpl @@ -11,6 +11,9 @@ <input type="hidden" name="xchan" value="{{$xchan}}" /> <input type="hidden" name="mid" value="{{$mid}}" /> +<div id="event-summary-text">{{$t_text}}</div> +<input type="text" id="event-summary" name="summary" value="{{$t_orig}}" /> + <div id="event-start-text">{{$s_text}}</div> {{if $bootstrap}} <i class="icon-calendar btn btn-default" onclick="eventGetStart(); return false;" /></i> <input type="text" name="start_text" id="start-text" value="{{$stext}}" /> @@ -20,17 +23,18 @@ <div class="clear"></div><br /> -<input type="checkbox" name="nofinish" value="1" id="event-nofinish-checkbox" {{$n_checked}} /> <div id="event-nofinish-text">{{$n_text}}</div> +<input type="checkbox" name="nofinish" value="1" id="event-nofinish-checkbox" {{$n_checked}} onclick="showHideFinishDate(); return true;" /> <div id="event-nofinish-text">{{$n_text}}</div> <div id="event-nofinish-break"></div> - +<div id="event-finish-wrapper"> <div id="event-finish-text">{{$f_text}}</div> {{if $bootstrap}} <i class="icon-calendar btn btn-default" onclick="eventGetFinish(); return false;" /></i> <input type="text" name="finish_text" id="finish-text" value="{{$ftext}}" /> {{else}} {{$f_dsel}} {{$f_tsel}} {{/if}} +</div> <div id="event-datetime-break"></div> @@ -39,8 +43,16 @@ <div id="event-adjust-break"></div> -<div id="event-summary-text">{{$t_text}}</div> -<input type="text" id="event-summary" name="summary" value="{{$t_orig}}" /> + + +{{if $catsenabled}} +<div id="event-category-wrap"> + <input name="category" id="event-category" type="text" placeholder="{{$placeholdercategory}}" value="{{$category}}" class="jothidden" style="display:none" /> +</div> +{{/if}} + + + <div id="event-desc-text">{{$d_text}}</div> |