Merge pull request #6 from fabrixxm/master

more work on ui

3 files changed, 94 insertions, 8 deletions

diff --git a/view/theme/duepuntozero/search_item.tpl b/view/theme/duepuntozero/search_item.tpl
new file mode 100644
index 000000000..b4a1c82cb
--- /dev/null
+++ b/view/theme/duepuntozero/search_item.tpl
@@ -0,0 +1,54 @@
+<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" >
+		<div class="wall-item-info" id="wall-item-info-$id">
+			<div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-$id" 
+				 onmouseover="if (typeof t$id != 'undefined') clearTimeout(t$id); openMenu('wall-item-photo-menu-button-$id')" 
+				 onmouseout="t$id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$id\'); closeMenu(\'wall-item-photo-menu-$id\');',200)">
+				<a href="$profile_url" target="redir" title="$linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$id">
+				<img src="$thumb" class="wall-item-photo$sparkle" id="wall-item-photo-$id" style="height: 80px; width: 80px;" alt="$name" /></a>
+				<span onclick="openClose('wall-item-photo-menu-$id');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-$id">menu</span>
+				<div class="wall-item-photo-menu" id="wall-item-photo-menu-$id">
+					<ul>
+						$item_photo_menu
+					</ul>
+				</div>
+			</div>
+			<div class="wall-item-photo-end"></div>	
+			<div class="wall-item-wrapper" id="wall-item-wrapper-$id" >
+				{{ 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 class="wall-item-location" id="wall-item-location-$id">$location</div>
+			</div>
+		</div>
+		<div class="wall-item-author">
+				<a href="$profile_url" target="redir" title="$linktitle" class="wall-item-name-link"><span class="wall-item-name$sparkle" 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-title-end"></div>
+			<div class="wall-item-body" id="wall-item-body-$id" >$body</div>
+		</div>
+		<div class="wall-item-tools" id="wall-item-tools-$id">
+			<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>
+	<div class="wall-item-wrapper-end"></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>
+
+<div class="wall-item-outside-wrapper-end$indent" ></div>
+
+</div>
+
+
diff --git a/view/theme/duepuntozero/wall_item.tpl b/view/theme/duepuntozero/wall_item.tpl
index 32820fb7c..d264d3999 100644
--- a/view/theme/duepuntozero/wall_item.tpl
+++ b/view/theme/duepuntozero/wall_item.tpl
@@ -16,7 +16,8 @@
 			</div>
 			<div class="wall-item-photo-end"></div>
 			<div class="wall-item-wrapper" id="wall-item-wrapper-$id" >
-			{{ if $lock }}<span class="icon s22 lock fakelink" onclick="lockview(event,$id);" title="$lock"></span>{{ endif }}	
+				{{ 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 class="wall-item-location" id="wall-item-location-$id">$location</div>				
 			</div>
 		</div>
@@ -31,15 +32,30 @@
 			<div class="wall-item-body" id="wall-item-body-$id" >$body</div>
 		</div>
 		<div class="wall-item-tools" id="wall-item-tools-$id">
-		$vote
+			{{ 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 }}
-		$edpost
+			{{ if $edpost }}
+				<a class="editpost icon pencil" href="$edpost.0" title="$edpost.1"></a>
+			{{ endif }}
+			 
 			{{ if $star }}
 			<a href="#" id="starred-$id" onclick="dostar($id); return false;" class="star-item icon $isstarred" title="$star.toggle"></a>
 			{{ endif }}
-		$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>
 	<div class="wall-item-wrapper-end"></div>
diff --git a/view/theme/duepuntozero/wallwall_item.tpl b/view/theme/duepuntozero/wallwall_item.tpl
index 58d5e16f6..aaa542760 100644
--- a/view/theme/duepuntozero/wallwall_item.tpl
+++ b/view/theme/duepuntozero/wallwall_item.tpl
@@ -21,7 +21,8 @@
 			</div>
 			<div class="wall-item-photo-end"></div>
 			<div class="wall-item-wrapper" id="wall-item-wrapper-$id" >
-				{{ if $lock }}<span class="icon s22 lock fakelink" onclick="lockview(event,$id);" title="$lock"></span>{{ endif }}	
+				{{ 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 class="wall-item-location" id="wall-item-location-$id">$location</div>
 			</div>
 		</div>
@@ -35,15 +36,30 @@
 			<div class="wall-item-body" id="wall-item-body-$id" >$body</div>
 		</div>
 		<div class="wall-item-tools" id="wall-item-tools-$id">
-		$vote
+			{{ 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 }}
-		$edpost
+			{{ if $edpost }}
+				<a class="editpost icon pencil" href="$edpost.0" title="$edpost.1"></a>
+			{{ endif }}
+			 
 			{{ if $star }}
 			<a href="#" id="starred-$id" onclick="dostar($id); return false;" class="star-item icon $isstarred" title="$star.toggle"></a>
 			{{ endif }}
-		$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>	
 	<div class="wall-item-wrapper-end"></div>