multi acl: port photos

view/tpl/photo_view.tpl

@@ -53,7 +53,7 @@
 	{{$map}}
 	</div>
 	<div id="photo-edit" class="section-content-tools-wrapper">
-		<form action="photos/{{$edit.nickname}}/{{$edit.resource_id}}" method="post" id="photo_edit_form">
+		<form action="photos/{{$edit.nickname}}/{{$edit.resource_id}}" method="post" id="photo_edit_form" class="acl-form" data-form_id="photo_edit_form" data-allow_cid='{{$edit.allow_cid}}' data-allow_gid='{{$edit.allow_gid}}' data-deny_cid='{{$edit.deny_cid}}' data-deny_gid='{{$edit.deny_gid}}'>
 			<input type="hidden" name="item_id" value="{{$edit.item_id}}" />
 			{{* album renaming is not supported atm.
 			<div class="form-group">
@@ -88,8 +88,6 @@
 			</div>
 			{{/if}}
 
-			{{$edit.aclselect}}
-
 			<div class="form-group pull-left">
 				<button class="btn btn-danger btn-sm" id="photo-edit-delete-button" type="submit" name="delete" value="{{$edit.delete}}" onclick="return confirmDelete();" />{{$edit.delete}}</button>
 			</div>
@@ -102,6 +100,7 @@
 				<button id="dbtn-submit" class="btn btn-primary btn-sm" type="submit" name="submit" >{{$edit.submit}}</button>
 			</div>
 		</form>
+		{{$edit.aclselect}}
 		<div id="photo-edit-end" class="clear"></div>
 	</div>
 	<div id="photo-view-wrapper">

view/tpl/photos_upload.tpl

@@ -1,6 +1,6 @@
 <div id="photo-upload-form">
 	<div class="section-content-tools-wrapper">
-		<form action="photos/{{$nickname}}" enctype="multipart/form-data" method="post" name="photos-upload-form" id="photos-upload-form">
+		<form action="photos/{{$nickname}}" enctype="multipart/form-data" method="post" name="photos-upload-form" id="photos-upload-form" class="acl-form" data-form_id="photos-upload-form" data-allow_cid='{{$allow_cid}}' data-allow_gid='{{$allow_gid}}' data-deny_cid='{{$deny_cid}}' data-deny_gid='{{$deny_gid}}'>
 			<input type="hidden" id="photos-upload-source" name="source" value="photos" />
 
 			<div class="form-group">
@@ -14,9 +14,6 @@
 				{{/foreach}}
 				</datalist>
 			</div>
-
-			{{$aclselect}}
-
 			{{if $default}}
 			<div class="form-group">
 				<input id="photos-upload-choose" type="file" name="userfile" />
@@ -59,5 +56,6 @@
 			{{/if}}
 		</form>
 	</div>
+	{{$aclselect}}
 	<div id="photos-upload-end" class="clear"></div>
 </div>