diff options
| author | Sem <sembrestels@riseup.net> | 2012-08-10 12:18:59 +0200 |
|---|---|---|
| committer | Sem <sembrestels@riseup.net> | 2012-08-10 12:18:59 +0200 |
| commit | 6fd66b2c46ed6c3eb68fd0b05c1e02cd5b996824 (patch) | |
| tree | bba9be7b9d037d4bb7b844f23103e6a268d273b3 /views/default | |
| parent | 3ac2c8fd0cacc57b8080be5f7d381b8cf5524f2f (diff) | |
| parent | 066365aa7ff1c407040a672e69d999ed8bd337f6 (diff) | |
| download | elgg-6fd66b2c46ed6c3eb68fd0b05c1e02cd5b996824.tar.gz elgg-6fd66b2c46ed6c3eb68fd0b05c1e02cd5b996824.tar.bz2 | |
Merge branch 'ical-icon' of github.com:sembrestels/Elgg-Event-Calendar
Diffstat (limited to 'views/default')
| -rw-r--r-- | views/default/event_calendar/full_calendar_view.php | 2 | ||||
| -rw-r--r-- | views/default/object/event_calendar.php | 8 |
2 files changed, 10 insertions, 0 deletions
diff --git a/views/default/event_calendar/full_calendar_view.php b/views/default/event_calendar/full_calendar_view.php index 4316b5359..3e0c583ce 100644 --- a/views/default/event_calendar/full_calendar_view.php +++ b/views/default/event_calendar/full_calendar_view.php @@ -43,10 +43,12 @@ handleDayClick = function(date,allDay,jsEvent,view) { // deselect $('#event-calendar-selected-date').val(""); $('.elgg-menu-item-event-calendar-0add').find('a').attr('href',url+'event_calendar/add/'+group_guid); + $('.event-calendar-button-add').attr('href',url+'event_calendar/add/'+group_guid); $('.elgg-menu-item-event-calendar-1schedule').find('a').attr('href',url+'event_calendar/schedule/'+group_guid); } else { $('#event-calendar-selected-date').val(iso); $('.elgg-menu-item-event-calendar-0add').find('a').attr('href',url+'event_calendar/add/'+group_guid+'/'+iso); + $('.event-calendar-button-add').attr('href',url+'event_calendar/add/'+group_guid+'/'+iso); $('.elgg-menu-item-event-calendar-1schedule').find('a').attr('href',url+'event_calendar/schedule/'+group_guid+'/'+iso); $(this).addClass('event-calendar-date-selected'); diff --git a/views/default/object/event_calendar.php b/views/default/object/event_calendar.php index afd4325f1..5779c004c 100644 --- a/views/default/object/event_calendar.php +++ b/views/default/object/event_calendar.php @@ -59,9 +59,17 @@ if ($full) { } else { echo '<p>'.$event->description.'</p>'; } + if ($vars['light_box'] == TRUE) { + $event_calendar_add_users = elgg_get_plugin_setting('add_users', 'event_calendar'); + if ($event_calendar_add_users == 'yes') { + $url = "event_calendar/manage_users/$event->guid"; + echo '<p>'.elgg_view('output/url',array('text'=> elgg_echo('event_calendar:manage_users:breadcrumb'), 'href'=>$url)).'</p>'; + } + } if (elgg_get_plugin_setting('add_to_group_calendar', 'event_calendar') == 'yes') { echo elgg_view('event_calendar/forms/add_to_group',array('event' => $event)); } + } else { $time_bit = event_calendar_get_formatted_time($event); |