diff options
Diffstat (limited to 'view/tpl/photo_view.tpl')
| -rwxr-xr-x | view/tpl/photo_view.tpl | 39 |
1 files changed, 20 insertions, 19 deletions
diff --git a/view/tpl/photo_view.tpl b/view/tpl/photo_view.tpl index cdaae67e4..f5e5bb7b5 100755 --- a/view/tpl/photo_view.tpl +++ b/view/tpl/photo_view.tpl @@ -1,6 +1,4 @@ -{{include file="prettyphoto.tpl"}} - -<div id="live-display"></div> +<div id="live-photos"></div> <h3><a href="{{$album.0}}">{{$album.1}}</a></h3> <div id="photo-edit-link-wrap"> @@ -11,22 +9,24 @@ </div> {{if $prevlink}}<div id="photo-prev-link"><a href="{{$prevlink.0}}"><i class="icon-backward photo-icons"></i></div>{{/if}} -<div id="photo-photo"><a href="{{$photo.href}}" title="{{$photo.title}}" rel="prettyPhoto"><img src="{{$photo.src}}" /></a></div> +<div id="photo-photo"><a href="{{$photo.href}}" title="{{$photo.title}}" onclick="$.colorbox({href: '{{$photo.href}}'}); return false;" ><img src="{{$photo.src}}" /></a></div> {{if $nextlink}}<div id="photo-next-link"><a href="{{$nextlink.0}}"><i class="icon-forward photo-icons"></i></a></div>{{/if}} <div id="photo-photo-end"></div> <div id="photo-caption">{{$desc}}</div> {{if $tags}} -<div id="in-this-photo-text">{{$tags.0}}</div> -<div id="in-this-photo">{{$tags.1}}</div> +<div id="in-this-photo-text">{{$tag_hdr}}</div> +{{foreach $tags as $t}} +<div id="in-this-photo">{{$t.0}}</div> +{{if $edit}}<div id="tag-remove"><a href="{{$t.1}}">{{$t.2}}</a></div>{{/if}} +{{/foreach}} {{/if}} -{{if $tags.2}}<div id="tag-remove"><a href="{{$tags.2}}">{{$tags.3}}</a></div>{{/if}} {{if $edit}} <div id="photo-edit-edit-wrapper" class="fakelink" onclick="openClose('photo-edit-edit');">{{$edit.edit}}</div> <div id="photo-edit-edit" style="display: none;"> <form action="photos/{{$edit.nickname}}/{{$edit.resource_id}}" method="post" id="photo_edit_form" > - <input type="hidden" name="item_id" value="{{$item_id}}" /> + <input type="hidden" name="item_id" value="{{$edit.item_id}}" /> <label id="photo-edit-albumname-label" for="photo-edit-albumname">{{$edit.newalbum}}</label> <input id="photo-edit-albumname" type="text" size="32" name="albname" value="{{$edit.album}}" /> @@ -52,19 +52,20 @@ </div> <div id="photo-edit-rotate-end"></div> - <div id="photo-edit-perms" class="photo-edit-perms" > - <a href="#photo-edit-perms-select" id="photo-edit-perms-menu" class="button popupbox" title="{{$edit.permissions}}"/> - <span id="jot-perms-icon" class="icon {{$edit.lockstate}}" ></span>{{$edit.permissions}} - </a> - <div id="photo-edit-perms-menu-end"></div> - - <div style="display: none;"> - <div id="photo-edit-perms-select" > - {{$edit.aclselect}} + <div id="settings-default-perms" class="settings-default-perms" > + <span id="jot-perms-icon" class="icon {{$edit.lockstate}}" ></span> + <a href="#profile-jot-acl-wrapper" id="settings-default-perms-menu" >{{$edit.permissions}}</a> + <div id="settings-default-perms-menu-end"></div> + <div id="settings-default-perms-select" style="display: none; margin-bottom: 20px" > + <div style="display: none;"> + <div id="profile-jot-acl-wrapper" style="width:auto;height:auto;overflow:auto;"> + {{$edit.aclselect}} + </div> </div> </div> - </div> - <div id="photo-edit-perms-end"></div> + </div> + <br/> + <div id="settings-default-perms-end"></div> <input id="photo-edit-submit-button" type="submit" name="submit" value="{{$edit.submit}}" /> <input id="photo-edit-delete-button" type="submit" name="delete" value="{{$edit.delete}}" onclick="return confirmDelete()"; /> |