like, dislike, activity streams, etc.

12 files changed, 63 insertions, 20 deletions

diff --git a/view/acl_selectors.php b/view/acl_selectors.php
index 42cd7a981..0366ab2a1 100644
--- a/view/acl_selectors.php
+++ b/view/acl_selectors.php
@@ -5,7 +5,7 @@ function group_select($selname,$selclass,$preselected = false,$size = 4) {
 
 	$o = '';
 
-	$o .= "<select name=\"{$selname}[]\" class=\"$selclass\" multiple=\"multiple\" size=\"$size\" />\r\n";
+	$o .= "<select name=\"{$selname}[]\" id=\"$selclass\" class=\"$selclass\" multiple=\"multiple\" size=\"$size\" >\r\n";
 
 	$r = q("SELECT * FROM `group` WHERE `deleted` = 0 AND `uid` = %d ORDER BY `name` ASC",
 		$_SESSION['uid']
@@ -39,11 +39,11 @@ function contact_select($selname, $selclass, $preselected = false, $size = 4, $p
 
 	if($privmail) {
 		$sql_extra = sprintf(" AND `rel` = %d ", intval(DIRECTION_BOTH));
-		$o .= "<select name=\"$selname\" class=\"$selclass\" size=\"$size\" />\r\n";
+		$o .= "<select name=\"$selname\" id=\"$selclass\" class=\"$selclass\" size=\"$size\" >\r\n";
 	}
 	else {
 		$sql_extra = '';
-		$o .= "<select name=\"{$selname}[]\" class=\"$selclass\" multiple=\"multiple\" size=\"$size\" />\r\n";
+		$o .= "<select name=\"{$selname}[]\" id=\"$selclass\" class=\"$selclass\" multiple=\"multiple\" size=\"$size\" >\r\n";
 	}
 
 	$r = q("SELECT `id`, `name`, `url` FROM `contact` 
diff --git a/view/comment_item.tpl b/view/comment_item.tpl
index 336ad3b33..62b3ce18a 100644
--- a/view/comment_item.tpl
+++ b/view/comment_item.tpl
@@ -18,6 +18,6 @@
 			<input type="submit" id="comment-edit-submit-$id" class="comment-edit-submit" name="submit" value="Submit" />
 		</div>
 
-		<div id="comment-edit-end"></div>
+		<div class="comment-edit-end"></div>
 	</form>
 </div>
diff --git a/view/jot-header.tpl b/view/jot-header.tpl
index 8c7cce360..bb95cd265 100644
--- a/view/jot-header.tpl
+++ b/view/jot-header.tpl
@@ -107,5 +107,6 @@ tinyMCE.init({
 		}
 	}
 
+
 </script>
 
diff --git a/view/jot.tpl b/view/jot.tpl
index 586274c35..ec11f2861 100644
--- a/view/jot.tpl
+++ b/view/jot.tpl
@@ -1,19 +1,19 @@
 
 <div id="profile-jot-wrapper" >
-<div id="profile-jot-banner-wrapper">
-	<div id="profile-jot-desc" >What's on your mind?</div>
-	<div id="character-counter" class="grey"></div>
-</div>
-<div id="profile-jot-banner-end"></div>
-<form id="profile-jot-form" action="item" method="post" >
-<input type="hidden" name="type" value="wall" />
-<input type="hidden" name="profile_uid" value="$profile_uid" />
-<input type="hidden" name="return" value="$return_path" />
-<input type="hidden" name="location" id="jot-location" value="$defloc" />
+	<div id="profile-jot-banner-wrapper">
+		<div id="profile-jot-desc" >What's on your mind?</div>
+		<div id="character-counter" class="grey"></div>
+	</div>
+	<div id="profile-jot-banner-end"></div>
 
-<textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" ></textarea>
+	<form id="profile-jot-form" action="item" method="post" >
+		<input type="hidden" name="type" value="wall" />
+		<input type="hidden" name="profile_uid" value="$profile_uid" />
+		<input type="hidden" name="return" value="$return_path" />
+		<input type="hidden" name="location" id="jot-location" value="$defloc" />
+
+		<textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" ></textarea>
 
-</div>
 <div id="profile-jot-submit-wrapper" >
 <input type="submit" id="profile-jot-submit" name="submit" value="Submit" />
 	<div id="profile-upload-wrapper" style="display: $visitor;" >
@@ -35,6 +35,7 @@
 	<div id="profile-jot-perms-end"></div>
 	<div id="profile-jot-acl-wrapper" style="display: none;" >$acl</div>
 </div>
+
 <div id="profile-jot-end"></div>
 </form>
 </div>
diff --git a/view/like.tpl b/view/like.tpl
new file mode 100644
index 000000000..73cbb2d4a
--- /dev/null
+++ b/view/like.tpl
@@ -0,0 +1,5 @@
+<div class="wall-item-like-buttons" id="wall-item-like-buttons-$id">
+<img src="images/like.gif" alt="I like this" title="I like this [toggle]" onclick="dolike($id,'like');" />
+<img src="images/dislike.gif" alt="I don't like this" title="I don't like this [toggle]" onclick="dolike($id,'dislike');" />
+<img id="like-rotator-$id" class="like-rotator" src="images/rotator.gif" alt="Please wait" title="Please wait" style="display: none;" />
+</div>
diff --git a/view/profile_tabs.tpl b/view/profile_tabs.tpl
index 0877edd73..9c6c54a1c 100644
--- a/view/profile_tabs.tpl
+++ b/view/profile_tabs.tpl
@@ -4,3 +4,4 @@
 	<a href="$url?tab=profile" id="profile-tab-profile-link" class="profile-tabs" >Profile</a>
 	<a href="$phototab" id="profile-tab-photos-link" class="profile-tabs" >Photos</a>
 <div id="profile-tabs-end"></div>
+</div>
\ No newline at end of file
diff --git a/view/settings.tpl b/view/settings.tpl
index aa0bf17e0..84fc38926 100644
--- a/view/settings.tpl
+++ b/view/settings.tpl
@@ -45,7 +45,7 @@ $profile_in_dir
 $profile_in_net_dir
 
 <div id="settings-default-perms" class="settings-default-perms" >
-	<div id="settings-default-perms-menu" onClick="openClose('settings-default-perms-select');" />$permissions</div>
+	<div id="settings-default-perms-menu" onClick="openClose('settings-default-perms-select');" >$permissions</div>
 	<div id="settings-default-perms-menu-end"></div>
 
 	<div id="settings-default-perms-select" style="display: none;" >
diff --git a/view/theme/default/style.css b/view/theme/default/style.css
index 3f169905d..6176f84ff 100644
--- a/view/theme/default/style.css
+++ b/view/theme/default/style.css
@@ -8,6 +8,22 @@ a:hover {
 	color: #0000FF;
 	text-decoration: underline;
 }
+
+.fakelink, .fakelink:visited {
+	color: #8888FF;
+	text-decoration: none;
+	cursor: pointer;
+	margin-top: 15px;
+	margin-bottom: 15px;
+}
+
+.fakelink:hover {
+	color: #0000FF;
+	text-decoration: underline;
+	cursor: pointer;
+}
+
+
 img {
 	border: none;
 }
@@ -649,6 +665,9 @@ input#dfrn-url {
 	font-size: 0.8em;
 }
 
+.wall-item-like-buttons img {
+	cursor: pointer;
+}
 .wall-item-delete-wrapper {
 	float: right;
 	margin-top: 20px;
diff --git a/view/theme/goldenrod/style.css b/view/theme/goldenrod/style.css
index 4f5773a4a..e84cf5d64 100644
--- a/view/theme/goldenrod/style.css
+++ b/view/theme/goldenrod/style.css
@@ -30,6 +30,17 @@ a:hover {
 	color: #0000FF;
 	text-decoration: underline;
 }
+
+.fakelink, .fakelink:visited {
+	color: #8888FF;
+}
+
+.fakelink:hover {
+	color: #0000FF;
+}
+
+
+
 .wall-item-content-wrapper.comment {
 	background: #FFCC55;
 }
diff --git a/view/wall_item.tpl b/view/wall_item.tpl
index c646bbee3..479a72ce2 100644
--- a/view/wall_item.tpl
+++ b/view/wall_item.tpl
@@ -9,6 +9,7 @@
 			<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 class="wall-item-location" id="wall-item-location-$id">$location</div>
+			$vote
 		</div>
 		<div class="wall-item-content" id="wall-item-content-$id" >
 			<div class="wall-item-title" id="wall-item-title-$id">$title</div>
@@ -17,7 +18,8 @@
 		$drop
 	</div>
 	<div class="wall-item-wrapper-end"></div>
-
+	<div class="wall-item-like" id="wall-item-like-$id">$like</div>
+	<div class="wall-item-dislike" id="wall-item-dislike-$id">$dislike</div>
 	<div class="wall-item-comment-wrapper" >
 	$comment
 	</div>
diff --git a/view/wall_item_drop.tpl b/view/wall_item_drop.tpl
index 9ca1ec968..84a2f3a8e 100644
--- a/view/wall_item_drop.tpl
+++ b/view/wall_item_drop.tpl
@@ -1 +1,2 @@
-<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$id" ><a href="item/drop/$id" onclick="return confirmDelete();" ><img src="images/b_drophide.gif" alt="Delete" title="Delete" id="wall-item-delete-icon-$id" class="wall-item-delete-icon" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a></div><div class="wall-item-delete-end"></div>
+<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$id" ><a href="item/drop/$id" onclick="return confirmDelete();" ><img src="images/b_drophide.gif" alt="Delete" title="Delete" id="wall-item-delete-icon-$id" class="wall-item-delete-icon" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a></div>
+<div class="wall-item-delete-end"></div>
diff --git a/view/wallwall_item.tpl b/view/wallwall_item.tpl
index 30970f6ae..f3a803543 100644
--- a/view/wallwall_item.tpl
+++ b/view/wallwall_item.tpl
@@ -12,7 +12,7 @@
 		<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> to <a href="$owner_url" title="View $owner_name's profile" class="wall-item-name-link"><span class="wall-item-name" id="wall-item-ownername-$id">$owner_name</span></a> via Wall-To-Wall:<br />
 		<div class="wall-item-ago"  id="wall-item-ago-$id">$ago</div>
 		<div class="wall-item-location" id="wall-item-location-$id">$location</div>
-
+		$vote
 	</div>
 	<div class="wall-item-content" id="wall-item-content-$id" >
 		<div class="wall-item-title" id="wall-item-title-$id">$title</div>
@@ -21,6 +21,8 @@
 	$drop
 	
 	<div class="wall-item-wrapper-end"></div>
+	<div class="wall-item-like" id="wall-item-like-$id">$like</div>
+	<div class="wall-item-dislike" id="wall-item-dislike-$id">$dislike</div>
 	<div class="wall-item-comment-separator"></div>
 	<div class="wall-item-comment-wrapper" >
 	$comment