From 2b06b081d32666ed62e47e7e224c8b4b27d4e9d5 Mon Sep 17 00:00:00 2001
From: Simon L'nu <simon.lnu@gmail.com>
Date: Sat, 17 Mar 2012 01:47:53 -0400
Subject: [PATCH 1/2] Merge branch 'master', remote-tracking branch
 'remotes/upstream/master'

* remotes/upstream/master:

* master:

From 87fdae2dd8bdb9e01ce3d98f6ea94d83664cb4c2 Mon Sep 17 00:00:00 2001
From: Simon L'nu <simon.lnu@gmail.com>
Date: Sat, 17 Mar 2012 01:55:40 -0400
Subject: [PATCH 2/2] [fix] whitespace in photo_view and like_noshare.
 dispy-dark clean up

Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
---
 view/like_noshare.tpl                |  8 ++++----
 view/photo_view.tpl                  |  2 +-
 view/theme/dispy-dark/photo_view.tpl | 13 +++++--------
 view/theme/dispy-dark/theme.php      |  3 ---
 4 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/view/like_noshare.tpl b/view/like_noshare.tpl
index 2c467c3c..2651ea1f 100755
--- a/view/like_noshare.tpl
+++ b/view/like_noshare.tpl
@@ -1,5 +1,5 @@
 <div class="wall-item-like-buttons" id="wall-item-like-buttons-$id">
-				<a href="#" class="icon like"title="$likethis" onclick="dolike($id,'like'); return false"></a>
-				<a href="#" class="icon dislike" title="$nolike" onclick="dolike($id,'dislike'); return false"></a>
-				<img id="like-rotator-$id" class="like-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
-			</div>
+	<a href="#" class="icon like" title="$likethis" onclick="dolike($id,'like'); return false"></a>
+	<a href="#" class="icon dislike" title="$nolike" onclick="dolike($id,'dislike'); return false"></a>
+	<img id="like-rotator-$id" class="like-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
+</div>
diff --git a/view/photo_view.tpl b/view/photo_view.tpl
index 5dbcabad..732caf69 100755
--- a/view/photo_view.tpl
+++ b/view/photo_view.tpl
@@ -14,7 +14,7 @@
 <div id="photo-photo"><a href="$photo.href" title="$photo.title"><img src="$photo.src" /></a></div>
 {{ if $nextlink }}<div id="photo-next-link"><a href="$nextlink.0">$nextlink.1</a></div>{{ endif }}
 <div id="photo-photo-end"></div>
-<div id="photo-caption" >$desc</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>
diff --git a/view/theme/dispy-dark/photo_view.tpl b/view/theme/dispy-dark/photo_view.tpl
index f1209ec5..732caf69 100644
--- a/view/theme/dispy-dark/photo_view.tpl
+++ b/view/theme/dispy-dark/photo_view.tpl
@@ -4,18 +4,15 @@
 <div id="photo-edit-link-wrap">
 {{ if $tools }}
 <a id="photo-edit-link" href="$tools.edit.0">$tools.edit.1</a>
--
+|
 <a id="photo-toprofile-link" href="$tools.profile.0">$tools.profile.1</a>
 {{ endif }}
-{{ if $lock }} - <img src="images/lock_icon.gif" class="lockview" alt="$lock" onclick="lockview(event,'photo$id');" /> {{ endif }}
-</div>
-
-<div id="photo-photo">
-	{{ if $prevlink }}<div id="photo-prev-link"><a href="$prevlink.0">$prevlink.1</a></div>{{ endif }}
-	<a href="$photo.href" title="$photo.title"><img src="$photo.src" /></a>
-	{{ if $nextlink }}<div id="photo-next-link"><a href="$nextlink.0">$nextlink.1</a></div>{{ endif }}
+{{ if $lock }} | <img src="images/lock_icon.gif" class="lockview" alt="$lock" onclick="lockview(event,'photo/$id');" /> {{ endif }}
 </div>
 
+{{ if $prevlink }}<div id="photo-prev-link"><a href="$prevlink.0">$prevlink.1</a></div>{{ endif }}
+<div id="photo-photo"><a href="$photo.href" title="$photo.title"><img src="$photo.src" /></a></div>
+{{ if $nextlink }}<div id="photo-next-link"><a href="$nextlink.0">$nextlink.1</a></div>{{ endif }}
 <div id="photo-photo-end"></div>
 <div id="photo-caption">$desc</div>
 {{ if $tags }}
diff --git a/view/theme/dispy-dark/theme.php b/view/theme/dispy-dark/theme.php
index b57971db..70013617 100644
--- a/view/theme/dispy-dark/theme.php
+++ b/view/theme/dispy-dark/theme.php
@@ -108,9 +108,6 @@ $(document).ready(function() {
 		$(this).css({color: '#eec'});
 	});
 
-	// make auto-complete work in more places
-	$(".wall-item-comment-wrapper textarea").contact_autocomplete(baseurl+"/acl");
-
 /*	$('#profile-photo-wrapper').mouseover(function() {
 		$('.profile-edit-side-div').css({display: 'block'});
 	}).mouseout(function() {