From: Michael J. Rubinsky Date: Fri, 25 Jun 2010 21:02:19 +0000 (-0400) Subject: Add code for embedding on the calendar edit dialog X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=1654e24dff51436a80831fd73dd9645fa7565546;p=horde.git Add code for embedding on the calendar edit dialog --- diff --git a/kronolith/js/kronolith.js b/kronolith/js/kronolith.js index fd8ccae83..3c54fdf2e 100644 --- a/kronolith/js/kronolith.js +++ b/kronolith/js/kronolith.js @@ -2846,6 +2846,7 @@ KronolithCore = { $('kronolithCalendar' + type + 'LinkImport').up('li').hide(); } $('kronolithCalendar' + type + 'UrlFeed').setValue(info.feed); + $('kronolithCalendar' + type + 'EmbedUrl').setValue(info.embed); // Fall through. case 'tasklists': $('kronolithCalendar' + type + 'Description').setValue(info.desc); diff --git a/kronolith/lib/Kronolith.php b/kronolith/lib/Kronolith.php index f3d8c48c3..280e19b66 100644 --- a/kronolith/lib/Kronolith.php +++ b/kronolith/lib/Kronolith.php @@ -270,6 +270,7 @@ class Kronolith 'edit' => $calendar->hasPermission($GLOBALS['registry']->getAuth(), Horde_Perms::EDIT), 'sub' => $subscriptionCals . ($calendar->get('owner') ? $calendar->get('owner') : '-system-') . '/' . $calendar->getName() . '.ics', 'feed' => (string)Kronolith::feedUrl($calendar->getName()), + 'embed' => self::embedCode($id), 'tg' => array_values($tagger->getTags($calendar->getName(), 'calendar'))); if ($owner) { $code['conf']['calendars']['internal'][$id]['perms'] = self::permissionToJson($calendar->getPermission()); diff --git a/kronolith/templates/chunks/calendar.php b/kronolith/templates/chunks/calendar.php index 4841000a6..3901cccfb 100644 --- a/kronolith/templates/chunks/calendar.php +++ b/kronolith/templates/chunks/calendar.php @@ -87,6 +87,11 @@ $file_upload = $GLOBALS['browser']->allowFileUploads();

+
+ +
+
+