Replaced javascript alert by elgg popup in ical button.

diff --git a/models/model.php b/models/model.php
index 69961969c27ba04b82ca16a5059afbcfac10d8d6..e7f823d4c7e18ac9e85ca83e5e6d8f30ee011952 100644 (file)
--- a/models/model.php
+++ b/models/model.php
@@ -1519,13 +1519,22 @@ function event_calendar_get_page_content_list($page_type,$container_guid,$start_
                'href' => $url,
                'title' => elgg_echo('feed:ical'),
                'priority' => 800,
+               'rel' => 'popup',
        );
        $menu_item = ElggMenuItem::factory($menu_options);
        elgg_register_menu_item('extras', $menu_item);
 
        $body = elgg_view_layout("content", $params);
+       $body .= elgg_view_module('popup', elgg_echo('feed:ical'), elgg_echo('event_calendar:ical_popup_message') . elgg_view('output/url', array(
+               'href' => $url,
+               'text' => elgg_echo('export'),
+               'class' => 'elgg-button elgg-button-action',
+       )), array(
+               'id' => 'event-calendar-ical',
+               'class' => 'event-calendar-ical hidden',
+       ));
 
-       return elgg_view_page($title,$body);
+       return elgg_view_page($title, $body);
 }
 
 function event_calendar_get_page_content_edit($page_type,$guid,$start_date='') {

diff --git a/views/default/event_calendar/css.php b/views/default/event_calendar/css.php
index c1dbf4633aeeb1aa5b5fa28d750fc11099946fa4..9ef2ecfa1ee5fdf9621f7fdf77962b4948fa21d2 100644 (file)
--- 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;

diff --git a/views/default/js/event_calendar/event_calendar.php b/views/default/js/event_calendar/event_calendar.php
index 65c4d29521ab24cafcb7969346a8dabb0c90116e..6150feb79a92527233d2807c2c967d37ed92f8be 100644 (file)
--- a/views/default/js/event_calendar/event_calendar.php
+++ b/views/default/js/event_calendar/event_calendar.php
@@ -96,9 +96,8 @@ elgg.event_calendar.handleRegionChange = function(e) {
 }
 
 elgg.event_calendar.handleIcalPopup = function(e) {
-       var message = elgg.echo('event_calendar:ical_popup_message')+"\n"+this.href;
-       alert(message);
-       return false;
+       this.href = '#event-calendar-ical';
+       e.preventDefault();
 }
 
 elgg.event_calendar.handlePagedPersonalCalendarToggle = function() {