Merge https://github.com/friendica/friendica into pull

doc/Remove-Account.md

@@ -9,16 +9,6 @@ http://sitename/removeme
 
 with your web browser. You will need to be logged in at the time.
 
-You will be asked for your password to confirm the request. If this matches your stored password, your account will immediately be removed. Unlike some social networks we do **not** hold onto it for a grace period in case you change your mind. Your user details, your conversations, your photos, your friends - everything; will be removed immediately and you will be logged out. 
+You will be asked for your password to confirm the request. If this matches your stored password, your account will immediately be blocked to all probing.  Unlike some social networks we do **not** hold onto it for a grace period in case you change your mind.  All your content and user data, etc is instantly removed. For all intents and purposes, the account is gone in moments.  
 
-When we expire posts we send notifications out to Friendica to remove the posts. Diaspora doesn't have a bulk delete so this step is skipped on that network - and hopefully it will be obvious that deletion doesn't work on any other networks. If you manually delete a post or a range of posts we send individual delete notifications to Friendica and Diaspora for each deleted post.
+We then send out an "unfriend" signal to all of your contacts.  This signal deletes all content on those networks.  Unfortunately, due to limitations of the other networks, this only works well with Friendica contacts.  We allow four days for this, in case some servers were down and the unfriend signal was queued.  After this, we finish off deleting the account.
-
-Diaspora often loses these.
-
-If you delete a post but somebody else has starred it, it is still removed. Your wishes take priority.
-
-When you remove your account we physically remove all your posts and your profile and user data, etc. immediately.
-
-In order to send out a bulk remove we would need to keep your account around to do this, as we would need to prove to your friends who it is that is submitting the request. We can't do this if you don't have an account.
-
-Your friends may still see your posts if your account is gone, but there is no public place within Friendica where they can be viewed. If you had friends on Diaspora, your public posts may stick around and be visible to others from that network.

mod/admin.php

