3 files changed, 69 insertions, 23 deletions
diff --git a/view/theme/dispy/search_item.tpl b/view/theme/dispy/search_item.tpl
index 39c74ef81..3d841ab08 100644
--- a/view/theme/dispy/search_item.tpl
+++ b/view/theme/dispy/search_item.tpl
@@ -16,9 +16,16 @@
 			<div class="wall-item-photo-end"></div>	
 			<div class="wall-item-location" id="wall-item-location-$id">{{ if $location }}<span class="icon globe"></span>$location {{ endif }}</div>
 		</div>
-		<div class="wall-item-lock-wrapper">$lock</div>
+		<div class="wall-item-lock-wrapper">
+			{{ if $lock }}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="$lock" onclick="lockview(event,$id);" /></div>
+			{{ else }}<div class="wall-item-lock"></div>{{ endif }}	
+		</div>
 		<div class="wall-item-tools" id="wall-item-tools-$id">
-		$drop
+			<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$id" >
+				{{ if $drop.dropping }}<a href="item/drop/$id" onclick="return confirmDelete();" class="icon drophide" title="$drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }}
+			</div>
+				{{ if $drop.dropping }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$drop.select" class="item-select" name="itemselected[]" value="$id" />{{ endif }}
+			<div class="wall-item-delete-end"></div>
 		</div>
 		<div class="wall-item-content" id="wall-item-content-$id" >
 			<div class="wall-item-title" id="wall-item-title-$id">$title</div>
@@ -36,5 +43,9 @@
 </div>
 
 <div class="wall-item-outside-wrapper-end$indent" ></div>
-	<div class="wall-item-conv" id="wall-item-conv-$id" >$conv</div>
+	<div class="wall-item-conv" id="wall-item-conv-$id" >
+	{{ if $conv }}
+		<a href='$conv.href' id='context-$id' title='$conv.title'>$conv.title</a>
+	{{ endif }}
+	</div>
 
diff --git a/view/theme/dispy/wall_item.tpl b/view/theme/dispy/wall_item.tpl
index 1f5cbcaeb..f555ed813 100644
--- a/view/theme/dispy/wall_item.tpl
+++ b/view/theme/dispy/wall_item.tpl
@@ -17,17 +17,34 @@
 			<div class="wall-item-photo-end"></div>
 			<div class="wall-item-location" id="wall-item-location-$id">{{ if $location }}<span class="icon globe"></span>$location {{ endif }}</div>				
 		</div>
-		<div class="wall-item-lock-wrapper">$lock</div>
+		<div class="wall-item-lock-wrapper">
+			{{ if $lock }}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="$lock" onclick="lockview(event,$id);" /></div>
+			{{ else }}<div class="wall-item-lock"></div>{{ endif }}
+		</div>
 		<div class="wall-item-tools" id="wall-item-tools-$id">
-		{{ if $star }}
-			<a href="#" id="starred-$id" onclick="dostar($id); return false;" class="star-item icon $isstarred" title="$star.toggle"></a>
-		{{ endif }}
-		$vote
-		{{ if $plink }}
-			<div class="wall-item-links-wrapper"><a href="$plink.href" title="$plink.title" target="external-link" class="icon remote-link"></a></div>
-		{{ endif }}
-		$edpost
-		$drop
+			{{ if $star }}
+				<a href="#" id="starred-$id" onclick="dostar($id); return false;" class="star-item icon $isstarred" title="$star.toggle"></a>
+			{{ endif }}
+			{{ if $vote }}
+			<div class="wall-item-like-buttons" id="wall-item-like-buttons-$id">
+				<a href="#" class="icon like" title="$vote.like.0" onclick="dolike($id,'like'); return false"></a>
+				<a href="#" class="icon dislike" title="$vote.dislike.0" onclick="dolike($id,'dislike'); return false"></a>
+				{{ if $vote.share }}<a href="#" class="icon recycle wall-item-share-buttons" title=""$vote.share.0" onclick="jotShare($id); return false"></a>{{ endif }}
+				<img id="like-rotator-$id" class="like-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
+			</div>
+			{{ endif }}
+			{{ if $plink }}
+				<div class="wall-item-links-wrapper"><a href="$plink.href" title="$plink.title" target="external-link" class="icon remote-link"></a></div>
+			{{ endif }}
+			{{ if $edpost }}
+				<a class="editpost icon pencil" href="$edpost.0" title="$edpost.1"></a>'
+			{{ endif }}
+		
+			<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$id" >
+				{{ if $drop.dropping }}<a href="item/drop/$id" onclick="return confirmDelete();" class="icon drophide" title="$drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }}
+			</div>
+				{{ if $drop.dropping }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$drop.select" class="item-select" name="itemselected[]" value="$id" />{{ endif }}
+			<div class="wall-item-delete-end"></div>
 		
 		</div>
 		<div class="wall-item-content" id="wall-item-content-$id" >
diff --git a/view/theme/dispy/wallwall_item.tpl b/view/theme/dispy/wallwall_item.tpl
index add2cd5a0..9e6ea40a1 100644
--- a/view/theme/dispy/wallwall_item.tpl
+++ b/view/theme/dispy/wallwall_item.tpl
@@ -22,17 +22,35 @@
 			<div class="wall-item-photo-end"></div>
 			<div class="wall-item-location" id="wall-item-location-$id">{{ if $location }}<span class="icon globe"></span>$location {{ endif }}</div>				
 		</div>
-		<div class="wall-item-lock-wrapper">$lock</div>
+		<div class="wall-item-lock-wrapper">
+				{{ if $lock }}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="$lock" onclick="lockview(event,$id);" /></div>
+				{{ else }}<div class="wall-item-lock"></div>{{ endif }}
+		</div>
 		<div class="wall-item-tools" id="wall-item-tools-$id">
-		{{ if $star }}
-			<a href="#" id="starred-$id" onclick="dostar($id); return false;" class="star-item icon $isstarred" title="$star.toggle"></a>
-		{{ endif }}
-		$vote
-		{{ if $plink }}
-			<div class="wall-item-links-wrapper"><a href="$plink.href" title="$plink.title" target="external-link" class="icon remote-link"></a></div>
-		{{ endif }}
-		$edpost
-		$drop
+			{{ if $star }}
+				<a href="#" id="starred-$id" onclick="dostar($id); return false;" class="star-item icon $isstarred" title="$star.toggle"></a>
+			{{ endif }}
+			{{ if $vote }}
+			<div class="wall-item-like-buttons" id="wall-item-like-buttons-$id">
+				<a href="#" class="icon like" title="$vote.like.0" onclick="dolike($id,'like'); return false"></a>
+				<a href="#" class="icon dislike" title="$vote.dislike.0" onclick="dolike($id,'dislike'); return false"></a>
+				{{ if $vote.share }}<a href="#" class="icon recycle wall-item-share-buttons" title=""$vote.share.0" onclick="jotShare($id); return false"></a>{{ endif }}
+				<img id="like-rotator-$id" class="like-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
+			</div>
+			{{ endif }}
+			{{ if $plink }}
+				<div class="wall-item-links-wrapper"><a href="$plink.href" title="$plink.title" target="external-link" class="icon remote-link"></a></div>
+			{{ endif }}
+			{{ if $edpost }}
+				<a class="editpost icon pencil" href="$edpost.0" title="$edpost.1"></a>'
+			{{ endif }}
+		
+			<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$id" >
+				{{ if $drop.dropping }}<a href="item/drop/$id" onclick="return confirmDelete();" class="icon drophide" title="$drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }}
+			</div>
+				{{ if $drop.dropping }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$drop.select" class="item-select" name="itemselected[]" value="$id" />{{ endif }}
+			<div class="wall-item-delete-end"></div>
+
 		</div>
 		<div class="wall-item-content" id="wall-item-content-$id" >
 			<div class="wall-item-title" id="wall-item-title-$id">$title</div>