From: Fabio Comuni Date: Tue, 24 Apr 2012 07:50:10 +0000 (+0200) Subject: remove html from get_birthdays() and get_events() X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=62ad5043d639c839ce4ae85f80f9cc5aed880d39;p=friendica.git remove html from get_birthdays() and get_events() --- diff --git a/boot.php b/boot.php index f024d64ce1..7584c1c5b4 100644 --- a/boot.php +++ b/boot.php @@ -1174,11 +1174,7 @@ if(! function_exists('get_birthdays')) { } $classtoday = $istoday ? ' birthday-today ' : ''; if($total) { - $o .= '
' . t('Birthday Reminders') . ' ' . '(' . $total . ')' . '
'; - $o .= ''; } } - return $o; + $tpl = get_markup_template("birthdays_reminder.tpl"); + return replace_macros($tpl, array( + '$baseurl' => $a->get_baseurl(), + '$classtoday' => $classtoday, + '$count' => $total, + '$event_reminders' => t('Birthday Reminders'), + '$event_title' => t('Birthdays this week:'), + '$events' => $r, + )); } } @@ -1215,7 +1220,6 @@ if(! function_exists('get_events')) { require_once('include/bbcode.php'); $a = get_app(); - $o = ''; if(! local_user()) return $o; @@ -1242,13 +1246,10 @@ if(! function_exists('get_events')) { if($strt === datetime_convert('UTC',$a->timezone,'now','Y-m-d')) $istoday = true; } - $classtoday = (($istoday) ? ' event-today ' : ''); + $classtoday = (($istoday) ? 'event-today' : ''); - $o .= '
' . t('Event Reminders') . ' ' . '(' . count($r) . ')' . '
'; - $o .= ''; } - return $o; + $tpl = get_markup_template("events_reminder.tpl"); + return replace_macros($tpl, array( + '$baseurl' => $a->get_baseurl(), + '$classtoday' => $classtoday, + '$count' => count($r), + '$event_reminders' => t('Event Reminders'), + '$event_title' => t('Events this week:'), + '$events' => $r, + )); } } diff --git a/view/birthdays_reminder.tpl b/view/birthdays_reminder.tpl new file mode 100644 index 0000000000..c0422c1d7d --- /dev/null +++ b/view/birthdays_reminder.tpl @@ -0,0 +1,10 @@ +{{ if $count }} +
$event_reminders ($count)
+ +{{ endif }} + diff --git a/view/events_reminder.tpl b/view/events_reminder.tpl new file mode 100644 index 0000000000..fe7e339803 --- /dev/null +++ b/view/events_reminder.tpl @@ -0,0 +1,10 @@ +{{ if $count }} + + +{{ endif }} +