1
0
Fork 0

Move mod/cal.php and mod/events.php to Module

This commit is contained in:
Philipp Holzer 2022-11-06 02:35:09 +01:00
commit f13c91b320
Signed by: nupplaPhil
GPG key ID: 24A7501396EB5432
41 changed files with 1054 additions and 1109 deletions

View file

@ -1,7 +1,7 @@
<script>
function showEvent(eventid) {
$.get(
'{{$baseurl}}{{$module_url}}/?id='+eventid,
'{{$event_api}}/'+eventid,
function(data){
$.colorbox({html:data});
}
@ -10,7 +10,7 @@
function doEventPreview() {
$('#event-edit-preview').val(1);
$.post('events',$('#event-edit-form').serialize(), function(data) {
$.post('calendar',$('#event-edit-form').serialize(), function(data) {
$.colorbox({ html: data });
});
$('#event-edit-preview').val(0);
@ -81,7 +81,7 @@
week: '{{$i18n.week|escape:'quotes'}}',
day: '{{$i18n.day|escape:'quotes'}}'
},
events: '{{$baseurl}}/calendar/json',
events: '{{$calendar_api}}',
header: {
left: 'prev,next today',
center: 'title',
@ -93,7 +93,7 @@
},
loading: function(isLoading, view) {
if(!isLoading) {
$('td.fc-day').dblclick(function() { window.location.href='/events/new?start='+$(this).data('date'); });
$('td.fc-day').dblclick(function() { window.location.href='/calendar/event/new?start='+$(this).data('date'); });
}
},

View file

@ -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>

View file

@ -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}}

View file

@ -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}}

View 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}}

View 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>

View 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);

View 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;
}

View file

@ -80,7 +80,7 @@ function get_modalpage_list() {
$modalpages = [
'message/new',
'settings/oauth/add',
'events/new',
'calendar/event/new',
// 'fbrowser/image/'
];

View file

@ -63,9 +63,8 @@
aStr.dtendLabel = '{{$i18n.dtend_label|escape:'quotes'}}';
aStr.locationLabel = '{{$i18n.location_label|escape:'quotes'}}';
var moduleUrl = '{{$module_url}}';
var modparams = {{$modparams}}
var calendar_api = '{{$calendar_api}}';
var event_api = '{{$event_api}}';
$(document).ready(function() {
$("#comment-edit-text-desc").bbco_autocomplete('bbcode');

View file

@ -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>

View file

@ -4,7 +4,7 @@
{{* 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 *}}
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>

View file

@ -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}}

View file

@ -81,10 +81,10 @@
</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}}

View 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')];

View file

@ -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}}

View 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',

View file

@ -7,7 +7,7 @@
<script>
function showEvent(eventid) {
$.get(
'{{$baseurl}}{{$module_url}}/?id='+eventid,
'{{$event_api}}/'+eventid,
function(data){
$.colorbox({html:data});
}
@ -87,7 +87,7 @@
week: '{{$i18n.week|escape:'quotes'}}',
day: '{{$i18n.day|escape:'quotes'}}'
},
events: '{{$baseurl}}/calendar/json',
events: '{{$calendar_api}}',
header: {
left: 'prev,next today',
center: 'title',
@ -99,7 +99,7 @@
},
loading: function(isLoading, view) {
if(!isLoading) {
$('td.fc-day').dblclick(function() { window.location.href='/events/new?start='+$(this).data('date'); });
$('td.fc-day').dblclick(function() { window.location.href='/calendar/event/new?start='+$(this).data('date'); });
}
},
@ -133,18 +133,6 @@
})
// 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]);

View 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>

View 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' />";
}