diff options
| -rw-r--r-- | include/ItemObject.php | 14 | ||||
| -rw-r--r-- | include/text.php | 39 | ||||
| -rw-r--r-- | view/css/conversation.css | 5 | ||||
| -rw-r--r-- | view/theme/redbasic/css/style.css | 17 | ||||
| -rwxr-xr-x | view/tpl/conv_item.tpl | 11 | ||||
| -rwxr-xr-x | view/tpl/conv_list.tpl | 5 | ||||
| -rwxr-xr-x | view/tpl/search_item.tpl | 5 |
7 files changed, 59 insertions, 37 deletions
diff --git a/include/ItemObject.php b/include/ItemObject.php index 9fe86118c..c5c2cb2e6 100644 --- a/include/ItemObject.php +++ b/include/ItemObject.php @@ -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 diff --git a/include/text.php b/include/text.php index d395a2523..11062a1b2 100644 --- a/include/text.php +++ b/include/text.php @@ -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; } diff --git a/view/css/conversation.css b/view/css/conversation.css index ecdf9dc2f..6f1d4b899 100644 --- a/view/css/conversation.css +++ b/view/css/conversation.css @@ -77,11 +77,6 @@ code { /* conv_item */ -.wall-photo-item { - display: table; - margin: 0px auto; -} - .wall-item-info { display: block; float: left; diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index e079af4da..e6ca7cbc3 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -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; } diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl index 0a6622fa4..760d64db0 100755 --- a/view/tpl/conv_item.tpl +++ b/view/tpl/conv_item.tpl @@ -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}}" > diff --git a/view/tpl/conv_list.tpl b/view/tpl/conv_list.tpl index 65b695a70..a3fb642ce 100755 --- a/view/tpl/conv_list.tpl +++ b/view/tpl/conv_list.tpl @@ -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}}"> diff --git a/view/tpl/search_item.tpl b/view/tpl/search_item.tpl index 003dae993..b44e1c39e 100755 --- a/view/tpl/search_item.tpl +++ b/view/tpl/search_item.tpl @@ -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}}"> |