diff options
Diffstat (limited to 'views/default/event_calendar')
| -rw-r--r-- | views/default/event_calendar/css.php | 41 | ||||
| -rw-r--r-- | views/default/event_calendar/datetime_edit.php | 13 | ||||
| -rw-r--r-- | views/default/event_calendar/filter_menu.php | 4 | ||||
| -rw-r--r-- | views/default/event_calendar/full_calendar_view.php | 81 | ||||
| -rw-r--r-- | views/default/event_calendar/repeat_form_element.php | 49 | ||||
| -rw-r--r-- | views/default/event_calendar/share_section.php | 6 |
6 files changed, 90 insertions, 104 deletions
diff --git a/views/default/event_calendar/css.php b/views/default/event_calendar/css.php index c1dbf4633..00cfd6cbb 100644 --- a/views/default/event_calendar/css.php +++ b/views/default/event_calendar/css.php @@ -38,6 +38,10 @@ ul#calendarmenu li a:hover, ul#calendarmenu li.sys_selected a{ background: <?php echo $highlight_colour; ?>; } +.event-calendar-ical { + width: 200px; +} + td.ui-datepicker-unselectable { background-color: #FFFFFF !important; color: #888888 !important; @@ -171,39 +175,12 @@ li.event-calendar-filter-menu-show-only { margin-right: 10px; } -.event-calendar-medium-text { - width: 500px !important; -} - -.event-calendar-edit-form-block label { - float: left; - width: 90px; - margin-top: 5px; -} - -.event-calendar-long-text { - width: 500px !important; -} - -.event-calendar-edit-form-other-block .mceLayout { - width: 500px !important; -} - -.event-calendar-edit-form { - background-color: #FFFFFF; -} - -.event-calendar-edit-form-block { - width: 90%; - background-color: #DDDDDD; - border-width:1px; - border-style:solid; - border-color:#bfbfbf; - padding: 5px; - margin-bottom: 10px; - clear: both; +fieldset > legend { + font-weight: bold; + font-size: 1.2em; + line-height: 1.1em; + padding-bottom: 5px; } - .event-calendar-repeating-wrapper { padding: 0; margin-top: 5px; diff --git a/views/default/event_calendar/datetime_edit.php b/views/default/event_calendar/datetime_edit.php index 64af30f53..2e0830167 100644 --- a/views/default/event_calendar/datetime_edit.php +++ b/views/default/event_calendar/datetime_edit.php @@ -8,20 +8,17 @@ if ($event_calendar_times != 'no') { if ($event_calendar_hide_end != 'yes') { $body .= '<p><label>'.elgg_echo('event_calendar:from_label').'</label>'; } - $body .= elgg_view("event_calendar/input/date_local",array( - //'timestamp'=>TRUE, - 'autocomplete'=>'off', + $body .= elgg_view("input/date", array( 'class'=>'event-calendar-compressed-date', 'name' => 'start_date', - 'value'=>$vars['start_date'])); + 'value'=>$vars['start_date'], + )); $body .= '<span id="event-calendar-start-time-wrapper">'; $body .= elgg_view("input/timepicker",array('name' => 'start_time','value'=>$vars['start_time'])); $body .= '</span>'; if ($event_calendar_hide_end != 'yes') { $body .= '</p><p id="event-calendar-to-time-wrapper"><label>'.elgg_echo('event_calendar:to_label').'</label>'; - $body .= elgg_view("event_calendar/input/date_local",array( - //'timestamp'=>TRUE, - 'autocomplete'=>'off', + $body .= elgg_view("input/date", array( 'class'=>'event-calendar-compressed-date', 'name' => 'end_date', 'value'=>$vars['end_date'], @@ -30,7 +27,7 @@ if ($event_calendar_times != 'no') { $body .= elgg_view("input/timepicker",array('name' => 'end_time','value'=>$vars['end_time'])); $body .= '</span>'; } - $body .= '</p></span>'; + $body .= '</p>'; } else { $body .= '<p><label>'.elgg_echo("event_calendar:start_date_label").'<br />'; diff --git a/views/default/event_calendar/filter_menu.php b/views/default/event_calendar/filter_menu.php index 926a29d0d..1364902a8 100644 --- a/views/default/event_calendar/filter_menu.php +++ b/views/default/event_calendar/filter_menu.php @@ -30,9 +30,6 @@ if (elgg_is_logged_in()) { 'selected' => ($filter_context == 'friends'), 'priority' => 400, ); - $text_bit = '<li class="event-calendar-filter-menu-show-only">'.elgg_echo('event_calendar:show_only').'</li>'; -} else { - $text_bit = ''; } $tab_rendered = array(); @@ -66,7 +63,6 @@ $menu = <<<__MENU <ul class="elgg-menu elgg-menu-filter elgg-menu-hz elgg-menu-filter-default"> {$tab_rendered['open']} {$tab_rendered['all']} - $text_bit {$tab_rendered['mine']} {$tab_rendered['friend']} </ul> diff --git a/views/default/event_calendar/full_calendar_view.php b/views/default/event_calendar/full_calendar_view.php index 3e0c583ce..1a58321b5 100644 --- a/views/default/event_calendar/full_calendar_view.php +++ b/views/default/event_calendar/full_calendar_view.php @@ -1,7 +1,7 @@ <?php elgg_load_js('elgg.full_calendar'); -elgg_load_js('lightbox'); -elgg_load_css('lightbox'); + +$timeformat = elgg_get_plugin_setting('timeformat', 'event_calendar') == 24 ? 'H(:mm)' : 'h(:mm)t'; // TODO: is there an easy way to avoid embedding JS? ?> @@ -11,13 +11,8 @@ var goToDateFlag = 0; handleEventClick = function(event) { if (event.url) { - if (event.is_event_poll) { - window.location.href = event.url; - } else { - //window.location.href = event.url; - $.fancybox({'href':event.url}); - } - return false; + window.location.href = event.url; + event.preventDefault(); } }; @@ -149,25 +144,57 @@ handleViewDisplay = function(view) { //$(".fc-widget-content[data-date='20120105']") } -$(document).ready(function() { - $('#calendar').fullCalendar({ - header: { - left: 'prev,next today', - center: 'title', - right: 'month,agendaWeek,agendaDay' - }, - month: <?php echo date('n',strtotime($vars['start_date']))-1; ?>, - ignoreTimezone: true, - editable: true, - slotMinutes: 15, - eventRender: handleEventRender, - eventDrop: handleEventDrop, - eventClick: handleEventClick, - dayClick: handleDayClick, - events: handleGetEvents, - viewDisplay: handleViewDisplay, +fullcalendarInit = function() { + + var loadFullCalendar = function() { + var locale = $.datepicker.regional[elgg.get_language()]; + if (!locale) { + locale = $.datepicker.regional['']; + } + $('#calendar').fullCalendar({ + header: { + left: 'prev,next today', + center: 'title', + right: 'month,agendaWeek,agendaDay' + }, + month: <?php echo date('n',strtotime($vars['start_date']))-1; ?>, + ignoreTimezone: true, + editable: true, + slotMinutes: 15, + eventRender: handleEventRender, + eventDrop: handleEventDrop, + eventClick: handleEventClick, + dayClick: handleDayClick, + events: handleGetEvents, + viewDisplay: handleViewDisplay, + + isRTL: locale.isRTL, + firstDay: locale.firstDay, + monthNames: locale.monthNames, + monthNamesShort: locale.monthNamesShort, + dayNames: locale.dayNames, + dayNamesShort: locale.dayNamesShort, + buttonText: { + today: locale.currentText, + month: elgg.echo('event_calendar:month_label'), + week: elgg.echo('event_calendar:week_label'), + day: elgg.echo('event_calendar:day_label') + }, + timeFormat: "<?php echo $timeformat; ?>", + }); + } + + elgg.get({ + url: elgg.config.wwwroot + 'vendors/jquery/i18n/jquery.ui.datepicker-'+ elgg.get_language() +'.js', + dataType: "script", + cache: true, + success: loadFullCalendar, + error: loadFullCalendar, // english language is already loaded. }); -}); +} + +elgg.register_hook_handler('init', 'system', fullcalendarInit); + </script> <div id='calendar'></div> <input type="hidden" id="event-calendar-selected-date" /> diff --git a/views/default/event_calendar/repeat_form_element.php b/views/default/event_calendar/repeat_form_element.php index 45fdabfa1..5de858caf 100644 --- a/views/default/event_calendar/repeat_form_element.php +++ b/views/default/event_calendar/repeat_form_element.php @@ -1,6 +1,8 @@ <?php $event = $vars['event']; $fd = $vars['form_data']; +$days = array('monday', 'tuesday', 'wednesday', 'thursday', 'friday', 'saturday', 'sunday'); + if ($fd['repeats'] == 'yes') { echo elgg_view('input/checkbox',array('name'=>'repeats','value'=>'yes','checked'=>'checked')); } else { @@ -10,34 +12,21 @@ echo elgg_echo('event_calendar:repeat_interval_label').' '; echo elgg_view('input/dropdown',array('name'=>'repeat_interval','value'=>$fd['repeat_interval'],'options_values'=>array('1'=>'1','2'=>'2','3'=>'3','4'=>'4','5'=>'5','6'=>'6','7'=>'7','8'=>'8'))); echo ' '.elgg_echo('event_calendar:repeat_weeks'); echo ' '.elgg_echo('event_calendar:on_these_days'); -?> -<div class="event-calendar-repeating-wrapper"> -<a id="event-calendar-repeating-monday" href="javascript:void(0);" class="event-calendar-repeating-unselected"> - <?php echo elgg_echo('event_calendar:day_abbrev:monday'); ?> + +echo '<div class="event-calendar-repeating-wrapper">'; + +foreach($days as $day) { + $label = elgg_echo("event_calendar:day_abbrev:$day"); + echo <<<HTML +<a id="event-calendar-repeating-$day" href="javascript:void(0);" class="event-calendar-repeating-unselected"> + $label </a> -<a id="event-calendar-repeating-tuesday" href="javascript:void(0);" class="event-calendar-repeating-unselected"> - <?php echo elgg_echo('event_calendar:day_abbrev:tuesday'); ?> -</a> -<a id="event-calendar-repeating-wednesday" href="javascript:void(0);" class="event-calendar-repeating-unselected"> - <?php echo elgg_echo('event_calendar:day_abbrev:wednesday'); ?> -</a> -<a id="event-calendar-repeating-thursday" href="javascript:void(0);" class="event-calendar-repeating-unselected"> - <?php echo elgg_echo('event_calendar:day_abbrev:thursday'); ?> -</a> -<a id="event-calendar-repeating-friday" href="javascript:void(0);" class="event-calendar-repeating-unselected"> - <?php echo elgg_echo('event_calendar:day_abbrev:friday'); ?> -</a> -<a id="event-calendar-repeating-saturday" href="javascript:void(0);" class="event-calendar-repeating-unselected"> - <?php echo elgg_echo('event_calendar:day_abbrev:saturday'); ?> -</a> -<a id="event-calendar-repeating-sunday" href="javascript:void(0);" class="event-calendar-repeating-unselected"> - <?php echo elgg_echo('event_calendar:day_abbrev:sunday'); ?> -</a> -</div> -<input type="hidden" name="event-calendar-repeating-monday-value" value="<?php echo $fd['event-calendar-repeating-monday-value']; ?>"> -<input type="hidden" name="event-calendar-repeating-tuesday-value" value="<?php echo $fd['event-calendar-repeating-tuesday-value']; ?>"> -<input type="hidden" name="event-calendar-repeating-wednesday-value" value="<?php echo $fd['event-calendar-repeating-wednesday-value']; ?>"> -<input type="hidden" name="event-calendar-repeating-thursday-value" value="<?php echo $fd['event-calendar-repeating-thursday-value']; ?>"> -<input type="hidden" name="event-calendar-repeating-friday-value" value="<?php echo $fd['event-calendar-repeating-friday-value']; ?>"> -<input type="hidden" name="event-calendar-repeating-saturday-value" value="<?php echo $fd['event-calendar-repeating-saturday-value']; ?>"> -<input type="hidden" name="event-calendar-repeating-sunday-value" value="<?php echo $fd['event-calendar-repeating-sunday-value']; ?>"> +HTML; + +} + +echo '</div>'; + +foreach($days as $day) { + echo elgg_view('input/hidden', array('name' => "event-calendar-repeating-$day-value", 'value' => $fd["event-calendar-repeating-$day-value"])); +}
\ No newline at end of file diff --git a/views/default/event_calendar/share_section.php b/views/default/event_calendar/share_section.php index 134f07656..c4f6cf45f 100644 --- a/views/default/event_calendar/share_section.php +++ b/views/default/event_calendar/share_section.php @@ -1,8 +1,8 @@ <?php $fd = $vars['form_data']; $event_calendar_hide_access = elgg_get_plugin_setting('hide_access', 'event_calendar'); -$body = '<div class="event-calendar-edit-form-block event-calendar-edit-form-share-block">'; -$body .= '<h2>'.elgg_echo('event_calendar:permissions:header').'</h2>'; +$body = '<fieldset>'; +$body .= '<legend>'.elgg_echo('event_calendar:permissions:header').'</legend>'; if($event_calendar_hide_access == 'yes') { $event_calendar_default_access = elgg_get_plugin_setting('default_access', 'event_calendar'); if($event_calendar_default_access) { @@ -21,6 +21,6 @@ if (elgg_plugin_exists('entity_admins')) { $body .= elgg_echo('event_calendar:share_ownership:description'); $body .= elgg_view('input/entity_admins_dropdown',array('entity'=>$vars['event'])); } -$body .= '</div>'; +$body .= '</fieldset>'; echo $body; |