diff options
| author | redmatrix <redmatrix@redmatrix.me> | 2015-10-22 17:20:52 -0700 |
|---|---|---|
| committer | redmatrix <redmatrix@redmatrix.me> | 2015-10-22 17:20:52 -0700 |
| commit | 4c406ec9c03d5f4c30d6ede7fbb0b93b3ff97885 (patch) | |
| tree | bd8cdd8b073503c95edae81c628464e8171a59aa /view/tpl | |
| parent | 500b896d50c7c31e3b5d1e2b329e77a2c45561dd (diff) | |
| parent | 18a239e8084305cd2b5b454386cb3948b48880fc (diff) | |
| download | volse-hubzilla-4c406ec9c03d5f4c30d6ede7fbb0b93b3ff97885.tar.gz volse-hubzilla-4c406ec9c03d5f4c30d6ede7fbb0b93b3ff97885.tar.bz2 volse-hubzilla-4c406ec9c03d5f4c30d6ede7fbb0b93b3ff97885.zip | |
Merge https://github.com/redmatrix/hubzilla into pending_merge
Diffstat (limited to 'view/tpl')
| -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 |
3 files changed, 16 insertions, 5 deletions
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}}"> |