diff options
| -rwxr-xr-x | boot.php | 2 | ||||
| -rw-r--r-- | include/photos.php | 2 | ||||
| -rwxr-xr-x | view/tpl/photo_item.tpl | 12 |
3 files changed, 7 insertions, 9 deletions
@@ -49,7 +49,7 @@ require_once('include/hubloc.php'); require_once('include/attach.php'); define ( 'PLATFORM_NAME', 'hubzilla' ); -define ( 'STD_VERSION', '2.5.8' ); +define ( 'STD_VERSION', '2.5.9' ); define ( 'ZOT_REVISION', '1.2' ); define ( 'DB_UPDATE_VERSION', 1192 ); diff --git a/include/photos.php b/include/photos.php index c3260d18c..6ea444e2e 100644 --- a/include/photos.php +++ b/include/photos.php @@ -296,7 +296,7 @@ function photo_upload($channel, $observer, $args) { $photo_link = '[zrl=' . z_root() . '/photos/' . $channel['channel_address'] . '/image/' . $photo_hash . ']' . t('a new photo') . '[/zrl]'; - $album_link = '[zrl=' . z_root() . '/photos/' . $channel['channel_address'] . '/album/' . bin2hex($album) . ']' . ((strlen($album)) ? $album : '/') . '[/zrl]'; + $album_link = '[zrl=' . z_root() . '/photos/' . $channel['channel_address'] . '/album/' . $args['directory']['hash'] . ']' . ((strlen($album)) ? $album : '/') . '[/zrl]'; $activity_format = sprintf(t('%1$s posted %2$s to %3$s','photo_upload'), $author_link, $photo_link, $album_link); diff --git a/view/tpl/photo_item.tpl b/view/tpl/photo_item.tpl index ec643c4a9..b6ee4508b 100755 --- a/view/tpl/photo_item.tpl +++ b/view/tpl/photo_item.tpl @@ -1,10 +1,10 @@ <div class="wall-item-outside-wrapper{{if $indent}} {{$indent}}{{/if}}" id="wall-item-outside-wrapper-{{$id}}" > - <div class="wall-item-content-wrapper{{if $indent}} {{$indent}}{{/if}}" id="wall-item-content-wrapper-{{$id}}" style="clear:both;"> - <div class="wall-item-head"> + <div class="clearfix wall-item-content-wrapper{{if $indent}} {{$indent}}{{/if}}" id="wall-item-content-wrapper-{{$id}}"> + <div class="p-2 clearfix wall-item-head"> <div class="wall-item-info" id="wall-item-info-{{$id}}" > <div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-{{$id}}" > <a href="{{$profile_url}}" title="View {{$name}}'s profile" class="wall-item-photo-link" id="wall-item-photo-link-{{$id}}"> - <img src="{{$thumb}}" class="wall-item-photo" id="wall-item-photo-{{$id}}" style="height: 80px; width: 80px;" alt="{{$name}}" /></a> + <img src="{{$thumb}}" class="wall-item-photo" id="wall-item-photo-{{$id}}" alt="{{$name}}" /></a> </div> </div> <div class="wall-item-wrapper" id="wall-item-wrapper-{{$id}}" > @@ -14,20 +14,18 @@ <div class="wall-item-ago" id="wall-item-ago-{{$id}}">{{$ago}}</div> </div> </div> - <div class="wall-item-content" id="wall-item-content-{{$id}}" > + <div class="p-2 clearfix wall-item-content" id="wall-item-content-{{$id}}" > <div class="wall-item-title" id="wall-item-title-{{$id}}">{{$title}}</div> <div class="wall-item-body" id="wall-item-body-{{$id}}" >{{$body}}</div> </div> {{if $drop}} - <div class="wall-item-tools" id="wall-item-tools-{{$id}}" > + <div class="p-2 clearfix wall-item-tools" id="wall-item-tools-{{$id}}" > <div class="wall-item-tools-right pull-right"> {{$drop}} </div> - <div class="clear"></div> </div> {{/if}} - <div class="clear"></div> {{$comment}} </div> </div> |