make lockview for photos work

This commit is contained in:
marijus 2014-10-17 14:28:21 +02:00
parent 7bbe700f3f
commit fd48d4d81d
2 changed files with 16 additions and 6 deletions

View File

@ -956,7 +956,7 @@ function photos_content(&$a) {
$edit = array( $edit = array(
'edit' => t('Edit photo'), 'edit' => t('Edit photo'),
'id' => $ph[0]['id'], 'id' => print_r($ph[0]), //['id'],
'rotatecw' => t('Rotate CW (right)'), 'rotatecw' => t('Rotate CW (right)'),
'rotateccw' => t('Rotate CCW (left)'), 'rotateccw' => t('Rotate CCW (left)'),
'albums' => $albums['albums'], 'albums' => $albums['albums'],
@ -1114,7 +1114,7 @@ function photos_content(&$a) {
$photo_tpl = get_markup_template('photo_view.tpl'); $photo_tpl = get_markup_template('photo_view.tpl');
$o .= replace_macros($photo_tpl, array( $o .= replace_macros($photo_tpl, array(
'$id' => $ph[0]['id'], '$id' => $link_item['id'], //$ph[0]['id'],
'$album' => $album_e, '$album' => $album_e,
'$tools' => $tools, '$tools' => $tools,
'$lock' => $lock, '$lock' => $lock,

View File

@ -3,11 +3,21 @@
<h3><a href="{{$album.0}}">{{$album.1}}</a></h3> <h3><a href="{{$album.0}}">{{$album.1}}</a></h3>
<div id="photo-edit-link-wrap"> <div id="photo-edit-link-wrap">
{{if $tools}}
<a id="photo-toprofile-link" href="{{$tools.profile.0}}">{{$tools.profile.1}}</a> {{if $lock}}
{{/if}} <div class="wall-item-lock dropdown">
{{if $lock}} | <i class="lockview icon-lock" title="{{$lock}}" onclick="lockview(event,'photo/{{$id}}');"></i> {{/if}} <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>&nbsp;
</div> </div>
{{/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}} {{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"> <div id="photo-view-wrapper">