Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-12-23 18:00:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1558 from rabuzarus/event-preview

Browse source 
Event preview
This commit is contained in:
fabrixxm 2015-05-14 16:32:24 +02:00
commit cbbb5da321
3 changed files with 31 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
mod/events.php
View file

@ -7,6 +7,8 @@ require_once('include/items.php');
function events_post(&$a) { function events_post(&$a) {
logger('post: ' . print_r($_REQUEST,true));
if(! local_user()) if(! local_user())
return; return;
@ -64,6 +66,10 @@ function events_post(&$a) {
if((! $summary) || (! $start)) { if((! $summary) || (! $start)) {
notice( t('Event title and start time are required.') . EOL); notice( t('Event title and start time are required.') . EOL);
if(intval($_REQUEST['preview'])) {
echo( t('Event title and start time are required.'));
killme();
}
goaway($a->get_baseurl() . '/events/new'); goaway($a->get_baseurl() . '/events/new');
} }
@ -125,6 +131,12 @@ function events_post(&$a) {
$datarray['created'] = $created; $datarray['created'] = $created;
$datarray['edited'] = $edited; $datarray['edited'] = $edited;
if(intval($_REQUEST['preview'])) {
$html = format_event_html($datarray);
echo $html;
killme();
}
$item_id = event_store($datarray); $item_id = event_store($datarray);
if(! $cid) if(! $cid)
@ -474,6 +486,7 @@ function events_content(&$a) {
'$t_orig' => $t_orig, '$t_orig' => $t_orig,
'$sh_text' => t('Share this event'), '$sh_text' => t('Share this event'),
'$sh_checked' => $sh_checked, '$sh_checked' => $sh_checked,
'$preview' => t('Preview'),
'$acl' => (($cid) ? '' : populate_acl(((x($orig_event)) ? $orig_event : $a->user),false)), '$acl' => (($cid) ? '' : populate_acl(((x($orig_event)) ? $orig_event : $a->user),false)),
'$submit' => t('Submit') '$submit' => t('Submit')

6
view/templates/event_form.tpl
View file

@ -5,11 +5,12 @@
{{$desc}} {{$desc}}
</p> </p>
<form action="{{$post}}" method="post" > <form id="event-edit-form" action="{{$post}}" method="post" >
<input type="hidden" name="event_id" value="{{$eid}}" /> <input type="hidden" name="event_id" value="{{$eid}}" />
<input type="hidden" name="cid" value="{{$cid}}" /> <input type="hidden" name="cid" value="{{$cid}}" />
<input type="hidden" name="uri" value="{{$uri}}" /> <input type="hidden" name="uri" value="{{$uri}}" />
<input type="hidden" name="preview" id="event-edit-preview" value="0" />
<div id="event-start-text">{{$s_text}}</div> <div id="event-start-text">{{$s_text}}</div>
{{$s_dsel}} {{$s_tsel}} {{$s_dsel}} {{$s_tsel}}
@ -38,12 +39,15 @@
<div id="event-location-text">{{$l_text}}</div> <div id="event-location-text">{{$l_text}}</div>
<textarea id="event-location-textarea" name="location">{{$l_orig}}</textarea> <textarea id="event-location-textarea" name="location">{{$l_orig}}</textarea>
<div id="event-location-break"></div>
<input type="checkbox" name="share" value="1" id="event-share-checkbox" {{$sh_checked}} /> <div id="event-share-text">{{$sh_text}}</div> <input type="checkbox" name="share" value="1" id="event-share-checkbox" {{$sh_checked}} /> <div id="event-share-text">{{$sh_text}}</div>
<div id="event-share-break"></div> <div id="event-share-break"></div>
{{$acl}} {{$acl}}
<div class="clear"></div> <div class="clear"></div>
<input id="event-edit-preview" type="submit" name="preview" value="{{$preview|escape:'html'}}" onclick="doEventPreview(); return false;" />
<input id="event-submit" type="submit" name="submit" value="{{$submit|escape:'html'}}" /> <input id="event-submit" type="submit" name="submit" value="{{$submit|escape:'html'}}" />
</form> </form>

13
view/templates/event_head.tpl
View file

@ -13,6 +13,15 @@
); );
} }
function doEventPreview() {
$('#event-edit-preview').val(1);
$.post('events',$('#event-edit-form').serialize(), function(data) {
$.colorbox({ html: data });
});
$('#event-edit-preview').val(0);
}
$(document).ready(function() { $(document).ready(function() {
$('#events-calendar').fullCalendar({ $('#events-calendar').fullCalendar({
events: '{{$baseurl}}/events/json/', events: '{{$baseurl}}/events/json/',
@ -75,6 +84,7 @@
</script> </script>
{{if $editselect != 'none'}}
<script language="javascript" type="text/javascript" <script language="javascript" type="text/javascript"
src="{{$baseurl}}/library/tinymce/jscripts/tiny_mce/tiny_mce_src.js"></script> src="{{$baseurl}}/library/tinymce/jscripts/tiny_mce/tiny_mce_src.js"></script>
<script language="javascript" type="text/javascript"> <script language="javascript" type="text/javascript">
@ -108,6 +118,9 @@
} }
}); });
{{else}}
<script language="javascript" type="text/javascript">
{{/if}}
$(document).ready(function() { $(document).ready(function() {