optional divider between item header and body
This commit is contained in:
parent
4fc8416c3c
commit
8fcf16ee63
@ -370,6 +370,7 @@ class ThreadItem {
|
|||||||
'unverified' => $unverified,
|
'unverified' => $unverified,
|
||||||
'forged' => $forged,
|
'forged' => $forged,
|
||||||
'location' => $location,
|
'location' => $location,
|
||||||
|
'divider' => get_pconfig($conv->get_profile_owner(),'system','item_divider'),
|
||||||
'attend_label' => t('Attend'),
|
'attend_label' => t('Attend'),
|
||||||
'attend_title' => t('Attendance Options'),
|
'attend_title' => t('Attendance Options'),
|
||||||
'vote_label' => t('Vote'),
|
'vote_label' => t('Vote'),
|
||||||
|
@ -628,13 +628,14 @@ function conversation($items, $mode, $update, $page_mode = 'traditional', $prepa
|
|||||||
// "New Item View" on network page or search page results
|
// "New Item View" on network page or search page results
|
||||||
// - just loop through the items and format them minimally for display
|
// - just loop through the items and format them minimally for display
|
||||||
|
|
||||||
|
|
||||||
//$tpl = get_markup_template('search_item.tpl');
|
|
||||||
$tpl = 'search_item.tpl';
|
$tpl = 'search_item.tpl';
|
||||||
|
|
||||||
foreach($items as $item) {
|
foreach($items as $item) {
|
||||||
|
|
||||||
$x = [ 'mode' => $mode, 'item' => $item ];
|
$x = [
|
||||||
|
'mode' => $mode,
|
||||||
|
'item' => $item
|
||||||
|
];
|
||||||
call_hooks('stream_item',$x);
|
call_hooks('stream_item',$x);
|
||||||
|
|
||||||
if($x['item']['blocked'])
|
if($x['item']['blocked'])
|
||||||
@ -655,14 +656,7 @@ function conversation($items, $mode, $update, $page_mode = 'traditional', $prepa
|
|||||||
if(((activity_match($item['verb'],ACTIVITY_LIKE)) || (activity_match($item['verb'],ACTIVITY_DISLIKE)))
|
if(((activity_match($item['verb'],ACTIVITY_LIKE)) || (activity_match($item['verb'],ACTIVITY_DISLIKE)))
|
||||||
&& ($item['id'] != $item['parent']))
|
&& ($item['id'] != $item['parent']))
|
||||||
continue;
|
continue;
|
||||||
// $nickname = $item['nickname'];
|
|
||||||
}
|
}
|
||||||
// else
|
|
||||||
// $nickname = App::$user['nickname'];
|
|
||||||
|
|
||||||
// $profile_name = ((strlen($item['author-name'])) ? $item['author-name'] : $item['name']);
|
|
||||||
// if($item['author-link'] && (! $item['author-name']))
|
|
||||||
// $profile_name = $item['author-link'];
|
|
||||||
|
|
||||||
$sp = false;
|
$sp = false;
|
||||||
$profile_link = best_link_url($item,$sp);
|
$profile_link = best_link_url($item,$sp);
|
||||||
@ -671,8 +665,6 @@ function conversation($items, $mode, $update, $page_mode = 'traditional', $prepa
|
|||||||
else
|
else
|
||||||
$profile_link = zid($profile_link);
|
$profile_link = zid($profile_link);
|
||||||
|
|
||||||
// $normalised = normalise_link((strlen($item['author-link'])) ? $item['author-link'] : $item['url']);
|
|
||||||
|
|
||||||
$profile_name = $item['author']['xchan_name'];
|
$profile_name = $item['author']['xchan_name'];
|
||||||
$profile_link = $item['author']['xchan_url'];
|
$profile_link = $item['author']['xchan_url'];
|
||||||
$profile_avatar = $item['author']['xchan_photo_m'];
|
$profile_avatar = $item['author']['xchan_photo_m'];
|
||||||
@ -768,6 +760,7 @@ function conversation($items, $mode, $update, $page_mode = 'traditional', $prepa
|
|||||||
'editedtime' => (($item['edited'] != $item['created']) ? sprintf( t('last edited: %s'), datetime_convert('UTC', date_default_timezone_get(), $item['edited'], 'r')) : ''),
|
'editedtime' => (($item['edited'] != $item['created']) ? sprintf( t('last edited: %s'), datetime_convert('UTC', date_default_timezone_get(), $item['edited'], 'r')) : ''),
|
||||||
'expiretime' => (($item['expires'] > NULL_DATE) ? sprintf( t('Expires: %s'), datetime_convert('UTC', date_default_timezone_get(), $item['expires'], 'r')):''),
|
'expiretime' => (($item['expires'] > NULL_DATE) ? sprintf( t('Expires: %s'), datetime_convert('UTC', date_default_timezone_get(), $item['expires'], 'r')):''),
|
||||||
'location' => $location,
|
'location' => $location,
|
||||||
|
'divider' => false,
|
||||||
'indent' => '',
|
'indent' => '',
|
||||||
'owner_name' => $owner_name,
|
'owner_name' => $owner_name,
|
||||||
'owner_url' => $owner_url,
|
'owner_url' => $owner_url,
|
||||||
|
@ -87,6 +87,10 @@
|
|||||||
margin-left:10px;
|
margin-left:10px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.wall-item-divider {
|
||||||
|
margin: 5px;
|
||||||
|
}
|
||||||
|
|
||||||
.wall-item-lock {
|
.wall-item-lock {
|
||||||
float: left;
|
float: left;
|
||||||
}
|
}
|
||||||
|
@ -46,7 +46,9 @@
|
|||||||
{{if $item.verified}}<i class="fa fa-check item-verified" title="{{$item.verified}}"></i> {{elseif $item.forged}}<i class="fa fa-exclamation item-forged" title="{{$item.forged}}"></i> {{/if}}{{if $item.location}}<span class="wall-item-location p-location" id="wall-item-location-{{$item.id}}">{{$item.location}}, </span>{{/if}}<span class="autotime" title="{{$item.isotime}}"><time class="dt-published" datetime="{{$item.isotime}}">{{$item.localtime}}</time>{{if $item.editedtime}} {{$item.editedtime}}{{/if}}{{if $item.expiretime}} {{$item.expiretime}}{{/if}}</span>{{if $item.editedtime}} <i class="fa fa-pencil"></i>{{/if}} {{if $item.app}}<span class="item.app">{{$item.str_app}}</span>{{/if}}
|
{{if $item.verified}}<i class="fa fa-check item-verified" title="{{$item.verified}}"></i> {{elseif $item.forged}}<i class="fa fa-exclamation item-forged" title="{{$item.forged}}"></i> {{/if}}{{if $item.location}}<span class="wall-item-location p-location" id="wall-item-location-{{$item.id}}">{{$item.location}}, </span>{{/if}}<span class="autotime" title="{{$item.isotime}}"><time class="dt-published" datetime="{{$item.isotime}}">{{$item.localtime}}</time>{{if $item.editedtime}} {{$item.editedtime}}{{/if}}{{if $item.expiretime}} {{$item.expiretime}}{{/if}}</span>{{if $item.editedtime}} <i class="fa fa-pencil"></i>{{/if}} {{if $item.app}}<span class="item.app">{{$item.str_app}}</span>{{/if}}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
{{if $item.divider}}
|
||||||
|
<hr class="wall-item-divider">
|
||||||
|
{{/if}}
|
||||||
{{if $item.body}}
|
{{if $item.body}}
|
||||||
<div class="p-2 wall-item-content clearfix" id="wall-item-content-{{$item.id}}">
|
<div class="p-2 wall-item-content clearfix" id="wall-item-content-{{$item.id}}">
|
||||||
<div class="wall-item-body e-content" id="wall-item-body-{{$item.id}}" >
|
<div class="wall-item-body e-content" id="wall-item-body-{{$item.id}}" >
|
||||||
|
@ -39,6 +39,9 @@
|
|||||||
{{if $item.verified}}<i class="fa fa-check item-verified" title="{{$item.verified}}"></i> {{elseif $item.forged}}<i class="fa fa-exclamation item-forged" title="{{$item.forged}}"></i> {{/if}}{{if $item.location}}<span class="wall-item-location" id="wall-item-location-{{$item.id}}">{{$item.location}}, </span>{{/if}}<span class="autotime" title="{{$item.isotime}}">{{$item.localtime}}{{if $item.editedtime}} {{$item.editedtime}}{{/if}}{{if $item.expiretime}} {{$item.expiretime}}{{/if}}</span>{{if $item.editedtime}} <i class="fa fa-pencil"></i>{{/if}} {{if $item.app}}<span class="item.app">{{$item.str_app}}</span>{{/if}}
|
{{if $item.verified}}<i class="fa fa-check item-verified" title="{{$item.verified}}"></i> {{elseif $item.forged}}<i class="fa fa-exclamation item-forged" title="{{$item.forged}}"></i> {{/if}}{{if $item.location}}<span class="wall-item-location" id="wall-item-location-{{$item.id}}">{{$item.location}}, </span>{{/if}}<span class="autotime" title="{{$item.isotime}}">{{$item.localtime}}{{if $item.editedtime}} {{$item.editedtime}}{{/if}}{{if $item.expiretime}} {{$item.expiretime}}{{/if}}</span>{{if $item.editedtime}} <i class="fa fa-pencil"></i>{{/if}} {{if $item.app}}<span class="item.app">{{$item.str_app}}</span>{{/if}}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
{{if $item.divider}}
|
||||||
|
<hr class="wall-item-divider">
|
||||||
|
{{/if}}
|
||||||
{{if $item.body}}
|
{{if $item.body}}
|
||||||
<div class="p-2 clrearfix {{if $item.is_photo}} wall-photo-item{{else}} wall-item-content{{/if}}" id="wall-item-content-{{$item.id}}">
|
<div class="p-2 clrearfix {{if $item.is_photo}} wall-photo-item{{else}} wall-item-content{{/if}}" id="wall-item-content-{{$item.id}}">
|
||||||
<div class="wall-item-body" id="wall-item-body-{{$item.id}}" >
|
<div class="wall-item-body" id="wall-item-body-{{$item.id}}" >
|
||||||
|
Reference in New Issue
Block a user