diff options
| author | Mario Vavti <mario@mariovavti.com> | 2015-10-20 09:36:15 +0200 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2015-10-20 09:36:15 +0200 |
| commit | f7601756e99fcedb062d1f7ac3e53431ea72642d (patch) | |
| tree | 5aae7959b0b2d16fc7e374335ddc85984b9a482d /view | |
| parent | 54059b2f153433f7154a754a77dafba1cc97a1a2 (diff) | |
| download | volse-hubzilla-f7601756e99fcedb062d1f7ac3e53431ea72642d.tar.gz volse-hubzilla-f7601756e99fcedb062d1f7ac3e53431ea72642d.tar.bz2 volse-hubzilla-f7601756e99fcedb062d1f7ac3e53431ea72642d.zip | |
create photo object if feature large photos is enabled and display those slightly different
Diffstat (limited to 'view')
| -rw-r--r-- | view/css/conversation.css | 8 | ||||
| -rw-r--r-- | view/theme/redbasic/css/style.css | 8 | ||||
| -rwxr-xr-x | view/tpl/conv_item.tpl | 9 | ||||
| -rwxr-xr-x | view/tpl/jot.tpl | 2 |
4 files changed, 19 insertions, 8 deletions
diff --git a/view/css/conversation.css b/view/css/conversation.css index df89eb7d1..ba2eac3b6 100644 --- a/view/css/conversation.css +++ b/view/css/conversation.css @@ -78,8 +78,12 @@ code { /* conv_item */ .wall-photo-item img { - width: 100% !important; - max-width: 100% !important; + +} + +.wall-photo-item { + display: table; + margin: 0px auto; } .wall-item-info { diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index b25ca333b..e079af4da 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1623,19 +1623,19 @@ img.mail-conv-sender-photo { /* conversation */ .wall-item-head { - padding: 10px 10px 0px 10px; + padding: 10px 10px 0.5em 10px; } .wall-item-content { - padding: 1em 10px; + padding: 0.5em 10px; } .wall-photo-item { - padding: 10px 0px; + padding: 0.5em 0px; } .wall-item-tools { - padding: 0px 10px 10px 10px; + padding: 0.5em 10px 10px 10px; } diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl index 5bac5b412..0a6622fa4 100755 --- a/view/tpl/conv_item.tpl +++ b/view/tpl/conv_item.tpl @@ -33,12 +33,19 @@ </div> <div class="clear"></div> </div> - <div class="{{if $item.is_photo}}wall-photo-item{{else}}wall-item-content{{/if}}" id="wall-item-content-{{$item.id}}"> + {{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}}" > {{$item.body}} </div> <div class="clear"></div> </div> + {{/if}} {{if $item.has_tags}} <div class="wall-item-tools"> {{if $item.mentions}} diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl index ea68368aa..e61d75fee 100755 --- a/view/tpl/jot.tpl +++ b/view/tpl/jot.tpl @@ -3,7 +3,7 @@ {{if $parent}} <input type="hidden" name="parent" value="{{$parent}}" /> {{/if}} - <input type="hidden" name="type" value="{{$ptyp}}" /> + <input type="hidden" name="obj_type" value="{{$ptyp}}" /> <input type="hidden" name="profile_uid" value="{{$profile_uid}}" /> <input type="hidden" name="return" value="{{$return_path}}" /> <input type="hidden" name="location" id="jot-location" value="{{$defloc}}" /> |