diff --git a/include/datetime.php b/include/datetime.php index 952151a00..1d10e7ad7 100644 --- a/include/datetime.php +++ b/include/datetime.php @@ -235,11 +235,7 @@ function datetimesel($format, $min, $max, $default, $label, $id = 'datetimepicke $o .= replace_macros($tpl,array( '$field' => array($id, $label, $input_text, (($required) ? t('Required') : ''), (($required) ? '*' : ''), 'placeholder="' . $readable_format . '"'), )); -<<<<<<< HEAD - $o .= ""; -======= $o .= ""; ->>>>>>> upstream/master return $o; } diff --git a/include/text.php b/include/text.php index 99c73ebee..4777e7a61 100644 --- a/include/text.php +++ b/include/text.php @@ -1444,62 +1444,11 @@ function prepare_body(&$item,$attach = false) { } } -<<<<<<< HEAD - $event = array(); - $is_event = (($item['obj_type'] === ACTIVITY_OBJ_EVENT) ? true : false); - - if($is_event) { - $object = json_decode($item['object'],true); - - //ensure compatibility with older items - if(array_key_exists('description', $object)) { - - $bd_format = t('l F d, Y \@ g:i A') ; // Friday January 18, 2011 @ 8:01 AM - - $event['header'] = '

 ' . bbcode($object['title']) . '

' . "\r\n"; - - $event['header'] .= '
' . t('Starts:') . ' ' - . (($object['adjust']) ? day_translate(datetime_convert('UTC', date_default_timezone_get(), - $object['start'] , $bd_format )) - : day_translate(datetime_convert('UTC', 'UTC', - $object['start'] , $bd_format))) - . '
' . "\r\n"; - - if(! $object['nofinish']) - $event['header'] .= '
' . t('Finishes:') . ' ' - . (($object['adjust']) ? day_translate(datetime_convert('UTC', date_default_timezone_get(), - $object['finish'] , $bd_format )) - : day_translate(datetime_convert('UTC', 'UTC', - $object['finish'] , $bd_format ))) - . '
' . "\r\n"; - - - $event['content'] = '
' . bbcode($object['description']) . '
' . "\r\n"; - - if(strlen($object['location'])) - $event['content'] .= '
' . t('Location:') . ' ' - . bbcode($object['location']) - . '
' . "\r\n"; - } - else { - $is_event = false; - } - } - - $prep_arr = array( - 'item' => $item, - 'html' => $is_event ? $event['content'] : $s, -======= $event = (($item['obj_type'] === ACTIVITY_OBJ_EVENT) ? format_event($item['object']) : false); $prep_arr = array( 'item' => $item, 'html' => $event ? $event['content'] : $s, ->>>>>>> upstream/master 'event' => $event['header'], 'photo' => $photo ); diff --git a/mod/events.php b/mod/events.php index a61da5f3e..080c39911 100755 --- a/mod/events.php +++ b/mod/events.php @@ -90,11 +90,7 @@ function events_post(&$a) { linkify_tags($a, $desc, local_channel()); linkify_tags($a, $location, local_channel()); -<<<<<<< HEAD - $action = ($event_hash == '') ? 'new' : "event/" . $event_hash; -======= //$action = ($event_hash == '') ? 'new' : "event/" . $event_hash; ->>>>>>> upstream/master //fixme: this url gives a wsod if there is a linebreak detected in one of the variables ($desc or $location) //$onerror_url = $a->get_baseurl() . "/events/" . $action . "?summary=$summary&description=$desc&location=$location&start=$start_text&finish=$finish_text&adjust=$adjust&nofinish=$nofinish&type=$type"; @@ -326,7 +322,6 @@ function events_content(&$a) { } if($mode == 'view') { -<<<<<<< HEAD /* edit/create form */ if($event_id) { @@ -344,25 +339,6 @@ function events_content(&$a) { if(!x($orig_event)) $orig_event = array(); -======= - - /* edit/create form */ - if($event_id) { - $r = q("SELECT * FROM `event` WHERE event_hash = '%s' AND `uid` = %d LIMIT 1", - dbesc($event_id), - intval(local_channel()) - ); - if(count($r)) - $orig_event = $r[0]; - } - - $channel = $a->get_channel(); - - // Passed parameters overrides anything found in the DB - if(!x($orig_event)) - $orig_event = array(); - ->>>>>>> upstream/master // In case of an error the browser is redirected back here, with these parameters filled in with the previous values /* if(x($_REQUEST,'nofinish')) $orig_event['nofinish'] = $_REQUEST['nofinish']; @@ -400,55 +376,24 @@ function events_content(&$a) { if(x($orig_event)) $tz = (($orig_event['adjust']) ? date_default_timezone_get() : 'UTC'); -<<<<<<< HEAD -// $syear = ((x($orig_event)) ? datetime_convert('UTC', $tz, $sdt, 'Y') : '0000'); -// $smonth = ((x($orig_event)) ? datetime_convert('UTC', $tz, $sdt, 'm') : '00'); -// $sday = ((x($orig_event)) ? datetime_convert('UTC', $tz, $sdt, 'd') : '00'); - $syear = datetime_convert('UTC', $tz, $sdt, 'Y'); $smonth = datetime_convert('UTC', $tz, $sdt, 'm'); $sday = datetime_convert('UTC', $tz, $sdt, 'd'); - -// $shour = ((x($orig_event)) ? datetime_convert('UTC', $tz, $sdt, 'H') : '00'); -// $sminute = ((x($orig_event)) ? datetime_convert('UTC', $tz, $sdt, 'i') : '00'); - -======= - $syear = datetime_convert('UTC', $tz, $sdt, 'Y'); - $smonth = datetime_convert('UTC', $tz, $sdt, 'm'); - $sday = datetime_convert('UTC', $tz, $sdt, 'd'); ->>>>>>> upstream/master $shour = datetime_convert('UTC', $tz, $sdt, 'H'); $sminute = datetime_convert('UTC', $tz, $sdt, 'i'); $stext = datetime_convert('UTC',$tz,$sdt); $stext = substr($stext,0,14) . "00:00"; -<<<<<<< HEAD -// $fyear = ((x($orig_event)) ? datetime_convert('UTC', $tz, $fdt, 'Y') : '0000'); -// $fmonth = ((x($orig_event)) ? datetime_convert('UTC', $tz, $fdt, 'm') : '00'); -// $fday = ((x($orig_event)) ? datetime_convert('UTC', $tz, $fdt, 'd') : '00'); - $fyear = datetime_convert('UTC', $tz, $fdt, 'Y'); $fmonth = datetime_convert('UTC', $tz, $fdt, 'm'); $fday = datetime_convert('UTC', $tz, $fdt, 'd'); - -// $fhour = ((x($orig_event)) ? datetime_convert('UTC', $tz, $fdt, 'H') : '00'); -// $fminute = ((x($orig_event)) ? datetime_convert('UTC', $tz, $fdt, 'i') : '00'); - -======= - $fyear = datetime_convert('UTC', $tz, $fdt, 'Y'); - $fmonth = datetime_convert('UTC', $tz, $fdt, 'm'); - $fday = datetime_convert('UTC', $tz, $fdt, 'd'); ->>>>>>> upstream/master $fhour = datetime_convert('UTC', $tz, $fdt, 'H'); $fminute = datetime_convert('UTC', $tz, $fdt, 'i'); $ftext = datetime_convert('UTC',$tz,$fdt); $ftext = substr($ftext,0,14) . "00:00"; -<<<<<<< HEAD -======= ->>>>>>> upstream/master $type = ((x($orig_event)) ? $orig_event['type'] : 'event'); $f = get_config('system','event_input_format'); @@ -648,11 +593,7 @@ function events_content(&$a) { $last_date = $d; -<<<<<<< HEAD - $edit = array($a->get_baseurl().'/events/'.$rr['event_hash'].'?expandform=1',t('Edit event'),'',''); -======= $edit = ((local_channel() && $rr['author_xchan'] == get_observer_hash()) ? array($a->get_baseurl().'/events/'.$rr['event_hash'].'?expandform=1',t('Edit event'),'','') : false); ->>>>>>> upstream/master $drop = array($a->get_baseurl().'/events/drop/'.$rr['event_hash'],t('Delete event'),'',''); diff --git a/version.inc b/version.inc index 30d5c870f..7e47edd58 100644 --- a/version.inc +++ b/version.inc @@ -1,5 +1 @@ -<<<<<<< HEAD -2015-11-25.1227 -======= 2015-11-27.1229 ->>>>>>> upstream/master diff --git a/view/css/mod_events.css b/view/css/mod_events.css index 3e6ee63ac..dc1dc902f 100644 --- a/view/css/mod_events.css +++ b/view/css/mod_events.css @@ -4,8 +4,6 @@ margin-bottom: -1px; } -<<<<<<< HEAD -======= .fc-unthemed th, .fc-unthemed td, .fc-unthemed thead, @@ -21,13 +19,10 @@ margin-bottom: -9px; } ->>>>>>> upstream/master .bootstrap-tagsinput { width: 100%; padding: 6px 12px; } -<<<<<<< HEAD -======= .event-wrapper { max-width: 700px; @@ -55,4 +50,3 @@ #event-upload-choose { width: 100%; } ->>>>>>> upstream/master diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 11e56cfc2..e392f00d9 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -848,71 +848,6 @@ nav .acpopup { cursor: pointer; } -<<<<<<< HEAD -.fc-unthemed th, -.fc-unthemed td, -.fc-unthemed thead, -.fc-unthemed tbody, -.fc-unthemed .fc-divider, -.fc-unthemed .fc-row, -.fc-unthemed .fc-popover { - border-color: #ccc !important; -} - -.wall-event-item { - padding: 10px; - color: #fff; - background-color: #3A87AD; /* should reflect calendar color */ - border-top-left-radius: $radiuspx; - border-top-right-radius: $radiuspx; -} - -.vevent .event-end { - padding-bottom: 10px; -} - -#event-summary-text { - margin-top: 15px; -} - - -#new-event-link { - margin-bottom: 10px; -} - -.edit-event-link, .plink-event-link, .drop-event-link { - float: left; - margin-top: 4px; - margin-right: 4px; - margin-bottom: 15px; -} - -.event-owner img { - padding-bottom: 10px; - padding-right: 10px; -} - -.event-buttons { - margin-top: 10px; -} - -.event-list-date { - margin-bottom: 10px; -} - -.prevcal, .nextcal { - float: left; - margin-left: 32px; - margin-right: 32px; - margin-top: 64px; -} -.event-calendar-end { - clear: both; -} - - -======= ->>>>>>> upstream/master #cboxOverlay { z-index: 1050; } @@ -2260,11 +2195,3 @@ nav .badge.mail-update:hover { .help-searchlist a { font-size: 130%; } -<<<<<<< HEAD - -.response-list ul { - list-style-type: none; -} - -======= ->>>>>>> upstream/master diff --git a/view/tpl/event_head.tpl b/view/tpl/event_head.tpl index 496a07782..dc98d14b3 100755 --- a/view/tpl/event_head.tpl +++ b/view/tpl/event_head.tpl @@ -58,11 +58,8 @@ $('#events-spinner').spin('tiny'); $('#events-spinner > i').css('color', 'transparent'); if(!isLoading) { -<<<<<<< HEAD -======= $('#events-spinner').spin(false); $('#events-spinner > i').css('color', ''); ->>>>>>> upstream/master $('td.fc-day').dblclick(function() { openMenu('form'); //window.location.href='/events/new?start='+$(this).data('date'); @@ -78,11 +75,7 @@ switch(view.name){ case "month": element.find(".fc-title").html( -<<<<<<< HEAD - " {1}: {2}".format( -======= " {2}".format( ->>>>>>> upstream/master event.item['author']['xchan_photo_s'], event.item['author']['xchan_name'], event.title, @@ -92,40 +85,22 @@ break; case "agendaWeek": element.find(".fc-title").html( -<<<<<<< HEAD - " {1}: {2}

{3}

{4}

".format( - event.item['author']['xchan_photo_s'], - event.item['author']['xchan_name'], - event.title, - event.item.description, - event.item.location -======= " {1}: {2}".format( event.item['author']['xchan_photo_s'], event.item['author']['xchan_name'], event.title, event.item.description ? event.item.description + "\r\n\r\n" : '', event.item.location ? aStr['location'] + ': ' + event.item.location.replace(/(<([^>]+)>)/ig,"") : '' ->>>>>>> upstream/master )); break; case "agendaDay": element.find(".fc-title").html( -<<<<<<< HEAD - " {1}: {2}

{3}

{4}

".format( - event.item['author']['xchan_photo_s'], - event.item['author']['xchan_name'], - event.title, - event.item.description, - event.item.location -======= " {1}: {2}".format( event.item['author']['xchan_photo_s'], event.item['author']['xchan_name'], event.title, event.item.description ? event.item.description + "\r\n\r\n" : '', event.item.location ? aStr['location'] + ': ' + event.item.location.replace(/(<([^>]+)>)/ig,"") : '' ->>>>>>> upstream/master )); break; } diff --git a/view/tpl/events-js.tpl b/view/tpl/events-js.tpl index cef7b45cc..08c8aa64a 100755 --- a/view/tpl/events-js.tpl +++ b/view/tpl/events-js.tpl @@ -1,13 +1,7 @@
-<<<<<<< HEAD - - -======= - ->>>>>>> upstream/master
@@ -19,22 +13,6 @@
-
diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl old mode 100644 new mode 100755 index b13d66cc4..e7edb7e64 --- a/view/tpl/jot.tpl +++ b/view/tpl/jot.tpl @@ -48,24 +48,6 @@
- {{if $writefiles}} - - {{/if}} -
- - -
- {{if $feature_encrypt}} - + {{/if}} + +
+