Merge https://github.com/redmatrix/hubzilla into pending_merge
This commit is contained in:
redmatrix
commit
4c406ec9c0
@ -278,17 +278,6 @@ class Item extends BaseObject {
|
||||
|
||||
$children = $this->get_children();
|
||||
|
||||
$is_photo = (($item['obj_type'] == ACTIVITY_OBJ_PHOTO) ? true : false);
|
||||
if($is_photo) {
|
||||
$object = json_decode($item['object'],true);
|
||||
$photo = array(
|
||||
'url' => rawurldecode($object['id']) . '?zid=' . $observer['xchan_addr'],
|
||||
'link' => rawurldecode(get_rel_link($object['link'],'alternate')) . '?zid=' . $observer['xchan_addr'],
|
||||
'width' => $object['width'],
|
||||
'height' => $object['height']
|
||||
);
|
||||
}
|
||||
|
||||
$has_tags = (($body['tags'] || $body['categories'] || $body['mentions'] || $body['attachments'] || $body['folders']) ? true : false);
|
||||
|
||||
$tmp_item = array(
|
||||
@ -342,8 +331,7 @@ class Item extends BaseObject {
|
||||
'owner_url' => $this->get_owner_url(),
|
||||
'owner_photo' => $this->get_owner_photo(),
|
||||
'owner_name' => $this->get_owner_name(),
|
||||
'is_photo' => $is_photo,
|
||||
'photo' => (($is_photo) ? $photo : ''),
|
||||
'photo' => $body['photo'],
|
||||
'has_tags' => $has_tags,
|
||||
|
||||
// Item toolbar buttons
|
||||
|
||||
@ -1363,6 +1363,7 @@ function generate_named_map($location) {
|
||||
|
||||
|
||||
function prepare_body(&$item,$attach = false) {
|
||||
require_once('include/identity.php');
|
||||
|
||||
// if($item['html']) {
|
||||
// $s = bb_observer($item['html']);
|
||||
@ -1373,9 +1374,24 @@ function prepare_body(&$item,$attach = false) {
|
||||
$s = prepare_text($item['body'],$item['mimetype'], false);
|
||||
// }
|
||||
|
||||
$prep_arr = array('item' => $item, 'html' => $s);
|
||||
$is_photo = (($item['obj_type'] === ACTIVITY_OBJ_PHOTO) ? true : false);
|
||||
$photo = '';
|
||||
|
||||
if($is_photo) {
|
||||
$object = json_decode($item['object'],true);
|
||||
$photo = '<a href="' . zid(rawurldecode(get_rel_link($object['link'],'alternate'))) . '" target="_newwin"><img style="max-width:' . $object['width'] . 'px; width:100%; height:auto;" src="'. zid(rawurldecode($object['id'])) . '"></a>';
|
||||
}
|
||||
|
||||
$prep_arr = array(
|
||||
'item' => $item,
|
||||
'html' => $s,
|
||||
'photo' => $photo
|
||||
);
|
||||
|
||||
call_hooks('prepare_body', $prep_arr);
|
||||
|
||||
$s = $prep_arr['html'];
|
||||
$photo = $prep_arr['photo'];
|
||||
|
||||
// q("update item set html = '%s' where id = %d",
|
||||
// dbesc($s),
|
||||
@ -1391,7 +1407,7 @@ function prepare_body(&$item,$attach = false) {
|
||||
if($x) {
|
||||
$s = preg_replace('/\<div class\=\"map\"\>/','$0' . $x,$s);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
$attachments = theme_attachments($item);
|
||||
|
||||
@ -1439,17 +1455,20 @@ function prepare_body(&$item,$attach = false) {
|
||||
}
|
||||
|
||||
$prep_arr = array(
|
||||
//'item' => $item,
|
||||
'html' => $s,
|
||||
'categories' => $categories,
|
||||
'folders' => $filer,
|
||||
'tags' => $tags,
|
||||
'mentions' => $mentions,
|
||||
'attachments' => $attachments
|
||||
);
|
||||
'item' => $item,
|
||||
'photo' => $photo,
|
||||
'html' => $s,
|
||||
'categories' => $categories,
|
||||
'folders' => $filer,
|
||||
'tags' => $tags,
|
||||
'mentions' => $mentions,
|
||||
'attachments' => $attachments
|
||||
);
|
||||
|
||||
call_hooks('prepare_body_final', $prep_arr);
|
||||
|
||||
unset($prep_arr['item']);
|
||||
|
||||
return $prep_arr;
|
||||
}
|
||||
|
||||
|
||||
@ -77,11 +77,6 @@ code {
|
||||
|
||||
/* conv_item */
|
||||
|
||||
.wall-photo-item {
|
||||
display: table;
|
||||
margin: 0px auto;
|
||||
}
|
||||
|
||||
.wall-item-info {
|
||||
display: block;
|
||||
float: left;
|
||||
|
||||
@ -794,11 +794,11 @@ a.rateme, div.rateme {
|
||||
}
|
||||
|
||||
#nav-search-text::-webkit-input-placeholder {
|
||||
font-family: FontAwesome;
|
||||
font-family: FontAwesome, sans-serif;
|
||||
}
|
||||
|
||||
#nav-search-text::-moz-placeholder {
|
||||
font-family: FontAwesome;
|
||||
font-family: FontAwesome, sans-serif;
|
||||
}
|
||||
|
||||
nav .acpopup {
|
||||
@ -1621,6 +1621,10 @@ img.mail-conv-sender-photo {
|
||||
}
|
||||
|
||||
/* conversation */
|
||||
.nsfw-wrap {
|
||||
text-align: center;
|
||||
font-size: $body_font_size;
|
||||
}
|
||||
|
||||
.wall-item-head {
|
||||
padding: 10px 10px 0.5em 10px;
|
||||
@ -1631,7 +1635,13 @@ img.mail-conv-sender-photo {
|
||||
}
|
||||
|
||||
.wall-photo-item {
|
||||
padding: 0.5em 0px;
|
||||
/*padding: 0.5em 10px;*/
|
||||
}
|
||||
|
||||
.wall-photo-item img {
|
||||
max-width: 100% !important;
|
||||
border-top-right-radius: $radiuspx;
|
||||
border-top-left-radius: $radiuspx;
|
||||
}
|
||||
|
||||
.wall-item-tools {
|
||||
@ -1762,7 +1772,6 @@ img.mail-conv-sender-photo {
|
||||
|
||||
.divgrow-showmore:hover {
|
||||
border-top: 1px dashed #adadad;
|
||||
text-decoration: underline;
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -8,6 +8,11 @@
|
||||
<a name="{{$item.id}}" ></a>
|
||||
<div class="wall-item-outside-wrapper {{$item.indent}}{{$item.previewing}}" id="wall-item-outside-wrapper-{{$item.id}}" >
|
||||
<div class="wall-item-content-wrapper {{$item.indent}}" id="wall-item-content-wrapper-{{$item.id}}" style="clear:both;">
|
||||
{{if $item.photo}}
|
||||
<div class="wall-photo-item" id="wall-photo-item-{{$item.id}}">
|
||||
{{$item.photo}}
|
||||
</div>
|
||||
{{/if}}
|
||||
<div class="wall-item-head">
|
||||
<div class="wall-item-info" id="wall-item-info-{{$item.id}}" >
|
||||
<div class="wall-item-photo-wrapper{{if $item.owner_url}} wwfrom{{/if}}" id="wall-item-photo-wrapper-{{$item.id}}">
|
||||
@ -33,11 +38,7 @@
|
||||
</div>
|
||||
<div class="clear"></div>
|
||||
</div>
|
||||
{{if $item.is_photo}}
|
||||
<div class="wall-photo-item" id="wall-photo-item-{{$item.id}}">
|
||||
<a href="{{$item.photo.link}}"><img style="max-width:{{$item.photo.width}}px; width:100%; height:auto;" src={{$item.photo.url}}></a>
|
||||
</div>
|
||||
{{/if}}
|
||||
|
||||
{{if $item.body}}
|
||||
<div class="wall-item-content" id="wall-item-content-{{$item.id}}">
|
||||
<div class="wall-item-body" id="wall-item-body-{{$item.id}}" >
|
||||
|
||||
@ -8,6 +8,11 @@
|
||||
<a name="{{$item.id}}" ></a>
|
||||
<div class="wall-item-outside-wrapper {{$item.indent}}{{$item.previewing}}" id="wall-item-outside-wrapper-{{$item.id}}" >
|
||||
<div class="wall-item-content-wrapper {{$item.indent}}" id="wall-item-content-wrapper-{{$item.id}}" style="clear:both;">
|
||||
{{if $item.photo}}
|
||||
<div class="wall-photo-item" id="wall-photo-item-{{$item.id}}">
|
||||
{{$item.photo}}
|
||||
</div>
|
||||
{{/if}}
|
||||
<div class="wall-item-head">
|
||||
<div class="wall-item-info" id="wall-item-info-{{$item.id}}" >
|
||||
<div class="wall-item-photo-wrapper{{if $item.owner_url}} wwfrom{{/if}}" id="wall-item-photo-wrapper-{{$item.id}}">
|
||||
|
||||
@ -2,6 +2,11 @@
|
||||
<a name="{{$item.id}}" ></a>
|
||||
<div class="wall-item-outside-wrapper {{$item.indent}}{{$item.previewing}}{{if $item.owner_url}} wallwall{{/if}}" id="wall-item-outside-wrapper-{{$item.id}}" >
|
||||
<div class="wall-item-content-wrapper {{$item.indent}}" id="wall-item-content-wrapper-{{$item.id}}" style="clear:both;">
|
||||
{{if $item.photo}}
|
||||
<div class="wall-photo-item" id="wall-photo-item-{{$item.id}}">
|
||||
{{$item.photo}}
|
||||
</div>
|
||||
{{/if}}
|
||||
<div class="wall-item-head">
|
||||
<div class="wall-item-info" id="wall-item-info-{{$item.id}}" >
|
||||
<div class="wall-item-photo-wrapper{{if $item.owner_url}} wwfrom{{/if}}" id="wall-item-photo-wrapper-{{$item.id}}">
|
||||
|
||||
Reference in New Issue
Block a user