diff options
| author | marijus <mario@mariovavti.com> | 2014-10-17 14:28:21 +0200 |
|---|---|---|
| committer | marijus <mario@mariovavti.com> | 2014-10-17 14:28:21 +0200 |
| commit | fd48d4d81d878928fe6821d3808eb578cb5088b4 (patch) | |
| tree | f70cb68111df8836f41107552f287cc4d290179a | |
| parent | 7bbe700f3f170cc4527131165a9b9ab1f99e5cd1 (diff) | |
| download | volse-hubzilla-fd48d4d81d878928fe6821d3808eb578cb5088b4.tar.gz volse-hubzilla-fd48d4d81d878928fe6821d3808eb578cb5088b4.tar.bz2 volse-hubzilla-fd48d4d81d878928fe6821d3808eb578cb5088b4.zip | |
make lockview for photos work
| -rw-r--r-- | mod/photos.php | 4 | ||||
| -rwxr-xr-x | view/tpl/photo_view.tpl | 16 |
2 files changed, 15 insertions, 5 deletions
diff --git a/mod/photos.php b/mod/photos.php index 2b859b7f1..85bd47399 100644 --- a/mod/photos.php +++ b/mod/photos.php @@ -956,7 +956,7 @@ function photos_content(&$a) { $edit = array( 'edit' => t('Edit photo'), - 'id' => $ph[0]['id'], + 'id' => print_r($ph[0]), //['id'], 'rotatecw' => t('Rotate CW (right)'), 'rotateccw' => t('Rotate CCW (left)'), 'albums' => $albums['albums'], @@ -1114,7 +1114,7 @@ function photos_content(&$a) { $photo_tpl = get_markup_template('photo_view.tpl'); $o .= replace_macros($photo_tpl, array( - '$id' => $ph[0]['id'], + '$id' => $link_item['id'], //$ph[0]['id'], '$album' => $album_e, '$tools' => $tools, '$lock' => $lock, diff --git a/view/tpl/photo_view.tpl b/view/tpl/photo_view.tpl index 4a9c0dfe8..4961464dc 100755 --- a/view/tpl/photo_view.tpl +++ b/view/tpl/photo_view.tpl @@ -3,11 +3,21 @@ <h3><a href="{{$album.0}}">{{$album.1}}</a></h3> <div id="photo-edit-link-wrap"> -{{if $tools}} -<a id="photo-toprofile-link" href="{{$tools.profile.0}}">{{$tools.profile.1}}</a> + +{{if $lock}} +<div class="wall-item-lock dropdown"> + <i class="icon-lock lockview dropdown-toggle" data-toggle="dropdown" title="{{$lock}}" onclick="lockview(event,{{$id}});" ></i><ul id="panel-{{$id}}" class="lockview-panel dropdown-menu"></ul> +</div> {{/if}} -{{if $lock}} | <i class="lockview icon-lock" title="{{$lock}}" onclick="lockview(event,'photo/{{$id}}');"></i> {{/if}} + + +{{if $tools}} +<div> + <a id="photo-toprofile-link" href="{{$tools.profile.0}}">{{$tools.profile.1}}</a> </div> +{{/if}} + +<div class="clear"></div> {{if $prevlink}}<div id="photo-prev-link"><a href="{{$prevlink.0}}"><i class="icon-backward photo-icons"></i></div>{{/if}} <div id="photo-view-wrapper"> |