From 95a45a119dd61241ae8d0f0f8eda467cff64d855 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Tue, 11 Feb 2014 18:45:50 -0800
Subject: shamelessly steal, and cut/paste from the settings page to get
 mod_photos edit permissions working - and it looks like we still have some
 other fancybox instances (yet another lightbox) which haven't yet been
 converted to colorbox and will need to be fixed. Way too many lightboxes.

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

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

diff --git a/view/tpl/photo_view.tpl b/view/tpl/photo_view.tpl
index 8c19d39d7..f5e5bb7b5 100755
--- a/view/tpl/photo_view.tpl
+++ b/view/tpl/photo_view.tpl
@@ -1,4 +1,4 @@
-<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">
@@ -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()"; />
-- 
cgit v1.2.3