]> git.mxchange.org Git - friendica.git/commitdiff
Move mod/cal.php and mod/events.php to Module
authorPhilipp <admin@philipp.info>
Sun, 6 Nov 2022 01:35:09 +0000 (02:35 +0100)
committerPhilipp <admin@philipp.info>
Mon, 7 Nov 2022 18:52:24 +0000 (19:52 +0100)
52 files changed:
mod/cal.php [deleted file]
mod/events.php [deleted file]
src/Content/Nav.php
src/Model/Event.php
src/Module/BaseNotifications.php
src/Module/BaseProfile.php
src/Module/Calendar/Event/API.php [new file with mode: 0644]
src/Module/Calendar/Event/Form.php [new file with mode: 0644]
src/Module/Calendar/Event/Get.php [new file with mode: 0644]
src/Module/Calendar/Event/Show.php [new file with mode: 0644]
src/Module/Calendar/Export.php
src/Module/Calendar/Json.php [deleted file]
src/Module/Calendar/Show.php [new file with mode: 0644]
src/Module/Manifest.php
src/Object/Post.php
static/routes.config.php
view/templates/calendar/calendar.tpl [new file with mode: 0644]
view/templates/calendar/calendar_head.tpl [new file with mode: 0644]
view/templates/calendar/event.tpl [new file with mode: 0644]
view/templates/calendar/event_form.tpl [new file with mode: 0644]
view/templates/event.tpl [deleted file]
view/templates/event_form.tpl [deleted file]
view/templates/event_head.tpl [deleted file]
view/templates/events.tpl [deleted file]
view/templates/events_js.tpl [deleted file]
view/templates/events_reminder.tpl
view/templates/widget/events.tpl
view/theme/frio/js/mod_events.js
view/theme/frio/js/modal.js
view/theme/frio/php/frio_boot.php
view/theme/frio/templates/calendar/calendar.tpl [new file with mode: 0644]
view/theme/frio/templates/calendar/calendar_head.tpl [new file with mode: 0644]
view/theme/frio/templates/calendar/event.tpl [new file with mode: 0644]
view/theme/frio/templates/calendar/event_form.tpl [new file with mode: 0644]
view/theme/frio/templates/event.tpl [deleted file]
view/theme/frio/templates/event_form.tpl [deleted file]
view/theme/frio/templates/event_head.tpl [deleted file]
view/theme/frio/templates/events_js.tpl [deleted file]
view/theme/frio/templates/nav.tpl
view/theme/frio/theme.php
view/theme/quattro/templates/calendar/calendar.tpl [new file with mode: 0644]
view/theme/quattro/templates/calendar/event_form.tpl [new file with mode: 0644]
view/theme/quattro/templates/event_form.tpl [deleted file]
view/theme/quattro/templates/events-js.tpl [deleted file]
view/theme/quattro/templates/events.tpl [deleted file]
view/theme/quattro/templates/events_reminder.tpl
view/theme/vier/templates/calendar/calendar_head.tpl [new file with mode: 0644]
view/theme/vier/templates/calendar/event_form.tpl [new file with mode: 0644]
view/theme/vier/templates/event_form.tpl [deleted file]
view/theme/vier/templates/event_head.tpl [deleted file]
view/theme/vier/templates/nav.tpl
view/theme/vier/theme.php

diff --git a/mod/cal.php b/mod/cal.php
deleted file mode 100644 (file)
index d5b0487..0000000
+++ /dev/null
@@ -1,253 +0,0 @@
-<?php
-/**
- * @copyright Copyright (C) 2010-2022, the Friendica project
- *
- * @license GNU AGPL version 3 or any later version
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- *
- * The calendar module
- *
- * This calendar is for profile visitors and contains only the events
- * of the profile owner
- */
-
-use Friendica\App;
-use Friendica\Content\Nav;
-use Friendica\Content\Widget;
-use Friendica\Core\Renderer;
-use Friendica\Core\System;
-use Friendica\Database\DBA;
-use Friendica\DI;
-use Friendica\Model\Event;
-use Friendica\Model\Item;
-use Friendica\Model\User;
-use Friendica\Module\BaseProfile;
-use Friendica\Network\HTTPException;
-use Friendica\Util\DateTimeFormat;
-use Friendica\Util\Temporal;
-
-function cal_init(App $a)
-{
-       if (DI::config()->get('system', 'block_public') && !DI::userSession()->isAuthenticated()) {
-               throw new HTTPException\ForbiddenException(DI::l10n()->t('Access denied.'));
-       }
-
-       if (DI::args()->getArgc() < 2) {
-               throw new HTTPException\ForbiddenException(DI::l10n()->t('Access denied.'));
-       }
-
-       Nav::setSelected('events');
-
-       // if it's a json request abort here becaus we don't
-       // need the widget data
-       if (!empty(DI::args()->getArgv()[2]) && (DI::args()->getArgv()[2] === 'json')) {
-               return;
-       }
-
-       $owner = User::getOwnerDataByNick(DI::args()->getArgv()[1]);
-       if (empty($owner)) {
-               throw new HTTPException\NotFoundException(DI::l10n()->t('User not found.'));
-       }
-
-       if (empty(DI::page()['aside'])) {
-               DI::page()['aside'] = '';
-       }
-
-       DI::page()['aside'] .= Widget\VCard::getHTML($owner);
-       DI::page()['aside'] .= Widget\CalendarExport::getHTML($owner['uid']);
-
-       return;
-}
-
-function cal_content(App $a)
-{
-       $owner = User::getOwnerDataByNick(DI::args()->getArgv()[1]);
-       if (empty($owner)) {
-               throw new HTTPException\NotFoundException(DI::l10n()->t('User not found.'));
-       }
-
-       Nav::setSelected('events');
-
-       // get the translation strings for the callendar
-       $i18n = Event::getStrings();
-
-       DI::page()->registerStylesheet('view/asset/fullcalendar/dist/fullcalendar.min.css');
-       DI::page()->registerStylesheet('view/asset/fullcalendar/dist/fullcalendar.print.min.css', 'print');
-       DI::page()->registerFooterScript('view/asset/moment/min/moment-with-locales.min.js');
-       DI::page()->registerFooterScript('view/asset/fullcalendar/dist/fullcalendar.min.js');
-
-       $htpl = Renderer::getMarkupTemplate('event_head.tpl');
-       DI::page()['htmlhead'] .= Renderer::replaceMacros($htpl, [
-               '$module_url' => '/cal/' . $owner['nickname'],
-               '$modparams' => 2,
-               '$i18n' => $i18n,
-       ]);
-
-       $mode = 'view';
-       $y = 0;
-       $m = 0;
-       $ignored = (!empty($_REQUEST['ignored']) ? intval($_REQUEST['ignored']) : 0);
-
-       // Setup permissions structures
-       $owner_uid = intval($owner['uid']);
-
-       $contact_id = DI::userSession()->getRemoteContactID($owner['uid']);
-
-       $remote_contact = $contact_id && DBA::exists('contact', ['id' => $contact_id, 'uid' => $owner['uid']]);
-
-       $is_owner = DI::userSession()->getLocalUserId() == $owner['uid'];
-
-       if ($owner['hidewall'] && !$is_owner && !$remote_contact) {
-               DI::sysmsg()->addNotice(DI::l10n()->t('Access to this profile has been restricted.'));
-               return;
-       }
-
-       // get the permissions
-       $sql_perms = Item::getPermissionsSQLByUserId($owner_uid);
-       // we only want to have the events of the profile owner
-       $sql_extra = " AND `event`.`cid` = 0 " . $sql_perms;
-
-       // get the tab navigation bar
-       $tabs = BaseProfile::getTabsHTML($a, 'cal', false, $owner['nickname'], $owner['hide-friends']);
-
-       // The view mode part is similiar to /mod/events.php
-       if ($mode == 'view') {
-               $thisyear = DateTimeFormat::localNow('Y');
-               $thismonth = DateTimeFormat::localNow('m');
-               if (!$y) {
-                       $y = intval($thisyear);
-               }
-
-               if (!$m) {
-                       $m = intval($thismonth);
-               }
-
-               // Put some limits on dates. The PHP date functions don't seem to do so well before 1900.
-               // An upper limit was chosen to keep search engines from exploring links millions of years in the future.
-
-               if ($y < 1901) {
-                       $y = 1900;
-               }
-
-               if ($y > 2099) {
-                       $y = 2100;
-               }
-
-               $nextyear = $y;
-               $nextmonth = $m + 1;
-               if ($nextmonth > 12) {
-                       $nextmonth = 1;
-                       $nextyear ++;
-               }
-
-               $prevyear = $y;
-               if ($m > 1) {
-                       $prevmonth = $m - 1;
-               } else {
-                       $prevmonth = 12;
-                       $prevyear --;
-               }
-
-               $dim = Temporal::getDaysInMonth($y, $m);
-               $start = sprintf('%d-%d-%d %d:%d:%d', $y, $m, 1, 0, 0, 0);
-               $finish = sprintf('%d-%d-%d %d:%d:%d', $y, $m, $dim, 23, 59, 59);
-
-
-               if (!empty(DI::args()->getArgv()[2]) && (DI::args()->getArgv()[2] === 'json')) {
-                       if (!empty($_GET['start'])) {
-                               $start = $_GET['start'];
-                       }
-
-                       if (!empty($_GET['end'])) {
-                               $finish = $_GET['end'];
-                       }
-               }
-
-               $start = DateTimeFormat::utc($start);
-               $finish = DateTimeFormat::utc($finish);
-
-               // put the event parametes in an array so we can better transmit them
-               $event_params = [
-                       'event_id'      => intval($_GET['id'] ?? 0),
-                       'start'         => $start,
-                       'finish'        => $finish,
-                       'ignore'        => $ignored,
-               ];
-
-               // get events by id or by date
-               if ($event_params['event_id']) {
-                       $r = Event::getListById($owner_uid, $event_params['event_id'], $sql_extra);
-               } else {
-                       $r = Event::getListByDate($owner_uid, $event_params, $sql_extra);
-               }
-
-               $links = [];
-
-               if (DBA::isResult($r)) {
-                       $r = Event::sortByDate($r);
-                       foreach ($r as $rr) {
-                               $j = DateTimeFormat::local($rr['start'], 'j');
-                               if (empty($links[$j])) {
-                                       $links[$j] = DI::baseUrl() . '/' . DI::args()->getCommand() . '#link-' . $j;
-                               }
-                       }
-               }
-
-               // transform the event in a usable array
-               $events = Event::prepareListForTemplate($r);
-
-               if (!empty(DI::args()->getArgv()[2]) && (DI::args()->getArgv()[2] === 'json')) {
-                       System::jsonExit($events);
-               }
-
-               // links: array('href', 'text', 'extra css classes', 'title')
-               if (!empty($_GET['id'])) {
-                       $tpl = Renderer::getMarkupTemplate("event.tpl");
-               } else {
-                       $tpl = Renderer::getMarkupTemplate("events_js.tpl");
-               }
-
-               // Get rid of dashes in key names, Smarty3 can't handle them
-               foreach ($events as $key => $event) {
-                       $event_item = [];
-                       foreach ($event['item'] as $k => $v) {
-                               $k = str_replace('-', '_', $k);
-                               $event_item[$k] = $v;
-                       }
-                       $events[$key]['item'] = $event_item;
-               }
-
-               $o = Renderer::replaceMacros($tpl, [
-                       '$tabs' => $tabs,
-                       '$title' => DI::l10n()->t('Events'),
-                       '$view' => DI::l10n()->t('View'),
-                       '$previous' => [DI::baseUrl() . "/events/$prevyear/$prevmonth", DI::l10n()->t('Previous'), '', ''],
-                       '$next' => [DI::baseUrl() . "/events/$nextyear/$nextmonth", DI::l10n()->t('Next'), '', ''],
-                       '$calendar' => Temporal::getCalendarTable($y, $m, $links, ' eventcal'),
-                       '$events' => $events,
-                       "today" => DI::l10n()->t("today"),
-                       "month" => DI::l10n()->t("month"),
-                       "week" => DI::l10n()->t("week"),
-                       "day" => DI::l10n()->t("day"),
-                       "list" => DI::l10n()->t("list"),
-               ]);
-
-               if (!empty($_GET['id'])) {
-                       System::httpExit($o);
-               }
-
-               return $o;
-       }
-}
diff --git a/mod/events.php b/mod/events.php
deleted file mode 100644 (file)
index b871206..0000000
+++ /dev/null
@@ -1,540 +0,0 @@
-<?php
-/**
- * @copyright Copyright (C) 2010-2022, the Friendica project
- *
- * @license GNU AGPL version 3 or any later version
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- *
- * The events module
- */
-
-use Friendica\App;
-use Friendica\Content\Nav;
-use Friendica\Content\Widget\CalendarExport;
-use Friendica\Core\ACL;
-use Friendica\Core\Logger;
-use Friendica\Core\Protocol;
-use Friendica\Core\Renderer;
-use Friendica\Core\System;
-use Friendica\Core\Theme;
-use Friendica\Core\Worker;
-use Friendica\Database\DBA;
-use Friendica\DI;
-use Friendica\Model\Conversation;
-use Friendica\Model\Event;
-use Friendica\Model\Item;
-use Friendica\Model\Post;
-use Friendica\Model\User;
-use Friendica\Module\BaseProfile;
-use Friendica\Module\Security\Login;
-use Friendica\Util\DateTimeFormat;
-use Friendica\Util\Strings;
-use Friendica\Util\Temporal;
-use Friendica\Worker\Delivery;
-
-function events_init(App $a)
-{
-       if (!DI::userSession()->getLocalUserId()) {
-               return;
-       }
-
-       if (empty(DI::page()['aside'])) {
-               DI::page()['aside'] = '';
-       }
-
-       $cal_widget = CalendarExport::getHTML(DI::userSession()->getLocalUserId());
-
-       DI::page()['aside'] .= $cal_widget;
-
-       return;
-}
-
-function events_post(App $a)
-{
-       Logger::debug('post', ['request' => $_REQUEST]);
-       if (!DI::userSession()->getLocalUserId()) {
-               return;
-       }
-
-       $event_id = !empty($_POST['event_id']) ? intval($_POST['event_id']) : 0;
-       $cid = !empty($_POST['cid']) ? intval($_POST['cid']) : 0;
-       $uid = DI::userSession()->getLocalUserId();
-
-       $start_text  = Strings::escapeHtml($_REQUEST['start_text'] ?? '');
-       $finish_text = Strings::escapeHtml($_REQUEST['finish_text'] ?? '');
-
-       $nofinish = intval($_POST['nofinish'] ?? 0);
-
-       $share = intval($_POST['share'] ?? 0);
-
-       // The default setting for the `private` field in event_store() is false, so mirror that
-       $private_event = false;
-
-       $start  = DBA::NULL_DATETIME;
-       $finish = DBA::NULL_DATETIME;
-
-       if ($start_text) {
-               $start = $start_text;
-       }
-
-       if ($finish_text) {
-               $finish = $finish_text;
-       }
-
-       $start = DateTimeFormat::convert($start, 'UTC', $a->getTimeZone());
-       if (!$nofinish) {
-               $finish = DateTimeFormat::convert($finish, 'UTC', $a->getTimeZone());
-       }
-
-       // Don't allow the event to finish before it begins.
-       // It won't hurt anything, but somebody will file a bug report
-       // and we'll waste a bunch of time responding to it. Time that
-       // could've been spent doing something else.
-
-       $summary  = trim($_POST['summary']  ?? '');
-       $desc     = trim($_POST['desc']     ?? '');
-       $location = trim($_POST['location'] ?? '');
-       $type     = 'event';
-
-       $params = [
-               'summary'     => $summary,
-               'description' => $desc,
-               'location'    => $location,
-               'start'       => $start_text,
-               'finish'      => $finish_text,
-               'nofinish'    => $nofinish,
-       ];
-
-       $action = ($event_id == '') ? 'new' : 'event/' . $event_id;
-       $onerror_path = 'events/' . $action . '?' . http_build_query($params, '', '&', PHP_QUERY_RFC3986);
-
-       if (strcmp($finish, $start) < 0 && !$nofinish) {
-               DI::sysmsg()->addNotice(DI::l10n()->t('Event can not end before it has started.'));
-               if (intval($_REQUEST['preview'])) {
-                       System::httpExit(DI::l10n()->t('Event can not end before it has started.'));
-               }
-               DI::baseUrl()->redirect($onerror_path);
-       }
-
-       if (!$summary || ($start === DBA::NULL_DATETIME)) {
-               DI::sysmsg()->addNotice(DI::l10n()->t('Event title and start time are required.'));
-               if (intval($_REQUEST['preview'])) {
-                       System::httpExit(DI::l10n()->t('Event title and start time are required.'));
-               }
-               DI::baseUrl()->redirect($onerror_path);
-       }
-
-       $self = \Friendica\Model\Contact::getPublicIdByUserId($uid);
-
-       $aclFormatter = DI::aclFormatter();
-
-       if ($share) {
-               $user = User::getById($uid, ['allow_cid', 'allow_gid', 'deny_cid', 'deny_gid']);
-               if (!DBA::isResult($user)) {
-                       return;
-               }
-
-               $str_contact_allow = isset($_REQUEST['contact_allow']) ? $aclFormatter->toString($_REQUEST['contact_allow']) : $user['allow_cid'] ?? '';
-               $str_group_allow   = isset($_REQUEST['group_allow'])   ? $aclFormatter->toString($_REQUEST['group_allow'])   : $user['allow_gid'] ?? '';
-               $str_contact_deny  = isset($_REQUEST['contact_deny'])  ? $aclFormatter->toString($_REQUEST['contact_deny'])  : $user['deny_cid']  ?? '';
-               $str_group_deny    = isset($_REQUEST['group_deny'])    ? $aclFormatter->toString($_REQUEST['group_deny'])    : $user['deny_gid']  ?? '';
-
-               $visibility = $_REQUEST['visibility'] ?? '';
-               if ($visibility === 'public') {
-                       // The ACL selector introduced in version 2019.12 sends ACL input data even when the Public visibility is selected
-                       $str_contact_allow = $str_group_allow = $str_contact_deny = $str_group_deny = '';
-               } else if ($visibility === 'custom') {
-                       // Since we know from the visibility parameter the item should be private, we have to prevent the empty ACL
-                       // case that would make it public. So we always append the author's contact id to the allowed contacts.
-                       // See https://github.com/friendica/friendica/issues/9672
-                       $str_contact_allow .= $aclFormatter->toString($self);
-               }
-       } else {
-               $str_contact_allow = $aclFormatter->toString($self);
-               $str_group_allow = $str_contact_deny = $str_group_deny = '';
-       }
-
-       // Make sure to set the `private` field as true. This is necessary to
-       // have the posts show up correctly in Diaspora if an event is created
-       // as visible only to self at first, but then edited to display to others.
-       if (strlen($str_group_allow) || strlen($str_contact_allow) || strlen($str_group_deny) || strlen($str_contact_deny)) {
-               $private_event = true;
-       }
-
-       $datarray = [
-               'start'     => $start,
-               'finish'    => $finish,
-               'summary'   => $summary,
-               'desc'      => $desc,
-               'location'  => $location,
-               'type'      => $type,
-               'nofinish'  => $nofinish,
-               'uid'       => $uid,
-               'cid'       => $cid,
-               'allow_cid' => $str_contact_allow,
-               'allow_gid' => $str_group_allow,
-               'deny_cid'  => $str_contact_deny,
-               'deny_gid'  => $str_group_deny,
-               'private'   => $private_event,
-               'id'        => $event_id,
-       ];
-
-       if (intval($_REQUEST['preview'])) {
-               System::httpExit(Event::getHTML($datarray));
-       }
-
-       $event_id = Event::store($datarray);
-
-       $item = ['network' => Protocol::DFRN, 'protocol' => Conversation::PARCEL_DIRECT, 'direction' => Conversation::PUSH];    
-       $item = Event::getItemArrayForId($event_id, $item);
-       if (Item::insert($item)) {
-               $uri_id = $item['uri-id'];
-       } else {
-               $uri_id = 0;
-       }
-
-       if (!$cid && $uri_id) {
-               Worker::add(Worker::PRIORITY_HIGH, "Notifier", Delivery::POST, (int)$uri_id, (int)$uid);
-       }
-
-       DI::baseUrl()->redirect('events');
-}
-
-function events_content(App $a)
-{
-       if (!DI::userSession()->getLocalUserId()) {
-               DI::sysmsg()->addNotice(DI::l10n()->t('Permission denied.'));
-               return Login::form();
-       }
-
-       if (DI::args()->getArgc() == 1) {
-               $_SESSION['return_path'] = DI::args()->getCommand();
-       }
-
-       if ((DI::args()->getArgc() > 2) && (DI::args()->getArgv()[1] === 'ignore') && intval(DI::args()->getArgv()[2])) {
-               DBA::update('event', ['ignore' => true], ['id' => DI::args()->getArgv()[2], 'uid' => DI::userSession()->getLocalUserId()]);
-       }
-
-       if ((DI::args()->getArgc() > 2) && (DI::args()->getArgv()[1] === 'unignore') && intval(DI::args()->getArgv()[2])) {
-               DBA::update('event', ['ignore' => false], ['id' => DI::args()->getArgv()[2], 'uid' => DI::userSession()->getLocalUserId()]);
-       }
-
-       if ($a->getThemeInfoValue('events_in_profile')) {
-               Nav::setSelected('home');
-       } else {
-               Nav::setSelected('events');
-       }
-
-       // get the translation strings for the callendar
-       $i18n = Event::getStrings();
-
-       DI::page()->registerStylesheet('view/asset/fullcalendar/dist/fullcalendar.min.css');
-       DI::page()->registerStylesheet('view/asset/fullcalendar/dist/fullcalendar.print.min.css', 'print');
-       DI::page()->registerFooterScript('view/asset/moment/min/moment-with-locales.min.js');
-       DI::page()->registerFooterScript('view/asset/fullcalendar/dist/fullcalendar.min.js');
-
-       $htpl = Renderer::getMarkupTemplate('event_head.tpl');
-       DI::page()['htmlhead'] .= Renderer::replaceMacros($htpl, [
-               '$module_url' => '/events',
-               '$modparams' => 1,
-               '$i18n' => $i18n,
-       ]);
-
-       $o = '';
-       $tabs = '';
-       // tabs
-       if ($a->getThemeInfoValue('events_in_profile')) {
-               $tabs = BaseProfile::getTabsHTML($a, 'events', true, $a->getLoggedInUserNickname(), false);
-       }
-
-       $mode = 'view';
-       $y = 0;
-       $m = 0;
-       $ignored = !empty($_REQUEST['ignored']) ? intval($_REQUEST['ignored']) : 0;
-
-       if (DI::args()->getArgc() > 1) {
-               if (DI::args()->getArgc() > 2 && DI::args()->getArgv()[1] == 'event') {
-                       $mode = 'edit';
-                       $event_id = intval(DI::args()->getArgv()[2]);
-               }
-               if (DI::args()->getArgc() > 2 && DI::args()->getArgv()[1] == 'drop') {
-                       $mode = 'drop';
-                       $event_id = intval(DI::args()->getArgv()[2]);
-               }
-               if (DI::args()->getArgc() > 2 && DI::args()->getArgv()[1] == 'copy') {
-                       $mode = 'copy';
-                       $event_id = intval(DI::args()->getArgv()[2]);
-               }
-               if (DI::args()->getArgv()[1] === 'new') {
-                       $mode = 'new';
-                       $event_id = 0;
-               }
-               if (DI::args()->getArgc() > 2 && intval(DI::args()->getArgv()[1]) && intval(DI::args()->getArgv()[2])) {
-                       $mode = 'view';
-                       $y = intval(DI::args()->getArgv()[1]);
-                       $m = intval(DI::args()->getArgv()[2]);
-               }
-       }
-
-       // The view mode part is similiar to /mod/cal.php
-       if ($mode == 'view') {
-               $thisyear  = DateTimeFormat::localNow('Y');
-               $thismonth = DateTimeFormat::localNow('m');
-               if (!$y) {
-                       $y = intval($thisyear);
-               }
-               if (!$m) {
-                       $m = intval($thismonth);
-               }
-
-               // Put some limits on dates. The PHP date functions don't seem to do so well before 1900.
-               // An upper limit was chosen to keep search engines from exploring links millions of years in the future.
-
-               if ($y < 1901) {
-                       $y = 1900;
-               }
-               if ($y > 2099) {
-                       $y = 2100;
-               }
-
-               $dim    = Temporal::getDaysInMonth($y, $m);
-               $start  = sprintf('%d-%d-%d %d:%d:%d', $y, $m, 1, 0, 0, 0);
-               $finish = sprintf('%d-%d-%d %d:%d:%d', $y, $m, $dim, 23, 59, 59);
-
-               // put the event parametes in an array so we can better transmit them
-               $event_params = [
-                       'event_id'      => intval($_GET['id'] ?? 0),
-                       'start'         => $start,
-                       'finish'        => $finish,
-                       'ignore'        => $ignored,
-               ];
-
-               // get events by id or by date
-               if ($event_params['event_id']) {
-                       $r = Event::getListById(DI::userSession()->getLocalUserId(), $event_params['event_id']);
-               } else {
-                       $r = Event::getListByDate(DI::userSession()->getLocalUserId(), $event_params);
-               }
-
-               $links = [];
-
-               if (DBA::isResult($r)) {
-                       $r = Event::sortByDate($r);
-                       foreach ($r as $rr) {
-                               $j = DateTimeFormat::local($rr['start'], 'j');
-                               if (empty($links[$j])) {
-                                       $links[$j] = DI::baseUrl() . '/' . DI::args()->getCommand() . '#link-' . $j;
-                               }
-                       }
-               }
-
-               $events = [];
-
-               // transform the event in a usable array
-               if (DBA::isResult($r)) {
-                       $r = Event::sortByDate($r);
-                       $events = Event::prepareListForTemplate($r);
-               }
-
-               if (!empty($_GET['id'])) {
-                       $tpl = Renderer::getMarkupTemplate("event.tpl");
-               } else {
-                       $tpl = Renderer::getMarkupTemplate("events_js.tpl");
-               }
-
-               // Get rid of dashes in key names, Smarty3 can't handle them
-               foreach ($events as $key => $event) {
-                       $event_item = [];
-                       foreach ($event['item'] as $k => $v) {
-                               $k = str_replace('-', '_', $k);
-                               $event_item[$k] = $v;
-                       }
-                       $events[$key]['item'] = $event_item;
-               }
-
-               // ACL blocks are loaded in modals in frio
-               DI::page()->registerFooterScript(Theme::getPathForFile('asset/typeahead.js/dist/typeahead.bundle.js'));
-               DI::page()->registerFooterScript(Theme::getPathForFile('js/friendica-tagsinput/friendica-tagsinput.js'));
-               DI::page()->registerStylesheet(Theme::getPathForFile('js/friendica-tagsinput/friendica-tagsinput.css'));
-               DI::page()->registerStylesheet(Theme::getPathForFile('js/friendica-tagsinput/friendica-tagsinput-typeahead.css'));
-
-               $o = Renderer::replaceMacros($tpl, [
-                       '$tabs'      => $tabs,
-                       '$title'     => DI::l10n()->t('Events'),
-                       '$view'      => DI::l10n()->t('View'),
-                       '$new_event' => [DI::baseUrl() . '/events/new', DI::l10n()->t('Create New Event'), '', ''],
-                       '$previous'  => [DI::baseUrl() . '/events/$prevyear/$prevmonth', DI::l10n()->t('Previous'), '', ''],
-                       '$next'      => [DI::baseUrl() . '/events/$nextyear/$nextmonth', DI::l10n()->t('Next'), '', ''],
-                       '$calendar'  => Temporal::getCalendarTable($y, $m, $links, ' eventcal'),
-
-                       '$events'    => $events,
-
-                       '$today' => DI::l10n()->t('today'),
-                       '$month' => DI::l10n()->t('month'),
-                       '$week'  => DI::l10n()->t('week'),
-                       '$day'   => DI::l10n()->t('day'),
-                       '$list'  => DI::l10n()->t('list'),
-               ]);
-
-               if (!empty($_GET['id'])) {
-                       System::httpExit($o);
-               }
-
-               return $o;
-       }
-
-       if (($mode === 'edit' || $mode === 'copy') && $event_id) {
-               $orig_event = DBA::selectFirst('event', [], ['id' => $event_id, 'uid' => DI::userSession()->getLocalUserId()]);
-       }
-
-       // Passed parameters overrides anything found in the DB
-       if (in_array($mode, ['edit', 'new', 'copy'])) {
-               $share_checked = '';
-               $share_disabled = '';
-
-               if (empty($orig_event)) {
-                       $orig_event = User::getById(DI::userSession()->getLocalUserId(), ['allow_cid', 'allow_gid', 'deny_cid', 'deny_gid']);;
-               } elseif ($orig_event['allow_cid'] !== '<' . DI::userSession()->getLocalUserId() . '>'
-                       || $orig_event['allow_gid']
-                       || $orig_event['deny_cid']
-                       || $orig_event['deny_gid']) {
-                       $share_checked = ' checked="checked" ';
-               }
-
-               // In case of an error the browser is redirected back here, with these parameters filled in with the previous values
-               if (!empty($_REQUEST['nofinish']))    {$orig_event['nofinish']    = $_REQUEST['nofinish'];}
-               if (!empty($_REQUEST['summary']))     {$orig_event['summary']     = $_REQUEST['summary'];}
-               if (!empty($_REQUEST['desc']))        {$orig_event['desc']        = $_REQUEST['desc'];}
-               if (!empty($_REQUEST['location']))    {$orig_event['location']    = $_REQUEST['location'];}
-               if (!empty($_REQUEST['start']))       {$orig_event['start']       = $_REQUEST['start'];}
-               if (!empty($_REQUEST['finish']))      {$orig_event['finish']      = $_REQUEST['finish'];}
-
-               $n_checked = (!empty($orig_event['nofinish']) ? ' checked="checked" ' : '');
-
-               $t_orig = $orig_event['summary']  ?? '';
-               $d_orig = $orig_event['desc']     ?? '';
-               $l_orig = $orig_event['location'] ?? '';
-               $eid = $orig_event['id'] ?? 0;
-               $cid = $orig_event['cid'] ?? 0;
-               $uri = $orig_event['uri'] ?? '';
-
-               if ($cid || $mode === 'edit') {
-                       $share_disabled = 'disabled="disabled"';
-               }
-
-               $sdt = $orig_event['start'] ?? 'now';
-               $fdt = $orig_event['finish'] ?? 'now';
-
-               $syear  = DateTimeFormat::local($sdt, 'Y');
-               $smonth = DateTimeFormat::local($sdt, 'm');
-               $sday   = DateTimeFormat::local($sdt, 'd');
-
-               $shour   = !empty($orig_event) ? DateTimeFormat::local($sdt, 'H') : '00';
-               $sminute = !empty($orig_event) ? DateTimeFormat::local($sdt, 'i') : '00';
-
-               $fyear  = DateTimeFormat::local($fdt, 'Y');
-               $fmonth = DateTimeFormat::local($fdt, 'm');
-               $fday   = DateTimeFormat::local($fdt, 'd');
-
-               $fhour   = !empty($orig_event) ? DateTimeFormat::local($fdt, 'H') : '00';
-               $fminute = !empty($orig_event) ? DateTimeFormat::local($fdt, 'i') : '00';
-
-               if (!$cid && in_array($mode, ['new', 'copy'])) {
-                       $acl = ACL::getFullSelectorHTML(DI::page(), $a->getLoggedInUserId(), false, ACL::getDefaultUserPermissions($orig_event));
-               } else {
-                       $acl = '';
-               }
-
-               // If we copy an old event, we need to remove the ID and URI
-               // from the original event.
-               if ($mode === 'copy') {
-                       $eid = 0;
-                       $uri = '';
-               }
-
-               $tpl = Renderer::getMarkupTemplate('event_form.tpl');
-
-               $o .= Renderer::replaceMacros($tpl, [
-                       '$post' => DI::baseUrl() . '/events',
-                       '$eid'  => $eid,
-                       '$cid'  => $cid,
-                       '$uri'  => $uri,
-
-                       '$title' => DI::l10n()->t('Event details'),
-                       '$desc' => DI::l10n()->t('Starting date and Title are required.'),
-                       '$s_text' => DI::l10n()->t('Event Starts:') . ' <span class="required" title="' . DI::l10n()->t('Required') . '">*</span>',
-                       '$s_dsel' => Temporal::getDateTimeField(
-                               new DateTime(),
-                               DateTime::createFromFormat('Y', intval($syear) + 5),
-                               DateTime::createFromFormat('Y-m-d H:i', "$syear-$smonth-$sday $shour:$sminute"),
-                               DI::l10n()->t('Event Starts:'),
-                               'start_text',
-                               true,
-                               true,
-                               '',
-                               '',
-                               true
-                       ),
-                       '$n_text' => DI::l10n()->t('Finish date/time is not known or not relevant'),
-                       '$n_checked' => $n_checked,
-                       '$f_text' => DI::l10n()->t('Event Finishes:'),
-                       '$f_dsel' => Temporal::getDateTimeField(
-                               new DateTime(),
-                               DateTime::createFromFormat('Y', intval($fyear) + 5),
-                               DateTime::createFromFormat('Y-m-d H:i', "$fyear-$fmonth-$fday $fhour:$fminute"),
-                               DI::l10n()->t('Event Finishes:'),
-                               'finish_text',
-                               true,
-                               true,
-                               'start_text'
-                       ),
-                       '$d_text' => DI::l10n()->t('Description:'),
-                       '$d_orig' => $d_orig,
-                       '$l_text' => DI::l10n()->t('Location:'),
-                       '$l_orig' => $l_orig,
-                       '$t_text' => DI::l10n()->t('Title:') . ' <span class="required" title="' . DI::l10n()->t('Required') . '">*</span>',
-                       '$t_orig' => $t_orig,
-                       '$summary' => ['summary', DI::l10n()->t('Title:'), $t_orig, '', '*'],
-                       '$sh_text' => DI::l10n()->t('Share this event'),
-                       '$share' => ['share', DI::l10n()->t('Share this event'), $share_checked, '', $share_disabled],
-                       '$sh_checked' => $share_checked,
-                       '$nofinish' => ['nofinish', DI::l10n()->t('Finish date/time is not known or not relevant'), $n_checked],
-                       '$preview' => DI::l10n()->t('Preview'),
-                       '$acl' => $acl,
-                       '$submit' => DI::l10n()->t('Submit'),
-                       '$basic' => DI::l10n()->t('Basic'),
-                       '$advanced' => DI::l10n()->t('Advanced'),
-                       '$permissions' => DI::l10n()->t('Permissions'),
-               ]);
-
-               return $o;
-       }
-
-       // Remove an event from the calendar and its related items
-       if ($mode === 'drop' && $event_id) {
-               $ev = Event::getListById(DI::userSession()->getLocalUserId(), $event_id);
-
-               // Delete only real events (no birthdays)
-               if (DBA::isResult($ev) && $ev[0]['type'] == 'event') {
-                       Item::deleteForUser(['id' => $ev[0]['itemid']], DI::userSession()->getLocalUserId());
-               }
-
-               if (Post::exists(['id' => $ev[0]['itemid']])) {
-                       DI::sysmsg()->addNotice(DI::l10n()->t('Failed to remove event'));
-               }
-
-               DI::baseUrl()->redirect('events');
-       }
-}
index 23f5dcf0721cade709cf16b33803fc0c05251d40..17b6412df29fcde9ba5358bd3a377ceea57c88ce 100644 (file)
@@ -46,7 +46,7 @@ class Nav
                'settings'  => null,
                'contacts'  => null,
                'delegation'=> null,
