mirror of
https://codeberg.org/streams/streams.git
synced 2024-09-20 02:15:19 +00:00
event form cleanup backported from trinidad - still need to style the checkboxes
This commit is contained in:
parent
b948fbaeda
commit
abcc70722c
4 changed files with 37 additions and 9 deletions
|
@ -174,7 +174,7 @@ function timesel($format, $h, $m, $id='timepicker') {
|
||||||
* @param $maxfrom
|
* @param $maxfrom
|
||||||
* set maximum date from picker with id $maxfrom (none by default)
|
* set maximum date from picker with id $maxfrom (none by default)
|
||||||
*/
|
*/
|
||||||
function datetimesel($format, $min, $max, $default, $id = 'datetimepicker', $pickdate = true, $picktime = true, $minfrom = '', $maxfrom = '') {
|
function datetimesel($format, $min, $max, $default, $id = 'datetimepicker', $pickdate = true, $picktime = true, $minfrom = '', $maxfrom = '',$required = false) {
|
||||||
// Once browser support is better this could probably be replaced with native HTML5 date picker
|
// Once browser support is better this could probably be replaced with native HTML5 date picker
|
||||||
$o = '';
|
$o = '';
|
||||||
|
|
||||||
|
@ -209,6 +209,7 @@ function datetimesel($format, $min, $max, $default, $id = 'datetimepicker', $pic
|
||||||
$readable_format = str_replace('i','MM',$readable_format);
|
$readable_format = str_replace('i','MM',$readable_format);
|
||||||
|
|
||||||
$o .= "<div class='date'><input type='text' placeholder='$readable_format' name='$id' id='$id' $input_text />";
|
$o .= "<div class='date'><input type='text' placeholder='$readable_format' name='$id' id='$id' $input_text />";
|
||||||
|
$o .= (($required) ? '<span class="required" title="' . t('Required') . '" >*</span>' : '');
|
||||||
$o .= '</div>';
|
$o .= '</div>';
|
||||||
$o .= "<script type='text/javascript'>\$(function () {var picker = \$('#$id').datetimepicker({step:5,format:'$dateformat' $minjs $maxjs $pickers $defaultdatejs}); $extra_js})</script>";
|
$o .= "<script type='text/javascript'>\$(function () {var picker = \$('#$id').datetimepicker({step:5,format:'$dateformat' $minjs $maxjs $pickers $defaultdatejs}); $extra_js})</script>";
|
||||||
return $o;
|
return $o;
|
||||||
|
|
|
@ -577,12 +577,13 @@ function events_content(&$a) {
|
||||||
'$catsenabled' => $catsenabled,
|
'$catsenabled' => $catsenabled,
|
||||||
'$placeholdercategory' => t('Categories (comma-separated list)'),
|
'$placeholdercategory' => t('Categories (comma-separated list)'),
|
||||||
'$category' => $category,
|
'$category' => $category,
|
||||||
'$s_text' => t('Event Starts:') . ' <span class="required" title="' . t('Required') . '">*</span>',
|
'$s_text' => t('Event Starts:'),
|
||||||
'$stext' => $stext,
|
'$stext' => $stext,
|
||||||
'$ftext' => $ftext,
|
'$ftext' => $ftext,
|
||||||
|
'$required' => ' <span class="required" title="' . t('Required') . '">*</span>',
|
||||||
'$ModalCANCEL' => t('Cancel'),
|
'$ModalCANCEL' => t('Cancel'),
|
||||||
'$ModalOK' => t('OK'),
|
'$ModalOK' => t('OK'),
|
||||||
'$s_dsel' => datetimesel($f,new DateTime(),DateTime::createFromFormat('Y',$syear+5),DateTime::createFromFormat('Y-m-d H:i',"$syear-$smonth-$sday $shour:$sminute"),'start_text'),
|
'$s_dsel' => datetimesel($f,new DateTime(),DateTime::createFromFormat('Y',$syear+5),DateTime::createFromFormat('Y-m-d H:i',"$syear-$smonth-$sday $shour:$sminute"),'start_text',true,true,'','',true),
|
||||||
'$n_text' => t('Finish date/time is not known or not relevant'),
|
'$n_text' => t('Finish date/time is not known or not relevant'),
|
||||||
'$n_checked' => $n_checked,
|
'$n_checked' => $n_checked,
|
||||||
'$f_text' => t('Event Finishes:'),
|
'$f_text' => t('Event Finishes:'),
|
||||||
|
@ -593,7 +594,7 @@ function events_content(&$a) {
|
||||||
'$d_orig' => $d_orig,
|
'$d_orig' => $d_orig,
|
||||||
'$l_text' => t('Location:'),
|
'$l_text' => t('Location:'),
|
||||||
'$l_orig' => $l_orig,
|
'$l_orig' => $l_orig,
|
||||||
'$t_text' => t('Title:') . ' <span class="required" title="' . t('Required') . '">*</span>',
|
'$t_text' => t('Title:'),
|
||||||
'$t_orig' => $t_orig,
|
'$t_orig' => $t_orig,
|
||||||
'$sh_text' => t('Share this event'),
|
'$sh_text' => t('Share this event'),
|
||||||
'$sh_checked' => $sh_checked,
|
'$sh_checked' => $sh_checked,
|
||||||
|
|
|
@ -1,12 +1,35 @@
|
||||||
|
|
||||||
#event-desc-textarea, #event-location-textarea {
|
#event-desc-textarea, #event-location-textarea {
|
||||||
width: 400px;
|
width: 400px;
|
||||||
}
|
}
|
||||||
|
|
||||||
#event-summary {
|
#event-summary-text, #event-start-text, #event-finish-text {
|
||||||
width: 400px;
|
width: 200px;
|
||||||
|
float: left;
|
||||||
|
}
|
||||||
|
|
||||||
|
#event-summary, #start_text, #finish_text {
|
||||||
|
width: 300px;
|
||||||
|
float: left;
|
||||||
|
}
|
||||||
|
|
||||||
|
#event-category-wrap {
|
||||||
|
margin-top: 15px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.event-cats {
|
.event-cats {
|
||||||
margin-top: 15px;
|
margin-top: 15px;
|
||||||
width: 400px;
|
width: 400px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
.required {
|
||||||
|
float: left;
|
||||||
|
}
|
||||||
|
|
||||||
|
#event-datetime-break {
|
||||||
|
clear: both;
|
||||||
|
}
|
||||||
|
#event-nofinish-break {
|
||||||
|
margin-bottom: 10px;
|
||||||
|
}
|
||||||
|
|
|
@ -14,9 +14,12 @@
|
||||||
<input type="hidden" name="mid" value="{{$mid}}" />
|
<input type="hidden" name="mid" value="{{$mid}}" />
|
||||||
|
|
||||||
<div id="event-summary-text">{{$t_text}}</div>
|
<div id="event-summary-text">{{$t_text}}</div>
|
||||||
<input type="text" id="event-summary" name="summary" value="{{$t_orig}}" />
|
<input type="text" id="event-summary" name="summary" value="{{$t_orig}}" />{{$required}}
|
||||||
|
|
||||||
|
<div class="clear"></div>
|
||||||
|
|
||||||
<div id="event-start-text">{{$s_text}}</div>
|
<div id="event-start-text">{{$s_text}}</div>
|
||||||
|
|
||||||
{{$s_dsel}}
|
{{$s_dsel}}
|
||||||
|
|
||||||
<div class="clear"></div><br />
|
<div class="clear"></div><br />
|
||||||
|
|
Loading…
Reference in a new issue