quattro: actions in wall_item

less html in conversation.php
removed unused tpls
fixed old themes

images/icons/Makefile

@@ -0,0 +1,31 @@
+
+IMAGES=add.png edit.png	gear.png info.png menu.png \
+		notify_off.png star.png  delete.png feed.png group.png \
+		lock.png notice.png notify_on.png user.png link.png
+
+DESTS=10/ 16/ 22/ 48/ \
+		$(addprefix 10/, $(IMAGES)) \
+		$(addprefix 16/, $(IMAGES)) \
+		$(addprefix 22/, $(IMAGES)) \
+		$(addprefix 48/, $(IMAGES))
+	 
+all: $(DESTS)
+
+%/:
+	mkdir $@
+
+10/%.png: %.png
+	convert $< -resize 10x10 $@
+	
+16/%.png: %.png
+	convert $< -resize 16x16 $@
+
+22/%.png: %.png
+	convert $< -resize 22x22 $@
+
+48/%.png: %.png
+	convert $< -resize 48x48 $@
+
+
+
+

images/icons/make.sh

@@ -1,14 +0,0 @@
-sizes="10 16 22 48"
-
-for s in $sizes
-do
- echo "=[ ${s}x${s} ]===="
- [ -d $s ] || mkdir $s
- for f in *.png
- do
-    convert $f -resize ${s}x${s} $s/$f
-    echo -n "#"
- done
- echo
-done
-echo "Ok."

include/conversation.php