-               'events'    => null,
+               'calendar'  => null,
                'register'  => null
        ];
 
@@ -165,7 +165,7 @@ class Nav
                        'apps'          => null,
                        'community'     => null,
                        'home'          => null,
-                       'events'        => null,
+                       'calendar'      => null,
                        'login'         => null,
                        'logout'        => null,
                        'langselector'  => null,
@@ -193,7 +193,7 @@ class Nav
                        $nav['usermenu'][] = ['profile/' . $a->getLoggedInUserNickname() . '/profile', DI::l10n()->t('Profile'), '', DI::l10n()->t('Your profile page')];
                        $nav['usermenu'][] = ['photos/' . $a->getLoggedInUserNickname(), DI::l10n()->t('Photos'), '', DI::l10n()->t('Your photos')];
                        $nav['usermenu'][] = ['profile/' . $a->getLoggedInUserNickname() . '/media', DI::l10n()->t('Media'), '', DI::l10n()->t('Your postings with media')];
-                       $nav['usermenu'][] = ['events/', DI::l10n()->t('Events'), '', DI::l10n()->t('Your events')];
+                       $nav['usermenu'][] = ['calendar/', DI::l10n()->t('Calendar'), '', DI::l10n()->t('Your calendar')];
                        $nav['usermenu'][] = ['notes/', DI::l10n()->t('Personal notes'), '', DI::l10n()->t('Your personal notes')];
 
                        // user info
@@ -257,7 +257,7 @@ class Nav
                }
 
                if (DI::userSession()->getLocalUserId()) {
-                       $nav['events'] = ['events', DI::l10n()->t('Events'), '', DI::l10n()->t('Events and Calendar')];
+                       $nav['calendar'] = ['calendar', DI::l10n()->t('Calendar'), '', DI::l10n()->t('Calendar')];
                }
 
                $nav['directory'] = [$gdirpath, DI::l10n()->t('Directory'), '', DI::l10n()->t('People directory')];
index e2235fa6645af53e40c75bcf9f8b6cfa568d9fc0..8745a787f6d7acc37b7678c7ef6ad694edc537b4 100644 (file)
@@ -24,15 +24,17 @@ namespace Friendica\Model;
 use Friendica\Content\Text\BBCode;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
-use Friendica\Core\Protocol;
 use Friendica\Core\Renderer;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\DI;
+use Friendica\Network\HTTPException\NotFoundException;
+use Friendica\Network\HTTPException\UnauthorizedException;
 use Friendica\Protocol\Activity;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Map;
 use Friendica\Util\Strings;
+use Friendica\Util\Temporal;
 use Friendica\Util\XML;
 
 /**
@@ -499,17 +501,27 @@ class Event
         *
         * @param int    $owner_uid The User ID of the owner of the event
         * @param int    $event_id  The ID of the event in the event table
-        * @param string $sql_extra
+        * @param string $nickname  a possible nickname to search for instead of the own uid
         * @return array Query result
         * @throws \Exception
         */
-       public static function getListById(int $owner_uid, int $event_id, string $sql_extra = ''): array
+       public static function getByIdAndUid(int $owner_uid, int $event_id, string $nickname = null): array
        {
-               $return = [];
+               if (!empty($nickname)) {
+                       $owner = static::getOwnerForNickname($nickname, true);
+                       $owner_uid = $owner['uid'];
+
+                       // get the permissions
+                       $sql_perms = Item::getPermissionsSQLByUserId($owner_uid);
+                       // we only want to have the events of the profile owner
+                       $sql_extra = " AND `event`.`cid` = 0 " . $sql_perms;
+               } else {
+                       $sql_extra = "";
+               }
 
-               // Ownly allow events if there is a valid owner_id.
+               // Only allow events if there is a valid owner_id.
                if ($owner_uid == 0) {
-                       return $return;
+                       return [];
                }
 
                // Query for the event by event id
@@ -518,34 +530,99 @@ class Event
                        WHERE `event`.`uid` = ? AND `event`.`id` = ? $sql_extra",
                        $owner_uid, $event_id));
 
-               if (DBA::isResult($events)) {
-                       $return = self::removeDuplicates($events);
+               if (empty($events)) {
+                       throw new NotFoundException(DI::l10n()->t('Event not found.'));
+               } else {
+                       $events = self::removeDuplicates($events);
+                       return $events[0];
+               }
+       }
+
+       /**
+        * Returns the owner array of a given nickname
+        * Additionally, it can check if the owner array is selectable
+        *
+        * @param string $nickname
+        * @param bool   $check
+        *
+        * @return array the owner array
+        * @throws NotFoundException The given nickname does not exist
+        * @throws UnauthorizedException The access for the given nickname is restricted
+        */
+       public static function getOwnerForNickname(string $nickname, bool $check = true): array
+       {
+               $owner = User::getOwnerDataByNick($nickname);
+               if (empty($owner)) {
+                       throw new NotFoundException(DI::l10n()->t('User not found.'));
                }
 
-               return $return;
+               if ($check) {
+                       $contact_id = DI::userSession()->getRemoteContactID($owner['uid']);
+
+                       $remote_contact = $contact_id && DBA::exists('contact', ['id' => $contact_id, 'uid' => $owner['uid']]);
+
+                       $is_owner = DI::userSession()->getLocalUserId() == $owner['uid'];
+
+                       if ($owner['hidewall'] && !$is_owner && !$remote_contact) {
+                               throw new UnauthorizedException(DI::l10n()->t('Access to this profile has been restricted.'));
+                       }
+               }
+
+               return $owner;
        }
 
        /**
         * Get all events in a specific time frame.
         *
-        * @param int    $owner_uid    The User ID of the owner of the events.
-        * @param array  $event_params An associative array with
-        *                             int 'ignore' =>
-        *                             string 'start' => Start time of the timeframe.
-        *                             string 'finish' => Finish time of the timeframe.
-        *
-        * @param string $sql_extra    Additional sql conditions (e.g. permission request).
+        * @param int         $owner_uid The User ID of the owner of the events.
+        * @param string|null $start     Start time of the timeframe.
+        * @param string|null $finish    Finish time of the timeframe.
+        * @param bool        $ignore
+        * @param string|null $nickname
         *
         * @return array Query results.
-        * @throws \Exception
+        * @throws NotFoundException
+        * @throws UnauthorizedException
         */
-       public static function getListByDate(int $owner_uid, array $event_params, string $sql_extra = ''): array
+       public static function getListByDate(int $owner_uid, string $start = null, string $finish = null, bool $ignore = false, string $nickname = null): array
        {
-               $return = [];
+               if (!empty($nickname)) {
+                       $owner     = static::getOwnerForNickname($nickname, true);
+                       $owner_uid = $owner['uid'];
+
+                       // get the permissions
+                       $sql_perms = Item::getPermissionsSQLByUserId($owner_uid);
+                       // we only want to have the events of the profile owner
+                       $sql_extra = " AND `event`.`cid` = 0 " . $sql_perms;
+               } else {
+                       $sql_extra = "";
+               }
 
                // Only allow events if there is a valid owner_id.
                if ($owner_uid == 0) {
-                       return $return;
+                       return [];
+               }
+
+               if (empty($start) || empty($finish)) {
+
+                       $y = intval(DateTimeFormat::localNow('Y'));
+                       $m = intval(DateTimeFormat::localNow('m'));
+
+                       // Put some limit on dates. The PHP date functions don't seem to do so well before 1900.
+                       if ($y < 1901) {
+                               $y = 1900;
+                       }
+
+                       if ($y > 2099) {
+                               $y = 2100;
+                       }
+
+                       if (empty($start)) {
+                               $start = sprintf('%d-%d-%d %d:%d:%d', $y, $m, 1, 0, 0, 0);
+                       } else {
+                               $dim    = Temporal::getDaysInMonth($y, $m);
+                               $finish = sprintf('%d-%d-%d %d:%d:%d', $y, $m, $dim, 23, 59, 59);
+                       }
                }
 
                // Query for the event by date.
@@ -554,15 +631,12 @@ class Event
                                WHERE `event`.`uid` = ? AND `event`.`ignore` = ?
                                AND (`finish` >= ? OR (`nofinish` AND `start` >= ?)) AND `start` <= ?
                                " . $sql_extra,
-                               $owner_uid, $event_params['ignore'],
-                               $event_params['start'], $event_params['start'], $event_params['finish']
+                       $owner_uid, $ignore,
+                       $start, $start, $finish
                ));
 
-               if (DBA::isResult($events)) {
-                       $return = self::removeDuplicates($events);
-               }
-
-               return $return;
+               $events = self::removeDuplicates($events ?? []);
+               return self::sortByDate($events);
        }
 
        /**
@@ -577,75 +651,84 @@ class Event
        {
                $event_list = [];
 
-               $last_date = '';
-               $fmt = DI::l10n()->t('l, F j');
                foreach ($event_result as $event) {
-                       $item = Post::selectFirst(['plink', 'author-name', 'author-network', 'author-id', 'author-avatar', 'author-link', 'private', 'uri-id'], ['id' => $event['itemid']]);
-                       if (!DBA::isResult($item)) {
-                               // Using default values when no item had been found
-                               $item = ['plink' => '', 'author-name' => '', 'author-avatar' => '', 'author-link' => '', 'private' => Item::PUBLIC, 'uri-id' => ($event['uri-id'] ?? 0)];
-                       }
+                       $event_list[] = static::prepareForItem($event);
+               }
 
-                       $event = array_merge($event, $item);
+               return $event_list;
+       }
 
-                       $start = DateTimeFormat::local($event['start'], 'c');
-                       $j     = DateTimeFormat::local($event['start'], 'j');
-                       $day   = DateTimeFormat::local($event['start'], $fmt);
-                       $day   = DI::l10n()->getDay($day);
+       /**
+        * Convert an one event in an array which could be used by the events template.
+        *
+        * @param array $event Event query array.
+        * @return array Event array for the template.
+        * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+        * @throws \ImagickException
+        */
+       public static function prepareForItem(array $event): array
+       {
+               $fmt = DI::l10n()->t('l, F j');
 
-                       if ($event['nofinish']) {
-                               $end = null;
-                       } else {
-                               $end = DateTimeFormat::local($event['finish'], 'c');
-                       }
+               $item = Post::selectFirst(['plink', 'author-name', 'author-network', 'author-id', 'author-avatar', 'author-link', 'private', 'uri-id'], ['id' => $event['itemid']]);
+               if (!DBA::isResult($item)) {
+                       // Using default values when no item had been found
+                       $item = ['plink' => '', 'author-name' => '', 'author-avatar' => '', 'author-link' => '', 'private' => Item::PUBLIC, 'uri-id' => ($event['uri-id'] ?? 0)];
+               }
 
-                       $is_first = ($day !== $last_date);
+               $event = array_merge($event, $item);
 
-                       $last_date = $day;
+               $start = DateTimeFormat::local($event['start'], 'c');
+               $j     = DateTimeFormat::local($event['start'], 'j');
+               $day   = DateTimeFormat::local($event['start'], $fmt);
+               $day   = DI::l10n()->getDay($day);
 
-                       // Show edit and drop actions only if the user is the owner of the event and the event
-                       // is a real event (no bithdays).
-                       $edit = null;
-                       $copy = null;
-                       $drop = null;
-                       if (DI::userSession()->getLocalUserId() && DI::userSession()->getLocalUserId() == $event['uid'] && $event['type'] == 'event') {
-                               $edit = !$event['cid'] ? [DI::baseUrl() . '/events/event/' . $event['id'], DI::l10n()->t('Edit event')     , '', ''] : null;
-                               $copy = !$event['cid'] ? [DI::baseUrl() . '/events/copy/' . $event['id'] , DI::l10n()->t('Duplicate event'), '', ''] : null;
-                               $drop =                  [DI::baseUrl() . '/events/drop/' . $event['id'] , DI::l10n()->t('Delete event')   , '', ''];
-                       }
+               if ($event['nofinish']) {
+                       $end = null;
+               } else {
+                       $end = DateTimeFormat::local($event['finish'], 'c');
+               }
 
-                       $title = BBCode::convertForUriId($event['uri-id'], Strings::escapeHtml($event['summary']));
-                       if (!$title) {
-                               list($title, $_trash) = explode("<br", BBCode::convertForUriId($event['uri-id'], Strings::escapeHtml($event['desc'])), BBCode::TWITTER_API);
-                       }
+               // Show edit and drop actions only if the user is the owner of the event and the event
+               // is a real event (no bithdays).
+               $edit = null;
+               $copy = null;
+               $drop = null;
+               if (DI::userSession()->getLocalUserId() && DI::userSession()->getLocalUserId() == $event['uid'] && $event['type'] == 'event') {
+                       $edit = !$event['cid'] ? [DI::baseUrl() . '/calendar/event/edit/' . $event['id'], DI::l10n()->t('Edit event')     , '', ''] : null;
+                       $copy = !$event['cid'] ? [DI::baseUrl() . '/calendar/event/copy/' . $event['id'] , DI::l10n()->t('Duplicate event'), '', ''] : null;
+                       $drop =                  [DI::baseUrl() . '/calendar/api/delete/' . $event['id'] , DI::l10n()->t('Delete event')   , '', ''];
+               }
 
-                       $author_link = $event['author-link'];
-
-                       $event['author-link'] = Contact::magicLink($author_link);
-
-                       $html = self::getHTML($event);
-                       $event['summary']  = BBCode::convertForUriId($event['uri-id'], Strings::escapeHtml($event['summary']));
-                       $event['desc']     = BBCode::convertForUriId($event['uri-id'], Strings::escapeHtml($event['desc']));
-                       $event['location'] = BBCode::convertForUriId($event['uri-id'], Strings::escapeHtml($event['location']));
-                       $event_list[] = [
-                               'id'       => $event['id'],
-                               'start'    => $start,
-                               'end'      => $end,
-                               'allDay'   => false,
-                               'title'    => $title,
-                               'j'        => $j,
-                               'd'        => $day,
-                               'edit'     => $edit,
-                               'drop'     => $drop,
-                               'copy'     => $copy,
-                               'is_first' => $is_first,
-                               'item'     => $event,
-                               'html'     => $html,
-                               'plink'    => Item::getPlink($event),
-                       ];
+               $title = BBCode::convertForUriId($event['uri-id'], Strings::escapeHtml($event['summary']));
+               if (!$title) {
+                       [$title, $_trash] = explode("<br", BBCode::convertForUriId($event['uri-id'], Strings::escapeHtml($event['desc'])), BBCode::TWITTER_API);
                }
 
-               return $event_list;
+               $author_link = $event['author-link'];
+
+               $event['author-link'] = Contact::magicLink($author_link);
+
+               $html = self::getHTML($event);
+               $event['summary']  = BBCode::convertForUriId($event['uri-id'], Strings::escapeHtml($event['summary']));
+               $event['desc']     = BBCode::convertForUriId($event['uri-id'], Strings::escapeHtml($event['desc']));
+               $event['location'] = BBCode::convertForUriId($event['uri-id'], Strings::escapeHtml($event['location']));
+
+               return [
+                       'id'       => $event['id'],
+                       'start'    => $start,
+                       'end'      => $end,
+                       'allDay'   => false,
+                       'title'    => $title,
+                       'j'        => $j,
+                       'd'        => $day,
+                       'edit'     => $edit,
+                       'drop'     => $drop,
+                       'copy'     => $copy,
+                       'item'     => $event,
+                       'html'     => $html,
+                       'plink'    => Item::getPlink($event),
+               ];
        }
 
        /**
@@ -1018,4 +1101,9 @@ class Event
                // Check if self::store() was success
                return (self::store($values) > 0);
        }
+
+       public static function setIgnore(int $uid, int $eventId, bool $ignore = true)
+       {
+               DBA::update('event', ['ignore' => $ignore], ['id' => $eventId, 'uid' => $uid]);
+       }
 }
index a011961b67ede1026b6ce2737c1b4ba71dedb373..d0c0ae36276857f7087a05e6f15e274216f0636d 100644 (file)
@@ -90,11 +90,11 @@ abstract class BaseNotifications extends BaseModule
         */
        abstract public function getNotifications();
 
