mirror of
https://github.com/friendica/friendica
synced 2024-11-14 04:22:55 +00:00
event notification stuff
This commit is contained in:
parent
1d325f6e76
commit
52038c6b88
2 changed files with 38 additions and 9 deletions
34
boot.php
34
boot.php
|
@ -9,7 +9,7 @@ require_once('include/nav.php');
|
||||||
require_once('include/cache.php');
|
require_once('include/cache.php');
|
||||||
|
|
||||||
define ( 'FRIENDIKA_PLATFORM', 'Free Friendika');
|
define ( 'FRIENDIKA_PLATFORM', 'Free Friendika');
|
||||||
define ( 'FRIENDIKA_VERSION', '2.3.1144' );
|
define ( 'FRIENDIKA_VERSION', '2.3.1145' );
|
||||||
define ( 'DFRN_PROTOCOL_VERSION', '2.21' );
|
define ( 'DFRN_PROTOCOL_VERSION', '2.21' );
|
||||||
define ( 'DB_UPDATE_VERSION', 1098 );
|
define ( 'DB_UPDATE_VERSION', 1098 );
|
||||||
|
|
||||||
|
@ -997,20 +997,23 @@ function get_birthdays() {
|
||||||
|
|
||||||
if($r && count($r)) {
|
if($r && count($r)) {
|
||||||
$total = 0;
|
$total = 0;
|
||||||
foreach($r as $rr)
|
$now = strtotime('now');
|
||||||
|
$istoday = false;
|
||||||
|
foreach($r as $rr) {
|
||||||
if(strlen($rr['name']))
|
if(strlen($rr['name']))
|
||||||
$total ++;
|
$total ++;
|
||||||
|
if((strtotime($rr['start'] . ' +00:00') < $now) && (strtotime($rr['finish'] . ' +00:00') > $now))
|
||||||
|
$istoday = true;
|
||||||
|
}
|
||||||
|
$classtoday = $istoday ? ' birthday-today ' : '';
|
||||||
if($total) {
|
if($total) {
|
||||||
$o .= '<div id="birthday-notice" class="birthday-notice fakelink" onclick=openClose(\'birthday-wrapper\'); >' . t('Birthday Reminders') . ' ' . '(' . $total . ')' . '</div>';
|
$o .= '<div id="birthday-notice" class="birthday-notice fakelink' . $classtoday . '" onclick=openClose(\'birthday-wrapper\'); >' . t('Birthday Reminders') . ' ' . '(' . $total . ')' . '</div>';
|
||||||
$o .= '<div id="birthday-wrapper" style="display: none;" ><div id="birthday-title">' . t('Birthdays this week:') . '</div>';
|
$o .= '<div id="birthday-wrapper" style="display: none;" ><div id="birthday-title">' . t('Birthdays this week:') . '</div>';
|
||||||
// $o .= '<div id="birthday-adjust">' . t("\x28Adjusted for local time\x29") . '</div>';
|
|
||||||
$o .= '<div id="birthday-title-end"></div>';
|
$o .= '<div id="birthday-title-end"></div>';
|
||||||
|
|
||||||
foreach($r as $rr) {
|
foreach($r as $rr) {
|
||||||
if(! strlen($rr['name']))
|
if(! strlen($rr['name']))
|
||||||
continue;
|
continue;
|
||||||
$now = strtotime('now');
|
|
||||||
$today = (((strtotime($rr['start'] . ' +00:00') < $now) && (strtotime($rr['finish'] . ' +00:00') > $now)) ? true : false);
|
$today = (((strtotime($rr['start'] . ' +00:00') < $now) && (strtotime($rr['finish'] . ' +00:00') > $now)) ? true : false);
|
||||||
$sparkle = '';
|
$sparkle = '';
|
||||||
$url = $rr['url'];
|
$url = $rr['url'];
|
||||||
|
@ -1054,7 +1057,19 @@ function get_events() {
|
||||||
);
|
);
|
||||||
|
|
||||||
if($r && count($r)) {
|
if($r && count($r)) {
|
||||||
$o .= '<div id="event-notice" class="birthday-notice fakelink" onclick=openClose(\'event-wrapper\'); >' . t('Event Reminders') . ' ' . '(' . count($r) . ')' . '</div>';
|
$now = strtotime('now');
|
||||||
|
$istoday = false;
|
||||||
|
foreach($r as $rr) {
|
||||||
|
if(strlen($rr['name']))
|
||||||
|
$total ++;
|
||||||
|
|
||||||
|
$strt = datetime_convert('UTC',$rr['convert'] ? $a->timezone : 'UTC',$rr['start'],'Y-m-d');
|
||||||
|
if($strt === datetime_convert('UTC',$a->timezone,'now','Y-m-d'))
|
||||||
|
$istoday = true;
|
||||||
|
}
|
||||||
|
$classtoday = (($istoday) ? ' event-today ' : '');
|
||||||
|
|
||||||
|
$o .= '<div id="event-notice" class="birthday-notice fakelink' . $classtoday . '" onclick=openClose(\'event-wrapper\'); >' . t('Event Reminders') . ' ' . '(' . count($r) . ')' . '</div>';
|
||||||
$o .= '<div id="event-wrapper" style="display: none;" ><div id="event-title">' . t('Events this week:') . '</div>';
|
$o .= '<div id="event-wrapper" style="display: none;" ><div id="event-title">' . t('Events this week:') . '</div>';
|
||||||
$o .= '<div id="event-title-end"></div>';
|
$o .= '<div id="event-title-end"></div>';
|
||||||
|
|
||||||
|
@ -1068,8 +1083,9 @@ function get_events() {
|
||||||
$title = substr(strip_tags(bbcode($rr['desc'])),0,32) . '... ';
|
$title = substr(strip_tags(bbcode($rr['desc'])),0,32) . '... ';
|
||||||
if(! $title)
|
if(! $title)
|
||||||
$title = t('[No description]');
|
$title = t('[No description]');
|
||||||
$now = strtotime('now');
|
|
||||||
$today = (((strtotime($rr['start'] . ' +00:00') < $now) && (strtotime($rr['finish'] . ' +00:00') > $now)) ? true : false);
|
$strt = datetime_convert('UTC',$rr['convert'] ? $a->timezone : 'UTC',$rr['start']);
|
||||||
|
$today = ((substr($strt,0,10) === datetime_convert('UTC',$a->timezone,'now','Y-m-d')) ? true : false);
|
||||||
|
|
||||||
$o .= '<div class="event-list" id="event-' . $rr['eid'] . '"></a> <a href="events/' . $md . '">' . $title . '</a>'
|
$o .= '<div class="event-list" id="event-' . $rr['eid'] . '"></a> <a href="events/' . $md . '">' . $title . '</a>'
|
||||||
. day_translate(datetime_convert('UTC', $rr['adjust'] ? $a->timezone : 'UTC', $rr['start'], $bd_format)) . (($today) ? ' ' . t('[today]') : '')
|
. day_translate(datetime_convert('UTC', $rr['adjust'] ? $a->timezone : 'UTC', $rr['start'], $bd_format)) . (($today) ? ' ' . t('[today]') : '')
|
||||||
|
|
|
@ -228,6 +228,9 @@ footer {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.birthday-today, .event-today {
|
||||||
|
font-weight: bold;
|
||||||
|
}
|
||||||
|
|
||||||
div.wall-item-content-wrapper.shiny {
|
div.wall-item-content-wrapper.shiny {
|
||||||
background-image: url('shiny.png');
|
background-image: url('shiny.png');
|
||||||
|
@ -2539,6 +2542,16 @@ a.mail-list-link {
|
||||||
margin-top: 10px;
|
margin-top: 10px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.body-tag {
|
||||||
|
opacity: 0.5;
|
||||||
|
filter:alpha(opacity=50);
|
||||||
|
}
|
||||||
|
|
||||||
|
.body-tag:hover {
|
||||||
|
opacity: 1.0 !important;
|
||||||
|
filter:alpha(opacity=100) !important;
|
||||||
|
}
|
||||||
|
|
||||||
.item-select {
|
.item-select {
|
||||||
opacity: 0.1;
|
opacity: 0.1;
|
||||||
filter:alpha(opacity=10);
|
filter:alpha(opacity=10);
|
||||||
|
|
Loading…
Reference in a new issue