@@ -134,8 +134,6 @@ function conversation(&$a, $items, $mode, $update) {
 
 
 	$cmnt_tpl    = get_markup_template('comment_item.tpl');
-	$like_tpl    = get_markup_template('like.tpl');
-	$noshare_tpl = get_markup_template('like_noshare.tpl');
 	$tpl         = get_markup_template('wall_item.tpl');
 	$wallwall    = get_markup_template('wallwall_item.tpl');
 	$droptpl     = get_markup_template('wall_item_drop.tpl');
@@ -393,13 +391,18 @@ function conversation(&$a, $items, $mode, $update) {
 
 			if($page_writeable) {
 				if($toplevelpost) {
-					$likebuttons = replace_macros(((($shareable)) ? $like_tpl : $noshare_tpl),array(
+					/*$likebuttons = replace_macros(((($shareable)) ? $like_tpl : $noshare_tpl),array(
 						'$id' => $item['id'],
 						'$likethis' => t("I like this \x28toggle\x29"),
 						'$nolike' => t("I don't like this \x28toggle\x29"),
 						'$share' => t('Share'),
 						'$wait' => t('Please wait') 
-					));
+					))*/
+					$likebuttons = array(
+						'like' => array( t("I like this \x28toggle\x29"), t("like")),
+						'dislike' => array( t("I don't like this \x28toggle\x29"), t("dislike")),
+					);
+					if ($shareable) $likebuttons['share'] = array( t('Share this'), t('share'));
 				}
 
 				if(($show_comment_box) || (($show_comment_box == false) && ($override_comment_box == false) && ($item['last-child']))) {
@@ -421,9 +424,8 @@ function conversation(&$a, $items, $mode, $update) {
 			}
 
 			$edpost = (((($profile_owner == local_user()) && ($toplevelpost) && (intval($item['wall']) == 1)) || ($mode === 'notes'))
-					? '<a class="editpost icon pencil" href="' . $a->get_baseurl() . '/editpost/' . $item['id'] 
+					? array($a->get_baseurl()."/editpost/".$item['id'], t("Edit"))
-						. '" title="' . t('Edit') . '"></a>'
+					: False);
-					: '');
 
 
 			$drop = '';
@@ -432,7 +434,11 @@ function conversation(&$a, $items, $mode, $update) {
 			if((intval($item['contact-id']) && $item['contact-id'] == remote_user()) || ($item['uid'] == local_user()))
 				$dropping = true;
 
-            $drop = replace_macros((($dropping)? $droptpl : $fakedrop), array('$id' => $item['id'], '$select' => t('Select'), '$delete' => t('Delete')));
+            $drop = array(
+				'dropping' => $dropping,
+				'select' => t('Select'), 
+				'delete' => t('Delete'),
+			);
 
 			$star = false;
 
@@ -535,7 +541,8 @@ function conversation(&$a, $items, $mode, $update) {
 				'$vote' => $likebuttons,
 				'$like' => $like,
 				'$dislike' => $dislike,
-				'$comment' => $comment
+				'$comment' => $comment,
+				'$wait' => t('Please wait'),
 
 			));
 

view/like.tpl

@@ -1,6 +0,0 @@
-<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>
-				<a href="#" class="icon recycle wall-item-share-buttons" title="$share" onclick="jotShare($id); return false"></a>
-				<img id="like-rotator-$id" class="like-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
-			</div>

view/like_noshare.tpl

@@ -1,5 +0,0 @@
-<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>

view/theme/dispy/wall_item.tpl

@@ -19,15 +19,29 @@
 		</div>
 		<div class="wall-item-lock-wrapper">$lock</div>
 		<div class="wall-item-tools" id="wall-item-tools-$id">
-		{{ if $star }}
+			{{ if $star }}
-			<a href="#" id="starred-$id" onclick="dostar($id); return false;" class="star-item icon $isstarred" title="$star.toggle"></a>
+				<a href="#" id="starred-$id" onclick="dostar($id); return false;" class="star-item icon $isstarred" title="$star.toggle"></a>
-		{{ endif }}
+			{{ endif }}
-		$vote
+			{{ if $vote }}
-		{{ if $plink }}
+			<div class="wall-item-like-buttons" id="wall-item-like-buttons-$id">
-			<div class="wall-item-links-wrapper"><a href="$plink.href" title="$plink.title" target="external-link" class="icon remote-link"></a></div>
+				<a href="#" class="icon like" title="$vote.like.0" onclick="dolike($id,'like'); return false"></a>
-		{{ endif }}
+				<a href="#" class="icon dislike" title="$vote.dislike.0" onclick="dolike($id,'dislike'); return false"></a>
-		$edpost
+				{{ if $vote.share }}<a href="#" class="icon recycle wall-item-share-buttons" title=""$vote.share.0" onclick="jotShare($id); return false"></a>{{ endif }}
-		$drop
+				<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" >

view/theme/dispy/wallwall_item.tpl

@@ -24,15 +24,30 @@
 		</div>
 		<div class="wall-item-lock-wrapper">$lock</div>
 		<div class="wall-item-tools" id="wall-item-tools-$id">
-		{{ if $star }}
+			{{ if $star }}
-			<a href="#" id="starred-$id" onclick="dostar($id); return false;" class="star-item icon $isstarred" title="$star.toggle"></a>
+				<a href="#" id="starred-$id" onclick="dostar($id); return false;" class="star-item icon $isstarred" title="$star.toggle"></a>
-		{{ endif }}
+			{{ endif }}
-		$vote
+			{{ if $vote }}
-		{{ if $plink }}
+			<div class="wall-item-like-buttons" id="wall-item-like-buttons-$id">
-			<div class="wall-item-links-wrapper"><a href="$plink.href" title="$plink.title" target="external-link" class="icon remote-link"></a></div>
+				<a href="#" class="icon like" title="$vote.like.0" onclick="dolike($id,'like'); return false"></a>
-		{{ endif }}
+				<a href="#" class="icon dislike" title="$vote.dislike.0" onclick="dolike($id,'dislike'); return false"></a>
-		$edpost
+				{{ if $vote.share }}<a href="#" class="icon recycle wall-item-share-buttons" title=""$vote.share.0" onclick="jotShare($id); return false"></a>{{ endif }}
-		$drop
+				<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>

view/theme/duepuntozero/wall_item.tpl

@@ -31,15 +31,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>

view/theme/duepuntozero/wallwall_item.tpl

@@ -35,15 +35,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>

view/theme/loozah/wall_item.tpl

@@ -31,15 +31,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>

view/theme/loozah/wallwall_item.tpl

@@ -35,15 +35,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>

view/theme/quattro/icons.less

@@ -44,7 +44,7 @@
 	}
 	&.s48 {
 		width:48px; height: 48px;
-		.icons(22);
+		.icons(48);
 	}
 	
 	

view/theme/quattro/quattro.less

@@ -21,10 +21,18 @@ body {
 	-webkit-border-radius: @arguments;
 	border-radius: @arguments;
 }
-
 .roundbottom (@radius: 5px){ .rounded(0, 0, @radius, @radius); }
 .roundtop (@radius: 5px){ .rounded(@radius, @radius, 0, 0); }
 
+.opaque(@v: 0.5){
+	opacity: @v;
+	-webkit-transition: all 0.2s ease-in-out;
+	-moz-transition: all 0.2s ease-in-out;
+	-o-transition: all 0.2s ease-in-out;
+	-ms-transition: all 0.2s ease-in-out;
+	transition: all 0.2s ease-in-out;
+}
+
 a, a:link { color: @Link; text-decoration: none; }
 a:visited { color: @LinkVisited; text-decoration: none; }
 a:hover {color: @LinkHover; text-decoration: underline; }
@@ -268,7 +276,6 @@ section {
 .wall-item-container {
 	display: table;
 	width: 780px;
-	margin-bottom: 10px;
 	
 	.wall-item-item,
 	.wall-item-bottom { display: table-row; }
@@ -290,22 +297,51 @@ section {
 		.wall-item-photo-menu { display: none; }
 		
 	} 
+	.wall-item-location {
+		word-wrap: break-word;
+		width: 50px;
+	}
 	.wall-item-content {
 		display: table-cell;
-		font-size: 12px;
+		font-size: 16px;
 		max-width: 720px;
 		word-wrap: break-word;
 	}
 	.wall-item-content img { max-width: 710px; }
 	.wall-item-links,
-	.wall-item-actions { display: table-cell; }
+	.wall-item-actions { 
+		display: table-cell; 
+		vertical-align: middle; 
+		
+		.icon {
+			.opaque(0.5);
+		}
+		.icon:hover  {
+			.opaque(1.0);
+		}		
+	}
 	
 	.wall-item-ago { padding-right: 40px; }
+	.wall-item-name { font-weight: bold; }
+	
+	.wall-item-actions-author { float: left; width: 25%; margin-top: 0.5em; }
+	.wall-item-actions-social { float: left; width: 50%; margin-top: 0.5em;
+		a { margin-right: 3em; }
+	 }
+	.wall-item-actions-tools { float: right; width: 25%; 
+		a { float: right; }
+		input { float: right; }
+	}
 }
+
+
+
 .wall-item-container.comment {
+	margin-top: 50px;
 	.wall-item-photo { width: 32px; height: 32px; margin-left: 16px;}	
 	.wall-item-photo-menu-button {
 		top: 13px !important;
 		left: 10px !important;
 	}
+	.wall-item-links { padding-left: 12px; }
 }

view/theme/quattro/style.css

@@ -121,34 +121,34 @@
   height: 48px;
 }
 .icon.s48.notify {
-  background-image: url("../../../images/icons/22/notify_off.png");
+  background-image: url("../../../images/icons/48/notify_off.png");
 }
 .icon.s48.gear {
-  background-image: url("../../../images/icons/22/gear.png");
+  background-image: url("../../../images/icons/48/gear.png");
 }
 .icon.s48.add {
-  background-image: url("../../../images/icons/22/add.png");
+  background-image: url("../../../images/icons/48/add.png");
 }
 .icon.s48.delete {
-  background-image: url("../../../images/icons/22/delete.png");
+  background-image: url("../../../images/icons/48/delete.png");
 }
 .icon.s48.edit {
-  background-image: url("../../../images/icons/22/edit.png");
+  background-image: url("../../../images/icons/48/edit.png");
 }
 .icon.s48.star {
-  background-image: url("../../../images/icons/22/star.png");
+  background-image: url("../../../images/icons/48/star.png");
 }
 .icon.s48.menu {
-  background-image: url("../../../images/icons/22/menu.png");
+  background-image: url("../../../images/icons/48/menu.png");
 }
 .icon.s48.link {
-  background-image: url("../../../images/icons/22/link.png");
+  background-image: url("../../../images/icons/48/link.png");
 }
 .icon.s48.lock {
-  background-image: url("../../../images/icons/22/lock.png");
+  background-image: url("../../../images/icons/48/lock.png");
 }
 .icon.s48.unlock {
-  background-image: url("../../../images/icons/22/unlock.png");
+  background-image: url("../../../images/icons/48/unlock.png");
 }
 /* global */
 body {
@@ -507,7 +507,6 @@ section {
 .wall-item-container {
   display: table;
   width: 780px;
-  margin-bottom: 10px;
 }
 .wall-item-container .wall-item-item, .wall-item-container .wall-item-bottom {
   display: table-row;
@@ -534,9 +533,13 @@ section {
 .wall-item-container .wall-item-info .wall-item-photo-menu {
   display: none;
 }
+.wall-item-container .wall-item-location {
+  word-wrap: break-word;
+  width: 50px;
+}
 .wall-item-container .wall-item-content {
   display: table-cell;
-  font-size: 12px;
+  font-size: 16px;
   max-width: 720px;
   word-wrap: break-word;
 }
@@ -545,10 +548,56 @@ section {
 }
 .wall-item-container .wall-item-links, .wall-item-container .wall-item-actions {
   display: table-cell;
+  vertical-align: middle;
+}
+.wall-item-container .wall-item-links .icon, .wall-item-container .wall-item-actions .icon {
+  opacity: 0.5;
+  -webkit-transition: all 0.2s ease-in-out;
+  -moz-transition: all 0.2s ease-in-out;
+  -o-transition: all 0.2s ease-in-out;
+  -ms-transition: all 0.2s ease-in-out;
+  transition: all 0.2s ease-in-out;
+}
+.wall-item-container .wall-item-links .icon:hover, .wall-item-container .wall-item-actions .icon:hover {
+  opacity: 1;
+  -webkit-transition: all 0.2s ease-in-out;
+  -moz-transition: all 0.2s ease-in-out;
+  -o-transition: all 0.2s ease-in-out;
+  -ms-transition: all 0.2s ease-in-out;
+  transition: all 0.2s ease-in-out;
 }
 .wall-item-container .wall-item-ago {
   padding-right: 40px;
 }
+.wall-item-container .wall-item-name {
+  font-weight: bold;
+}
+.wall-item-container .wall-item-actions-author {
+  float: left;
+  width: 25%;
+  margin-top: 0.5em;
+}
+.wall-item-container .wall-item-actions-social {
+  float: left;
+  width: 50%;
+  margin-top: 0.5em;
+}
+.wall-item-container .wall-item-actions-social a {
+  margin-right: 3em;
+}
+.wall-item-container .wall-item-actions-tools {
+  float: right;
+  width: 25%;
+}
+.wall-item-container .wall-item-actions-tools a {
+  float: right;
+}
+.wall-item-container .wall-item-actions-tools input {
+  float: right;
+}
+.wall-item-container.comment {
+  margin-top: 50px;
+}
 .wall-item-container.comment .wall-item-photo {
   width: 32px;
   height: 32px;
@@ -558,3 +607,6 @@ section {
   top: 13px !important;
   left: 10px !important;
 }
+.wall-item-container.comment .wall-item-links {
+  padding-left: 12px;
+}

view/theme/testbubble/wall_item.tpl

@@ -26,16 +26,32 @@
 		</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 class="wall-item-author">

view/theme/testbubble/wallwall_item.tpl

@@ -24,10 +24,30 @@
 		</div>
 		<div class="wall-item-lock-wrapper">$lock</div>
 		<div class="wall-item-tools" id="wall-item-tools-$id">
-		$vote
+			{{ if $vote }}
-		$plink
+			<div class="wall-item-like-buttons" id="wall-item-like-buttons-$id">
-		$edpost
+				<a href="#" class="icon like" title="$vote.like.0" onclick="dolike($id,'like'); return false"></a>
-		$drop
+				<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 }}
+			 
+			{{ if $star }}
+			<a href="#" id="starred-$id" onclick="dostar($id); return false;" class="star-item icon $isstarred" title="$star.toggle"></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>

view/wall_fake_drop.tpl

@@ -1,2 +0,0 @@
-<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$id" >&nbsp;</div>
-<div class="wall-item-delete-end"></div>

view/wall_item.tpl

@@ -2,6 +2,7 @@
 <div class="wall-item-decor">
 	<span class="icon s22 star $isstarred" id="starred-$id" title="$star.starred">$star.starred</span>
 	{{ if $lock }}<span class="icon s22 lock fakelink" onclick="lockview(event,$id);" title="$lock">$lock</span>{{ endif }}	
+	<img id="like-rotator-$id" class="like-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
 </div>
 {{ endif }}
 <div class="wall-item-container $indent">
@@ -31,12 +32,37 @@
 			{{ if $plink }}<a class="icon s16 link" title="$plink.title" href="$plink.href">$plink.title</a>{{ endif }}
 		</div>
 		<div class="wall-item-actions">
-			<a href="$profile_url" target="redir" title="$linktitle" class="wall-item-name-link"><span class="wall-item-name$sparkle">$name</span></a> <span class="wall-item-ago">$ago</span>
+			<div class="wall-item-actions-author">
+				<a href="$profile_url" target="redir" title="$linktitle" class="wall-item-name-link"><span class="wall-item-name$sparkle">$name</span></a> <span class="wall-item-ago">$ago</span>
+			</div>
 			
+			<div class="wall-item-actions-social">
 			{{ if $star }}
-			<a href="#" id="star-$id" onclick="dostar($id); return false;"  class="$star.classdo"  title="$star.do">$star.do</a>
+				<a href="#" id="star-$id" onclick="dostar($id); return false;"  class="$star.classdo"  title="$star.do">$star.do</a>
-			<a href="#" id="unstar-$id" onclick="dostar($id); return false;"  class="$star.classundo"  title="$star.undo">$star.undo</a>
+				<a href="#" id="unstar-$id" onclick="dostar($id); return false;"  class="$star.classundo"  title="$star.undo">$star.undo</a>
 			{{ endif }}
+			
+			{{ if $vote }}
+				<a href="#" id="like-$id" title="$vote.like.0" onclick="dolike($id,'like'); return false">$vote.like.1</a>
+				<a href="#" id="dislike-$id" title="$vote.dislike.0" onclick="dolike($id,'dislike'); return false">$vote.dislike.1</a>
+			{{ endif }}
+						
+			{{ if $vote.share }}
+				<a href="#" id="share-$id" title="$vote.share.0" onclick="jotShare($id); return false">$vote.share.1</a>
+			{{ endif }}			
+			</div>
+			
+			<div class="wall-item-actions-tools">
+
+				{{ if $drop.dropping }}
+					<input type="checkbox" title="$drop.select" name="itemselected[]" value="$id" />
+					<a href="item/drop/$id" onclick="return confirmDelete();" class="icon delete s16" title="$drop.delete">$drop.delete</a>
+				{{ endif }}
+				{{ if $edpost }}
+					<a class="icon edit s16" href="$edpost.0" title="$edpost.1"></a>
+				{{ endif }}
+			</div>
+			
 		</div>
 	</div>
 </div>

view/wall_item_drop.tpl

@@ -1,6 +0,0 @@
-<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$id" >
-	
-	<a href="item/drop/$id" onclick="return confirmDelete();" class="icon drophide" title="$delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>
-</div>
-<input type="checkbox" onclick="checkboxhighlight(this);" title="$select" class="item-select" name="itemselected[]" value="$id" />
-<div class="wall-item-delete-end"></div>