-       public function __construct(L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, IHandleUserSessions $userSession, array $server, array $parameters = [])
+       public function __construct(L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, IHandleUserSessions $session, array $server, array $parameters = [])
        {
                parent::__construct($l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
 
-               if (!$userSession->getLocalUserId()) {
+               if (!$session->getLocalUserId()) {
                        throw new ForbiddenException($this->t('Permission denied.'));
                }
 
index 3937fa07d2ee2b2da5b801882caeec47b3c708d0..16ba224c9cb008f4648a03c6c2a323c7966da700 100644 (file)
@@ -81,23 +81,23 @@ class BaseProfile extends BaseModule
                // the calendar link for the full featured events calendar
                if ($is_owner && $a->getThemeInfoValue('events_in_profile')) {
                        $tabs[] = [
-                               'label' => DI::l10n()->t('Events'),
-                               'url'   => DI::baseUrl() . '/events',
-                               'sel'   => $current == 'events' ? 'active' : '',
-                               'title' => DI::l10n()->t('Events and Calendar'),
-                               'id'    => 'events-tab',
-                               'accesskey' => 'e',
+                               'label' => DI::l10n()->t('Calendar'),
+                               'url'   => DI::baseUrl() . '/calendar',
+                               'sel'   => $current == 'calendar' ? 'active' : '',
+                               'title' => DI::l10n()->t('Calendar'),
+                               'id'    => 'calendar-tab',
+                               'accesskey' => 'c',
                        ];
                        // if the user is not the owner of the calendar we only show a calendar
                        // with the public events of the calendar owner
                } elseif (!$is_owner) {
                        $tabs[] = [
-                               'label' => DI::l10n()->t('Events'),
-                               'url'   => DI::baseUrl() . '/cal/' . $nickname,
-                               'sel'   => $current == 'cal' ? 'active' : '',
-                               'title' => DI::l10n()->t('Events and Calendar'),
-                               'id'    => 'events-tab',
-                               'accesskey' => 'e',
+                               'label' => DI::l10n()->t('Calendar'),
+                               'url'   => DI::baseUrl() . '/calendar/show/' . $nickname,
+                               'sel'   => $current == 'calendar' ? 'active' : '',
+                               'title' => DI::l10n()->t('Calendar'),
+                               'id'    => 'calendar-tab',
+                               'accesskey' => 'c',
                        ];
                }
 
diff --git a/src/Module/Calendar/Event/API.php b/src/Module/Calendar/Event/API.php
new file mode 100644 (file)
index 0000000..b11da27
--- /dev/null
@@ -0,0 +1,277 @@
+<?php
+/**
+ * @copyright Copyright (C) 2010-2022, the Friendica project
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
+
+namespace Friendica\Module\Calendar\Event;
+
+use Friendica\App;
+use Friendica\BaseModule;
+use Friendica\Core\L10n;
+use Friendica\Core\Protocol;
+use Friendica\Core\Session\Capability\IHandleUserSessions;
+use Friendica\Core\System;
+use Friendica\Core\Worker;
+use Friendica\Database\DBA;
+use Friendica\Model\Contact;
+use Friendica\Model\Conversation;
+use Friendica\Model\Event;
+use Friendica\Model\Item;
+use Friendica\Model\Post;
+use Friendica\Model\User;
+use Friendica\Module\Response;
+use Friendica\Navigation\SystemMessages;
+use Friendica\Network\HTTPException\BadRequestException;
+use Friendica\Network\HTTPException\UnauthorizedException;
+use Friendica\Util\ACLFormatter;
+use Friendica\Util\DateTimeFormat;
+use Friendica\Util\Profiler;
+use Friendica\Util\Strings;
+use Friendica\Worker\Delivery;
+use Psr\Log\LoggerInterface;
+
+/**
+ * Basic API class for events
+ * currently supports create, delete, ignore, unignore
+ *
+ * @todo: make create/update as REST-call instead of POST
+ */
+class API extends BaseModule
+{
+       const ACTION_CREATE   = 'create';
+       const ACTION_DELETE   = 'delete';
+       const ACTION_IGNORE   = 'ignore';
+       const ACTION_UNIGNORE = 'unignore';
+
+       const ALLOWED_ACTIONS = [
+               self::ACTION_CREATE,
+               self::ACTION_DELETE,
+               self::ACTION_IGNORE,
+               self::ACTION_UNIGNORE,
+       ];
+
+       /** @var IHandleUserSessions */
+       protected $session;
+       /** @var SystemMessages */
+       protected $sysMessages;
+       /** @var ACLFormatter */
+       protected $aclFormatter;
+       /** @var string */
+       protected $timezone;
+
+       public function __construct(L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, IHandleUserSessions $session, SystemMessages $sysMessages, ACLFormatter $aclFormatter, App $app, array $server, array $parameters = [])
+       {
+               parent::__construct($l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
+
+               $this->session      = $session;
+               $this->sysMessages  = $sysMessages;
+               $this->aclFormatter = $aclFormatter;
+               $this->timezone     = $app->getTimeZone();
+
+               if (!$this->session->getLocalUserId()) {
+                       throw new UnauthorizedException($this->t('Permission denied.'));
+               }
+       }
+
+       protected function post(array $request = [])
+       {
+               $this->createEvent($request);
+       }
+
+       protected function rawContent(array $request = [])
+       {
+               if (empty($this->parameters['action']) || !in_array($this->parameters['action'], self::ALLOWED_ACTIONS)) {
+                       throw new BadRequestException($this->t('Invalid Request'));
+               }
+
+               // CREATE is done per POSt, so nothing to do left
+               if ($this->parameters['action'] === static::ACTION_CREATE) {
+                       return;
+               }
+
+               if (empty($this->parameters['id'])) {
+                       throw new BadRequestException($this->t('Event id is missing.'));
+               }
+
+               $returnPath = $request['return_path'] ?? 'calendar';
+
+               switch ($this->parameters['action']) {
+                       case self::ACTION_IGNORE:
+                               Event::setIgnore($this->session->getLocalUserId(), $this->parameters['id']);
+                               break;
+                       case self::ACTION_UNIGNORE:
+                               Event::setIgnore($this->session->getLocalUserId(), $this->parameters['id'], false);
+                               break;
+                       case self::ACTION_DELETE:
+                               // Remove an event from the calendar and its related items
+                               $event = Event::getByIdAndUid($this->session->getLocalUserId(), $this->parameters['id']);
+
+                               // Delete only real events (no birthdays)
+                               if (!empty($event) && $event['type'] == 'event') {
+                                       Item::deleteForUser(['id' => $event['itemid']], $this->session->getLocalUserId());
+                               }
+
+                               if (Post::exists(['id' => $event['itemid']])) {
+                                       $this->sysMessages->addNotice($this->t('Failed to remove event'));
+                               }
+                               break;
+                       default:
+                               throw new BadRequestException($this->t('Invalid Request'));
+               }
+
+               $this->baseUrl->redirect($returnPath);
+       }
+
+       protected function createEvent(array $request)
+       {
+               $eventId = !empty($request['event_id']) ? intval($request['event_id']) : 0;
+               $uid     = (int)$this->session->getLocalUserId();
+               $cid     = !empty($request['cid']) ? intval($request['cid']) : 0;
+
+               $strStartDateTime  = Strings::escapeHtml($request['start_text'] ?? '');
+               $strFinishDateTime = Strings::escapeHtml($request['finish_text'] ?? '');
+
+               $noFinish = intval($request['nofinish'] ?? 0);
+
+               $share     = intval($request['share'] ?? 0);
+               $isPreview = intval($request['preview'] ?? 0);
+
+               $start = DateTimeFormat::convert($strStartDateTime ?? DBA::NULL_DATETIME, $this->timezone);
+               if (!$noFinish) {
+                       $finish = DateTimeFormat::convert($strFinishDateTime ?? DBA::NULL_DATETIME, 'UTC', $this->timezone);
+               } else {
+                       $finish = DBA::NULL_DATETIME;
+               }
+
+               // Don't allow the event to finish before it begins.
+               // It won't hurt anything, but somebody will file a bug report,
+               // and we'll waste a bunch of time responding to it. Time that
+               // could've been spent doing something else.
+
+               $summary  = trim($request['summary'] ?? '');
+               $desc     = trim($request['desc'] ?? '');
+               $location = trim($request['location'] ?? '');
+               $type     = 'event';
+
+               $params = [
+                       'summary'     => $summary,
+                       'description' => $desc,
+                       'location'    => $location,
+                       'start'       => $strStartDateTime,
+                       'finish'      => $strFinishDateTime,
+                       'nofinish'    => $noFinish,
+               ];
+
+               $action          = empty($eventId) ? 'new' : 'edit/' . $eventId;
+               $redirectOnError = 'calendar/event/' . $action . '?' . http_build_query($params, '', '&', PHP_QUERY_RFC3986);
+
+               if (strcmp($finish, $start) < 0 && !$noFinish) {
+                       if ($isPreview) {
+                               System::httpExit($this->t('Event can not end before it has started.'));
+                               return;
+                       } else {
+                               $this->sysMessages->addNotice($this->t('Event can not end before it has started.'));
+                               $this->baseUrl->redirect($redirectOnError);
+                       }
+               }
+
+               if (empty($summary) || ($start === DBA::NULL_DATETIME)) {
+                       if ($isPreview) {
+                               System::httpExit($this->t('Event title and start time are required.'));
+                               return;
+                       } else {
+                               $this->sysMessages->addNotice($this->t('Event title and start time are required.'));
+                               $this->baseUrl->redirect($redirectOnError);
+                       }
+               }
+
+               $self = Contact::getPublicIdByUserId($uid);
+
+               $aclFormatter = $this->aclFormatter;
+
+               if ($share) {
+                       $user = User::getById($uid, ['allow_cid', 'allow_gid', 'deny_cid', 'deny_gid']);
+                       if (empty($user)) {
+                               $this->logger->warning('Cannot find user for an event.', ['uid' => $uid, 'event' => $eventId]);
+                               $this->response->setStatus(500);
+                               return;
+                       }
+
+                       $strAclContactAllow = isset($request['contact_allow']) ? $aclFormatter->toString($request['contact_allow']) : $user['allow_cid'] ?? '';
+                       $strAclGroupAllow   = isset($request['group_allow']) ? $aclFormatter->toString($request['group_allow']) : $user['allow_gid'] ?? '';
+                       $strContactDeny     = isset($request['contact_deny']) ? $aclFormatter->toString($request['contact_deny']) : $user['deny_cid'] ?? '';
+                       $strGroupDeny       = isset($request['group_deny']) ? $aclFormatter->toString($request['group_deny']) : $user['deny_gid'] ?? '';
+
+                       $visibility = $request['visibility'] ?? '';
+                       if ($visibility === 'public') {
+                               // The ACL selector introduced in version 2019.12 sends ACL input data even when the Public visibility is selected
+                               $strAclContactAllow = $strAclGroupAllow = $strContactDeny = $strGroupDeny = '';
+                       } else if ($visibility === 'custom') {
+                               // Since we know from the visibility parameter the item should be private, we have to prevent the empty ACL
+                               // case that would make it public. So we always append the author's contact id to the allowed contacts.
+                               // See https://github.com/friendica/friendica/issues/9672
+                               $strAclContactAllow .= $aclFormatter->toString($self);
+                       }
+               } else {
+                       $strAclContactAllow = $aclFormatter->toString($self);
+                       $strAclGroupAllow   = $strContactDeny = $strGroupDeny = '';
+               }
+
+               $datarray = [
+                       'start'     => $start,
+                       'finish'    => $finish,
+                       'summary'   => $summary,
+                       'desc'      => $desc,
+                       'location'  => $location,
+                       'type'      => $type,
+                       'nofinish'  => $noFinish,
+                       'uid'       => $uid,
+                       'cid'       => $cid,
+                       'allow_cid' => $strAclContactAllow,
+                       'allow_gid' => $strAclGroupAllow,
+                       'deny_cid'  => $strContactDeny,
+                       'deny_gid'  => $strGroupDeny,
+                       'id'        => $eventId,
+               ];
+
+               if (intval($request['preview'])) {
+                       System::httpExit(Event::getHTML($datarray));
+                       return;
+               }
+
+               $eventId = Event::store($datarray);
+
+               $newItem = Event::getItemArrayForId($eventId, [
+                       'network'   => Protocol::DFRN,
+                       'protocol'  => Conversation::PARCEL_DIRECT,
+                       'direction' => Conversation::PUSH
+               ]);
+               if (Item::insert($newItem)) {
+                       $uriId = (int)$newItem['uri-id'];
+               } else {
+                       $uriId = 0;
+               }
+
+               if (!$cid && $uriId) {
+                       Worker::add(Worker::PRIORITY_HIGH, "Notifier", Delivery::POST, $uriId, $uid);
+               }
+
+               $this->baseUrl->redirect('calendar');
+       }
+}
diff --git a/src/Module/Calendar/Event/Form.php b/src/Module/Calendar/Event/Form.php
new file mode 100644 (file)
index 0000000..b458f95
--- /dev/null
@@ -0,0 +1,253 @@
+<?php
+/**
+ * @copyright Copyright (C) 2010-2022, the Friendica project
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
+
+namespace Friendica\Module\Calendar\Event;
+
+use Friendica\App;
+use Friendica\BaseModule;
+use Friendica\Content\Widget\CalendarExport;
+use Friendica\Core\ACL;
+use Friendica\Core\L10n;
+use Friendica\Core\Renderer;
+use Friendica\Core\Session\Capability\IHandleUserSessions;
+use Friendica\Model\Event as EventModel;
+use Friendica\Model\User;
+use Friendica\Module\Response;
+use Friendica\Module\Security\Login;
+use Friendica\Navigation\SystemMessages;
+use Friendica\Network\HTTPException\BadRequestException;
+use Friendica\Util\ACLFormatter;
+use Friendica\Util\DateTimeFormat;
+use Friendica\Util\Profiler;
+use Friendica\Util\Temporal;
+use Psr\Log\LoggerInterface;
+
+/**
+ * The editor-view of an event
+ */
+class Form extends BaseModule
+{
+       const MODE_NEW  = 'new';
+       const MODE_EDIT = 'edit';
+       const MODE_COPY = 'copy';
+
+       const ALLOWED_MODES = [
+               self::MODE_NEW,
+               self::MODE_EDIT,
+               self::MODE_COPY,
+       ];
+
+       /** @var IHandleUserSessions */
+       protected $session;
+       /** @var SystemMessages */
+       protected $sysMessages;
+       /** @var ACLFormatter */
+       protected $aclFormatter;
+       /** @var App\Page */
+       protected $page;
+
+       public function __construct(L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, IHandleUserSessions $session, SystemMessages $sysMessages, ACLFormatter $aclFormatter, App\Page $page, array $server, array $parameters = [])
+       {
+               parent::__construct($l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
+
+               $this->session      = $session;
+               $this->sysMessages  = $sysMessages;
+               $this->aclFormatter = $aclFormatter;
+               $this->page         = $page;
+       }
+
+       protected function content(array $request = []): string
+       {
+               if (empty($this->parameters['mode']) || !in_array($this->parameters['mode'], self::ALLOWED_MODES)) {
+                       throw new BadRequestException($this->t('Invalid Request'));
+               }
+
+               if (!$this->session->getLocalUserId()) {
+                       $this->sysMessages->addNotice($this->t('Permission denied.'));
+                       return Login::form();
+               }
+
+               $mode = $this->parameters['mode'];
+
+               if (($mode === self::MODE_EDIT || $mode === self::MODE_COPY)) {
+                       if (empty($this->parameters['id'])) {
+                               throw new BadRequestException('Invalid Request');
+                       }
+                       $orig_event = EventModel::getByIdAndUid($this->session->getLocalUserId(), $this->parameters['id']);
+                       if (empty($orig_event)) {
+                               throw new BadRequestException('Invalid Request');
+                       }
+               }
+
+               if ($mode === self::MODE_NEW) {
+                       $this->session->set('return_path', $this->args->getCommand());
+               }
+
+               // get the translation strings for the calendar
+               $i18n = EventModel::getStrings();
+
+               $this->page->registerStylesheet('view/asset/fullcalendar/dist/fullcalendar.min.css');
+               $this->page->registerStylesheet('view/asset/fullcalendar/dist/fullcalendar.print.min.css', 'print');
+               $this->page->registerFooterScript('view/asset/moment/min/moment-with-locales.min.js');
+               $this->page->registerFooterScript('view/asset/fullcalendar/dist/fullcalendar.min.js');
+
+               $htpl                   = Renderer::getMarkupTemplate('calendar/calendar_head.tpl');
+               $this->page['htmlhead'] .= Renderer::replaceMacros($htpl, [
+                       '$calendar_api' => $this->baseUrl . '/calendar/api/get',
+                       '$event_api'    => $this->baseUrl . '/calendar/event/show',
+                       '$modparams' => 2,
+                       '$i18n' => $i18n,
+               ]);
+
+               $share_checked  = '';
+               $share_disabled = '';
+
+               if (empty($orig_event)) {
+                       $orig_event = User::getById($this->session->getLocalUserId(), ['allow_cid', 'allow_gid', 'deny_cid',
+                                                                                                                                                  'deny_gid']);;
+               } else if ($orig_event['allow_cid'] !== '<' . $this->session->getLocalUserId() . '>'
+                                  || $orig_event['allow_gid']
+                                  || $orig_event['deny_cid']
+                                  || $orig_event['deny_gid']) {
+                       $share_checked = ' checked="checked" ';
+               }
+
+               // In case of an error the browser is redirected back here, with these parameters filled in with the previous values
+               if (!empty($request['nofinish'])) {
+                       $orig_event['nofinish'] = $request['nofinish'];
+               }
+               if (!empty($request['summary'])) {
+                       $orig_event['summary'] = $request['summary'];
+               }
+               if (!empty($request['desc'])) {
+                       $orig_event['desc'] = $request['desc'];
+               }
+               if (!empty($request['location'])) {
+                       $orig_event['location'] = $request['location'];
+               }
+               if (!empty($request['start'])) {
+                       $orig_event['start'] = $request['start'];
+               }
+               if (!empty($request['finish'])) {
+                       $orig_event['finish'] = $request['finish'];
+               }
+
+               $n_checked = (!empty($orig_event['nofinish']) ? ' checked="checked" ' : '');
+
+               $t_orig = $orig_event['summary'] ?? '';
+               $d_orig = $orig_event['desc'] ?? '';
+               $l_orig = $orig_event['location'] ?? '';
+               $eid    = $orig_event['id'] ?? 0;
+               $cid    = $orig_event['cid'] ?? 0;
+               $uri    = $orig_event['uri'] ?? '';
+
+               if ($cid || $mode === 'edit') {
+                       $share_disabled = 'disabled="disabled"';
+               }
+
+               $sdt = $orig_event['start'] ?? 'now';
+               $fdt = $orig_event['finish'] ?? 'now';
+
+               $syear  = DateTimeFormat::local($sdt, 'Y');
+               $smonth = DateTimeFormat::local($sdt, 'm');
+               $sday   = DateTimeFormat::local($sdt, 'd');
+
+               $shour   = !empty($orig_event) ? DateTimeFormat::local($sdt, 'H') : '00';
+               $sminute = !empty($orig_event) ? DateTimeFormat::local($sdt, 'i') : '00';
+
+               $fyear  = DateTimeFormat::local($fdt, 'Y');
+               $fmonth = DateTimeFormat::local($fdt, 'm');
+               $fday   = DateTimeFormat::local($fdt, 'd');
+
+               $fhour   = !empty($orig_event) ? DateTimeFormat::local($fdt, 'H') : '00';
+               $fminute = !empty($orig_event) ? DateTimeFormat::local($fdt, 'i') : '00';
+
+               if (!$cid && in_array($mode, [self::MODE_NEW, self::MODE_COPY])) {
+                       $acl = ACL::getFullSelectorHTML($this->page, $this->session->getLocalUserId(), false, ACL::getDefaultUserPermissions($orig_event));
+               } else {
+                       $acl = '';
+               }
+
+               // If we copy an old event, we need to remove the ID and URI
+               // from the original event.
+               if ($mode === self::MODE_COPY) {
+                       $eid = 0;
+                       $uri = '';
+               }
+
+               $this->page['aside'] .= CalendarExport::getHTML($this->session->getLocalUserId());
+
+               $tpl = Renderer::getMarkupTemplate('calendar/event_form.tpl');
+
+               return Renderer::replaceMacros($tpl, [
+                       '$post' => $this->baseUrl . '/calendar/api/create',
+                       '$eid'  => $eid,
+                       '$cid'  => $cid,
+                       '$uri'  => $uri,
+
+                       '$title'       => $this->t('Event details'),
+                       '$desc'        => $this->t('Starting date and Title are required.'),
+                       '$s_text'      => $this->t('Event Starts:') . ' <span class="required" title="' . $this->t('Required') . '">*</span>',
+                       '$s_dsel'      => Temporal::getDateTimeField(
+                               new \DateTime(),
+                               \DateTime::createFromFormat('Y', intval($syear) + 5),
+                               \DateTime::createFromFormat('Y-m-d H:i', "$syear-$smonth-$sday $shour:$sminute"),
+                               $this->t('Event Starts:'),
+                               'start_text',
+                               true,
+                               true,
+                               '',
+                               '',
+                               true
+                       ),
+                       '$n_text'      => $this->t('Finish date/time is not known or not relevant'),
+                       '$n_checked'   => $n_checked,
+                       '$f_text'      => $this->t('Event Finishes:'),
+                       '$f_dsel'      => Temporal::getDateTimeField(
+                               new \DateTime(),
+                               \DateTime::createFromFormat('Y', intval($fyear) + 5),
+                               \DateTime::createFromFormat('Y-m-d H:i', "$fyear-$fmonth-$fday $fhour:$fminute"),
+                               $this->t('Event Finishes:'),
+                               'finish_text',
+                               true,
+                               true,
+                               'start_text'
+                       ),
+                       '$d_text'      => $this->t('Description:'),
+                       '$d_orig'      => $d_orig,
+                       '$l_text'      => $this->t('Location:'),
+                       '$l_orig'      => $l_orig,
+                       '$t_text'      => $this->t('Title:') . ' <span class="required" title="' . $this->t('Required') . '">*</span>',
+                       '$t_orig'      => $t_orig,
+                       '$summary'     => ['summary', $this->t('Title:'), $t_orig, '', '*'],
+                       '$sh_text'     => $this->t('Share this event'),
+                       '$share'       => ['share', $this->t('Share this event'), $share_checked, '', $share_disabled],
+                       '$sh_checked'  => $share_checked,
+                       '$nofinish'    => ['nofinish', $this->t('Finish date/time is not known or not relevant'), $n_checked],
+                       '$preview'     => $this->t('Preview'),
+                       '$acl'         => $acl,
+                       '$submit'      => $this->t('Submit'),
+                       '$basic'       => $this->t('Basic'),
+                       '$advanced'    => $this->t('Advanced'),
+                       '$permissions' => $this->t('Permissions'),
+               ]);
+       }
+}
diff --git a/src/Module/Calendar/Event/Get.php b/src/Module/Calendar/Event/Get.php
new file mode 100644 (file)
index 0000000..f0824d1
--- /dev/null
@@ -0,0 +1,90 @@
+<?php
+/**
+ * @copyright Copyright (C) 2010-2022, the Friendica project
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
+
+namespace Friendica\Module\Calendar\Event;
+
+use Friendica\App;
+use Friendica\Core\L10n;
+use Friendica\Core\Session\Capability\IHandleUserSessions;
+use Friendica\Core\System;
+use Friendica\Model\Event;
+use Friendica\Model\Item;
+use Friendica\Model\Post;
+use Friendica\Module\Response;
+use Friendica\Network\HTTPException;
+use Friendica\Util\DateTimeFormat;
+use Friendica\Util\Profiler;
+use Psr\Log\LoggerInterface;
+
+/**
+ * GET-Controller for event
+ * returns the result as JSON
+ */
+class Get extends \Friendica\BaseModule
+{
+       /** @var IHandleUserSessions */
+       protected $session;
+
+       public function __construct(L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, IHandleUserSessions $session, array $server, array $parameters = [])
+       {
+               parent::__construct($l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
+
+               $this->session = $session;
+       }
+
+       protected function rawContent(array $request = [])
+       {
+               if (!$this->session->getLocalUserId()) {
+                       throw new HTTPException\UnauthorizedException();
+               }
+
+               // get events by id or by date
+               if (!empty($request['id'])) {
+                       $events = [Event::getByIdAndUid($this->session->getLocalUserId(), $request['id'], $this->parameters['nickname'] ?? null)];
+               } else {
+                       $events = Event::getListByDate($this->session->getLocalUserId(), $request['start'] ?? '', $request['end'] ?? '', false, $this->parameters['nickname'] ?? null);
+               }
+
+               System::jsonExit($events ? self::map($events) : []);
+       }
+
+       private static function map(array $events): array
+       {
+               return array_map(function ($event) {
+                       $item = Post::selectFirst(['plink', 'author-name', 'author-avatar', 'author-link', 'private', 'uri-id'], ['id' => $event['itemid']]);
+                       if (empty($item)) {
+                               // Using default values when no item had been found
+                               $item = ['plink' => '', 'author-name' => '', 'author-avatar' => '', 'author-link' => '', 'private' => Item::PUBLIC, 'uri-id' => ($event['uri-id'] ?? 0)];
+                       }
+
+                       return [
+                               'id'       => $event['id'],
+                               'title'    => $event['summary'],
+                               'start'    => DateTimeFormat::local($event['start']),
+                               'end'      => DateTimeFormat::local($event['finish']),
+                               'nofinish' => $event['nofinish'],
+                               'desc'     => $event['desc'],
+                               'location' => $event['location'],
+                               'item'     => $item,
+                       ];
+               }, $events);
+       }
+}
diff --git a/src/Module/Calendar/Event/Show.php b/src/Module/Calendar/Event/Show.php
new file mode 100644 (file)
index 0000000..2c606cf
--- /dev/null
@@ -0,0 +1,84 @@
+<?php
+/**
+ * @copyright Copyright (C) 2010-2022, the Friendica project
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
+
+namespace Friendica\Module\Calendar\Event;
+
+use Friendica\App;
+use Friendica\BaseModule;
+use Friendica\Core\L10n;
+use Friendica\Core\Renderer;
+use Friendica\Core\Session\Capability\IHandleUserSessions;
+use Friendica\Core\System;
+use Friendica\Model\Event;
+use Friendica\Module\Response;
+use Friendica\Network\HTTPException;
+use Friendica\Util\Profiler;
+use Psr\Log\LoggerInterface;
+
+/**
+ * Displays one specific event in a <div> container
+ */
+class Show extends BaseModule
+{
+       /** @var IHandleUserSessions */
+       protected $session;
+
+       public function __construct(L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, IHandleUserSessions $session, array $server, array $parameters = [])
+       {
+               parent::__construct($l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
+
+               $this->session = $session;
+       }
+
+       protected function rawContent(array $request = [])
+       {
+               if (!$this->session->getLocalUserId()) {
+                       throw new HTTPException\UnauthorizedException($this->t('Permission denied.'));
+               }
+
+               if (empty($this->parameters['id'])) {
+                       throw new HTTPException\BadRequestException($this->t('Invalid Request'));
+               }
+
+               $event = Event::getByIdAndUid($this->session->getLocalUserId(), (int)$this->parameters['id'], $this->parameters['nickname'] ?? '');
+
+               if (empty($event)) {
+                       throw new HTTPException\NotFoundException($this->t('Event not found.'));
+               }
+
+               $tplEvent = Event::prepareForItem($event);
+
+               $event_item = [];
+               foreach ($tplEvent['item'] as $k => $v) {
+                       $k              = str_replace('-', '_', $k);
+                       $event_item[$k] = $v;
+               }
+               $tplEvent['item'] = $event_item;
+
+               $tpl = Renderer::getMarkupTemplate('calendar/event.tpl');
+
+               $o = Renderer::replaceMacros($tpl, [
+                       '$event' => $tplEvent,
+               ]);
+
+               System::httpExit($o);
+       }
+}
index 74fc52b464d5d43de6a1c5b4b725f27c0cc6bc7a..be47ba71801b624adb4ff4b7c71dc14acedb4d55 100644 (file)
@@ -82,9 +82,9 @@ class Export extends BaseModule
                        // If it is the own calendar return to the events page
                        // otherwise to the profile calendar page
                        if ($this->session->getLocalUserId() === $ownerUid) {
-                               $returnPath = 'events';
+                               $returnPath = 'calendar';
                        } else {
-                               $returnPath = 'events/' . $this->parameters['nickname'];
+                               $returnPath = 'calendar/show/' . $this->parameters['nickname'];
                        }
 
                        $this->baseUrl->redirect($returnPath);
diff --git a/src/Module/Calendar/Json.php b/src/Module/Calendar/Json.php
deleted file mode 100644 (file)
index 08481e6..0000000
+++ /dev/null
@@ -1,122 +0,0 @@
-<?php
-/**
- * @copyright Copyright (C) 2010-2022, the Friendica project
- *
- * @license GNU AGPL version 3 or any later version
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- *
- */
-
-namespace Friendica\Module\Calendar;
-
-use Friendica\Core\System;
-use Friendica\Database\DBA;
-use Friendica\DI;
-use Friendica\Model\Event;
-use Friendica\Model\Item;
-use Friendica\Model\Post;
-use Friendica\Network\HTTPException;
-use Friendica\Util\DateTimeFormat;
-use Friendica\Util\Temporal;
-
-class Json extends \Friendica\BaseModule
-{
-       protected function rawContent(array $request = [])
-       {
-               if (!DI::userSession()->getLocalUserId()) {
-                       throw new HTTPException\UnauthorizedException();
-               }
-
-               $y = intval(DateTimeFormat::localNow('Y'));
-               $m = intval(DateTimeFormat::localNow('m'));
-
-               // Put some limit on dates. The PHP date functions don't seem to do so well before 1900.
-               if ($y < 1901) {
-                       $y = 1900;
-               }
-
-               $dim    = Temporal::getDaysInMonth($y, $m);
-               $start  = sprintf('%d-%d-%d %d:%d:%d', $y, $m, 1, 0, 0, 0);
-               $finish = sprintf('%d-%d-%d %d:%d:%d', $y, $m, $dim, 23, 59, 59);
-
-               if (!empty($request['start'])) {
-                       $start = $request['start'];
-               }
-
-               if (!empty($request['end'])) {
-                       $finish = $request['end'];
-               }
-
-               // put the event parametes in an array so we can better transmit them
-               $event_params = [
-                       'event_id' => intval($request['id'] ?? 0),
-                       'start'    => $start,
-                       'finish'   => $finish,
-                       'ignore'   => 0,
-               ];
-
-               // get events by id or by date
-               if ($event_params['event_id']) {
-                       $r = Event::getListById(DI::userSession()->getLocalUserId(), $event_params['event_id']);
-               } else {
-                       $r = Event::getListByDate(DI::userSession()->getLocalUserId(), $event_params);
-               }
-
-               $links = [];
-
-               if (DBA::isResult($r)) {
-                       $r = Event::sortByDate($r);
-                       foreach ($r as $rr) {
-                               $j = DateTimeFormat::utc($rr['start'], 'j');
-                               if (empty($links[$j])) {
-                                       $links[$j] = DI::baseUrl() . '/' . DI::args()->getCommand() . '#link-' . $j;
-                               }
-                       }
-               }
-
-               $events = [];
-
-               // transform the event in a usable array
-               if (DBA::isResult($r)) {
-                       $events = Event::sortByDate($r);
-
-                       $events = self::map($events);
-               }
-
-               System::jsonExit($events);
-       }
-
-       private static function map(array $events): array
-       {
-               return array_map(function ($event) {
-                       $item = Post::selectFirst(['plink', 'author-name', 'author-avatar', 'author-link', 'private', 'uri-id'], ['id' => $event['itemid']]);
-                       if (!DBA::isResult($item)) {
-                               // Using default values when no item had been found
-                               $item = ['plink' => '', 'author-name' => '', 'author-avatar' => '', 'author-link' => '', 'private' => Item::PUBLIC, 'uri-id' => ($event['uri-id'] ?? 0)];
-                       }
-
-                       return [
-                               'id'       => $event['id'],
-                               'title'    => $event['summary'],
-                               'start'    => DateTimeFormat::local($event['start']),
-                               'end'      => DateTimeFormat::local($event['finish']),
-                               'nofinish' => $event['nofinish'],
-                               'desc'     => $event['desc'],
-                               'location' => $event['location'],
-                               'item'     => $item,
-                       ];
-               }, $events);
-       }
-}
diff --git a/src/Module/Calendar/Show.php b/src/Module/Calendar/Show.php
new file mode 100644 (file)
index 0000000..99a38fa
--- /dev/null
@@ -0,0 +1,133 @@
+<?php
+/**
+ * @copyright Copyright (C) 2010-2022, the Friendica project
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
+
+namespace Friendica\Module\Calendar;
+
+use Friendica\App;
+use Friendica\BaseModule;
+use Friendica\Content\Nav;
+use Friendica\Content\Widget;
+use Friendica\Core\L10n;
+use Friendica\Core\Renderer;
+use Friendica\Core\Session\Capability\IHandleUserSessions;
+use Friendica\Core\Theme;
+use Friendica\Model\Event;
+use Friendica\Module\BaseProfile;
+use Friendica\Module\Response;
+use Friendica\Module\Security\Login;
+use Friendica\Navigation\SystemMessages;
+use Friendica\Util\Profiler;
+use Psr\Log\LoggerInterface;
+
+class Show extends BaseModule
+{
+       /** @var IHandleUserSessions */
+       protected $session;
+       /** @var SystemMessages */
+       protected $sysMessages;
+       /** @var App\Page */
+       protected $page;
+       /** @var App */
+       protected $app;
+
+       public function __construct(L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, IHandleUserSessions $session, SystemMessages $sysMessages, App\Page $page, App $app, array $server, array $parameters = [])
+       {
+               parent::__construct($l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
+
+               $this->session      = $session;
+               $this->sysMessages  = $sysMessages;
+               $this->page         = $page;
+               $this->app          = $app;
+       }
+
+       protected function content(array $request = []): string
+       {
+               if (!$this->session->getLocalUserId()) {
+                       $this->sysMessages->addNotice($this->t('Permission denied.'));
+                       return Login::form();
+               }
+
+               // get the translation strings for the calendar
+               $i18n = Event::getStrings();
+
+               $this->page->registerStylesheet('view/asset/fullcalendar/dist/fullcalendar.min.css');
+               $this->page->registerStylesheet('view/asset/fullcalendar/dist/fullcalendar.print.min.css', 'print');
+               $this->page->registerFooterScript('view/asset/moment/min/moment-with-locales.min.js');
+               $this->page->registerFooterScript('view/asset/fullcalendar/dist/fullcalendar.min.js');
+
+               $htpl = Renderer::getMarkupTemplate('calendar/calendar_head.tpl');
+               $this->page['htmlhead'] .= Renderer::replaceMacros($htpl, [
+                       '$calendar_api' => $this->baseUrl . '/calendar/api/get' . (!empty($this->parameters['nickname']) ? '/' . $this->parameters['nickname'] : ''),
+                       '$event_api'    => $this->baseUrl . '/calendar/event/show' . (!empty($this->parameters['nickname']) ? '/' . $this->parameters['nickname'] : ''),
+                       '$modparams' => 2,
+                       '$i18n' => $i18n,
+               ]);
+
+               $tabs = '';
+
+               if (empty($this->parameters['nickname'])) {
+                       if ($this->app->getThemeInfoValue('events_in_profile')) {
+                               Nav::setSelected('home');
+                       } else {
+                               Nav::setSelected('calendar');
+                       }
+
+                       // tabs
+                       if ($this->app->getThemeInfoValue('events_in_profile')) {
+                               $tabs = BaseProfile::getTabsHTML($this->app, 'calendar', true, $this->app->getLoggedInUserNickname(), false);
+                       }
+
+                       $this->page['aside'] .= Widget\CalendarExport::getHTML($this->session->getLocalUserId());
+               } else {
+                       $owner = Event::getOwnerForNickname($this->parameters['nickname'], true);
+
+                       Nav::setSelected('calendar');
+
+                       // get the tab navigation bar
+                       $tabs = BaseProfile::getTabsHTML($this->app, 'calendar', false, $owner['nickname'], $owner['hide-friends']);
+
+                       $this->page['aside'] .= Widget\VCard::getHTML($owner);
+                       $this->page['aside'] .= Widget\CalendarExport::getHTML($owner['uid']);
+               }
+
+               // ACL blocks are loaded in modals in frio
+               $this->page->registerFooterScript(Theme::getPathForFile('asset/typeahead.js/dist/typeahead.bundle.js'));
+               $this->page->registerFooterScript(Theme::getPathForFile('js/friendica-tagsinput/friendica-tagsinput.js'));
+               $this->page->registerStylesheet(Theme::getPathForFile('js/friendica-tagsinput/friendica-tagsinput.css'));
+               $this->page->registerStylesheet(Theme::getPathForFile('js/friendica-tagsinput/friendica-tagsinput-typeahead.css'));
+
+               $tpl = Renderer::getMarkupTemplate("calendar/calendar.tpl");
+               $o = Renderer::replaceMacros($tpl, [
+                       '$tabs'      => $tabs,
+                       '$title'     => $this->t('Events'),
+                       '$view'      => $this->t('View'),
+                       '$new_event' => [$this->baseUrl . '/calendar/event/new', $this->t('Create New Event'), '', ''],
+
+                       '$today' => $this->t('today'),
+                       '$month' => $this->t('month'),
+                       '$week'  => $this->t('week'),
+                       '$day'   => $this->t('day'),
+                       '$list'  => $this->t('list'),
+               ]);
+
+               return $o;
+       }
+}
index a554f7752648973babc6caf4310e3abf18a9db07..a19f94675011af692d1823bfbd13432c6129a653 100644 (file)
@@ -60,8 +60,8 @@ class Manifest extends BaseModule
                                        'url'   => '/contact'
                                ],
                                [
-                                       'name'  => 'Events',
-                                       'url'   => '/events'
+                                       'name'  => 'Calendar',
+                                       'url'   => '/calendar'
                                ]
                        ]
                ];
index ddbc1a73682e69831f1dc48eb3cd56c364932e2f..459405cdbfac5c85425958ef636b4b54c24c1c48 100644 (file)
@@ -218,7 +218,7 @@ class Post
                if (DI::userSession()->getLocalUserId()) {
                        if (Strings::compareLink(DI::session()->get('my_url'), $item['author-link'])) {
                                if ($item['event-id'] != 0) {
-                                       $edpost = ['events/event/' . $item['event-id'], DI::l10n()->t('Edit')];
+                                       $edpost = ['calendar/event/edit/' . $item['event-id'], DI::l10n()->t('Edit')];
                                } else {
                                        $edpost = ['editpost/' . $item['id'], DI::l10n()->t('Edit')];
                                }
index d72302da239fb0581d7287a4da5d76ae70ae3d59..773b8d253162a5b5436b149043293ed490c6a3ca 100644 (file)
@@ -365,8 +365,18 @@ return [
 
        '/bookmarklet'         => [Module\Bookmarklet::class,  [R::GET]],
 
-       '/calendar/{nickname}/export[/{format}]' => [Module\Calendar\Export::class, [R::GET]],
-       '/calendar/json'                         => [Module\Calendar\Json::class,   [R::GET]],
+       '/calendar' => [
+               '[/]'                                           => [Module\Calendar\Show::class,       [R::GET         ]],
+               '/show/{nickname}'                              => [Module\Calendar\Show::class,       [R::GET         ]],
+               '/export/{nickname}[/{format:csv|ical}]'        => [Module\Calendar\Export::class,     [R::GET         ]],
+               '/api/{action:ignore|unignore|delete}/{id:\d+}' => [Module\Calendar\Event\API::class,  [R::GET         ]],
+               '/api/{action:create}'                          => [Module\Calendar\Event\API::class,  [        R::POST]],
+               '/api/get[/{nickname}]'                         => [Module\Calendar\Event\Get::class,  [R::GET         ]],
+               '/event/show/{id:\d+}'                          => [Module\Calendar\Event\Show::class, [R::GET         ]],
+               '/event/show/{nickname}/{id:\d+}'               => [Module\Calendar\Event\Show::class, [R::GET         ]],
+               '/event/{mode:new}'                             => [Module\Calendar\Event\Form::class, [R::GET         ]],
+               '/event/{mode:edit|copy}/{id:\d+}'              => [Module\Calendar\Event\Form::class, [R::GET         ]],
+       ],
 
        '/community[/{content}]' => [Module\Conversation\Community::class, [R::GET]],
 
diff --git a/view/templates/calendar/calendar.tpl b/view/templates/calendar/calendar.tpl
new file mode 100644 (file)
index 0000000..dfafc6a
--- /dev/null
@@ -0,0 +1,7 @@
+
+{{$tabs nofilter}}
+<h2>{{$title}}</h2>
+
+<div id="new-event-link"><a href="{{$new_event.0}}">{{$new_event.1}}</a></div>
+
+<div id="events-calendar"></div>
diff --git a/view/templates/calendar/calendar_head.tpl b/view/templates/calendar/calendar_head.tpl
new file mode 100644 (file)
index 0000000..082de6c
--- /dev/null
@@ -0,0 +1,188 @@
+<script>
+       function showEvent(eventid) {
+               $.get(
+                       '{{$event_api}}/'+eventid,
+                       function(data){
+                               $.colorbox({html:data});
+                       }
+               );
+       }
+
+       function doEventPreview() {
+               $('#event-edit-preview').val(1);
+               $.post('calendar',$('#event-edit-form').serialize(), function(data) {
+                       $.colorbox({ html: data });
+               });
+               $('#event-edit-preview').val(0);
+       }
+
+       // disable the input for the finish date if it is not available
+       function enableDisableFinishDate() {
+               if( $('#id_nofinish').is(':checked'))
+                       $('#id_finish_text').prop("disabled", true);
+               else
+                       $('#id_finish_text').prop("disabled", false);
+       }
+
+       $(document).ready(function() {
+               $('#events-calendar').fullCalendar({
+                       firstDay: '{{$i18n.firstDay|escape:'quotes'}}',
+                       monthNames: [
+                               '{{$i18n.January|escape:'quotes'}}',
+                               '{{$i18n.February|escape:'quotes'}}',
+                               '{{$i18n.March|escape:'quotes'}}',
+                               '{{$i18n.April|escape:'quotes'}}',
+                               '{{$i18n.May|escape:'quotes'}}',
+                               '{{$i18n.June|escape:'quotes'}}',
+                               '{{$i18n.July|escape:'quotes'}}',
+                               '{{$i18n.August|escape:'quotes'}}',
+                               '{{$i18n.September|escape:'quotes'}}',
+                               '{{$i18n.October|escape:'quotes'}}',
+                               '{{$i18n.November|escape:'quotes'}}',
+                               '{{$i18n.December|escape:'quotes'}}'
+                       ],
+                       monthNamesShort: [
+                               '{{$i18n.Jan|escape:'quotes'}}',
+                               '{{$i18n.Feb|escape:'quotes'}}',
+                               '{{$i18n.Mar|escape:'quotes'}}',
+                               '{{$i18n.Apr|escape:'quotes'}}',
+                               '{{$i18n.May|escape:'quotes'}}',
+                               '{{$i18n.Jun|escape:'quotes'}}',
+                               '{{$i18n.Jul|escape:'quotes'}}',
+                               '{{$i18n.Aug|escape:'quotes'}}',
+                               '{{$i18n.Sep|escape:'quotes'}}',
+                               '{{$i18n.Oct|escape:'quotes'}}',
+                               '{{$i18n.Nov|escape:'quotes'}}',
+                               '{{$i18n.Dec|escape:'quotes'}}'
+                       ],
+                       dayNames: [
+                               '{{$i18n.Sunday|escape:'quotes'}}',
+                               '{{$i18n.Monday|escape:'quotes'}}',
+                               '{{$i18n.Tuesday|escape:'quotes'}}',
+                               '{{$i18n.Wednesday|escape:'quotes'}}',
+                               '{{$i18n.Thursday|escape:'quotes'}}',
+                               '{{$i18n.Friday|escape:'quotes'}}',
+                               '{{$i18n.Saturday|escape:'quotes'}}'
+                       ],
+                       dayNamesShort: [
+                               '{{$i18n.Sun|escape:'quotes'}}',
+                               '{{$i18n.Mon|escape:'quotes'}}',
+                               '{{$i18n.Tue|escape:'quotes'}}',
+                               '{{$i18n.Wed|escape:'quotes'}}',
+                               '{{$i18n.Thu|escape:'quotes'}}',
+                               '{{$i18n.Fri|escape:'quotes'}}',
+                               '{{$i18n.Sat|escape:'quotes'}}'
+                       ],
+                       allDayText: '{{$i18n.allday|escape:'quotes'}}',
+                       noEventsMessage: '{{$i18n.noevent|escape:'quotes'}}',
+                       buttonText: {
+                               today: '{{$i18n.today|escape:'quotes'}}',
+                               month: '{{$i18n.month|escape:'quotes'}}',
+                               week: '{{$i18n.week|escape:'quotes'}}',
+                               day: '{{$i18n.day|escape:'quotes'}}'
+                       },
+                       events: '{{$calendar_api}}',
+                       header: {
+                               left: 'prev,next today',
+                               center: 'title',
+                               right: 'month,agendaWeek,agendaDay'
+                       },
+                       timeFormat: 'H(:mm)',
+                       eventClick: function(calEvent, jsEvent, view) {
+                               showEvent(calEvent.id);
+                       },
+                       loading: function(isLoading, view) {
+                               if(!isLoading) {
+                                       $('td.fc-day').dblclick(function() { window.location.href='/calendar/event/new?start='+$(this).data('date'); });
+                               }
+                       },
+
+                       eventRender: function(event, element, view) {
+                               if (event.item['author-name']==null) return;
+                               switch(view.name){
+                                       case "month":
+                                       element.find(".fc-title").html(
+                                               "<img src='{0}' style='height:10px;width:10px'>{1} : {2}".format(
+                                                       event.item['author-avatar'],
+                                                       event.item['author-name'],
+                                                       event.title
+                                       ));
+                                       break;
+                                       case "agendaWeek":
+                                       element.find(".fc-title").html(
+                                               "<img src='{0}' style='height:12px; width:12px'>{1}<p>{2}</p><p>{3}</p>".format(
+                                                       event.item['author-avatar'],
+                                                       event.item['author-name'],
+                                                       event.item.desc,
+                                                       event.item.location
+                                       ));
+                                       break;
+                                       case "agendaDay":
+                                       element.find(".fc-title").html(
+                                               "<img src='{0}' style='height:24px;width:24px'>{1}<p>{2}</p><p>{3}</p>".format(
+                                                       event.item['author-avatar'],
+                                                       event.item['author-name'],
+                                                       event.item.desc,
+                                                       event.item.location
+                                       ));
+                                       break;
+                               }
+                       }
+
+               })
+
+               // center on date
+               var args=location.href.replace(baseurl,"").split("/");
+{{if $modparams == 2}}
+               if (args.length>=5) {
+                       $("#events-calendar").fullCalendar('gotoDate',args[3] , args[4]-1);
+               }
+{{else}}
+               if (args.length>=4) {
+                       $("#events-calendar").fullCalendar('gotoDate',args[2] , args[3]-1);
+               }
+{{/if}}
+
+               // show event popup
+               var hash = location.hash.split("-")
+               if (hash.length==2 && hash[0]=="#link") showEvent(hash[1]);
+
+       });
+</script>
+
+<script language="javascript" type="text/javascript">
+
+       $(document).ready(function() {
+               $("#comment-edit-text-desc").bbco_autocomplete('bbcode');
+
+               $('#id_share').change(function() {
+
+                       if ($('#id_share').is(':checked')) {
+                               $('#acl-wrapper').show();
+                       }
+                       else {
+                               $('#acl-wrapper').hide();
+                       }
+               }).trigger('change');
+
+               $('#contact_allow, #contact_deny, #group_allow, #group_deny').change(function() {
+                       var selstr;
+                       $('#contact_allow option:selected, #contact_deny option:selected, #group_allow option:selected, #group_deny option:selected').each( function() {
+                               selstr = $(this).html();
+                               $('#jot-public').hide();
+                       });
+                       if(selstr == null) {
+                               $('#jot-public').show();
+                       }
+
+               }).trigger('change');
+
+               // disable the finish time input if the user disable it
+               $('#id_nofinish').change(function() {
+                       enableDisableFinishDate()
+               }).trigger('change');
+
+       });
+
+</script>
+
diff --git a/view/templates/calendar/event.tpl b/view/templates/calendar/event.tpl
new file mode 100644 (file)
index 0000000..e58db62
--- /dev/null
@@ -0,0 +1,10 @@
+<div class="event">
+
+{{if $event.item.author_name}}<a href="{{$event.item.author_link}}"><img src="{{$event.item.author_avatar}}" height="32" width="32" />{{$event.item.author_name}}</a>{{/if}}
+{{$event.html nofilter}}
+{{if $event.plink.orig}}<a href="{{$event.plink.orig}}" title="{{$event.plink.orig_title}}" target="_blank" rel="noopener noreferrer" class="plink-event-link icon s22 remote-link"></a>{{/if}}
+{{if $event.edit}}<a href="{{$event.edit.0}}" title="{{$event.edit.1}}" class="edit-event-link icon s22 pencil"></a>{{/if}}
+{{if $event.copy}}<a href="{{$event.copy.0}}" title="{{$event.copy.1}}" class="copy-event-link icon s22 copy"></a>{{/if}}
+{{if $event.drop}}<a href="{{$event.drop.0}}" onclick="return confirmDelete();" title="{{$event.drop.1}}" class="drop-event-link icon s22 delete"></a>{{/if}}
+</div>
+<div class="clear"></div>
\ No newline at end of file
diff --git a/view/templates/calendar/event_form.tpl b/view/templates/calendar/event_form.tpl
new file mode 100644 (file)
index 0000000..894d50f
--- /dev/null
@@ -0,0 +1,42 @@
+
+<h3>{{$title}}</h3>
+
+<p>
+{{$desc nofilter}}
+</p>
+
+<form id="event-edit-form" action="{{$post}}" method="post">
+
+<input type="hidden" name="event_id" value="{{$eid}}" />
+<input type="hidden" name="cid" value="{{$cid}}" />
+<input type="hidden" name="uri" value="{{$uri}}" />
+<input type="hidden" name="preview" id="event-edit-preview" value="0" />
+
+{{$s_dsel nofilter}}
+
+{{$f_dsel nofilter}}
+
+{{include file="field_checkbox.tpl" field=$nofinish}}
+
+{{include file="field_input.tpl" field=$summary}}
+
+
+<div id="event-desc-text">{{$d_text}}</div>
+<textarea id="event-desc-textarea" name="desc">{{$d_orig}}</textarea>
+
+
+<div id="event-location-text">{{$l_text}}</div>
+<textarea id="event-location-textarea" name="location">{{$l_orig}}</textarea>
+
+<div id="event-location-break"></div>
+
+{{if ! $eid}}
+{{include file="field_checkbox.tpl" field=$share}}
+{{/if}}
+
+{{$acl nofilter}}
+
+<div class="clear"></div>
+<input id="event-edit-preview" type="submit" name="preview" value="{{$preview}}" onclick="doEventPreview(); return false;" />
+<input id="event-submit" type="submit" name="submit" value="{{$submit}}" />
+</form>
diff --git a/view/templates/event.tpl b/view/templates/event.tpl
deleted file mode 100644 (file)
index c8250c8..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-
-{{foreach $events as $event}}
-       <div class="event">
-       
-       {{if $event.item.author_name}}<a href="{{$event.item.author_link}}"><img src="{{$event.item.author_avatar}}" height="32" width="32" />{{$event.item.author_name}}</a>{{/if}}
-       {{$event.html nofilter}}
-       {{if $event.plink.orig}}<a href="{{$event.plink.orig}}" title="{{$event.plink.orig_title}}" target="_blank" rel="noopener noreferrer" class="plink-event-link icon s22 remote-link"></a>{{/if}}
-       {{if $event.edit}}<a href="{{$event.edit.0}}" title="{{$event.edit.1}}" class="edit-event-link icon s22 pencil"></a>{{/if}}
-       {{if $event.copy}}<a href="{{$event.copy.0}}" title="{{$event.copy.1}}" class="copy-event-link icon s22 copy"></a>{{/if}}
-       {{if $event.drop}}<a href="{{$event.drop.0}}" onclick="return confirmDelete();" title="{{$event.drop.1}}" class="drop-event-link icon s22 delete"></a>{{/if}}
-       </div>
-       <div class="clear"></div>
-{{/foreach}}
diff --git a/view/templates/event_form.tpl b/view/templates/event_form.tpl
deleted file mode 100644 (file)
index 894d50f..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-
-<h3>{{$title}}</h3>
-
-<p>
-{{$desc nofilter}}
-</p>
-
-<form id="event-edit-form" action="{{$post}}" method="post">
-
-<input type="hidden" name="event_id" value="{{$eid}}" />
-<input type="hidden" name="cid" value="{{$cid}}" />
-<input type="hidden" name="uri" value="{{$uri}}" />
-<input type="hidden" name="preview" id="event-edit-preview" value="0" />
-
-{{$s_dsel nofilter}}
-
-{{$f_dsel nofilter}}
-
-{{include file="field_checkbox.tpl" field=$nofinish}}
-
-{{include file="field_input.tpl" field=$summary}}
-
-
-<div id="event-desc-text">{{$d_text}}</div>
-<textarea id="event-desc-textarea" name="desc">{{$d_orig}}</textarea>
-
-
-<div id="event-location-text">{{$l_text}}</div>
-<textarea id="event-location-textarea" name="location">{{$l_orig}}</textarea>
-
-<div id="event-location-break"></div>
-
-{{if ! $eid}}
-{{include file="field_checkbox.tpl" field=$share}}
-{{/if}}
-
-{{$acl nofilter}}
-
-<div class="clear"></div>
-<input id="event-edit-preview" type="submit" name="preview" value="{{$preview}}" onclick="doEventPreview(); return false;" />
-<input id="event-submit" type="submit" name="submit" value="{{$submit}}" />
-</form>
diff --git a/view/templates/event_head.tpl b/view/templates/event_head.tpl
deleted file mode 100644 (file)
index 1627bd6..0000000
+++ /dev/null
@@ -1,188 +0,0 @@
-<script>
-       function showEvent(eventid) {
-               $.get(
-                       '{{$baseurl}}{{$module_url}}/?id='+eventid,
-                       function(data){
-                               $.colorbox({html:data});
-                       }
-               );
-       }
-
-       function doEventPreview() {
-               $('#event-edit-preview').val(1);
-               $.post('events',$('#event-edit-form').serialize(), function(data) {
-                       $.colorbox({ html: data });
-               });
-               $('#event-edit-preview').val(0);
-       }
-
-       // disable the input for the finish date if it is not available
-       function enableDisableFinishDate() {
-               if( $('#id_nofinish').is(':checked'))
-                       $('#id_finish_text').prop("disabled", true);
-               else
-                       $('#id_finish_text').prop("disabled", false);
-       }
-
-       $(document).ready(function() {
-               $('#events-calendar').fullCalendar({
-                       firstDay: '{{$i18n.firstDay|escape:'quotes'}}',
-                       monthNames: [
-                               '{{$i18n.January|escape:'quotes'}}',
-                               '{{$i18n.February|escape:'quotes'}}',
-                               '{{$i18n.March|escape:'quotes'}}',
-                               '{{$i18n.April|escape:'quotes'}}',
-                               '{{$i18n.May|escape:'quotes'}}',
-                               '{{$i18n.June|escape:'quotes'}}',
-                               '{{$i18n.July|escape:'quotes'}}',
-                               '{{$i18n.August|escape:'quotes'}}',
-                               '{{$i18n.September|escape:'quotes'}}',
-                               '{{$i18n.October|escape:'quotes'}}',
-                               '{{$i18n.November|escape:'quotes'}}',
-                               '{{$i18n.December|escape:'quotes'}}'
-                       ],
-                       monthNamesShort: [
-                               '{{$i18n.Jan|escape:'quotes'}}',
-                               '{{$i18n.Feb|escape:'quotes'}}',
-                               '{{$i18n.Mar|escape:'quotes'}}',
-                               '{{$i18n.Apr|escape:'quotes'}}',
-                               '{{$i18n.May|escape:'quotes'}}',
-                               '{{$i18n.Jun|escape:'quotes'}}',
-                               '{{$i18n.Jul|escape:'quotes'}}',
-                               '{{$i18n.Aug|escape:'quotes'}}',
-                               '{{$i18n.Sep|escape:'quotes'}}',
-                               '{{$i18n.Oct|escape:'quotes'}}',
-                               '{{$i18n.Nov|escape:'quotes'}}',
-                               '{{$i18n.Dec|escape:'quotes'}}'
-                       ],
-                       dayNames: [
-                               '{{$i18n.Sunday|escape:'quotes'}}',
-                               '{{$i18n.Monday|escape:'quotes'}}',
-                               '{{$i18n.Tuesday|escape:'quotes'}}',
-                               '{{$i18n.Wednesday|escape:'quotes'}}',
-                               '{{$i18n.Thursday|escape:'quotes'}}',
-                               '{{$i18n.Friday|escape:'quotes'}}',
-                               '{{$i18n.Saturday|escape:'quotes'}}'
-                       ],
-                       dayNamesShort: [
-                               '{{$i18n.Sun|escape:'quotes'}}',
-                               '{{$i18n.Mon|escape:'quotes'}}',
-                               '{{$i18n.Tue|escape:'quotes'}}',
-                               '{{$i18n.Wed|escape:'quotes'}}',
-                               '{{$i18n.Thu|escape:'quotes'}}',
-                               '{{$i18n.Fri|escape:'quotes'}}',
-                               '{{$i18n.Sat|escape:'quotes'}}'
-                       ],
-                       allDayText: '{{$i18n.allday|escape:'quotes'}}',
-                       noEventsMessage: '{{$i18n.noevent|escape:'quotes'}}',
-                       buttonText: {
-                               today: '{{$i18n.today|escape:'quotes'}}',
-                               month: '{{$i18n.month|escape:'quotes'}}',
-                               week: '{{$i18n.week|escape:'quotes'}}',
-                               day: '{{$i18n.day|escape:'quotes'}}'
-                       },
-                       events: '{{$baseurl}}/calendar/json',
-                       header: {
-                               left: 'prev,next today',
-                               center: 'title',
-                               right: 'month,agendaWeek,agendaDay'
-                       },
-                       timeFormat: 'H(:mm)',
-                       eventClick: function(calEvent, jsEvent, view) {
-                               showEvent(calEvent.id);
-                       },
-                       loading: function(isLoading, view) {
-                               if(!isLoading) {
-                                       $('td.fc-day').dblclick(function() { window.location.href='/events/new?start='+$(this).data('date'); });
-                               }
-                       },
-
-                       eventRender: function(event, element, view) {
-                               if (event.item['author-name']==null) return;
-                               switch(view.name){
-                                       case "month":
-                                       element.find(".fc-title").html(
-                                               "<img src='{0}' style='height:10px;width:10px'>{1} : {2}".format(
-                                                       event.item['author-avatar'],
-                                                       event.item['author-name'],
-                                                       event.title
-                                       ));
-                                       break;
-                                       case "agendaWeek":
-                                       element.find(".fc-title").html(
-                                               "<img src='{0}' style='height:12px; width:12px'>{1}<p>{2}</p><p>{3}</p>".format(
-                                                       event.item['author-avatar'],
-                                                       event.item['author-name'],
-                                                       event.item.desc,
-                                                       event.item.location
-                                       ));
-                                       break;
-                                       case "agendaDay":
-                                       element.find(".fc-title").html(
-                                               "<img src='{0}' style='height:24px;width:24px'>{1}<p>{2}</p><p>{3}</p>".format(
-                                                       event.item['author-avatar'],
-                                                       event.item['author-name'],
-                                                       event.item.desc,
-                                                       event.item.location
-                                       ));
-                                       break;
-                               }
-                       }
-
-               })
-
-               // center on date
-               var args=location.href.replace(baseurl,"").split("/");
-{{if $modparams == 2}}
-               if (args.length>=5) {
-                       $("#events-calendar").fullCalendar('gotoDate',args[3] , args[4]-1);
-               }
-{{else}}
-               if (args.length>=4) {
-                       $("#events-calendar").fullCalendar('gotoDate',args[2] , args[3]-1);
-               }
-{{/if}}
-
-               // show event popup
-               var hash = location.hash.split("-")
-               if (hash.length==2 && hash[0]=="#link") showEvent(hash[1]);
-
-       });
-</script>
-
-<script language="javascript" type="text/javascript">
-
-       $(document).ready(function() {
-               $("#comment-edit-text-desc").bbco_autocomplete('bbcode');
-
-               $('#id_share').change(function() {
-
-                       if ($('#id_share').is(':checked')) {
-                               $('#acl-wrapper').show();
-                       }
-                       else {
-                               $('#acl-wrapper').hide();
-                       }
-               }).trigger('change');
-
-               $('#contact_allow, #contact_deny, #group_allow, #group_deny').change(function() {
-                       var selstr;
-                       $('#contact_allow option:selected, #contact_deny option:selected, #group_allow option:selected, #group_deny option:selected').each( function() {
-                               selstr = $(this).html();
-                               $('#jot-public').hide();
-                       });
-                       if(selstr == null) {
-                               $('#jot-public').show();
-                       }
-
-               }).trigger('change');
-
-               // disable the finish time input if the user disable it
-               $('#id_nofinish').change(function() {
-                       enableDisableFinishDate()
-               }).trigger('change');
-
-       });
-
-</script>
-
diff --git a/view/templates/events.tpl b/view/templates/events.tpl
deleted file mode 100644 (file)
index 07943bd..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-
-{{$tabs nofilter}}
-{{include file="section_title.tpl"}}
-
-<div id="new-event-link"><a href="{{$new_event.0}}">{{$new_event.1}}</a></div>
-
-<div id="event-calendar-wrapper">
-       <a href="{{$previus.0}}" class="prevcal {{$previus.2}}"><div id="event-calendar-prev" class="icon s22 prev" title="{{$previus.1}}"></div></a>
-       {{$calendar}}
-       <a href="{{$next.0}}" class="nextcal {{$next.2}}"><div id="event-calendar-prev" class="icon s22 next" title="{{$next.1}}"></div></a>
-</div>
-<div class="event-calendar-end"></div>
-
-
-{{foreach $events as $event}}
-       <div class="event">
-       {{if $event.is_first}}<hr /><a name="link-{{$event.j}}"><div class="event-list-date">{{$event.d}}</div></a>{{/if}}
-       {{if $event.item.author_name}}<a href="{{$event.item.author_link}}"><img src="{{$event.item.author_avatar}}" height="32" width="32" />{{$event.item.author_name}}</a>{{/if}}
-       {{$event.html nofilter}}
-       {{if $event.item.plink}}<a href="{{$event.plink.0}}" title="{{$event.plink.1}}" target="_blank" rel="noopener noreferrer" class="plink-event-link icon s22 remote-link"></a>{{/if}}
-       {{if $event.edit}}<a href="{{$event.edit.0}}" title="{{$event.edit.1}}" class="edit-event-link icon s22 pencil"></a>{{/if}}
-       </div>
-       <div class="clear"></div>
-
-{{/foreach}}
diff --git a/view/templates/events_js.tpl b/view/templates/events_js.tpl
deleted file mode 100644 (file)
index dfafc6a..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-
-{{$tabs nofilter}}
-<h2>{{$title}}</h2>
-
-<div id="new-event-link"><a href="{{$new_event.0}}">{{$new_event.1}}</a></div>
-
-<div id="events-calendar"></div>
index 228a741b02423065a1be8a4b8728600a6a0a8095..2b1fee3745ddc014ce64b6161f761eb2eacee3f7 100644 (file)
@@ -4,7 +4,7 @@
 <div id="event-wrapper" style="display: none;"><div id="event-title">{{$event_title}}</div>
 <div id="event-title-end"></div>
 {{foreach $events as $event}}
-<div class="event-list" id="event-{{$event.id}}"> <a class="ajax-popupbox" href="events/?id={{$event.id}}">{{$event.title}}</a> - {{$event.date}} </div>
+<div class="event-list" id="event-{{$event.id}}"> <a class="ajax-popupbox" href="calendar/event/show/{{$event.id}}">{{$event.title}}</a> - {{$event.date}} </div>
 {{/foreach}}
 </div>
 {{/if}}
index 10f142cb3959fb506d5f299d8744e05bd97919a6..27a6ac85139ca377f632ce6c4b3d9667216b9d65 100644 (file)
@@ -1,9 +1,9 @@
 
-<div id="sidebar-events" class="widget">
+<div id="sidebar-calendar" class="widget">
        <h3>{{$etitle}}</h3>
 
        <ul class="sidebar-calendar-export-ul">
-               <li role="menuitem" class="sidebar-calendar-export-li"><a href="{{$baseurl}}/calendar/{{$user}}/export/ical">{{$export_ical}}</a></li>
-               <li role="menuitem" class="sidebar-calendar-export-li"><a href="{{$baseurl}}/calendar/{{$user}}/export/csv">{{$export_csv}}</a></li>
+               <li role="menuitem" class="sidebar-calendar-export-li"><a href="{{$baseurl}}/calendar/export/{{$user}}/ical">{{$export_ical}}</a></li>
+               <li role="menuitem" class="sidebar-calendar-export-li"><a href="{{$baseurl}}/calendar/export/{{$user}}/csv">{{$export_csv}}</a></li>
        </ul>
 </div>
index c1f22761c45d02e425a452de68cee89556603ded..67f67aeea9a9777842e0ffd5050f17eeec4a6eea 100644 (file)
@@ -22,7 +22,7 @@ $(document).ready(function () {
                        week: aStr.week,
                        day: aStr.day,
                },
-               events: baseurl + moduleUrl + "/json/",
+               events: calendar_api,
                header: {
                        left: "",
                        //      center: 'title',
@@ -35,7 +35,7 @@ $(document).ready(function () {
                loading: function (isLoading, view) {
                        if (!isLoading) {
                                $("td.fc-day").dblclick(function () {
-                                       addToModal("/events/new?start=" + $(this).data("date"));
+                                       addToModal("/calendar/event/new?start=" + $(this).data("date"));
                                });
                        }
                },
@@ -103,18 +103,6 @@ $(document).ready(function () {
                },
        });
 
-       // center on date
-       var args = location.href.replace(baseurl, "").split("/");
-       if (modparams == 2) {
-               if (args.length >= 5) {
-                       $("#events-calendar").fullCalendar("gotoDate", args[3], args[4] - 1);
-               }
-       } else {
-               if (args.length >= 4) {
-                       $("#events-calendar").fullCalendar("gotoDate", args[2], args[3] - 1);
-               }
-       }
-
        // echo the title
        var view = $("#events-calendar").fullCalendar("getView");
        $("#fc-title").text(view.title);
@@ -186,7 +174,7 @@ $(document).ready(function () {
 
 // loads the event into a modal
 function showEvent(eventid) {
-       addToModal(baseurl + moduleUrl + "/?id=" + eventid);
+       addToModal(event_api + '/' + eventid);
 }
 
 function changeView(action, viewName) {
@@ -329,7 +317,7 @@ function formatListViewEvent(event) {
 // event-edit section.
 function doEventPreview() {
        $("#event-edit-preview").val(1);
-       $.post("events", $("#event-edit-form").serialize(), function (data) {
+       $.post("calendar/api/create", $("#event-edit-form").serialize(), function (data) {
                $("#event-preview").append(data);
        });
        $("#event-edit-preview").val(0);
index 75c4d96e4efc6fb69870295be10f52238e924f90..eaf41eeb87b8c50a2609298094125aa594c78ac7 100644 (file)
@@ -254,10 +254,10 @@ function editpost(url) {
        // But first we have to test if the url links to an event. So we will split up
        // the url in its parts.
        var splitURL = parseUrl(url);
-       // Test if in the url path containing "events/event". If the path containing this
+       // Test if in the url path containing "calendar/event/show". If the path containing this
        // expression then we will call the addToModal function and exit this function at
        // this point.
-       if (splitURL.path.indexOf("events/event") > -1) {
+       if (splitURL.path.indexOf("calendar/event/show") > -1) {
                addToModal(splitURL.path);
                return;
        }
index 70111ab3b8d50c72744245b1bb6743e6a31d5014..2bc6dbe87c6289492651cc25ec7a91ecbcfac134 100644 (file)
@@ -80,7 +80,7 @@ function get_modalpage_list() {
        $modalpages = [
                'message/new',
                'settings/oauth/add',
-               'events/new',
+               'calendar/event/new',
 //             'fbrowser/image/'
        ];
 
diff --git a/view/theme/frio/templates/calendar/calendar.tpl b/view/theme/frio/templates/calendar/calendar.tpl
new file mode 100644 (file)
index 0000000..f233866
--- /dev/null
@@ -0,0 +1,55 @@
+<div class="generic-page-wrapper">
+       {{$tabs nofilter}}
+       {{include file="section_title.tpl" title=$title pullright=1}}
+
+       {{* The link to create a new event *}}
+       {{if $new_event.0}}
+       <div class="pull-right" id="new-event-link">
+               <button type="button" class="btn-link page-action faded-icon" onclick="addToModal('{{$new_event.0}}')" title="{{$new_event.1}}" data-toggle="tooltip">
+                       <i class="fa fa-plus"></i>
+               </button>
+       </div>
+       {{/if}}
+
+       {{* We create our own fullcallendar header (with title & calendar view *}}
+       <div id="fc-header" class="clear">
+               <div id="fc-header-right" class="pull-right">
+                       {{* The dropdown to change the callendar view *}}
+                       <ul class="nav nav-pills">
+                               <li class="dropdown pull-right">
+                                       <button class="btn btn-link btn-sm dropdown-toggle" type="button" id="event-calendar-views" data-toggle="dropdown" aria-expanded="false">
+                                               <i class="fa fa-angle-down" aria-hidden="true"></i> {{$view}}
+                                       </button>
+                                       <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="event-calendar-views">
+                                               <li role="presentation">
+                                                       <button role="menuitem" type="button" class="btn-link" onclick="changeView('changeView', 'month');$('#events-calendar').fullCalendar('option', {contentHeight: '', aspectRatio: 1});">{{$month}}</button>
+                                               </li>
+                                               <li role="presentation">
+                                                       <button role="menuitem" type="button" class="btn-link" onclick="changeView('changeView', 'agendaWeek');$('#events-calendar').fullCalendar('option', 'contentHeight', 'auto');">{{$week}}</button>
+                                               </li>
+                                               <li role="presentation">
+                                                       <button role="menuitem" type="button" class="btn-link" onclick="changeView('changeView', 'agendaDay');$('#events-calendar').fullCalendar('option', 'contentHeight', 'auto');">{{$day}}</button>
+                                               </li>
+                                               <li role="presentation">
+                                                       <button role="menuitem" type="button" class="btn-link" onclick="changeView('changeView', 'listMonth');$('#events-calendar').fullCalendar('option', 'contentHeight', 'auto');">{{$list}}</button>
+                                               </li>
+                                       </ul>
+                               </li>
+                       </ul>
+               </div>
+
+               {{* The buttons to change the month/weeks/days *}}
+               <div id="fc-fc-header-left" class="btn-group">
+                       <button class="btn btn-eventnav" onclick="changeView('prev', false);" title="{{$previous.1}}"><i class="fa fa-angle-up" aria-hidden="true"></i></button>
+                       <button class="btn btn-eventnav btn-separator" onclick="changeView('next', false);" title="{{$next.1}}"><i class="fa fa-angle-down" aria-hidden="true"></i></button>
+                       <button class="btn btn-eventnav btn-separator" onclick="changeView('today', false);" title="{{$today}}"><i class="fa fa-bullseye" aria-hidden="true"></i></button>
+               </div>
+
+               {{* The title (e.g. name of the mont/week/day) *}}
+               <div id="event-calendar-title"><h4 id="fc-title"></h4></div>
+
+       </div>
+
+       {{* This is the container where the fullCalendar is inserted through js *}}
+       <div id="events-calendar"></div>
+</div>
diff --git a/view/theme/frio/templates/calendar/calendar_head.tpl b/view/theme/frio/templates/calendar/calendar_head.tpl
new file mode 100644 (file)
index 0000000..15f3fbc
--- /dev/null
@@ -0,0 +1,72 @@
+
+<script type="text/javascript" src="view/theme/frio/js/mod_events.js?v={{$smarty.const.FRIENDICA_VERSION}}"></script>
+
+<script type="text/javascript">
+       // pass php translation strings to js variables/arrays so we can make use of it in js files
+       aStr.monthNames = [
+               '{{$i18n.January|escape:'quotes'}}',
+               '{{$i18n.February|escape:'quotes'}}',
+               '{{$i18n.March|escape:'quotes'}}',
+               '{{$i18n.April|escape:'quotes'}}',
+               '{{$i18n.May|escape:'quotes'}}',
+               '{{$i18n.June|escape:'quotes'}}',
+               '{{$i18n.July|escape:'quotes'}}',
+               '{{$i18n.August|escape:'quotes'}}',
+               '{{$i18n.September|escape:'quotes'}}',
+               '{{$i18n.October|escape:'quotes'}}',
+               '{{$i18n.November|escape:'quotes'}}',
+               '{{$i18n.December|escape:'quotes'}}'
+       ];
+       aStr.monthNamesShort = [
+               '{{$i18n.Jan|escape:'quotes'}}',
+               '{{$i18n.Feb|escape:'quotes'}}',
+               '{{$i18n.Mar|escape:'quotes'}}',
+               '{{$i18n.Apr|escape:'quotes'}}',
+               '{{$i18n.May|escape:'quotes'}}',
+               '{{$i18n.Jun|escape:'quotes'}}',
+               '{{$i18n.Jul|escape:'quotes'}}',
+               '{{$i18n.Aug|escape:'quotes'}}',
+               '{{$i18n.Sep|escape:'quotes'}}',
+               '{{$i18n.Oct|escape:'quotes'}}',
+               '{{$i18n.Nov|escape:'quotes'}}',
+               '{{$i18n.Dec|escape:'quotes'}}'
+       ];
+       aStr.dayNames = [
+               '{{$i18n.Sunday|escape:'quotes'}}',
+               '{{$i18n.Monday|escape:'quotes'}}',
+               '{{$i18n.Tuesday|escape:'quotes'}}',
+               '{{$i18n.Wednesday|escape:'quotes'}}',
+               '{{$i18n.Thursday|escape:'quotes'}}',
+               '{{$i18n.Friday|escape:'quotes'}}',
+               '{{$i18n.Saturday|escape:'quotes'}}'
+       ];
+       aStr.dayNamesShort = [
+               '{{$i18n.Sun|escape:'quotes'}}',
+               '{{$i18n.Mon|escape:'quotes'}}',
+               '{{$i18n.Tue|escape:'quotes'}}',
+               '{{$i18n.Wed|escape:'quotes'}}',
+               '{{$i18n.Thu|escape:'quotes'}}',
+               '{{$i18n.Fri|escape:'quotes'}}',
+               '{{$i18n.Sat|escape:'quotes'}}'
+       ];
+
+       aStr.firstDay = '{{$i18n.firstDay|escape:'quotes'}}';
+       aStr.today = '{{$i18n.today|escape:'quotes'}}';
+       aStr.month = '{{$i18n.month|escape:'quotes'}}';
+       aStr.week = '{{$i18n.week|escape:'quotes'}}';
+       aStr.day = '{{$i18n.day|escape:'quotes'}}';
+
+       aStr.allday = '{{$i18n.allday|escape:'quotes'}}';
+       aStr.noevent = '{{$i18n.noevent|escape:'quotes'}}';
+
+       aStr.dtstartLabel = '{{$i18n.dtstart_label|escape:'quotes'}}';
+       aStr.dtendLabel = '{{$i18n.dtend_label|escape:'quotes'}}';
+       aStr.locationLabel = '{{$i18n.location_label|escape:'quotes'}}';
+
+       var calendar_api = '{{$calendar_api}}';
+       var event_api = '{{$event_api}}';
+
+       $(document).ready(function() {
+               $("#comment-edit-text-desc").bbco_autocomplete('bbcode');
+       });
+</script>
diff --git a/view/theme/frio/templates/calendar/event.tpl b/view/theme/frio/templates/calendar/event.tpl
new file mode 100644 (file)
index 0000000..32ca645
--- /dev/null
@@ -0,0 +1,24 @@
+
+<div class="event-wrapper">
+       <div class="event">
+               <div class="media">
+                       <div class="event-owner media-left">
+                               {{if $event.item.author_name}}
+                               <a href="{{$event.item.author_link}}"><img src="{{$event.item.author_avatar}}" /></a>
+                               <a href="{{$event.item.author_link}}">{{$event.item.author_name}}</a>
+                               {{/if}}
+                       </div>
+                       <div class="media-body">
+                               {{$event.html nofilter}}
+                       </div>
+               </div>
+
+               <div class="event-buttons pull-right">
+                       {{if $event.edit}}<button type="button" class="btn" onclick="eventEdit('{{$event.edit.0}}')" title="{{$event.edit.1}}"><i class="fa fa-pencil" aria-hidden="true"></i></button>{{/if}}
+                       {{if $event.copy}}<button type="button" class="btn" onclick="eventEdit('{{$event.copy.0}}')" title="{{$event.copy.1}}"><i class="fa fa-files-o" aria-hidden="true"></i></button>{{/if}}
+                       {{if $event.drop}}<a href="{{$event.drop.0}}" onclick="return confirmDelete();" title="{{$event.drop.1}}" class="drop-event-link btn"><i class="fa fa-trash-o" aria-hidden="true"></i></a>{{/if}}
+                       {{if $event.plink.orig}}<a href="{{$event.plink.orig}}" title="{{$event.plink.orig_title}}" class="plink-event-link btn" aria-label="{{$event.plink.1}}"><i class="fa fa-external-link" aria-hidden="true"></i></a>{{/if}}
+               </div>
+               <div class="clear"></div>
+       </div>
+</div>
diff --git a/view/theme/frio/templates/calendar/event_form.tpl b/view/theme/frio/templates/calendar/event_form.tpl
new file mode 100644 (file)
index 0000000..d0bd904
--- /dev/null
@@ -0,0 +1,188 @@
+<div id="event-form-wrapper">
+       <h3 class="heading">{{$title}}</h3>
+
+       {{* The event edit navigation menu (text input, permissions, preview, filebrowser) *}}
+       <ul id="event-nav" class="nav nav-tabs event-nav" role="menubar" data-tabs="tabs">
+               {{* Mark the first list entry as active because it is the first which is active after opening
+                       the modal. Changing of the activity status is done by js in calendar_head.tpl *}}
+               <li class="active" role="menuitem">
+                       <a id="event-edit-lnk" onclick="eventEditActive(); return false;">{{$basic}}</a>
+               </li>
+               <li role="menuitem">
+                       <a id="event-desc-lnk" onclick="eventDescActive(); return false;">{{$advanced}}</a>
+               </li>
+               {{if $acl}}
+               <li role="menuitem" {{if !$sh_checked}} style="display: none"{{/if}}>
+                       <a id="event-perms-lnk" onclick="eventAclActive(); return false;">{{$permissions}}</a>
+               </li>
+               {{/if}}
+               {{if $preview}}
+               <li role="menuitem">
+                       <a id="event-preview-lnk" onclick="eventPreviewActive(); return false;">{{$preview}}</a>
+               </li>
+               {{/if}}
+               {{* commented out because it isn't implemented yet
+               <li role="menuitem"><a id="event-preview-link" onclick="fbrowserActive(); return false;"> Browser </a></li>
+               *}}
+       </ul>
+
+       <div id="event-edit-form-wrapper">
+       <form id="event-edit-form" action="{{$post}}" method="post">
+
+               <input type="hidden" name="event_id" value="{{$eid}}" />
+               <input type="hidden" name="cid" value="{{$cid}}" />
+               <input type="hidden" name="uri" value="{{$uri}}" />
+               <input type="hidden" name="preview" id="event-edit-preview" value="0" />
+
+               {{* The tab conten with the necessary basic settings *}}
+               <div id="event-edit-wrapper">
+
+                       {{* The event title *}}
+                       {{include file="field_input.tpl" field=$summary}}
+
+                       <div id="event-edit-time">
+                               {{* The field for event starting time *}}
+                               {{$s_dsel nofilter}}
+
+                               {{* The field for event finish time *}}
+                               {{$f_dsel nofilter}}
+
+                               {{* checkbox if the the event doesn't have a finish time *}}
+                               {{include file="field_checkbox.tpl" field=$nofinish}}
+                       </div>
+
+                       {{* checkbox to enable event sharing and the permissions tab *}}
+                       {{if ! $eid}}
+                       {{include file="field_checkbox.tpl" field=$share}}
+                       {{/if}}
+
+                       {{* The submit button - saves the event *}}
+                       <div class="pull-right">
+                               <button id="event-submit" type="submit" name="submit" class="btn btn-primary" value="{{$submit}}">{{$submit}}</button>
+                       </div>
+                       <div class="clear"></div>
+               </div>
+
+               {{* The advanced tab *}}
+               <div id="event-desc-wrapper" style="display: none">
+
+                       {{* The textarea for the event description *}}
+                       <div class="form-group">
+                               <div id="event-desc-text"><b>{{$d_text}}</b></div>
+                               <textarea id="comment-edit-text-desc" class="form-control text-autosize" name="desc" dir="auto">{{$d_orig}}</textarea>
+                               <ul id="event-desc-text-edit-bb" class="comment-edit-bb comment-icon-list nav nav-pills hidden-xs pull-left">
+                                       {{* commented out because it isn't implemented yet
+                                       <li>
+                                               <button type="button" class="btn-link icon bb-img" style="cursor: pointer;" title="{{$edimg}}" data-role="insert-formatting" data-comment=" " data-bbcode="img" data-id="desc">
+                                                       <i class="fa fa-picture-o"></i>
+                                               </button>
+                                       </li>
+                                       *}}
+                                       <li>
+                                               <button type="button" class="btn-link icon bb-url" style="cursor: pointer;" title="{{$edurl}}" data-role="insert-formatting" data-comment=" " data-bbcode="url" data-id="desc">
+                                                       <i class="fa fa-link"></i>
+                                               </button>
+                                       </li>
+                                       <li>
+                                               <button type="button" class="btn-link icon bb-video" style="cursor: pointer;" title="{{$edvideo}}" data-role="insert-formatting" data-comment=" " data-bbcode="video" data-id="desc">
+                                                       <i class="fa fa-video-camera"></i>
+                                               </button>
+                                       </li>
+
+                                       <li>
+                                               <button type="button" class="btn-link icon underline" style="cursor: pointer;" title="{{$eduline}}" data-role="insert-formatting" data-comment=" " data-bbcode="u" data-id="desc">
+                                                       <i class="fa fa-underline"></i>
+                                               </button>
+                                       </li>
+                                       <li>
+                                               <button type="button" class="btn-link icon italic" style="cursor: pointer;" title="{{$editalic}}" data-role="insert-formatting" data-comment=" " data-bbcode="i" data-id="desc">
+                                                       <i class="fa fa-italic"></i>
+                                               </button>
+                                       </li>
+                                       <li>
+                                               <button type="button" class="btn-link icon bold" style="cursor: pointer;"  title="{{$edbold}}" data-role="insert-formatting" data-comment=" " data-bbcode="b" data-id="desc">
+                                                       <i class="fa fa-bold"></i>
+                                               </button>
+                                       </li>
+                                       <li>
+                                               <button type="button" class="btn-link icon quote" style="cursor: pointer;" title="{{$edquote}}" data-role="insert-formatting" data-comment=" " data-bbcode="quote" data-id="desc">
+                                                       <i class="fa fa-quote-left"></i>
+                                               </button>
+                                       </li>
+                               </ul>
+                               <div class="clear"></div>
+                       </div>
+
+                       {{* The textarea for the event location *}}
+                       <div class="form-group">
+                               <div id="event-location-text"><b>{{$l_text}}</b></div>
+                               <textarea id="comment-edit-text-loc" class="form-control text-autosize" name="location" dir="auto">{{$l_orig}}</textarea>
+                               <ul id="comment-tools-loc" class="comment-edit-bb comment-icon-list nav nav-pills hidden-xs pull-left">
+                                       {{* commented out because it isn't implemented yet
+                                       <li>
+                                               <button type="button" class="btn-link icon bb-img" style="cursor: pointer;" title="{{$edimg}}" data-role="insert-formatting" data-comment=" " data-bbcode="img" data-id="loc">
+                                                       <i class="fa fa-picture-o"></i>
+                                               </button>
+                                       </li>
+                                       *}}
+                                       <li>
+                                               <button type="button" class="btn-link icon bb-url" style="cursor: pointer;" title="{{$edurl}}" data-role="insert-formatting" data-comment=" " data-bbcode="url" data-id="loc">
+                                                       <i class="fa fa-link"></i>
+                                               </button>
+                                       </li>
+                                       <li>
+                                               <button type="button" class="btn-link icon bb-video" style="cursor: pointer;" title="{{$edvideo}}" data-role="insert-formatting" data-comment=" " data-bbcode="video" data-id="loc">
+                                                       <i class="fa fa-video-camera"></i>
+                                               </button>
+                                       </li>
+
+                                       <li>
+                                               <button type="button" class="btn-link icon underline" style="cursor: pointer;" title="{{$eduline}}" data-role="insert-formatting" data-comment=" " data-bbcode="u" data-id="loc">
+                                                       <i class="fa fa-underline"></i>
+                                               </button>
+                                       </li>
+                                       <li>
+                                               <button type="button" class="btn-link icon italic" style="cursor: pointer;" title="{{$editalic}}" data-role="insert-formatting" data-comment=" " data-bbcode="i" data-id="loc">
+                                                       <i class="fa fa-italic"></i>
+                                               </button>
+                                       </li>
+                                       <li>
+                                               <button type="button" class="btn-link icon bold" style="cursor: pointer;"  title="{{$edbold}}" data-role="insert-formatting" data-comment=" " data-bbcode="b" data-id="loc">
+                                                       <i class="fa fa-bold"></i>
+                                               </button>
+                                       </li>
+                                       <li>
+                                               <button type="button" class="btn-link icon quote" style="cursor: pointer;" title="{{$edquote}}" data-role="insert-formatting" data-comment=" " data-bbcode="quote" data-id="loc">
+                                                       <i class="fa fa-quote-left"></i>
+                                               </button>
+                                       </li>
+                               </ul>
+                               <div class="clear"></div>
+                       </div>
+               </div>
+
+               {{* The tab for the permissions (if event sharing is enabled) *}}
+               <div id="event-acl-wrapper" style="display: none">
+                       {{$acl nofilter}}
+               </div>
+
+               {{* The tab for the event preview (content is inserted by js) *}}
+               <div id="event-preview" style="display: none"></div>
+
+               <div class="clear"></div>
+
+       </form>
+       </div>
+</div>
+
+<script type="text/javascript">
+       $(document).ready( function() {
+               // disable finish date input if it isn't available
+               enableDisableFinishDate();
+               // load bbcode autocomplete for the description textarea
+               $('#comment-edit-text-desc, #comment-edit-text-loc').bbco_autocomplete('bbcode');
+
+               // initiale autosize for the textareas
+               autosize($("textarea.text-autosize"));
+       });
+</script>
diff --git a/view/theme/frio/templates/event.tpl b/view/theme/frio/templates/event.tpl
deleted file mode 100644 (file)
index 89fe283..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-
-{{foreach $events as $event}}
-       <div class="event-wrapper">
-               <div class="event">
-                       <div class="media">
-                               <div class="event-owner media-left">
-                                       {{if $event.item.author_name}}
-                                       <a href="{{$event.item.author_link}}"><img src="{{$event.item.author_avatar}}" /></a>
-                                       <a href="{{$event.item.author_link}}">{{$event.item.author_name}}</a>
-                                       {{/if}}
-                               </div>
-                               <div class="media-body">
-                                       {{$event.html nofilter}}
-                               </div>
-                       </div>
-
-                       <div class="event-buttons pull-right">
-                               {{if $event.edit}}<button type="button" class="btn" onclick="eventEdit('{{$event.edit.0}}')" title="{{$event.edit.1}}"><i class="fa fa-pencil" aria-hidden="true"></i></button>{{/if}}
-                               {{if $event.copy}}<button type="button" class="btn" onclick="eventEdit('{{$event.copy.0}}')" title="{{$event.copy.1}}"><i class="fa fa-files-o" aria-hidden="true"></i></button>{{/if}}
-                               {{if $event.drop}}<a href="{{$event.drop.0}}" onclick="return confirmDelete();" title="{{$event.drop.1}}" class="drop-event-link btn"><i class="fa fa-trash-o" aria-hidden="true"></i></a>{{/if}}
-                               {{if $event.plink.orig}}<a href="{{$event.plink.orig}}" title="{{$event.plink.orig_title}}" class="plink-event-link btn" aria-label="{{$event.plink.1}}"><i class="fa fa-external-link" aria-hidden="true"></i></a>{{/if}}
-                       </div>
-                       <div class="clear"></div>
-               </div>
-       </div>
-{{/foreach}}
diff --git a/view/theme/frio/templates/event_form.tpl b/view/theme/frio/templates/event_form.tpl
deleted file mode 100644 (file)
index cbefa04..0000000
+++ /dev/null
@@ -1,188 +0,0 @@
-<div id="event-form-wrapper">
-       <h3 class="heading">{{$title}}</h3>
-
-       {{* The event edit navigation menu (text input, permissions, preview, filebrowser) *}}
-       <ul id="event-nav" class="nav nav-tabs event-nav" role="menubar" data-tabs="tabs">
-               {{* Mark the first list entry as active because it is the first which is active after opening
-                       the modal. Changing of the activity status is done by js in event_head.tpl *}}
-               <li class="active" role="menuitem">
-                       <a id="event-edit-lnk" onclick="eventEditActive(); return false;">{{$basic}}</a>
-               </li>
-               <li role="menuitem">
-                       <a id="event-desc-lnk" onclick="eventDescActive(); return false;">{{$advanced}}</a>
-               </li>
-               {{if $acl}}
-               <li role="menuitem" {{if !$sh_checked}} style="display: none"{{/if}}>
-                       <a id="event-perms-lnk" onclick="eventAclActive(); return false;">{{$permissions}}</a>
-               </li>
-               {{/if}}
-               {{if $preview}}
-               <li role="menuitem">
-                       <a id="event-preview-lnk" onclick="eventPreviewActive(); return false;">{{$preview}}</a>
-               </li>
-               {{/if}}
-               {{* commented out because it isn't implemented yet
-               <li role="menuitem"><a id="event-preview-link" onclick="fbrowserActive(); return false;"> Browser </a></li>
-               *}}
-       </ul>
-
-       <div id="event-edit-form-wrapper">
-       <form id="event-edit-form" action="{{$post}}" method="post">
-
-               <input type="hidden" name="event_id" value="{{$eid}}" />
-               <input type="hidden" name="cid" value="{{$cid}}" />
-               <input type="hidden" name="uri" value="{{$uri}}" />
-               <input type="hidden" name="preview" id="event-edit-preview" value="0" />
-
-               {{* The tab conten with the necessary basic settings *}}
-               <div id="event-edit-wrapper">
-
-                       {{* The event title *}}
-                       {{include file="field_input.tpl" field=$summary}}
-
-                       <div id="event-edit-time">
-                               {{* The field for event starting time *}}
-                               {{$s_dsel nofilter}}
-
-                               {{* The field for event finish time *}}
-                               {{$f_dsel nofilter}}
-
-                               {{* checkbox if the the event doesn't have a finish time *}}
-                               {{include file="field_checkbox.tpl" field=$nofinish}}
-                       </div>
-
-                       {{* checkbox to enable event sharing and the permissions tab *}}
-                       {{if ! $eid}}
-                       {{include file="field_checkbox.tpl" field=$share}}
-                       {{/if}}
-
-                       {{* The submit button - saves the event *}}
-                       <div class="pull-right">
-                               <button id="event-submit" type="submit" name="submit" class="btn btn-primary" value="{{$submit}}">{{$submit}}</button>
-                       </div>
-                       <div class="clear"></div>
-               </div>
-
-               {{* The advanced tab *}}
-               <div id="event-desc-wrapper" style="display: none">
-
-                       {{* The textarea for the event description *}}
-                       <div class="form-group">
-                               <div id="event-desc-text"><b>{{$d_text}}</b></div>
-                               <textarea id="comment-edit-text-desc" class="form-control text-autosize" name="desc" dir="auto">{{$d_orig}}</textarea>
-                               <ul id="event-desc-text-edit-bb" class="comment-edit-bb comment-icon-list nav nav-pills hidden-xs pull-left">
-                                       {{* commented out because it isn't implemented yet
-                                       <li>
-                                               <button type="button" class="btn-link icon bb-img" style="cursor: pointer;" title="{{$edimg}}" data-role="insert-formatting" data-comment=" " data-bbcode="img" data-id="desc">
-                                                       <i class="fa fa-picture-o"></i>
-                                               </button>
-                                       </li>
-                                       *}}
-                                       <li>
-                                               <button type="button" class="btn-link icon bb-url" style="cursor: pointer;" title="{{$edurl}}" data-role="insert-formatting" data-comment=" " data-bbcode="url" data-id="desc">
-                                                       <i class="fa fa-link"></i>
-                                               </button>
-                                       </li>
-                                       <li>
-                                               <button type="button" class="btn-link icon bb-video" style="cursor: pointer;" title="{{$edvideo}}" data-role="insert-formatting" data-comment=" " data-bbcode="video" data-id="desc">
-                                                       <i class="fa fa-video-camera"></i>
-                                               </button>
-                                       </li>
-
-                                       <li>
-                                               <button type="button" class="btn-link icon underline" style="cursor: pointer;" title="{{$eduline}}" data-role="insert-formatting" data-comment=" " data-bbcode="u" data-id="desc">
-                                                       <i class="fa fa-underline"></i>
-                                               </button>
-                                       </li>
-                                       <li>
-                                               <button type="button" class="btn-link icon italic" style="cursor: pointer;" title="{{$editalic}}" data-role="insert-formatting" data-comment=" " data-bbcode="i" data-id="desc">
-                                                       <i class="fa fa-italic"></i>
-                                               </button>
-                                       </li>
-                                       <li>
-                                               <button type="button" class="btn-link icon bold" style="cursor: pointer;"  title="{{$edbold}}" data-role="insert-formatting" data-comment=" " data-bbcode="b" data-id="desc">
-                                                       <i class="fa fa-bold"></i>
-                                               </button>
-                                       </li>
-                                       <li>
-                                               <button type="button" class="btn-link icon quote" style="cursor: pointer;" title="{{$edquote}}" data-role="insert-formatting" data-comment=" " data-bbcode="quote" data-id="desc">
-                                                       <i class="fa fa-quote-left"></i>
-                                               </button>
-                                       </li>
-                               </ul>
-                               <div class="clear"></div>
-                       </div>
-
-                       {{* The textarea for the event location *}}
-                       <div class="form-group">
-                               <div id="event-location-text"><b>{{$l_text}}</b></div>
-                               <textarea id="comment-edit-text-loc" class="form-control text-autosize" name="location" dir="auto">{{$l_orig}}</textarea>
-                               <ul id="comment-tools-loc" class="comment-edit-bb comment-icon-list nav nav-pills hidden-xs pull-left">
-                                       {{* commented out because it isn't implemented yet
-                                       <li>
-                                               <button type="button" class="btn-link icon bb-img" style="cursor: pointer;" title="{{$edimg}}" data-role="insert-formatting" data-comment=" " data-bbcode="img" data-id="loc">
-                                                       <i class="fa fa-picture-o"></i>
-                                               </button>
-                                       </li>
-                                       *}}
-                                       <li>
-                                               <button type="button" class="btn-link icon bb-url" style="cursor: pointer;" title="{{$edurl}}" data-role="insert-formatting" data-comment=" " data-bbcode="url" data-id="loc">
-                                                       <i class="fa fa-link"></i>
-                                               </button>
-                                       </li>
-                                       <li>
-                                               <button type="button" class="btn-link icon bb-video" style="cursor: pointer;" title="{{$edvideo}}" data-role="insert-formatting" data-comment=" " data-bbcode="video" data-id="loc">
-                                                       <i class="fa fa-video-camera"></i>
-                                               </button>
-                                       </li>
-
-                                       <li>
-                                               <button type="button" class="btn-link icon underline" style="cursor: pointer;" title="{{$eduline}}" data-role="insert-formatting" data-comment=" " data-bbcode="u" data-id="loc">
-                                                       <i class="fa fa-underline"></i>
-                                               </button>
-                                       </li>
-                                       <li>
-                                               <button type="button" class="btn-link icon italic" style="cursor: pointer;" title="{{$editalic}}" data-role="insert-formatting" data-comment=" " data-bbcode="i" data-id="loc">
-                                                       <i class="fa fa-italic"></i>
-                                               </button>
-                                       </li>
-                                       <li>
-                                               <button type="button" class="btn-link icon bold" style="cursor: pointer;"  title="{{$edbold}}" data-role="insert-formatting" data-comment=" " data-bbcode="b" data-id="loc">
-                                                       <i class="fa fa-bold"></i>
-                                               </button>
-                                       </li>
-                                       <li>
-                                               <button type="button" class="btn-link icon quote" style="cursor: pointer;" title="{{$edquote}}" data-role="insert-formatting" data-comment=" " data-bbcode="quote" data-id="loc">
-                                                       <i class="fa fa-quote-left"></i>
-                                               </button>
-                                       </li>
-                               </ul>
-                               <div class="clear"></div>
-                       </div>
-               </div>
-
-               {{* The tab for the permissions (if event sharing is enabled) *}}
-               <div id="event-acl-wrapper" style="display: none">
-                       {{$acl nofilter}}
-               </div>
-
-               {{* The tab for the event preview (content is inserted by js) *}}
-               <div id="event-preview" style="display: none"></div>
-
-               <div class="clear"></div>
-
-       </form>
-       </div>
-</div>
-
-<script type="text/javascript">
-       $(document).ready( function() {
-               // disable finish date input if it isn't available
-               enableDisableFinishDate();
-               // load bbcode autocomplete for the description textarea
-               $('#comment-edit-text-desc, #comment-edit-text-loc').bbco_autocomplete('bbcode');
-
-               // initiale autosize for the textareas
-               autosize($("textarea.text-autosize"));
-       });
-</script>
diff --git a/view/theme/frio/templates/event_head.tpl b/view/theme/frio/templates/event_head.tpl
deleted file mode 100644 (file)
index e27fabf..0000000
+++ /dev/null
@@ -1,73 +0,0 @@
-
-<script type="text/javascript" src="view/theme/frio/js/mod_events.js?v={{$smarty.const.FRIENDICA_VERSION}}"></script>
-
-<script type="text/javascript">
-       // pass php translation strings to js variables/arrays so we can make use of it in js files
-       aStr.monthNames = [
-               '{{$i18n.January|escape:'quotes'}}',
-               '{{$i18n.February|escape:'quotes'}}',
-               '{{$i18n.March|escape:'quotes'}}',
-               '{{$i18n.April|escape:'quotes'}}',
-               '{{$i18n.May|escape:'quotes'}}',
-               '{{$i18n.June|escape:'quotes'}}',
-               '{{$i18n.July|escape:'quotes'}}',
-               '{{$i18n.August|escape:'quotes'}}',
-               '{{$i18n.September|escape:'quotes'}}',
-               '{{$i18n.October|escape:'quotes'}}',
-               '{{$i18n.November|escape:'quotes'}}',
-               '{{$i18n.December|escape:'quotes'}}'
-       ];
-       aStr.monthNamesShort = [
-               '{{$i18n.Jan|escape:'quotes'}}',
-               '{{$i18n.Feb|escape:'quotes'}}',
-               '{{$i18n.Mar|escape:'quotes'}}',
-               '{{$i18n.Apr|escape:'quotes'}}',
-               '{{$i18n.May|escape:'quotes'}}',
-               '{{$i18n.Jun|escape:'quotes'}}',
-               '{{$i18n.Jul|escape:'quotes'}}',
-               '{{$i18n.Aug|escape:'quotes'}}',
-               '{{$i18n.Sep|escape:'quotes'}}',
-               '{{$i18n.Oct|escape:'quotes'}}',
-               '{{$i18n.Nov|escape:'quotes'}}',
-               '{{$i18n.Dec|escape:'quotes'}}'
-       ];
-       aStr.dayNames = [
-               '{{$i18n.Sunday|escape:'quotes'}}',
-               '{{$i18n.Monday|escape:'quotes'}}',
-               '{{$i18n.Tuesday|escape:'quotes'}}',
-               '{{$i18n.Wednesday|escape:'quotes'}}',
-               '{{$i18n.Thursday|escape:'quotes'}}',
-               '{{$i18n.Friday|escape:'quotes'}}',
-               '{{$i18n.Saturday|escape:'quotes'}}'
-       ];
-       aStr.dayNamesShort = [
-               '{{$i18n.Sun|escape:'quotes'}}',
-               '{{$i18n.Mon|escape:'quotes'}}',
-               '{{$i18n.Tue|escape:'quotes'}}',
-               '{{$i18n.Wed|escape:'quotes'}}',
-               '{{$i18n.Thu|escape:'quotes'}}',
-               '{{$i18n.Fri|escape:'quotes'}}',
-               '{{$i18n.Sat|escape:'quotes'}}'
-       ];
-
-       aStr.firstDay = '{{$i18n.firstDay|escape:'quotes'}}';
-       aStr.today = '{{$i18n.today|escape:'quotes'}}';
-       aStr.month = '{{$i18n.month|escape:'quotes'}}';
-       aStr.week = '{{$i18n.week|escape:'quotes'}}';
-       aStr.day = '{{$i18n.day|escape:'quotes'}}';
-
-       aStr.allday = '{{$i18n.allday|escape:'quotes'}}';
-       aStr.noevent = '{{$i18n.noevent|escape:'quotes'}}';
-
-       aStr.dtstartLabel = '{{$i18n.dtstart_label|escape:'quotes'}}';
-       aStr.dtendLabel = '{{$i18n.dtend_label|escape:'quotes'}}';
-       aStr.locationLabel = '{{$i18n.location_label|escape:'quotes'}}';
-
-       var moduleUrl = '{{$module_url}}';
-       var modparams = {{$modparams}}
-
-
-       $(document).ready(function() {
-               $("#comment-edit-text-desc").bbco_autocomplete('bbcode');
-       });
-</script>
diff --git a/view/theme/frio/templates/events_js.tpl b/view/theme/frio/templates/events_js.tpl
deleted file mode 100644 (file)
index f233866..0000000
+++ /dev/null
@@ -1,55 +0,0 @@
-<div class="generic-page-wrapper">
-       {{$tabs nofilter}}
-       {{include file="section_title.tpl" title=$title pullright=1}}
-
-       {{* The link to create a new event *}}
-       {{if $new_event.0}}
-       <div class="pull-right" id="new-event-link">
-               <button type="button" class="btn-link page-action faded-icon" onclick="addToModal('{{$new_event.0}}')" title="{{$new_event.1}}" data-toggle="tooltip">
-                       <i class="fa fa-plus"></i>
-               </button>
-       </div>
-       {{/if}}
-
-       {{* We create our own fullcallendar header (with title & calendar view *}}
-       <div id="fc-header" class="clear">
-               <div id="fc-header-right" class="pull-right">
-                       {{* The dropdown to change the callendar view *}}
-                       <ul class="nav nav-pills">
-                               <li class="dropdown pull-right">
-                                       <button class="btn btn-link btn-sm dropdown-toggle" type="button" id="event-calendar-views" data-toggle="dropdown" aria-expanded="false">
-                                               <i class="fa fa-angle-down" aria-hidden="true"></i> {{$view}}
-                                       </button>
-                                       <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="event-calendar-views">
-                                               <li role="presentation">
-                                                       <button role="menuitem" type="button" class="btn-link" onclick="changeView('changeView', 'month');$('#events-calendar').fullCalendar('option', {contentHeight: '', aspectRatio: 1});">{{$month}}</button>
-                                               </li>
-                                               <li role="presentation">
-                                                       <button role="menuitem" type="button" class="btn-link" onclick="changeView('changeView', 'agendaWeek');$('#events-calendar').fullCalendar('option', 'contentHeight', 'auto');">{{$week}}</button>
-                                               </li>
-                                               <li role="presentation">
-                                                       <button role="menuitem" type="button" class="btn-link" onclick="changeView('changeView', 'agendaDay');$('#events-calendar').fullCalendar('option', 'contentHeight', 'auto');">{{$day}}</button>
-                                               </li>
-                                               <li role="presentation">
-                                                       <button role="menuitem" type="button" class="btn-link" onclick="changeView('changeView', 'listMonth');$('#events-calendar').fullCalendar('option', 'contentHeight', 'auto');">{{$list}}</button>
-                                               </li>
-                                       </ul>
-                               </li>
-                       </ul>
-               </div>
-
-               {{* The buttons to change the month/weeks/days *}}
-               <div id="fc-fc-header-left" class="btn-group">
-                       <button class="btn btn-eventnav" onclick="changeView('prev', false);" title="{{$previous.1}}"><i class="fa fa-angle-up" aria-hidden="true"></i></button>
-                       <button class="btn btn-eventnav btn-separator" onclick="changeView('next', false);" title="{{$next.1}}"><i class="fa fa-angle-down" aria-hidden="true"></i></button>
-                       <button class="btn btn-eventnav btn-separator" onclick="changeView('today', false);" title="{{$today}}"><i class="fa fa-bullseye" aria-hidden="true"></i></button>
-               </div>
-
-               {{* The title (e.g. name of the mont/week/day) *}}
-               <div id="event-calendar-title"><h4 id="fc-title"></h4></div>
-
-       </div>
-
-       {{* This is the container where the fullCalendar is inserted through js *}}
-       <div id="events-calendar"></div>
-</div>
index 47c9acce57ae17e89c943d3a88cf2e0d64f104a6..dd71acff299754fc411d38b77b5e9e5ebcfa30f4 100644 (file)
                                                        </li>
                                                {{/if}}
 
-                                               {{if $nav.events}}
+                                               {{if $nav.calendar}}
                                                        <li class="nav-segment hidden-xs">
-                                                               <a accesskey="e" id="nav-events-link" href="{{$nav.events.0}}" data-toggle="tooltip"
-                                                                       aria-label="{{$nav.events.1}}" title="{{$nav.events.1}}" class="nav-menu"><i
+                                                               <a accesskey="e" id="nav-calendar-link" href="{{$nav.calendar.0}}" data-toggle="tooltip"
+                                                                       aria-label="{{$nav.calendar.1}}" title="{{$nav.calendar.1}}" class="nav-menu"><i
                                                                                class="fa fa-lg fa-calendar fa-fw"></i></a>
                                                        </li>
                                                {{/if}}
index c29b1f13d5b0645f73b59777ee02d926f4272690..f4daed4d6c1cb2f698f2a6afdb322be078a9b298 100644 (file)
@@ -238,11 +238,11 @@ function frio_remote_nav(App $a, array &$nav_info)
                        $nav_info['nav']['usermenu'][] = [$server_url . '/profile/' . $remoteUser['nick'] . '/profile', DI::l10n()->t('Profile'), '', DI::l10n()->t('Your profile page')];
                        $nav_info['nav']['usermenu'][] = [$server_url . '/photos/' . $remoteUser['nick'], DI::l10n()->t('Photos'), '', DI::l10n()->t('Your photos')];
                        $nav_info['nav']['usermenu'][] = [$server_url . '/profile/' . $remoteUser['nick'] . '/media', DI::l10n()->t('Media'), '', DI::l10n()->t('Your postings with media')];
-                       $nav_info['nav']['usermenu'][] = [$server_url . '/events/', DI::l10n()->t('Events'), '', DI::l10n()->t('Your events')];
+                       $nav_info['nav']['usermenu'][] = [$server_url . '/calendar/', DI::l10n()->t('Calendar'), '', DI::l10n()->t('Your calendar')];
 
                        // navbar links
                        $nav_info['nav']['network']  = [$server_url . '/network', DI::l10n()->t('Network'), '', DI::l10n()->t('Conversations from your friends')];
-                       $nav_info['nav']['events']   = [$server_url . '/events', DI::l10n()->t('Events'), '', DI::l10n()->t('Events and Calendar')];
+                       $nav_info['nav']['calendar'] = [$server_url . '/calendar', DI::l10n()->t('Calendar'), '', DI::l10n()->t('Calendar')];
                        $nav_info['nav']['messages'] = [$server_url . '/message', DI::l10n()->t('Messages'), '', DI::l10n()->t('Private mail')];
                        $nav_info['nav']['settings'] = [$server_url . '/settings', DI::l10n()->t('Settings'), '', DI::l10n()->t('Account settings')];
                        $nav_info['nav']['contacts'] = [$server_url . '/contact', DI::l10n()->t('Contacts'), '', DI::l10n()->t('Manage/edit friends and contacts')];
diff --git a/view/theme/quattro/templates/calendar/calendar.tpl b/view/theme/quattro/templates/calendar/calendar.tpl
new file mode 100644 (file)
index 0000000..62b9e66
--- /dev/null
@@ -0,0 +1,7 @@
+
+{{$tabs nofilter}}
+<h2>{{$title}} <a class="actionbutton" href="{{$new_event.0}}"><i class="icon add s10"></i> {{$new_event.1}}</a></h2>
+
+<div id="new-event-link"></div>
+
+<div id="events-calendar"></div>
diff --git a/view/theme/quattro/templates/calendar/event_form.tpl b/view/theme/quattro/templates/calendar/event_form.tpl
new file mode 100644 (file)
index 0000000..9ad1c8a
--- /dev/null
@@ -0,0 +1,49 @@
+
+<h3>{{$title}}</h3>
+
+<p>{{$desc nofilter}}</p>
+
+<form id="event-edit-form" action="{{$post}}" method="post">
+
+       <input type="hidden" name="event_id" value="{{$eid}}" />
+       <input type="hidden" name="cid" value="{{$cid}}" />
+       <input type="hidden" name="uri" value="{{$uri}}" />
+       <input type="hidden" name="preview" id="event-edit-preview" value="0" />
+
+       {{$s_dsel nofilter}}
+
+       {{$f_dsel nofilter}}
+
+       {{include file="field_checkbox.tpl" field=$nofinish}}
+       <hr>
+       {{include file="field_input.tpl" field=$summary}}
+       {{include file="field_textarea.tpl" field=array('desc', $d_text, $d_orig, "")}}
+
+       {{include file="field_textarea.tpl" field=array('location', $l_text, $l_orig, "")}}
+       <hr>
+
+       {{if ! $eid}}
+       {{include file="field_checkbox.tpl" field=$share}}
+       {{/if}}
+
+       {{$acl nofilter}}
+
+       <div class="settings-submit-wrapper">
+               <input id="event-edit-preview" type="submit" name="preview" value="{{$preview}}" onclick="doEventPreview(); return false;" />
+               <input id="event-submit" type="submit" name="submit" value="{{$submit}}" />
+       </div>
+</form>
+
+<script language="javascript" type="text/javascript">
+       $(document).ready(function() {
+               $('#id_share').change(function() {
+
+                       if ($('#id_share').is(':checked')) {
+                               $('#acl-wrapper').show();
+                       }
+                       else {
+                               $('#acl-wrapper').hide();
+                       }
+               }).trigger('change');
+       });
+</script>
diff --git a/view/theme/quattro/templates/event_form.tpl b/view/theme/quattro/templates/event_form.tpl
deleted file mode 100644 (file)
index 9ad1c8a..0000000
+++ /dev/null
@@ -1,49 +0,0 @@
-
-<h3>{{$title}}</h3>
-
-<p>{{$desc nofilter}}</p>
-
-<form id="event-edit-form" action="{{$post}}" method="post">
-
-       <input type="hidden" name="event_id" value="{{$eid}}" />
-       <input type="hidden" name="cid" value="{{$cid}}" />
-       <input type="hidden" name="uri" value="{{$uri}}" />
-       <input type="hidden" name="preview" id="event-edit-preview" value="0" />
-
-       {{$s_dsel nofilter}}
-
-       {{$f_dsel nofilter}}
-
-       {{include file="field_checkbox.tpl" field=$nofinish}}
-       <hr>
-       {{include file="field_input.tpl" field=$summary}}
-       {{include file="field_textarea.tpl" field=array('desc', $d_text, $d_orig, "")}}
-
-       {{include file="field_textarea.tpl" field=array('location', $l_text, $l_orig, "")}}
-       <hr>
-
-       {{if ! $eid}}
-       {{include file="field_checkbox.tpl" field=$share}}
-       {{/if}}
-
-       {{$acl nofilter}}
-
-       <div class="settings-submit-wrapper">
-               <input id="event-edit-preview" type="submit" name="preview" value="{{$preview}}" onclick="doEventPreview(); return false;" />
-               <input id="event-submit" type="submit" name="submit" value="{{$submit}}" />
-       </div>
-</form>
-
-<script language="javascript" type="text/javascript">
-       $(document).ready(function() {
-               $('#id_share').change(function() {
-
-                       if ($('#id_share').is(':checked')) {
-                               $('#acl-wrapper').show();
-                       }
-                       else {
-                               $('#acl-wrapper').hide();
-                       }
-               }).trigger('change');
-       });
-</script>
diff --git a/view/theme/quattro/templates/events-js.tpl b/view/theme/quattro/templates/events-js.tpl
deleted file mode 100644 (file)
index 62b9e66..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-
-{{$tabs nofilter}}
-<h2>{{$title}} <a class="actionbutton" href="{{$new_event.0}}"><i class="icon add s10"></i> {{$new_event.1}}</a></h2>
-
-<div id="new-event-link"></div>
-
-<div id="events-calendar"></div>
diff --git a/view/theme/quattro/templates/events.tpl b/view/theme/quattro/templates/events.tpl
deleted file mode 100644 (file)
index 052846f..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-{{$tabs nofilter}}
-<h2>{{$title}} <a class="actionbutton" href="{{$new_event.0}}"><i class="icon add s10"></i> {{$new_event.1}}</a></h2>
-
-<div id="event-calendar-wrapper">
-       <a href="{{$previus.0}}" class="prevcal {{$previus.2}}"><div id="event-calendar-prev" class="icon s22 prev" title="{{$previus.1}}"></div></a>
-       {{$calendar}}
-       <a href="{{$next.0}}" class="nextcal {{$next.2}}"><div id="event-calendar-prev" class="icon s22 next" title="{{$next.1}}"></div></a>
-</div>
-<div class="event-calendar-end"></div>
-
-{{foreach $events as $event}}
-       <div class="event">
-       {{if $event.is_first}}<hr /><a name="link-{{$event.j}}"><div class="event-list-date">{{$event.d}}</div></a>{{/if}}
-       {{if $event.item.author_name}}<a href="{{$event.item.author_link}}"><img src="{{$event.item.author_avatar}}" height="32" width="32" />{{$event.item.author_name}}</a>{{/if}}
-       {{$event.html nofilter}}
-       {{if $event.item.plink}}<a href="{{$event.plink.0}}" title="{{$event.plink.1}}" target="_blank" rel="noopener noreferrer" class="plink-event-link icon s22 remote-link"></a>{{/if}}
-       {{if $event.edit}}<a href="{{$event.edit.0}}" title="{{$event.edit.1}}" class="edit-event-link icon s22 pencil"></a>{{/if}}
-       </div>
-       <div class="clear"></div>
-{{/foreach}}
index 8c9bf4e97741a838eb5843157de61c611d48e728..48b4633866735efb244a3ee1c513811bb6377dd0 100644 (file)
@@ -10,7 +10,7 @@
 
        function showEvent(eventid) {
                $.get(
-                       '{{$baseurl}}/events/?id='+eventid,
+                       '{{$event_api}}/'+eventid,
                        function(data){
                                $.colorbox({html:data});
                        }
@@ -22,7 +22,7 @@
                        year: yesterday.getFullYear(),
                        month: yesterday.getMonth(),
                        date: yesterday.getDate(),
-                       events: '{{$baseurl}}/calendar/json',
+                       events: '{{$baseurl}}/calendar/api/get',
                        header: false,
                        timeFormat: 'H(:mm)',
                        defaultView: 'basicWeek',
diff --git a/view/theme/vier/templates/calendar/calendar_head.tpl b/view/theme/vier/templates/calendar/calendar_head.tpl
new file mode 100644 (file)
index 0000000..3bc1f78
--- /dev/null
@@ -0,0 +1,178 @@
+
+<link rel="stylesheet" type="text/css" href="{{$baseurl}}/view/asset/fullcalendar/dist/fullcalendar.min.css?v={{$smarty.const.FRIENDICA_VERSION}}" />
+<link rel="stylesheet" type="text/css" href="{{$baseurl}}/view/asset/fullcalendar/dist/fullcalendar.print.min.css?v={{$smarty.const.FRIENDICA_VERSION}}" media="print" />
+<script type="text/javascript" src="{{$baseurl}}/view/asset/moment/min/moment-with-locales.min.js?v={{$smarty.const.FRIENDICA_VERSION}}"></script>
+<script type="text/javascript" src="{{$baseurl}}/view/asset/fullcalendar/dist/fullcalendar.min.js?v={{$smarty.const.FRIENDICA_VERSION}}"></script>
+
+<script>
+       function showEvent(eventid) {
+               $.get(
+                       '{{$event_api}}/'+eventid,
+                       function(data){
+                               $.colorbox({html:data});
+                       }
+               );
+       }
+
+       function doEventPreview() {
+               $('#event-edit-preview').val(1);
+               $.post('events',$('#event-edit-form').serialize(), function(data) {
+                       $.colorbox({ html: data });
+               });
+               $('#event-edit-preview').val(0);
+       }
+
+       // disable the input for the finish date if it is not available
+       function enableDisableFinishDate() {
+               if( $('#id_nofinish').is(':checked'))
+                       $('#id_finish_text').prop("disabled", true);
+               else
+                       $('#id_finish_text').prop("disabled", false);
+       }
+
+       $(document).ready(function() {
+               $('#events-calendar').fullCalendar({
+                       firstDay: '{{$i18n.firstDay|escape:'quotes'}}',
+                       monthNames: [
+                               '{{$i18n.January|escape:'quotes'}}',
+                               '{{$i18n.February|escape:'quotes'}}',
+                               '{{$i18n.March|escape:'quotes'}}',
+                               '{{$i18n.April|escape:'quotes'}}',
+                               '{{$i18n.May|escape:'quotes'}}',
+                               '{{$i18n.June|escape:'quotes'}}',
+                               '{{$i18n.July|escape:'quotes'}}',
+                               '{{$i18n.August|escape:'quotes'}}',
+                               '{{$i18n.September|escape:'quotes'}}',
+                               '{{$i18n.October|escape:'quotes'}}',
+                               '{{$i18n.November|escape:'quotes'}}',
+                               '{{$i18n.December|escape:'quotes'}}'
+                       ],
+                       monthNamesShort: [
+                               '{{$i18n.Jan|escape:'quotes'}}',
+                               '{{$i18n.Feb|escape:'quotes'}}',
+                               '{{$i18n.Mar|escape:'quotes'}}',
+                               '{{$i18n.Apr|escape:'quotes'}}',
+                               '{{$i18n.May|escape:'quotes'}}',
+                               '{{$i18n.Jun|escape:'quotes'}}',
+                               '{{$i18n.Jul|escape:'quotes'}}',
+                               '{{$i18n.Aug|escape:'quotes'}}',
+                               '{{$i18n.Sep|escape:'quotes'}}',
+                               '{{$i18n.Oct|escape:'quotes'}}',
+                               '{{$i18n.Nov|escape:'quotes'}}',
+                               '{{$i18n.Dec|escape:'quotes'}}'
+                       ],
+                       dayNames: [
+                               '{{$i18n.Sunday|escape:'quotes'}}',
+                               '{{$i18n.Monday|escape:'quotes'}}',
+                               '{{$i18n.Tuesday|escape:'quotes'}}',
+                               '{{$i18n.Wednesday|escape:'quotes'}}',
+                               '{{$i18n.Thursday|escape:'quotes'}}',
+                               '{{$i18n.Friday|escape:'quotes'}}',
+                               '{{$i18n.Saturday|escape:'quotes'}}'
+                       ],
+                       dayNamesShort: [
+                               '{{$i18n.Sun|escape:'quotes'}}',
+                               '{{$i18n.Mon|escape:'quotes'}}',
+                               '{{$i18n.Tue|escape:'quotes'}}',
+                               '{{$i18n.Wed|escape:'quotes'}}',
+                               '{{$i18n.Thu|escape:'quotes'}}',
+                               '{{$i18n.Fri|escape:'quotes'}}',
+                               '{{$i18n.Sat|escape:'quotes'}}'
+                       ],
+                       allDayText: '{{$i18n.allday|escape:'quotes'}}',
+                       noEventsMessage: '{{$i18n.noevent|escape:'quotes'}}',
+                       buttonText: {
+                               today: '{{$i18n.today|escape:'quotes'}}',
+                               month: '{{$i18n.month|escape:'quotes'}}',
+                               week: '{{$i18n.week|escape:'quotes'}}',
+                               day: '{{$i18n.day|escape:'quotes'}}'
+                       },
+                       events: '{{$calendar_api}}',
+                       header: {
+                               left: 'prev,next today',
+                               center: 'title',
+                               right: 'month,agendaWeek,agendaDay'
+                       },
+                       timeFormat: 'H:mm',
+                       eventClick: function(calEvent, jsEvent, view) {
+                               showEvent(calEvent.id);
+                       },
+                       loading: function(isLoading, view) {
+                               if(!isLoading) {
+                                       $('td.fc-day').dblclick(function() { window.location.href='/calendar/event/new?start='+$(this).data('date'); });
+                               }
+                       },
+
+                       eventRender: function(event, element, view) {
+                               if (event.item['author-name']==null) return;
+                               switch(view.name){
+                                       case "month":
+                                       element.find(".fc-title").html(
+                                               "{0}".format(
+                                                       event.title
+                                       ));
+                                       break;
+                                       case "agendaWeek":
+                                       element.find(".fc-title").html(
+                                               "{0}<p>{1}</p><p>{2}</p>".format(
+                                                       event.item['author-name'],
+                                                       event.item.desc,
+                                                       event.item.location
+                                       ));
+                                       break;
+                                       case "agendaDay":
+                                       element.find(".fc-title").html(
+                                               "{0}<p>{1}</p><p>{2}</p>".format(
+                                                       event.item['author-name'],
+                                                       event.item.desc,
+                                                       event.item.location
+                                       ));
+                                       break;
+                               }
+                       }
+
+               })
+
+               // show event popup
+               var hash = location.hash.split("-")
+               if (hash.length==2 && hash[0]=="#link") showEvent(hash[1]);
+
+       });
+</script>
+
+<script language="javascript" type="text/javascript">
+
+       $(document).ready(function() {
+               $("#comment-edit-text-desc").bbco_autocomplete('bbcode');
+
+               $('#id_share').change(function() {
+
+                       if ($('#id_share').is(':checked')) {
+                               $('#acl-wrapper').show();
+                       }
+                       else {
+                               $('#acl-wrapper').hide();
+                       }
+               }).trigger('change');
+
+               $('#contact_allow, #contact_deny, #group_allow, #group_deny').change(function() {
+                       var selstr;
+                       $('#contact_allow option:selected, #contact_deny option:selected, #group_allow option:selected, #group_deny option:selected').each( function() {
+                               selstr = $(this).html();
+                               $('#jot-public').hide();
+                       });
+                       if(selstr == null) {
+                               $('#jot-public').show();
+                       }
+
+               }).trigger('change');
+
+               // disable the finish time input if the user disable it
+               $('#id_nofinish').change(function() {
+                       enableDisableFinishDate()
+               }).trigger('change');
+
+       });
+
+</script>
+
diff --git a/view/theme/vier/templates/calendar/event_form.tpl b/view/theme/vier/templates/calendar/event_form.tpl
new file mode 100644 (file)
index 0000000..1581fb6
--- /dev/null
@@ -0,0 +1,62 @@
+
+
+<h3>{{$title}}</h3>
+
+<p>
+{{$desc nofilter}}
+</p>
+
+<form id="event-edit-form" action="{{$post}}" method="post">
+
+<input type="hidden" name="event_id" value="{{$eid}}" />
+<input type="hidden" name="cid" value="{{$cid}}" />
+<input type="hidden" name="uri" value="{{$uri}}" />
+<input type="hidden" name="preview" id="event-edit-preview" value="0" />
+
+{{$s_dsel nofilter}}
+
+{{$f_dsel nofilter}}
+
+{{include file="field_checkbox.tpl" field=$nofinish}}
+
+{{include file="field_input.tpl" field=$summary}}
+
+
+<div id="event-desc-text">{{$d_text}}</div>
+<textarea id="comment-edit-text-desc" rows="8" cols="64" name="desc" autocomplete="off" dir="auto">{{$d_orig}}</textarea>
+<div id="event-desc-text-edit-bb" class="comment-edit-bb">
+       <a title="{{$edimg}}" data-role="insert-formatting" data-bbcode="img" data-id="desc"><i class="icon-picture"></i></a>
+       <a title="{{$edurl}}" data-role="insert-formatting" data-bbcode="url" data-id="desc"><i class="icon-link"></i></a>
+       <a title="{{$edvideo}}" data-role="insert-formatting" data-bbcode="video" data-id="desc"><i class="icon-film"></i></a>
+
+       <a title="{{$eduline}}" data-role="insert-formatting" data-bbcode="u" data-id="desc"><i class="icon-underline"></i></a>
+       <a title="{{$editalic}}" data-role="insert-formatting" data-bbcode="i" data-id="desc"><i class="icon-italic"></i></a>
+       <a title="{{$edbold}}" data-role="insert-formatting" data-bbcode="b" data-id="desc"><i class="icon-bold"></i></a>
+       <a title="{{$edquote}}" data-role="insert-formatting" data-bbcode="quote" data-id="desc"><i class="icon-quote-left"></i></a>
+</div>
+
+<div id="event-location-text">{{$l_text}}</div>
+<textarea id="comment-edit-text-location" rows="4" cols="64" name="location" dir="auto">{{$l_orig}}</textarea>
+<div id="event-location-text-edit-bb" class="comment-edit-bb">
+       <a title="{{$edimg}}" data-role="insert-formatting" data-bbcode="img" data-id="location"><i class="icon-picture"></i></a>
+       <a title="{{$edurl}}" data-role="insert-formatting" data-bbcode="url" data-id="location"><i class="icon-link"></i></a>
+       <a title="{{$edvideo}}" data-role="insert-formatting" data-bbcode="video" data-id="location"><i class="icon-film"></i></a>
+
+       <a title="{{$eduline}}" data-role="insert-formatting" data-bbcode="u" data-id="location"><i class="icon-underline"></i></a>
+       <a title="{{$editalic}}" data-role="insert-formatting" data-bbcode="i" data-id="location"><i class="icon-italic"></i></a>
+       <a title="{{$edbold}}" data-role="insert-formatting" data-bbcode="b" data-id="location"><i class="icon-bold"></i></a>
+       <a title="{{$edquote}}" data-role="insert-formatting" data-bbcode="quote" data-id="location"><i class="icon-quote-left"></i></a>
+</div>
+
+<div id="event-location-break"></div>
+
+{{if ! $eid}}
+{{include file="field_checkbox.tpl" field=$share}}
+{{/if}}
+
+{{$acl nofilter}}
+
+<div class="clear"></div>
+<input id="event-edit-preview" type="submit" name="preview" value="{{$preview}}" onclick="doEventPreview(); return false;" />
+<input id="event-submit" type="submit" name="submit" value="{{$submit}}" />
+</form>
diff --git a/view/theme/vier/templates/event_form.tpl b/view/theme/vier/templates/event_form.tpl
deleted file mode 100644 (file)
index 1581fb6..0000000
+++ /dev/null
@@ -1,62 +0,0 @@
-
-
-<h3>{{$title}}</h3>
-
-<p>
-{{$desc nofilter}}
-</p>
-
-<form id="event-edit-form" action="{{$post}}" method="post">
-
-<input type="hidden" name="event_id" value="{{$eid}}" />
-<input type="hidden" name="cid" value="{{$cid}}" />
-<input type="hidden" name="uri" value="{{$uri}}" />
-<input type="hidden" name="preview" id="event-edit-preview" value="0" />
-
-{{$s_dsel nofilter}}
-
-{{$f_dsel nofilter}}
-
-{{include file="field_checkbox.tpl" field=$nofinish}}
-
-{{include file="field_input.tpl" field=$summary}}
-
-
-<div id="event-desc-text">{{$d_text}}</div>
-<textarea id="comment-edit-text-desc" rows="8" cols="64" name="desc" autocomplete="off" dir="auto">{{$d_orig}}</textarea>
-<div id="event-desc-text-edit-bb" class="comment-edit-bb">
-       <a title="{{$edimg}}" data-role="insert-formatting" data-bbcode="img" data-id="desc"><i class="icon-picture"></i></a>
-       <a title="{{$edurl}}" data-role="insert-formatting" data-bbcode="url" data-id="desc"><i class="icon-link"></i></a>
-       <a title="{{$edvideo}}" data-role="insert-formatting" data-bbcode="video" data-id="desc"><i class="icon-film"></i></a>
-
-       <a title="{{$eduline}}" data-role="insert-formatting" data-bbcode="u" data-id="desc"><i class="icon-underline"></i></a>
-       <a title="{{$editalic}}" data-role="insert-formatting" data-bbcode="i" data-id="desc"><i class="icon-italic"></i></a>
-       <a title="{{$edbold}}" data-role="insert-formatting" data-bbcode="b" data-id="desc"><i class="icon-bold"></i></a>
-       <a title="{{$edquote}}" data-role="insert-formatting" data-bbcode="quote" data-id="desc"><i class="icon-quote-left"></i></a>
-</div>
-
-<div id="event-location-text">{{$l_text}}</div>
-<textarea id="comment-edit-text-location" rows="4" cols="64" name="location" dir="auto">{{$l_orig}}</textarea>
-<div id="event-location-text-edit-bb" class="comment-edit-bb">
-       <a title="{{$edimg}}" data-role="insert-formatting" data-bbcode="img" data-id="location"><i class="icon-picture"></i></a>
-       <a title="{{$edurl}}" data-role="insert-formatting" data-bbcode="url" data-id="location"><i class="icon-link"></i></a>
-       <a title="{{$edvideo}}" data-role="insert-formatting" data-bbcode="video" data-id="location"><i class="icon-film"></i></a>
-
-       <a title="{{$eduline}}" data-role="insert-formatting" data-bbcode="u" data-id="location"><i class="icon-underline"></i></a>
-       <a title="{{$editalic}}" data-role="insert-formatting" data-bbcode="i" data-id="location"><i class="icon-italic"></i></a>
-       <a title="{{$edbold}}" data-role="insert-formatting" data-bbcode="b" data-id="location"><i class="icon-bold"></i></a>
-       <a title="{{$edquote}}" data-role="insert-formatting" data-bbcode="quote" data-id="location"><i class="icon-quote-left"></i></a>
-</div>
-
-<div id="event-location-break"></div>
-
-{{if ! $eid}}
-{{include file="field_checkbox.tpl" field=$share}}
-{{/if}}
-
-{{$acl nofilter}}
-
-<div class="clear"></div>
-<input id="event-edit-preview" type="submit" name="preview" value="{{$preview}}" onclick="doEventPreview(); return false;" />
-<input id="event-submit" type="submit" name="submit" value="{{$submit}}" />
-</form>
diff --git a/view/theme/vier/templates/event_head.tpl b/view/theme/vier/templates/event_head.tpl
deleted file mode 100644 (file)
index 817204a..0000000
+++ /dev/null
@@ -1,190 +0,0 @@
-
-<link rel="stylesheet" type="text/css" href="{{$baseurl}}/view/asset/fullcalendar/dist/fullcalendar.min.css?v={{$smarty.const.FRIENDICA_VERSION}}" />
-<link rel="stylesheet" type="text/css" href="{{$baseurl}}/view/asset/fullcalendar/dist/fullcalendar.print.min.css?v={{$smarty.const.FRIENDICA_VERSION}}" media="print" />
-<script type="text/javascript" src="{{$baseurl}}/view/asset/moment/min/moment-with-locales.min.js?v={{$smarty.const.FRIENDICA_VERSION}}"></script>
-<script type="text/javascript" src="{{$baseurl}}/view/asset/fullcalendar/dist/fullcalendar.min.js?v={{$smarty.const.FRIENDICA_VERSION}}"></script>
-
-<script>
-       function showEvent(eventid) {
-               $.get(
-                       '{{$baseurl}}{{$module_url}}/?id='+eventid,
-                       function(data){
-                               $.colorbox({html:data});
-                       }
-               );
-       }
-
-       function doEventPreview() {
-               $('#event-edit-preview').val(1);
-               $.post('events',$('#event-edit-form').serialize(), function(data) {
-                       $.colorbox({ html: data });
-               });
-               $('#event-edit-preview').val(0);
-       }
-
-       // disable the input for the finish date if it is not available
-       function enableDisableFinishDate() {
-               if( $('#id_nofinish').is(':checked'))
-                       $('#id_finish_text').prop("disabled", true);
-               else
-                       $('#id_finish_text').prop("disabled", false);
-       }
-
-       $(document).ready(function() {
-               $('#events-calendar').fullCalendar({
-                       firstDay: '{{$i18n.firstDay|escape:'quotes'}}',
-                       monthNames: [
-                               '{{$i18n.January|escape:'quotes'}}',
-                               '{{$i18n.February|escape:'quotes'}}',
-                               '{{$i18n.March|escape:'quotes'}}',
-                               '{{$i18n.April|escape:'quotes'}}',
-                               '{{$i18n.May|escape:'quotes'}}',
-                               '{{$i18n.June|escape:'quotes'}}',
-                               '{{$i18n.July|escape:'quotes'}}',
-                               '{{$i18n.August|escape:'quotes'}}',
-                               '{{$i18n.September|escape:'quotes'}}',
-                               '{{$i18n.October|escape:'quotes'}}',
-                               '{{$i18n.November|escape:'quotes'}}',
-                               '{{$i18n.December|escape:'quotes'}}'
-                       ],
-                       monthNamesShort: [
-                               '{{$i18n.Jan|escape:'quotes'}}',
-                               '{{$i18n.Feb|escape:'quotes'}}',
-                               '{{$i18n.Mar|escape:'quotes'}}',
-                               '{{$i18n.Apr|escape:'quotes'}}',
-                               '{{$i18n.May|escape:'quotes'}}',
-                               '{{$i18n.Jun|escape:'quotes'}}',
-                               '{{$i18n.Jul|escape:'quotes'}}',
-                               '{{$i18n.Aug|escape:'quotes'}}',
-                               '{{$i18n.Sep|escape:'quotes'}}',
-                               '{{$i18n.Oct|escape:'quotes'}}',
-                               '{{$i18n.Nov|escape:'quotes'}}',
-                               '{{$i18n.Dec|escape:'quotes'}}'
-                       ],
-                       dayNames: [
-                               '{{$i18n.Sunday|escape:'quotes'}}',
-                               '{{$i18n.Monday|escape:'quotes'}}',
-                               '{{$i18n.Tuesday|escape:'quotes'}}',
-                               '{{$i18n.Wednesday|escape:'quotes'}}',
-                               '{{$i18n.Thursday|escape:'quotes'}}',
-                               '{{$i18n.Friday|escape:'quotes'}}',
-                               '{{$i18n.Saturday|escape:'quotes'}}'
-                       ],
-                       dayNamesShort: [
-                               '{{$i18n.Sun|escape:'quotes'}}',
-                               '{{$i18n.Mon|escape:'quotes'}}',
-                               '{{$i18n.Tue|escape:'quotes'}}',
-                               '{{$i18n.Wed|escape:'quotes'}}',
-                               '{{$i18n.Thu|escape:'quotes'}}',
-                               '{{$i18n.Fri|escape:'quotes'}}',
-                               '{{$i18n.Sat|escape:'quotes'}}'
-                       ],
-                       allDayText: '{{$i18n.allday|escape:'quotes'}}',
-                       noEventsMessage: '{{$i18n.noevent|escape:'quotes'}}',
-                       buttonText: {
-                               today: '{{$i18n.today|escape:'quotes'}}',
-                               month: '{{$i18n.month|escape:'quotes'}}',
-                               week: '{{$i18n.week|escape:'quotes'}}',
-                               day: '{{$i18n.day|escape:'quotes'}}'
-                       },
-                       events: '{{$baseurl}}/calendar/json',
-                       header: {
-                               left: 'prev,next today',
-                               center: 'title',
-                               right: 'month,agendaWeek,agendaDay'
-                       },
-                       timeFormat: 'H:mm',
-                       eventClick: function(calEvent, jsEvent, view) {
-                               showEvent(calEvent.id);
-                       },
-                       loading: function(isLoading, view) {
-                               if(!isLoading) {
-                                       $('td.fc-day').dblclick(function() { window.location.href='/events/new?start='+$(this).data('date'); });
-                               }
-                       },
-
-                       eventRender: function(event, element, view) {
-                               if (event.item['author-name']==null) return;
-                               switch(view.name){
-                                       case "month":
-                                       element.find(".fc-title").html(
-                                               "{0}".format(
-                                                       event.title
-                                       ));
-                                       break;
-                                       case "agendaWeek":
-                                       element.find(".fc-title").html(
-                                               "{0}<p>{1}</p><p>{2}</p>".format(
-                                                       event.item['author-name'],
-                                                       event.item.desc,
-                                                       event.item.location
-                                       ));
-                                       break;
-                                       case "agendaDay":
-                                       element.find(".fc-title").html(
-                                               "{0}<p>{1}</p><p>{2}</p>".format(
-                                                       event.item['author-name'],
-                                                       event.item.desc,
-                                                       event.item.location
-                                       ));
-                                       break;
-                               }
-                       }
-
-               })
-
-               // center on date
-               var args=location.href.replace(baseurl,"").split("/");
-{{if $modparams == 2}}
-               if (args.length>=5) {
-                       $("#events-calendar").fullCalendar('gotoDate',args[3] , args[4]-1);
-               }
-{{else}}
-               if (args.length>=4) {
-                       $("#events-calendar").fullCalendar('gotoDate',args[2] , args[3]-1);
-               }
-{{/if}}
-
-               // show event popup
-               var hash = location.hash.split("-")
-               if (hash.length==2 && hash[0]=="#link") showEvent(hash[1]);
-
-       });
-</script>
-
-<script language="javascript" type="text/javascript">
-
-       $(document).ready(function() {
-               $("#comment-edit-text-desc").bbco_autocomplete('bbcode');
-
-               $('#id_share').change(function() {
-
-                       if ($('#id_share').is(':checked')) {
-                               $('#acl-wrapper').show();
-                       }
-                       else {
-                               $('#acl-wrapper').hide();
-                       }
-               }).trigger('change');
-
-               $('#contact_allow, #contact_deny, #group_allow, #group_deny').change(function() {
-                       var selstr;
-                       $('#contact_allow option:selected, #contact_deny option:selected, #group_allow option:selected, #group_deny option:selected').each( function() {
-                               selstr = $(this).html();
-                               $('#jot-public').hide();
-                       });
-                       if(selstr == null) {
-                               $('#jot-public').show();
-                       }
-
-               }).trigger('change');
-
-               // disable the finish time input if the user disable it
-               $('#id_nofinish').change(function() {
-                       enableDisableFinishDate()
-               }).trigger('change');
-
-       });
-
-</script>
-
index 8eabe95323ae62b2c73d732dabd80d8c67279030..e102b305942adc374e9e8c320e5c2e630b916335 100644 (file)
@@ -31,7 +31,7 @@
                        </li>
                {{/if}}
                {{if $nav.events}}
-                       <li role="menuitem" id="nav-events-link" class="nav-menu {{$sel.events}}">
+                       <li role="menuitem" id="nav-calendar-link" class="nav-menu {{$sel.events}}">
                                <a accesskey="e" class="{{$nav.events.2}} desktop-view" href="{{$nav.events.0}}" title="{{$nav.events.3}}">{{$nav.events.1}}</a>
                                <a class="{{$nav.events.2}} mobile-view" href="{{$nav.events.0}}" title="{{$nav.events.3}}"><i class="icon s22 icon-calendar"></i></a>
                        </li>
index 28c5c3e86308fdb975c5595aa4ebf2a77fe40fed..006450edfcfd62f2a06b94a25b43f78d19b4948b 100644 (file)
@@ -106,7 +106,7 @@ EOT;
 
        // Hide the left menu bar
        /// @TODO maybe move this static array out where it should belong?
-       if (empty(DI::page()['aside']) && in_array($args->get(0), ["community", "events", "help", "delegation", "notifications",
+       if (empty(DI::page()['aside']) && in_array($args->get(0), ["community", "calendar", "help", "delegation", "notifications",
                        "probe", "webfinger", "login", "invite", "credits"])) {
                DI::page()['htmlhead'] .= "<link rel='stylesheet' href='view/theme/vier/hide.css' />";
        }