From 694781d190fba09437a37983f077d0381a56050b Mon Sep 17 00:00:00 2001 From: brettp Date: Fri, 16 Oct 2009 21:25:25 +0000 Subject: Finished standardizing seconday views. git-svn-id: http://code.elgg.org/elgg/trunk@3559 36083f99-b078-4883-b0ff-0f9b5a30f544 --- views/ical/canvas/default.php | 28 +++++++++++------------ views/ical/export/entity.php | 44 ++++++++++++++++++------------------- views/ical/object/default.php | 22 +++++++++---------- views/ical/pageshells/pageshell.php | 23 ++++++++++--------- views/ical/search/entity_list.php | 29 +++++++++++------------- 5 files changed, 69 insertions(+), 77 deletions(-) (limited to 'views/ical') diff --git a/views/ical/canvas/default.php b/views/ical/canvas/default.php index 38977dca9..0a955e92d 100644 --- a/views/ical/canvas/default.php +++ b/views/ical/canvas/default.php @@ -1,18 +1,16 @@ \ No newline at end of file +} \ No newline at end of file diff --git a/views/ical/export/entity.php b/views/ical/export/entity.php index cac1f17ba..6d8a9d655 100644 --- a/views/ical/export/entity.php +++ b/views/ical/export/entity.php @@ -1,33 +1,33 @@ getCalendarStartTime()) && - ($entity->getCalendarEndTime()) - ) - { -?> +$entity = $vars['entity']; + +if ( + ($entity instanceof Notable) && + ($entity->getCalendarStartTime()) && + ($entity->getCalendarEndTime()) +) +{ +?> BEGIN:VEVENT DTSTAMP:getTimeCreated()); ?> DTSTART:getCalendarStartTime()); ?> DTEND:getCalendarEndTime()); ?> SUMMARY:title; ?> LAST-MODIFIED:getTimeUpdated()); ?> -END:VEVENT - if ( - + ) \ No newline at end of file diff --git a/views/ical/object/default.php b/views/ical/object/default.php index 29e4ab219..fcbfcba5b 100644 --- a/views/ical/object/default.php +++ b/views/ical/object/default.php @@ -1,14 +1,12 @@ \ No newline at end of file +elgg_view('export/entity', $vars); \ No newline at end of file diff --git a/views/ical/pageshells/pageshell.php b/views/ical/pageshells/pageshell.php index eee032681..0ea76c9e9 100644 --- a/views/ical/pageshells/pageshell.php +++ b/views/ical/pageshells/pageshell.php @@ -1,18 +1,17 @@ BEGIN:VCALENDAR VERSION:2.0 diff --git a/views/ical/search/entity_list.php b/views/ical/search/entity_list.php index 9e5737bbe..b39bb4229 100644 --- a/views/ical/search/entity_list.php +++ b/views/ical/search/entity_list.php @@ -1,18 +1,15 @@ 0) { - foreach($entities as $entity) - echo elgg_view_entity($entity); - } - -?> \ No newline at end of file +$entities = $vars['entities']; +if (is_array($entities) && sizeof($entities) > 0) { + foreach($entities as $entity) + echo elgg_view_entity($entity); +} \ No newline at end of file -- cgit v1.2.3