From bae3029c639bf6f9469dd93bfedc3dce0d8510d7 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Sun, 19 Oct 2014 16:12:05 -0700
Subject: merge madness

---
 view/tpl/photo_view.tpl | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

(limited to 'view/tpl/photo_view.tpl')

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>&nbsp;
+</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"> 
-- 
cgit v1.2.3