4 files changed, 31 insertions, 21 deletions
diff --git a/view/tpl/event_form.tpl b/view/tpl/event_form.tpl
index 2a580e3b8..d91e44458 100755
--- a/view/tpl/event_form.tpl
+++ b/view/tpl/event_form.tpl
@@ -66,7 +66,8 @@
 <input type="checkbox" name="share" value="1" id="event-share-checkbox" {{$sh_checked}} /> <div id="event-share-text">{{$sh_text}}</div>
 <div id="event-share-break"></div>
 
-{{$acl}}
+<button id="event-permissions-button" class="btn btn-default btn-xs" data-toggle="modal" data-target="#aclModal" onclick="return false;">{{$permissions}}</button>
+	{{$acl}}
 
 <div class="clear"></div>
 <input id="event-submit" type="submit" name="submit" value="{{$submit}}" />
diff --git a/view/tpl/event_head.tpl b/view/tpl/event_head.tpl
index 8388187d1..6f1d2f22c 100755
--- a/view/tpl/event_head.tpl
+++ b/view/tpl/event_head.tpl
@@ -115,10 +115,10 @@
 		$('#event-share-checkbox').change(function() {
 
 			if ($('#event-share-checkbox').is(':checked')) { 
-				$('#acl-wrapper').show();
+				$('#event-permissions-button').show();
 			}
 			else {
-				$('#acl-wrapper').hide();
+				$('#event-permissions-button').hide();
 			}
 		}).trigger('change');
 
diff --git a/view/tpl/photo_item.tpl b/view/tpl/photo_item.tpl
index e7d25fd55..16f9a76c2 100755
--- a/view/tpl/photo_item.tpl
+++ b/view/tpl/photo_item.tpl
@@ -1,22 +1,27 @@
-<div class="wall-item-outside-wrapper{{$indent}}" id="wall-item-outside-wrapper-{{$id}}" >
-	<div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-{{$id}}" >
-		<a href="{{$profile_url}}" title="View {{$name}}'s profile" class="wall-item-photo-link" id="wall-item-photo-link-{{$id}}">
-		<img src="{{$thumb}}" class="wall-item-photo" id="wall-item-photo-{{$id}}" style="height: 80px; width: 80px;" alt="{{$name}}" /></a>
-	</div>
+<div class="wall-item-outside-wrapper {{$indent}}" id="wall-item-outside-wrapper-{{$id}}" >
+	<div class="wall-item-content-wrapper {{$indent}}" id="wall-item-content-wrapper-{{$id}}" style="clear:both;">
+		<div class="wall-item-info" id="wall-item-info-{{$item.id}}" >
+			<div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-{{$id}}" >
+				<a href="{{$profile_url}}" title="View {{$name}}'s profile" class="wall-item-photo-link" id="wall-item-photo-link-{{$id}}">
+				<img src="{{$thumb}}" class="wall-item-photo" id="wall-item-photo-{{$id}}" style="height: 80px; width: 80px;" alt="{{$name}}" /></a>
+			</div>
+		</div>
+		<div class="wall-item-wrapper" id="wall-item-wrapper-{{$id}}" >
+			<div class="wall-item-author">
+				<a href="{{$profile_url}}" title="View {{$name}}'s profile" class="wall-item-name-link"><span class="wall-item-name" id="wall-item-name-{{$id}}" >{{$name}}</span></a>
+			</div>
+			<div class="wall-item-ago"  id="wall-item-ago-{{$id}}">{{$ago}}</div>
+		</div>
+		<div class="wall-item-content" id="wall-item-content-{{$id}}" >
+			<div class="wall-item-title" id="wall-item-title-{{$id}}">{{$title}}</div>
+			<div class="wall-item-body" id="wall-item-body-{{$id}}" >{{$body}}</div>
+		</div>
+		{{$drop}}
+		<div class="wall-item-wrapper-end"></div>
 
-	<div class="wall-item-wrapper" id="wall-item-wrapper-{{$id}}" >
-		<a href="{{$profile_url}}" title="View {{$name}}'s profile" class="wall-item-name-link"><span class="wall-item-name" id="wall-item-name-{{$id}}" >{{$name}}</span></a>
-		<div class="wall-item-ago"  id="wall-item-ago-{{$id}}">{{$ago}}</div>
-	</div>
-	<div class="wall-item-content" id="wall-item-content-{{$id}}" >
-		<div class="wall-item-title" id="wall-item-title-{{$id}}">{{$title}}</div>
-		<div class="wall-item-body" id="wall-item-body-{{$id}}" >{{$body}}</div>
-	</div>
-	{{$drop}}
-	<div class="wall-item-wrapper-end"></div>
-	<div class="wall-item-comment-separator"></div>
-	{{$comment}}
+		{{$comment}}
 
-<div class="wall-item-outside-wrapper-end{{$indent}}" ></div>
+	<div class="wall-item-outside-wrapper-end{{$indent}}" ></div>
+	</div>
 </div>
 
diff --git a/view/tpl/photo_view.tpl b/view/tpl/photo_view.tpl
index f895b3129..4a9c0dfe8 100755
--- a/view/tpl/photo_view.tpl
+++ b/view/tpl/photo_view.tpl
@@ -92,6 +92,10 @@
 
 {{$comments}}
 
+<div class="wall-item-comment-wrapper{{if $comments}} wall-item-comment-wrapper-wc{{/if}}" >
+	{{$commentbox}}
+</div>
+
 </div>
 
 {{if $nextlink}}<div id="photo-next-link"><a href="{{$nextlink.0}}"><i class="icon-forward photo-icons"></i></a></div>{{/if}}