diff options
author | Mario Vavti <mario@mariovavti.com> | 2017-03-17 14:22:10 +0100 |
---|---|---|
committer | Mario Vavti <mario@mariovavti.com> | 2017-03-17 14:22:10 +0100 |
commit | d10525a375884850b1b643796b839747cbc623b2 (patch) | |
tree | 917c17806b477b7ddb7c51ef2c519ff27fb57ac3 /include/conversation.php | |
parent | 4c2bdc9dc021418563040929fbd0363e08591f9f (diff) | |
download | volse-hubzilla-d10525a375884850b1b643796b839747cbc623b2.tar.gz volse-hubzilla-d10525a375884850b1b643796b839747cbc623b2.tar.bz2 volse-hubzilla-d10525a375884850b1b643796b839747cbc623b2.zip |
fix item_list and item_search templates. make item filer use a bootdtrap modal and some css and class fixes
Diffstat (limited to 'include/conversation.php')
-rw-r--r-- | include/conversation.php | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/include/conversation.php b/include/conversation.php index 45b3a53e8..167b10846 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -614,6 +614,7 @@ function conversation(&$a, $items, $mode, $update, $page_mode = 'traditional', $ $owner_photo = ''; $owner_name = ''; $sparkle = ''; + $is_new = false; if($mode === 'search' || $mode === 'community') { if(((activity_match($item['verb'],ACTIVITY_LIKE)) || (activity_match($item['verb'],ACTIVITY_DISLIKE))) @@ -682,6 +683,9 @@ function conversation(&$a, $items, $mode, $update, $page_mode = 'traditional', $ $has_tags = (($body['tags'] || $body['categories'] || $body['mentions'] || $body['attachments'] || $body['folders']) ? true : false); + if(strcmp(datetime_convert('UTC','UTC',$item['created']),datetime_convert('UTC','UTC','now - 12 hours')) > 0) + $is_new = true; + $tmp_item = array( 'template' => $tpl, 'toplevel' => 'toplevel_item', @@ -738,6 +742,7 @@ function conversation(&$a, $items, $mode, $update, $page_mode = 'traditional', $ 'wait' => t('Please wait'), 'thread_level' => 1, 'has_tags' => $has_tags, + 'is_new' => $is_new ); $arr = array('item' => $item, 'output' => $tmp_item); @@ -1176,7 +1181,7 @@ function builtin_activity_puller($item, &$conv_responses) { if((activity_match($item['verb'], $verb)) && ($item['id'] != $item['parent'])) { $name = (($item['author']['xchan_name']) ? $item['author']['xchan_name'] : t('Unknown')); $url = (($item['author_xchan'] && $item['author']['xchan_photo_s']) - ? '<a class="dropdown-item" href="' . chanlink_hash($item['author_xchan']) . '">' . '<img class="dropdown-menu-img-xs" src="' . zid($item['author']['xchan_photo_s']) . '" alt="' . urlencode($name) . '" />' . $name . '</a>' + ? '<a class="dropdown-item" href="' . chanlink_hash($item['author_xchan']) . '">' . '<img class="menu-img-1" src="' . zid($item['author']['xchan_photo_s']) . '" alt="' . urlencode($name) . '" />' . $name . '</a>' : '<a class="dropdown-item" href="#" class="disabled">' . $name . '</a>' ); |