@@ -244,6 +244,7 @@ function admin_page_site_post(&$a){
 	
 	
 	$register_policy	=	((x($_POST,'register_policy'))		? intval(trim($_POST['register_policy']))	:  0);
+	$daily_registrations	=	((x($_POST,'max_daily_registrations'))	? intval(trim($_POST['max_daily_registrations']))	:0);	
 	$abandon_days	    	=	((x($_POST,'abandon_days'))		? intval(trim($_POST['abandon_days']))		:  0);
 
 	$register_text		=	((x($_POST,'register_text'))		? notags(trim($_POST['register_text']))		: '');	
@@ -339,6 +340,7 @@ function admin_page_site_post(&$a){
 	set_config('system','jpeg_quality', $jpegimagequality);
 	
 	set_config('config','register_policy', $register_policy);
+	set_config('system','max_daily_registrations', $daily_registrations);
 	set_config('system','account_abandon_days', $abandon_days);
 	set_config('config','register_text', $register_text);
 	set_config('system','allowed_sites', $allowed_sites);
@@ -459,6 +461,7 @@ function admin_page_site(&$a) {
 		'$jpegimagequality'		=> array('jpegimagequality', t("JPEG image quality"), get_config('system','jpeg_quality'), t("Uploaded JPEGS will be saved at this quality setting [0-100]. Default is 100, which is full quality.")),
 
 		'$register_policy'	=> array('register_policy', t("Register policy"), $a->config['register_policy'], "", $register_choices),
+		'$daily_registrations'	=> array('max_daily_registrations', t("Maximum Daily Registrations"), get_config('system', 'max_daily_registrations'), t("If registration is permitted above, this sets the maximum number of new user registrations to accept per day.  If register is set to closed, this setting has no effect.")),
 		'$register_text'	=> array('register_text', t("Register text"), htmlentities($a->config['register_text'], ENT_QUOTES, 'UTF-8'), t("Will be displayed prominently on the registration page.")),
 		'$abandon_days'		=> array('abandon_days', t('Accounts abandoned after x days'), get_config('system','account_abandon_days'), t('Will not waste system resources polling external sites for abandonded accounts. Enter 0 for no time limit.')),
 		'$allowed_sites'	=> array('allowed_sites', t("Allowed friend domains"), get_config('system','allowed_sites'), t("Comma separated list of domains which are allowed to establish friendships with this site. Wildcards are accepted. Empty to allow any domains")),

mod/community.php

@@ -44,23 +44,23 @@ function community_content(&$a, $update = 0) {
 	// Only public posts can be shown
 	// OR your own posts if you are a logged in member
 
-        if(! get_pconfig(local_user(),'system','alt_pager')) {
+	if( (! get_config('alt_pager', 'global')) && (! get_pconfig(local_user(),'system','alt_pager')) ) {
-	        $r = q("SELECT COUNT(distinct(`item`.`uri`)) AS `total`
+		$r = q("SELECT COUNT(distinct(`item`.`uri`)) AS `total`
-		        FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id` LEFT JOIN `user` ON `user`.`uid` = `item`.`uid`
+			FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id` LEFT JOIN `user` ON `user`.`uid` = `item`.`uid`
-		        WHERE `item`.`visible` = 1 AND `item`.`deleted` = 0 and `item`.`moderated` = 0
+			WHERE `item`.`visible` = 1 AND `item`.`deleted` = 0 and `item`.`moderated` = 0
-		        AND `item`.`allow_cid` = ''  AND `item`.`allow_gid` = '' 
+			AND `item`.`allow_cid` = ''  AND `item`.`allow_gid` = '' 
-		        AND `item`.`deny_cid`  = '' AND `item`.`deny_gid`  = ''
+			AND `item`.`deny_cid`  = '' AND `item`.`deny_gid`  = ''
-		        AND `item`.`private` = 0 AND `item`.`wall` = 1 AND `user`.`hidewall` = 0 
+			AND `item`.`private` = 0 AND `item`.`wall` = 1 AND `user`.`hidewall` = 0 
-		        AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0"
+			AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0"
-	        );
+		);
 
-	        if(count($r))
+		if(count($r))
-		        $a->set_pager_total($r[0]['total']);
+			$a->set_pager_total($r[0]['total']);
 
-	        if(! $r[0]['total']) {
+		if(! $r[0]['total']) {
-		        info( t('No results.') . EOL);
+			info( t('No results.') . EOL);
-		        return $o;
+			return $o;
-	        }
+		}
 
 	}
 
@@ -91,11 +91,11 @@ function community_content(&$a, $update = 0) {
 
 	$o .= conversation($a,$r,'community',$update);
 
-        if(! get_pconfig(local_user(),'system','alt_pager')) {
+	if( get_config('alt_pager', 'global') || get_pconfig(local_user(),'system','alt_pager') ) {
-	        $o .= paginate($a);
+	        $o .= alt_pager($a,count($r));
 	}
 	else {
-	        $o .= alt_pager($a,count($r));
+	        $o .= paginate($a);
 	}
 
 	return $o;

mod/network.php

@@ -696,7 +696,7 @@ function network_content(&$a, $update = 0) {
 
 	}
 	else {
-		if(! get_pconfig(local_user(),'system','alt_pager')) {
+		if( (! get_config('alt_pager', 'global')) && (! get_pconfig(local_user(),'system','alt_pager')) ) {
 		        $r = q("SELECT COUNT(*) AS `total`
 			        FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
 			        WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0
@@ -845,11 +845,11 @@ function network_content(&$a, $update = 0) {
 	$o .= conversation($a,$items,$mode,$update);
 
 	if(! $update) {
-		if(! get_pconfig(local_user(),'system','alt_pager')) {
+		if( get_config('alt_pager', 'global') || get_pconfig(local_user(),'system','alt_pager') ) {
-		        $o .= paginate($a);
+		        $o .= alt_pager($a,count($items));
 		}
 		else {
-		        $o .= alt_pager($a,count($items));
+		        $o .= paginate($a);
 		}
 	}
 

mod/profile.php

@@ -242,7 +242,7 @@ function profile_content(&$a, $update = 0) {
 			$sql_extra2 .= protect_sprintf(sprintf(" AND item.created >= '%s' ", dbesc(datetime_convert(date_default_timezone_get(),'',$datequery2))));
 		}
 
-		if(! get_pconfig($a->profile['profile_uid'],'system','alt_pager')) {
+		if( (! get_config('alt_pager', 'global')) && (! get_pconfig($a->profile['profile_uid'],'system','alt_pager')) ) {
 		    $r = q("SELECT COUNT(*) AS `total`
 			    FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
 			    WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0
@@ -323,12 +323,12 @@ function profile_content(&$a, $update = 0) {
 	$o .= conversation($a,$items,'profile',$update);
 
 	if(! $update) {
-	  if(! get_pconfig($a->profile['profile_uid'],'system','alt_pager')) {
+		if( get_config('alt_pager', 'global') || get_pconfig($a->profile['profile_uid'],'system','alt_pager') ) {
-		        $o .= paginate($a);
+			$o .= alt_pager($a,count($items));
-	        }
+		}
-	        else {
+		else {
-	                $o .= alt_pager($a,count($items));
+			$o .= paginate($a);
-	        }
+		}
 	}
 
 	return $o;

mod/search.php

@@ -144,7 +144,7 @@ function search_content(&$a) {
 	// OR your own posts if you are a logged in member
 	// No items will be shown if the member has a blocked profile wall. 
 
-	if(! get_pconfig(local_user(),'system','alt_pager')) {
+	if( (! get_config('alt_pager', 'global')) && (! get_pconfig(local_user(),'system','alt_pager')) ) {
 	        $r = q("SELECT distinct(`item`.`uri`) as `total`
 		        FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id` LEFT JOIN `user` ON `user`.`uid` = `item`.`uid`
 		        WHERE `item`.`visible` = 1 AND `item`.`deleted` = 0 and `item`.`moderated` = 0
@@ -197,11 +197,11 @@ function search_content(&$a) {
 
 	$o .= conversation($a,$r,'search',false);
 
-        if(! get_pconfig(local_user(),'system','alt_pager')) {
+	if( get_config('alt_pager', 'global') || get_pconfig(local_user(),'system','alt_pager') ) {
-	        $o .= paginate($a);
+	        $o .= alt_pager($a,count($r));
 	}
 	else {
-	        $o .= alt_pager($a,count($r));
+	        $o .= paginate($a);
 	}
 
 	return $o;

view/admin_site.tpl

@@ -53,7 +53,7 @@
 	<h3>$registration</h3>
 	{{ inc field_input.tpl with $field=$register_text }}{{ endinc }}
 	{{ inc field_select.tpl with $field=$register_policy }}{{ endinc }}
-	
+	{{ inc field_input.tpl with $field=$daily_registrations }}{{ endinc }}	
 	{{ inc field_checkbox.tpl with $field=$no_multi_reg }}{{ endinc }}
 	{{ inc field_checkbox.tpl with $field=$no_openid }}{{ endinc }}
 	{{ inc field_checkbox.tpl with $field=$no_regfullname }}{{ endinc }}

view/theme/diabook/admin_users.tpl

@@ -0,0 +1,88 @@
+<script>
+	function confirm_delete(uname){
+		return confirm( "$confirm_delete".format(uname));
+	}
+	function confirm_delete_multi(){
+		return confirm("$confirm_delete_multi");
+	}
+	function selectall(cls){
+		$("."+cls).attr('checked','checked');
+		return false;
+	}
+</script>
+<div id='adminpage'>
+	<h1>$title - $page</h1>
+	
+	<form action="$baseurl/admin/users" method="post">
+		        <input type='hidden' name='form_security_token' value='$form_security_token'>
+		<h3>$h_pending</h3>
+		{{ if $pending }}
+			<table id='pending'>
+				<thead>
+				<tr>
+					{{ for $th_pending as $th }}<th>$th</th>{{ endfor }}
+					<th></th>
+					<th></th>
+				</tr>
+				</thead>
+				<tbody>
+			{{ for $pending as $u }}
+				<tr>
+					<td class="created">$u.created</td>
+					<td class="name">$u.name</td>
+					<td class="email">$u.email</td>
+					<td class="checkbox"><input type="checkbox" class="pending_ckbx" id="id_pending_$u.hash" name="pending[]" value="$u.hash" /></td>
+					<td class="tools">
+						<a href="$baseurl/regmod/allow/$u.hash" title='$approve'><span class='icon like'></span></a>
+						<a href="$baseurl/regmod/deny/$u.hash" title='$deny'><span class='icon dislike'></span></a>
+					</td>
+				</tr>
+			{{ endfor }}
+				</tbody>
+			</table>
+			<div class='selectall'><a href='#' onclick="return selectall('pending_ckbx');">$select_all</a></div>
+			<div class="submit"><input type="submit" name="page_users_deny" value="$deny"/> <input type="submit" name="page_users_approve" value="$approve" /></div>			
+		{{ else }}
+			<p>$no_pending</p>
+		{{ endif }}
+	
+	
+		
+	
+		<h3>$h_users</h3>
+		{{ if $users }}
+			<table id='users'>
+				<thead>
+				<tr>
+					<th></th>
+					{{ for $th_users as $th }}<th>$th</th>{{ endfor }}
+					<th></th>
+					<th></th>
+				</tr>
+				</thead>
+				<tbody>
+				{{ for $users as $u }}
+					<tr>
+						<td><img src="$u.micro" alt="$u.nickname" title="$u.nickname"></td>
+						<td class='name'><a href="$u.url" title="$u.nickname" >$u.name</a></td>
+						<td class='email'>$u.email</td>
+						<td class='register_date'>$u.register_date</td>
+						<td class='login_date'>$u.login_date</td>
+						<td class='lastitem_date'>$u.lastitem_date</td>
+						<td class='login_date'>$u.page-flags</td>
+						<td class="checkbox"><input type="checkbox" class="users_ckbx" id="id_user_$u.uid" name="user[]" value="$u.uid"/></td>
+						<td class="tools" style="width:60px;">
+							<a href="$baseurl/admin/users/block/$u.uid?t=$form_security_token" title='{{ if $u.blocked }}$unblock{{ else }}$block{{ endif }}'><span class='icon block {{ if $u.blocked==0 }}dim{{ endif }}'></span></a>
+							<a href="$baseurl/admin/users/delete/$u.uid?t=$form_security_token" title='$delete' onclick="return confirm_delete('$u.name')"><span class='icon ad_drop'></span></a>
+						</td>
+					</tr>
+				{{ endfor }}
+				</tbody>
+			</table>
+			<div class='selectall'><a href='#' onclick="return selectall('users_ckbx');">$select_all</a></div>
+			<div class="submit"><input type="submit" name="page_users_block" value="$block/$unblock" /> <input type="submit" name="page_users_delete" value="$delete" onclick="return confirm_delete_multi()" /></div>						
+		{{ else }}
+			NO USERS?!?
+		{{ endif }}
+	</form>
+</div>

view/theme/diabook/bottom.tpl

@@ -15,7 +15,7 @@ $(document).ready(function() {
        
     });
     
-    $("div#pause").attr("style", "position: fixed;bottom: 25px;left: 5px;");
+    $("div#pause").attr("style", "position: fixed;bottom: 43px;left: 5px;");
     $("div#pause").html("<img src='images/pause.gif' alt='pause' title='pause live-updates (ctrl+space)' style='border: 1px solid black;opacity: 0.2;'>");
     $(document).keydown(function(event) {
     if (!$("div#pause").html()){

view/theme/diabook/comment_item.tpl

@@ -6,7 +6,6 @@
 				<input type="hidden" name="return" value="$return_path" />
 				<input type="hidden" name="jsreload" value="$jsreload" />
 				<input type="hidden" name="preview" id="comment-preview-inp-$id" value="0" />
-				<input type="hidden" name="post_id_random" value="$rand_num" />
 
 				<div class="comment-edit-photo" id="comment-edit-photo-$id" >
 					<a class="comment-edit-photo-link" href="$mylink" title="$mytitle"><img class="my-comment-photo" src="$myphoto" alt="$mytitle" title="$mytitle" /></a>

view/theme/diabook/contact_template.tpl

@@ -0,0 +1,25 @@
+
+<div class="contact-entry-wrapper" id="contact-entry-wrapper-$contact.id" >
+	<div class="contact-entry-photo-wrapper" >
+		<div class="contact-entry-photo mframe" id="contact-entry-photo-$contact.id"
+		onmouseover="if (typeof t$contact.id != 'undefined') clearTimeout(t$contact.id); openMenu('contact-photo-menu-button-$contact.id')" 
+		onmouseout="t$contact.id=setTimeout('closeMenu(\'contact-photo-menu-button-$contact.id\'); closeMenu(\'contact-photo-menu-$contact.id\');',200)" >
+
+			<a href="$contact.url" title="$contact.img_hover" /><img src="$contact.thumb" $contact.sparkle alt="$contact.name" /></a>
+
+			{{ if $contact.photo_menu }}
+			<span onclick="openClose('contact-photo-menu-$contact.id');" class="fakelink contact-photo-menu-button" id="contact-photo-menu-button-$contact.id">menu</span>
+                <div class="contact-photo-menu" id="contact-photo-menu-$contact.id">
+                    <ul>
+                        $contact.photo_menu
+                    </ul>
+                </div>
+			{{ endif }}
+		</div>
+			
+	</div>
+	<div class="contact-entry-photo-end" ></div>
+		<div class="contact-entry-name" id="contact-entry-name-$contact.id" >$contact.name</div>
+
+	<div class="contact-entry-end" ></div>
+</div>

view/theme/diabook/jot.tpl

@@ -14,9 +14,7 @@
 		<input type="hidden" name="post_id" value="$post_id" />
 		<input type="hidden" name="preview" id="jot-preview" value="0" />
 		<input name="title" id="jot-title" type="text" placeholder="$placeholdertitle" value="$title" class="jothidden" style="display:none">
-		{{ if $placeholdercategory }}
 		<div id="jot-category-wrap"><input name="category" id="jot-category" type="text" placeholder="$placeholdercategory" value="$category" class="jothidden" style="display:none" /></div>		
-		{{ endif }}
 		<div id="character-counter" class="grey"></div>		
 		<img id="profile-jot-text-loading" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
 		<textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" >{{ if $content }}$content{{ else }}$share{{ endif }}</textarea>

view/theme/diabook/js/jquery.mousewheel.js

@@ -0,0 +1,84 @@
+/*! Copyright (c) 2011 Brandon Aaron (http://brandonaaron.net)
+ * Licensed under the MIT License (LICENSE.txt).
+ *
+ * Thanks to: http://adomas.org/javascript-mouse-wheel/ for some pointers.
+ * Thanks to: Mathias Bank(http://www.mathias-bank.de) for a scope bug fix.
+ * Thanks to: Seamus Leahy for adding deltaX and deltaY
+ *
+ * Version: 3.0.6
+ * 
+ * Requires: 1.2.2+
+ */
+
+(function($) {
+
+var types = ['DOMMouseScroll', 'mousewheel'];
+
+if ($.event.fixHooks) {
+    for ( var i=types.length; i; ) {
+        $.event.fixHooks[ types[--i] ] = $.event.mouseHooks;
+    }
+}
+
+$.event.special.mousewheel = {
+    setup: function() {
+        if ( this.addEventListener ) {
+            for ( var i=types.length; i; ) {
+                this.addEventListener( types[--i], handler, false );
+            }
+        } else {
+            this.onmousewheel = handler;
+        }
+    },
+    
+    teardown: function() {
+        if ( this.removeEventListener ) {
+            for ( var i=types.length; i; ) {
+                this.removeEventListener( types[--i], handler, false );
+            }
+        } else {
+            this.onmousewheel = null;
+        }
+    }
+};
+
+$.fn.extend({
+    mousewheel: function(fn) {
+        return fn ? this.bind("mousewheel", fn) : this.trigger("mousewheel");
+    },
+    
+    unmousewheel: function(fn) {
+        return this.unbind("mousewheel", fn);
+    }
+});
+
+
+function handler(event) {
+    var orgEvent = event || window.event, args = [].slice.call( arguments, 1 ), delta = 0, returnValue = true, deltaX = 0, deltaY = 0;
+    event = $.event.fix(orgEvent);
+    event.type = "mousewheel";
+    
+    // Old school scrollwheel delta
+    if ( orgEvent.wheelDelta ) { delta = orgEvent.wheelDelta/120; }
+    if ( orgEvent.detail     ) { delta = -orgEvent.detail/3; }
+    
+    // New school multidimensional scroll (touchpads) deltas
+    deltaY = delta;
+    
+    // Gecko
+    if ( orgEvent.axis !== undefined && orgEvent.axis === orgEvent.HORIZONTAL_AXIS ) {
+        deltaY = 0;
+        deltaX = -1*delta;
+    }
+    
+    // Webkit
+    if ( orgEvent.wheelDeltaY !== undefined ) { deltaY = orgEvent.wheelDeltaY/120; }
+    if ( orgEvent.wheelDeltaX !== undefined ) { deltaX = -1*orgEvent.wheelDeltaX/120; }
+    
+    // Add event and delta to the front of the arguments
+    args.unshift(event, delta, deltaX, deltaY);
+    
+    return ($.event.dispatch || $.event.handle).apply(this, args);
+}
+
+})(jQuery);

view/theme/diabook/message_side.tpl

@@ -0,0 +1,10 @@
+<div id="message-sidebar" class="widget">
+	<div id="message-new" class="{{ if $new.sel }}selected{{ endif }}"><a href="$new.url">$new.label</a> </div>
+	
+	<ul class="message-ul">
+		{{ for $tabs as $t }}
+			<li class="tool {{ if $t.sel }}selected{{ endif }}"><a href="$t.url" class="message-link">$t.label</a></li>
+		{{ endfor }}
+	</ul>
+	
+</div>

view/theme/diabook/nav.tpl

@@ -137,8 +137,11 @@
 
 
 <div id="scrollup" style="position: fixed; bottom: 5px; right: 10px;z-index: 97;"><a id="down" onclick="scrolldown()" ><img id="scroll_top_bottom" src="view/theme/diabook/icons/scroll_bottom.png" style="display:cursor !important;" alt="back to top" title="Scroll to bottom"></a></div>
-<div style="position: fixed; bottom: 45px; left: 6px;">$langselector</div>
+<div style="position: fixed; bottom: 61px; left: 6px;">$langselector</div>
-</div>
+<div style="position: fixed; bottom: 23px; left: 5px;"><a href="http://pad.toktan.org/p/diabook" target="blank" ><img src="view/theme/diabook/icons/bluebug.png" title="report bugs for the theme diabook"/></a></div>
+
+
+
 
 <ul id="nav-notifications-template" style="display:none;" rel="template">
 	<li class="{4}"><a href="{0}"><img src="{1}">{2} <span class="notif-when">{3}</span></a></li>

view/theme/diabook/search_item.tpl

@@ -1,9 +1,9 @@
-{{ if $item.indent $item.shiny }}{{ else }}
+{{ if $item.indent }}{{ else }}
 <div class="wall-item-decor">
 	<img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
 </div>
 {{ endif }}
-<div class="wall-item-container $item.indent $item.shiny">
+<div class="wall-item-container $item.indent">
 	<div class="wall-item-item">
 		<div class="wall-item-info">
 			<div class="contact-photo-wrapper"

view/theme/diabook/style-network.css

@@ -394,7 +394,14 @@
 }
 
 /* global */
-
+body {
+  font-family: 'Lato', "Helvetica Neue", Helvetica, Arial, sans-serif;
+  font-size: 12.5px;
+  background-color: #ffffff;
+  color: #2d2d2d;
+  margin: 50px auto auto;
+  display: table;
+}
 
 h4 {
   font-size: 1.1em;
@@ -948,8 +955,8 @@ ul.menu-popup .empty {
 aside {
   display: table-cell;
   vertical-align: top;
-  width: 150px;
+  width: 160px;
-  padding: 0px 5px 0px 5px;
+  padding: 0px 10px 0px 10px;
   border-right: 1px solid #D2D2D2;
   float: left;
   /* background: #F1F1F1; */
@@ -1009,7 +1016,7 @@ aside #profiles-menu {
   width: 20em;
 }
 aside #search-text {
-	width: 140px;
+	width: 150px;
 	height: 17px;
 	padding-left: 10px;
 	border-top-left-radius: 15px;
@@ -1150,6 +1157,12 @@ span.sbox input {
   top: 18px;
 }
 /* section */
+section {
+  display: table-cell;
+  vertical-align: top;
+  width: auto;
+  padding: 0px 0px 0px 12px;
+}
 
 body .pageheader{
   text-align: center;
@@ -1198,11 +1211,7 @@ body .pageheader{
 	}
 	
 #birthday-notice, #event-notice, #birthday-wrapper, #event-wrapper{
-	background-color: lightblue;
+	margin-bottom: 10px;
-	border: think solid black;
-	margin: 2px;
-	padding: 5px;
-	width: 95%;
 	}
 
 right_aside {
@@ -1245,7 +1254,14 @@ transition: all 0.2s ease-in-out;
 
 
 /* wall item */
-
+.tread-wrapper {
+  border-bottom: 1px solid #D2D2D2;
+  position: relative;
+  padding: 5px;
+  margin-bottom: 0px;
+  width: 575px;
+  padding-top: 10px;
+}
 .wall-item-decor {
   position: absolute;
   left: 790px;

view/theme/diabook/style-profile.css

@@ -398,7 +398,7 @@ body {
   font-size: 12.5px;
   background-color: #ffffff;
   color: #2d2d2d;
-  margin: 45px 2%;
+  margin: 50px auto auto;
   display: table;
 }
 
@@ -511,6 +511,21 @@ div.jGrowl div.info {
   padding-left: 58px;
 }
 /* header */
+header {
+  position: fixed;
+  left: 0%;
+  right: 80%;
+  top: 0px;
+  margin: 0px;
+  padding: 0px;
+  width: 22%;
+  height: 32px;
+  background: #000;
+  z-index: 100;
+  -webkit-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
+  -moz-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
+  box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
+}
 header #site-location {
   display: none;
 }
@@ -542,6 +557,20 @@ header #banner #logo-text {
   top: 10%;
 }
 /* nav */
+nav {
+  width: 80%;
+  height: 32px;
+  position: fixed;
+  left: 22%;
+  top: 0px;
+  padding: 0px;
+  background: #000;
+  color: #ffffff;
+  z-index: 99;
+  -webkit-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
+  -moz-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
+  box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
+}
 nav a,
 nav a:active,
 nav a:visited,
@@ -907,8 +936,8 @@ ul.menu-popup .empty {
 aside {
   display: table-cell;
   vertical-align: top;
-  width: 150px;
+  width: 160px;
-  padding: 0px 8px 0px 8px;
+  padding: 0px 10px 0px 10px;
   border-right: 1px solid #D2D2D2;
   float: left;
   /* background: #F1F1F1; */
@@ -1107,8 +1136,8 @@ span.sbox input {
 section {
   display: table-cell;
   vertical-align: top;
-  width: 90%;
+  width: 610px;
-  padding: 5px;
+  padding: 0px 0px 0px 12px;
 }
 
 body .pageheader{
@@ -1157,11 +1186,7 @@ body .pageheader{
 	}
 	
 #birthday-notice, #event-notice, #birthday-wrapper, #event-wrapper{
-	background-color: lightblue;
+	margin-bottom: 10px;
-	border: think solid black;
-	margin: 2px;
-	padding: 5px;
-	width: 95%;
 	}
 
 right_aside {
@@ -1204,8 +1229,6 @@ right_aside .icon {width: 10px; height: 10px;}
 transition: all 0.2s ease-in-out;
 		}
 /* wall item */
-
-/*
 .tread-wrapper {
   border-bottom: 1px solid #D2D2D2;
   position: relative;
@@ -1213,8 +1236,7 @@ transition: all 0.2s ease-in-out;
   margin-bottom: 0px;
   width: 575px;
   padding-top: 10px;
-}*/
+}
-
 .wall-item-decor {
   position: absolute;
   left: 790px;

view/theme/diabook/style.css

@@ -238,7 +238,6 @@
   width: 20px;
   height: 20px;
   /*background-image: url('icons.png');*/
-  float: left;
 }
 
 .icon {
@@ -435,7 +434,7 @@ body {
   font-size: 12.5px;
   background-color: #ffffff;
   color: #2d2d2d;
-  margin: 50px 2%;
+  margin: 50px auto auto;
   display: table;
 }
 
@@ -582,6 +581,9 @@ header {
   height: 32px;
   background: #000;
   z-index: 100;
+  -webkit-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
+  -moz-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
+  box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
 }
 header #site-location {
   display: none;
@@ -702,6 +704,9 @@ nav {
   background: #000;
   color: #ffffff;
   z-index: 99;
+  -webkit-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
+  -moz-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
+  box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
 }
 nav a,
 nav a:active,
@@ -1314,8 +1319,8 @@ transition: all 0.2s ease-in-out;
 section {
   display: table-cell;
   vertical-align: top;
- /* width: 90%; */
+  width: 800px;
- padding: 5px;
+  padding: 0px 0px 0px 12px;
 }
 
 body .pageheader{
@@ -1373,8 +1378,7 @@ body .pageheader{
   position: relative;
   padding: 5px;
   margin-bottom: 0px;
-  margin-left: 15px;
+  width: 775px;
- /* width: 775px; */
   padding-top: 10px;
 }
 
@@ -1415,14 +1419,11 @@ body .pageheader{
   -ms-transition: all 0.2s ease-in-out;
   transition: all 0.2s ease-in-out; */
 }
-.wall-item-container,
+.wall-item-container .wall-item-info {
-.wall-item-info {
   display: table-cell;
   vertical-align: top;
   text-align: left;
-  width: 110px;
+  width: 80px;
-  float: left;
-  margin: 10px;
 }
 .wall-item-photo-container .wall-item-info {
   display: table-cell;
@@ -1430,40 +1431,6 @@ body .pageheader{
   text-align: left;
   width: 80px;
 }
-
-.wall-item-photo-menu-button {
-	display: block;
-	position: absolute;
-	background-image: url("photo-menu.jpg");
-	background-position: top left; 
-	background-repeat: no-repeat;
-	margin: 0px; padding: 0px;
-	width: 16px;
-	height: 16px;
-	top: 74px; left:10px;
-	overflow: hidden;
-	text-indent: 40px;
-	display: none;
-	
-}
-.wall-item-photo-menu {
-	width: auto;
-	border: 2px solid #444444;
-	background: #FFFFFF;
-	position: absolute;
-	left: 10px; top: 90px;
-	display: none;
-	z-index: 10000;
-}
-.wall-item-photo-menu ul { margin:0px; padding: 0px; list-style: none }
-.wall-item-photo-menu li a { display: block; padding: 2px; }
-.wall-item-photo-menu li a:hover { color: #FFFFFF; background: #3465A4; text-decoration: none; }
-
-
-.comment .wall-item-photo-menu-button {	top: 44px;}
-.comment .wall-item-photo-menu { top: 60px; }
-
-
 .wall-item-container .wall-item-location {
   padding-right: 40px;
   display: table-cell;
@@ -1472,28 +1439,6 @@ body .pageheader{
   padding-right: 40px;
   display: table-cell;
 }
-
-.wall-item-tools {
-	clear: both;
-	background-image: url("head.jpg");
-    background-position: 0 -20px;
-    background-repeat: repeat-x;
-   	padding: 5px 25% 0px;
-}
-
-.wall-item-like-buttons {
-	float: left;
-	margin-right: 10px;
-/*	padding-right: 10px; */
-/*	border-right: 2px solid #fff; */
-}
-
-.wall-item-lock {
-position: absolute;
-top: 5px;
-left: 105px;
-}
-
 .wall-item-container .wall-item-ago {
   word-wrap: break-word;
   width: 50px;
@@ -1514,23 +1459,14 @@ left: 105px;
   margin-bottom: 5px;
 }
 
-
+.wall-item-container .wall-item-content {
-.wall-item-content-wrapper {
-	margin-top: 10px;
-	border: 1px solid #CCC;
-	position: relative;
-	-moz-border-radius: 3px;
-	border-radius: 3px;	
-}
-
-.wall-item-content {
 
   max-width: 720px;
   word-wrap: break-word;
-  overflow:auto;
+
 
 }
-.wall-item-photo-container {
+.wall-item-photo-container .wall-item-content {
 
   max-width: 720px;
   word-wrap: break-word;

view/theme/diabook/style.php

@@ -166,8 +166,8 @@
 	}
 	
 	if($resolution == "wide") {	
-	if (file_exists("$THEMEPATH/style.css")){
+	if (file_exists("$THEMEPATH/style-wide.css")){
-		echo file_get_contents("$THEMEPATH/style.css");
+		echo file_get_contents("$THEMEPATH/style-wide.css");
 	}
 	if($diabook_font_size == "16"){
 		echo "
@@ -445,8 +445,8 @@
 	}
 	
 	if($resolution == "wide") {	
-	if (file_exists("$THEMEPATH/diabook-aerith/style.css")){
+	if (file_exists("$THEMEPATH/diabook-aerith/style-wide.css")){
-		echo file_get_contents("$THEMEPATH/diabook-aerith/style.css");
+		echo file_get_contents("$THEMEPATH/diabook-aerith/style-wide.css");
 	}
 	if($diabook_font_size == "16"){
 		echo "
@@ -723,8 +723,8 @@
 	}
 	
 	if($resolution == "wide") {	
-	if (file_exists("$THEMEPATH/diabook-blue/style.css")){
+	if (file_exists("$THEMEPATH/diabook-blue/style-wide.css")){
-		echo file_get_contents("$THEMEPATH/diabook-blue/style.css");
+		echo file_get_contents("$THEMEPATH/diabook-blue/style-wide.css");
 	}
 	if($diabook_font_size == "16"){
 		echo "
@@ -1001,8 +1001,8 @@
 	}
 	
 	if($resolution == "wide") {	
-	if (file_exists("$THEMEPATH/diabook-red/style.css")){
+	if (file_exists("$THEMEPATH/diabook-red/style-wide.css")){
-		echo file_get_contents("$THEMEPATH/diabook-red/style.css");
+		echo file_get_contents("$THEMEPATH/diabook-red/style-wide.css");
 	}
 	if($diabook_font_size == "16"){
 		echo "
@@ -1279,8 +1279,8 @@
 	}
 	
 	if($resolution == "wide") {	
-	if (file_exists("$THEMEPATH/diabook-pink/style.css")){
+	if (file_exists("$THEMEPATH/diabook-pink/style-wide.css")){
-		echo file_get_contents("$THEMEPATH/diabook-pink/style.css");
+		echo file_get_contents("$THEMEPATH/diabook-pink/style-wide.css");
 	}
 	if($diabook_font_size == "16"){
 		echo "
@@ -1557,8 +1557,8 @@
 	}
 	
 	if($resolution == "wide") {	
-	if (file_exists("$THEMEPATH/diabook-green/style.css")){
+	if (file_exists("$THEMEPATH/diabook-green/style-wide.css")){
-		echo file_get_contents("$THEMEPATH/diabook-green/style.css");
+		echo file_get_contents("$THEMEPATH/diabook-green/style-wide.css");
 	}
 	if($diabook_font_size == "16"){
 		echo "
@@ -1835,8 +1835,8 @@
 	}
 	
 	if($resolution == "wide") {	
-	if (file_exists("$THEMEPATH/diabook-dark/style.css")){
+	if (file_exists("$THEMEPATH/diabook-dark/style-wide.css")){
-		echo file_get_contents("$THEMEPATH/diabook-dark/style.css");
+		echo file_get_contents("$THEMEPATH/diabook-dark/style-wide.css");
 	}
 	if($diabook_font_size == "16"){
 		echo "

view/theme/diabook/theme.php

@@ -37,6 +37,7 @@ load_config("diabook");
 load_pconfig(local_user(), "diabook");
 
 //get statuses of boxes at right-hand-column
+$close_pages      = get_diabook_config( "close_pages", 1 );
 $close_profiles   = get_diabook_config( "close_profiles", 0 );
 $close_helpers    = get_diabook_config( "close_helpers", 0 );
 $close_services   = get_diabook_config( "close_services", 0 );
@@ -108,9 +109,8 @@ if ($color=="dark") $color_path = "/diabook-dark/";
 	diabook_community_info();
 
 	// CUSTOM CSS
-	// Makes no difference now - but we'll keep this here in case I fucked up.
 	if($resolution == "normal") {$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook".$color_path."style-network.css";}
-	if($resolution == "wide") {$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook".$color_path."style-network.css";}
+	if($resolution == "wide") {$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook".$color_path."style-network-wide.css";}
 	}
 	}
 
@@ -124,7 +124,7 @@ if ($color=="dark") $color_path = "/diabook-dark/";
 
 	// CUSTOM CSS
 	if($resolution == "normal") {$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook".$color_path."style-profile.css";}
-	if($resolution == "wide") {$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook".$color_path."style-profile.css";}
+	if($resolution == "wide") {$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook".$color_path."style-profile-wide.css";}
 
 	}
 	}
@@ -297,6 +297,11 @@ if ($color=="dark") $color_path = "/diabook-dark/";
 	<script>
 	$("right_aside").ready(function(){
 
+	if('.$close_pages.')
+		{
+		document.getElementById( "close_pages" ).style.display = "none";
+			};
+
 	if('.$close_mapquery.')
 		{
 		document.getElementById( "close_mapquery" ).style.display = "none";
@@ -363,6 +368,7 @@ if ($color=="dark") $color_path = "/diabook-dark/";
  function diabook_community_info() {
 	$a = get_app();
 
+	$close_pages      = get_diabook_config( "close_pages", 1 );
 	$close_profiles   = get_diabook_config( "close_profiles", 0 );
 	$close_helpers    = get_diabook_config( "close_helpers", 0 );
 	$close_services   = get_diabook_config( "close_services", 0 );
@@ -524,6 +530,40 @@ if ($color=="dark") $color_path = "/diabook-dark/";
 	$aside['$nv'] = $nv;
 	}}
 
+   //Community_Pages at right_aside
+   if($close_pages != "1") {
+   if(local_user()) {
+   $page = '
+			<h3 style="margin-top:0px;">'.t("Community Pages").'<a id="closeicon" href="#boxsettings" onClick="open_boxsettings(); return false;" style="text-decoration:none;" class="icon close_box" title="'.t("Settings").'"></a></h3>
+			<div id=""><ul style="margin-left: 7px;margin-top: 0px;padding-left: 0px;padding-top: 0px;">';
+
+	$pagelist = array();
+
+	$contacts = q("SELECT `id`, `url`, `name`, `micro`FROM `contact`
+			WHERE `network`= 'dfrn' AND `forum` = 1 AND `uid` = %d
+			ORDER BY `name` ASC",
+			intval($a->user['uid'])
+	);
+
+	$pageD = array();
+
+	// Look if the profile is a community page
+	foreach($contacts as $contact) {
+		$pageD[] = array("url"=>$contact["url"], "name"=>$contact["name"], "id"=>$contact["id"], "micro"=>$contact['micro']);
+	};
+
+
+	$contacts = $pageD;
+
+	foreach($contacts as $contact) {
+		$page .= '<li style="list-style-type: none;" class="tool"><img height="20" width="20" style="float: left; margin-right: 3px;" src="' . $contact['micro'] .'" alt="' . $contact['url'] . '" /> <a href="'.$a->get_baseurl().'/redir/'.$contact["id"].'" style="margin-top: 2px; word-wrap: break-word; width: 132px;" title="' . $contact['url'] . '" class="label" target="external-link">'.
+				$contact["name"]."</a></li>";
+	}
+	$page .= '</ul></div>';
+	//if (sizeof($contacts) > 0)
+		$aside['$page'] = $page;
+	}}
+  //END Community Page
 
    //mapquery
 
@@ -576,6 +616,7 @@ if ($color=="dark") $color_path = "/diabook-dark/";
 	}
    //end twitter
    if($ccCookie != "10") {
+	$close_pages      = get_diabook_config( "close_pages", 1 );
 	$close_profiles   = get_diabook_config( "close_profiles", 0 );
 	$close_helpers    = get_diabook_config( "close_helpers", 0 );
 	$close_services   = get_diabook_config( "close_services", 0 );
@@ -588,6 +629,7 @@ if ($color=="dark") $color_path = "/diabook-dark/";
 	$close_or_not = array('1'=>t("don't show"),	'0'=>t("show"),);
 	$boxsettings['title'] = Array("", t('Show/hide boxes at right-hand column:'), "", "");
 	$aside['$boxsettings'] = $boxsettings;
+	$aside['$close_pages'] = array('diabook_close_pages', t('Community Pages'), $close_pages, '', $close_or_not);
 	$aside['$close_mapquery'] = array('diabook_close_mapquery', t('Earth Layers'), $close_mapquery, '', $close_or_not);
 	$aside['$close_profiles'] = array('diabook_close_profiles', t('Community Profiles'), $close_profiles, '', $close_or_not);
 	$aside['$close_helpers'] = array('diabook_close_helpers', t('Help or @NewHere ?'), $close_helpers, '', $close_or_not);
@@ -601,6 +643,7 @@ if ($color=="dark") $color_path = "/diabook-dark/";
    $baseurl = $a->get_baseurl($ssl_state);
    $aside['$baseurl'] = $baseurl;
    if (isset($_POST['diabook-settings-box-sub']) && $_POST['diabook-settings-box-sub']!=''){
+		set_pconfig(local_user(), 'diabook', 'close_pages', $_POST['diabook_close_pages']);
 		set_pconfig(local_user(), 'diabook', 'close_mapquery', $_POST['diabook_close_mapquery']);
 		set_pconfig(local_user(), 'diabook', 'close_profiles', $_POST['diabook_close_profiles']);
 		set_pconfig(local_user(), 'diabook', 'close_helpers', $_POST['diabook_close_helpers']);

view/theme/diabook/todo

@@ -1,8 +0,0 @@
-- Wall item tools in slightly the wrong place.
-- Such and suck likes this in slightly the wrong place.
-- Need to remove about 2 pixels from somewhere for 1024 resolution
-- Quick and dirty hack to make people with wide already configured use the normal CSS needs to be done properly.
-- Community profiles needs to be removed/pluginised or improved.  Most profiles are from Facebook.  That's unsupported.
-- Earth layers needs to be pluginised.
-- Twatter needs to be pluginised.
-- There's still a LOT of CSS clean up to be done

view/theme/diabook/wall_thread.tpl

@@ -0,0 +1,136 @@
+{{if $item.comment_firstcollapsed}}
+	<div class="hide-comments-outer">
+	<span id="hide-comments-total-$item.id" class="hide-comments-total">$item.num_comments</span> <span id="hide-comments-$item.id" class="hide-comments fakelink" onclick="showHideComments($item.id);">$item.hide_text</span>
+	</div>
+	<div id="collapsed-comments-$item.id" class="collapsed-comments" style="display: none;">
+{{endif}}
+<div id="tread-wrapper-$item.id" class="tread-wrapper $item.toplevel">
+{{ if $item.indent }}{{ else }}
+<div class="wall-item-decor">
+	<img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
+</div>
+{{ endif }}
+<div class="wall-item-container $item.indent">
+	<div class="wall-item-item">
+		<div class="wall-item-info">
+			<div class="contact-photo-wrapper"
+				onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')" 
+				onmouseout="t$item.id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$item.id\'); closeMenu(\'wall-item-photo-menu-$item.id\');',200)">
+				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="contact-photo-link" id="wall-item-photo-link-$item.id">
+					<img src="$item.thumb" class="contact-photo$item.sparkle" id="wall-item-photo-$item.id" alt="$item.name" />
+				</a>
+				<a href="#" rel="#wall-item-photo-menu-$item.id" class="contact-photo-menu-button icon s16 menu" id="wall-item-photo-menu-button-$item.id">menu</a>
+				<ul class="contact-menu menu-popup" id="wall-item-photo-menu-$item.id">
+				$item.item_photo_menu
+				</ul>
+				
+			</div>
+		</div>
+			<div class="wall-item-actions-author">
+				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle">$item.name</span></a> 
+			<span class="wall-item-ago">-
+			{{ if $item.plink }}<a class="link$item.sparkle" title="$item.plink.title" href="$item.plink.href" style="color: #999">$item.ago</a>{{ else }} $item.ago {{ endif }}
+			{{ if $item.lock }} - <span class="fakelink" style="color: #999" onclick="lockview(event,$item.id);">$item.lock</span> {{ endif }}
+			</span>
+			</div>
+		<div class="wall-item-content">
+			{{ if $item.title }}<h2><a href="$item.plink.href">$item.title</a></h2>{{ endif }}
+			$item.body
+			{{ if $item.has_cats }}
+			<div class="categorytags"><span>$item.txt_cats {{ for $item.categories as $cat }}$cat.name <a href="$cat.removeurl" title="$remove">[$remove]</a> {{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }}
+			</div>
+			{{ endif }}
+
+			{{ if $item.has_folders }}
+			<div class="filesavetags"><span>$item.txt_folders {{ for $item.folders as $cat }}$cat.name <a href="$cat.removeurl" title="$remove">[$remove]</a> {{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }}
+			</div>
+			{{ endif }}
+		</div>
+	</div>
+	<div class="wall-item-bottom">
+		<div class="wall-item-links">
+		</div>
+		<div class="wall-item-tags">
+			{{ for $item.tags as $tag }}
+				<span class='tag'>$tag</span>
+			{{ endfor }}
+		</div>
+	</div>
+	<div class="wall-item-bottom">
+		<div class="">
+
+		</div>
+		<div class="wall-item-actions">
+
+			<div class="wall-item-actions-social">
+			
+			
+			{{ if $item.vote }}
+				<a href="#" id="like-$item.id" class="icon like" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false">$item.vote.like.1</a>
+				<a href="#" id="dislike-$item.id" class="icon dislike" title="$item.vote.dislike.0" onclick="dolike($item.id,'dislike'); return false"></a>
+			{{ endif }}
+						
+			{{ if $item.vote.share }}
+				<a href="#" id="share-$item.id" class="icon recycle" title="$item.vote.share.0" onclick="jotShare($item.id); return false"></a>
+			{{ endif }}	
+
+
+			{{ if $item.star }}
+				<a href="#" id="starred-$item.id" onclick="dostar($item.id); return false;" class="star-item icon $item.isstarred" title="$item.star.toggle">
+				<img src="images/star_dummy.png" class="icon star" alt="$item.star.do" /> </a>
+				<a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.star.tagger"></a>					  
+			{{ endif }}	
+			
+			{{ if $item.filer }}
+			<a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item icon file-as" title="$item.star.filer"></a>
+			{{ endif }}				
+			
+			{{ if $item.plink }}<a class="icon link" title="$item.plink.title" href="$item.plink.href">$item.plink.title</a>{{ endif }}
+			
+					
+					
+			</div>
+			
+			<div class="wall-item-actions-tools">
+
+				{{ if $item.drop.pagedrop }}
+					<input type="checkbox" title="$item.drop.select" name="itemselected[]" class="item-select" value="$item.id" />
+				{{ endif }}
+				{{ if $item.drop.dropping }}
+					<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drop" title="$item.drop.delete">$item.drop.delete</a>
+				{{ endif }}
+				{{ if $item.edpost }}
+					<a class="icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a>
+				{{ endif }}
+			</div>
+			<div class="wall-item-location">$item.location&nbsp;</div>
+		</div>
+	</div>
+	<div class="wall-item-bottom">
+		<div class="wall-item-links"></div>
+		<div class="wall-item-like" id="wall-item-like-$item.id">$item.like</div>
+		<div class="wall-item-dislike" id="wall-item-dislike-$item.id">$item.dislike</div>	
+	</div>
+</div>
+
+{{ if $item.threaded }}
+{{ if $item.comment }}
+<div class="wall-item-comment-wrapper $item.indent" >
+	$item.comment
+</div>
+{{ endif }}
+{{ endif }}
+
+{{ if $item.flatten }}
+<div class="wall-item-comment-wrapper" >
+	$item.comment
+</div>
+{{ endif }}
+
+
+{{ for $item.children as $item }}
+	{{ inc $item.template }}{{ endinc }}
+{{ endfor }}
+
+</div>
+{{if $item.comment_lastcollapsed}}</div>{{endif}}