Merge remote branch 'upstream/master'

boot.php

@@ -9,7 +9,7 @@ require_once('include/nav.php');
 require_once('include/cache.php');
 
 define ( 'FRIENDICA_PLATFORM',     'Friendica');
-define ( 'FRIENDICA_VERSION',      '2.3.1287' );
+define ( 'FRIENDICA_VERSION',      '2.3.1288' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
 define ( 'DB_UPDATE_VERSION',      1132      );
 

include/conversation.php

@@ -897,8 +897,7 @@ function status_editor($a,$x, $notes_cid = 0, $popup=false) {
 		'$audurl' => t("Please enter an audio link/URL:"),
 		'$term' => t('Tag term:'),
 		'$fileas' => t('File as:'),
-		'$whereareu' => t('Where are you right now?'),
+		'$whereareu' => t('Where are you right now?')
-		'$title' => t('Enter a title for this item') 
 	));
 
 

include/text.php

@@ -712,6 +712,7 @@ function smilies($s, $sample = false) {
 		';-)', 
 		':-(', 
 		':-P', 
+		':-p', 
 		':-"', 
 		':-"', 
 		':-x', 
@@ -745,6 +746,7 @@ function smilies($s, $sample = false) {
 		'<img src="' . $a->get_baseurl() . '/images/smiley-wink.gif" alt=";-)" />',
 		'<img src="' . $a->get_baseurl() . '/images/smiley-frown.gif" alt=":-(" />',
 		'<img src="' . $a->get_baseurl() . '/images/smiley-tongue-out.gif" alt=":-P" />',
+		'<img src="' . $a->get_baseurl() . '/images/smiley-tongue-out.gif" alt=":-p" />',
 		'<img src="' . $a->get_baseurl() . '/images/smiley-kiss.gif" alt=":-\"" />',
 		'<img src="' . $a->get_baseurl() . '/images/smiley-kiss.gif" alt=":-\"" />',
 		'<img src="' . $a->get_baseurl() . '/images/smiley-kiss.gif" alt=":-x" />',

js/fk.autocomplete.js

@@ -14,22 +14,22 @@ function ACPopup(elm,backend_url){
 	this.kp_timer = false;
 	this.url = backend_url;
 
+	var w = 530;
+	var h = 130;
+
+
 	if(typeof elm.editorId == "undefined") {	
 		style = $(elm).offset();
 		w = $(elm).width();
 		h = $(elm).height();
 	}
 	else {
-		style = $(elm.container).offset();
+		var container = elm.getContainer();
-		w = elm.container.offsetWidth;
+		if(typeof container != "undefined") {
-		h = elm.container.offsetHeight;
+			style = $(container).offset();
-		// Quick fix for chrome until I get a tool to inspect the dom
+			w = $(container).width();
-		// Chrome returns 0x0
+	    	h = $(container).height();
-		if(! w)
+		}
-			w = 530;
-		if(! h)
-			h = 130;
-
 	}
 
 	style.top=style.top+h;

mod/community.php

@@ -50,7 +50,7 @@ function community_content(&$a, $update = 0) {
 		WHERE `item`.`visible` = 1 AND `item`.`deleted` = 0 and `item`.`moderated` = 0
 		AND `item`.`allow_cid` = ''  AND `item`.`allow_gid` = '' 
 		AND `item`.`deny_cid`  = '' AND `item`.`deny_gid`  = '' 
-		AND `item`.`private` = 0 AND `user`.`hidewall` = 0 
+		AND `item`.`private` = 0 AND `item`.`wall` = 1 AND `user`.`hidewall` = 0 
 		AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 "
 	);
 
@@ -72,7 +72,7 @@ function community_content(&$a, $update = 0) {
 		WHERE `item`.`visible` = 1 AND `item`.`deleted` = 0 and `item`.`moderated` = 0
 		AND `item`.`allow_cid` = ''  AND `item`.`allow_gid` = '' 
 		AND `item`.`deny_cid`  = '' AND `item`.`deny_gid`  = '' 
-		AND `item`.`private` = 0 AND `user`.`hidewall` = 0 
+		AND `item`.`private` = 0 AND `item`.`wall` = 1 AND `user`.`hidewall` = 0 
 		AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
 		ORDER BY `received` DESC LIMIT %d, %d ",
 		intval($a->pager['start']),

mod/item.php

@@ -243,6 +243,7 @@ function item_post(&$a) {
 		}
 
 
+
 		if(! strlen($body)) {
 			if($preview)
 				killme();
@@ -253,6 +254,15 @@ function item_post(&$a) {
 		}
 	}
 
+	// Work around doubled linefeeds in Tinymce 3.5b2
+	// First figure out if it's a status post that would've been
+	// created using tinymce. Otherwise leave it alone. 
+
+	$plaintext = (local_user() ? intval(get_pconfig(local_user(),'system','plaintext')) : 0);
+	if((! $parent) && (! $api_source) && (! $plaintext)) {
+		$body = str_replace("\r\n","\n",$body);
+		$body = str_replace("\n\n","\n",$body);
+	}
 
 
 	// get contact info for poster

view/head.tpl

@@ -7,7 +7,7 @@
 
 <link rel="stylesheet" type="text/css" href="$stylesheet" media="all" />
 
-<link rel="shortcut icon" href="$baseurl/images/friendika-32.png" />
+<link rel="shortcut icon" href="$baseurl/images/friendica-32.png" />
 <link rel="search"
          href="$baseurl/opensearch" 
          type="application/opensearchdescription+xml" 
@@ -34,14 +34,16 @@
 	function commentOpen(obj,id) {
 		if(obj.value == '$comment') {
 			obj.value = '';
-			obj.className = "comment-edit-text-full";
+			$("#comment-edit-text-" + id).addClass("comment-edit-text-full");
+			$("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
 			openMenu("comment-edit-submit-wrapper-" + id);
 		}
 	}
 	function commentClose(obj,id) {
 		if(obj.value == '') {
 			obj.value = '$comment';
-			obj.className="comment-edit-text-empty";
+			$("#comment-edit-text-" + id).removeClass("comment-edit-text-full");
+			$("#comment-edit-text-" + id).addClass("comment-edit-text-empty");
 			closeMenu("comment-edit-submit-wrapper-" + id);
 		}
 	}

view/jot-header.tpl

@@ -121,7 +121,6 @@ function enableOnUser(){
 <script type="text/javascript" src="$baseurl/js/ajaxupload.js" ></script>
 <script>
 	var ispublic = '$ispublic';
-	var addtitle = '$addtitle';
 
 	$(document).ready(function() {
 		

view/theme/comix-plain/comment_item.tpl

@@ -0,0 +1,32 @@
+		<div class="comment-wwedit-wrapper" id="comment-edit-wrapper-$id" style="display: block;">
+			<form class="comment-edit-form" id="comment-edit-form-$id" action="item" method="post" onsubmit="post_comment($id); return false;">
+				<input type="hidden" name="type" value="$type" />
+				<input type="hidden" name="profile_uid" value="$profile_uid" />
+				<input type="hidden" name="parent" value="$parent" />
+				<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" />
+
+				<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>
+				</div>
+				<div class="comment-edit-photo-end"></div>
+				<textarea id="comment-edit-text-$id" class="comment-edit-text-empty triangle-isosceles left" style="display: block;" name="body" onFocus="commentOpen(this,$id);" onBlur="commentClose(this,$id);" >$comment</textarea>
+				{{ if $qcomment }}
+				{{ for $qcomment as $qc }}				
+					<span class="fakelink qcomment" onclick="commentInsert(this,$id); return false;" >$qc</span>
+					&nbsp;
+				{{ endfor }}
+				{{ endif }}
+
+				<div class="comment-edit-text-end"></div>
+				<div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-$id" style="display: none;" >
+					<input type="submit" onclick="post_comment($id); return false;" id="comment-edit-submit-$id" class="comment-edit-submit" name="submit" value="$submit" />
+					<span onclick="preview_comment($id);" id="comment-edit-preview-link-$id" class="fakelink">$preview</span>
+					<div id="comment-edit-preview-$id" class="comment-edit-preview" style="display:none;"></div>
+				</div>
+
+				<div class="comment-edit-end"></div>
+			</form>
+
+		</div>

view/theme/comix-plain/search_item.tpl

@@ -0,0 +1,54 @@
+<div class="wall-item-outside-wrapper$item.indent$item.previewing" id="wall-item-outside-wrapper-$item.id" >
+	<div class="wall-item-content-wrapper$item.indent" id="wall-item-content-wrapper-$item.id" >
+		<div class="wall-item-info" id="wall-item-info-$item.id">
+			<div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-$item.id" 
+				 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="wall-item-photo-link" id="wall-item-photo-link-$item.id">
+				<img src="$item.thumb" class="wall-item-photo$item.sparkle" id="wall-item-photo-$item.id" style="height: 80px; width: 80px;" alt="$item.name" /></a>
+				<span onclick="openClose('wall-item-photo-menu-$item.id');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-$item.id">menu</span>
+				<div class="wall-item-photo-menu" id="wall-item-photo-menu-$item.id">
+					<ul>
+						$item.item_photo_menu
+					</ul>
+				</div>
+			</div>
+			<div class="wall-item-photo-end"></div>	
+			<div class="wall-item-wrapper" id="wall-item-wrapper-$item.id" >
+				{{ if $item.lock }}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="$item.lock" onclick="lockview(event,$item.id);" /></div>
+				{{ else }}<div class="wall-item-lock"></div>{{ endif }}	
+				<div class="wall-item-location" id="wall-item-location-$item.id">$item.location</div>
+			</div>
+		</div>
+		<div class="wall-item-author">
+				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle" id="wall-item-name-$item.id" >$item.name</span></a>
+				<div class="wall-item-ago"  id="wall-item-ago-$item.id">$item.ago</div>
+				
+		</div>			
+		<div class="wall-item-content" id="wall-item-content-$item.id" >
+			<div class="wall-item-title" id="wall-item-title-$item.id">$item.title</div>
+			<div class="wall-item-title-end"></div>
+			<div class="wall-item-body triangle-isosceles left" id="wall-item-body-$item.id" >$item.body</div>
+		</div>
+		<div class="wall-item-tools" id="wall-item-tools-$item.id">
+			<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$item.id" >
+				{{ if $item.drop.dropping }}<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drophide" title="$item.drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }}
+			</div>
+				{{ if $item.drop.dropping }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$item.drop.select" class="item-select" name="itemselected[]" value="$item.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-$item.id" >
+	{{ if $item.conv }}
+			<a href='$item.conv.href' id='context-$item.id' title='$item.conv.title'>$item.conv.title</a>
+	{{ endif }}
+	</div>
+
+<div class="wall-item-outside-wrapper-end$item.indent" ></div>
+
+</div>
+
+

view/theme/comix-plain/style.css

@@ -0,0 +1,105 @@
+@import url('../duepuntozero/style.css');
+
+.wall-item-content-wrapper {
+	border: none;
+}
+
+.wall-item-content-wrapper.comment {
+	background: #ffffff !important;
+	border-left: 1px solid #EEE;
+}
+
+.wall-item-tools {
+	background: none;
+}
+
+.comment-edit-text-empty, .comment-edit-text-full {
+	border: none;
+	border-left: 1px solid #EEE;
+	background: #EEEEEE;
+}
+
+.comment-edit-wrapper, .comment-wwedit-wrapper {
+	background: #ffffff !important;
+}
+
+section {
+	margin: 0px 32px;
+}
+
+aside {
+	margin-left: 32px;
+}
+nav {
+	margin-left: 32px;
+	margin-right: 32px;
+}
+
+nav #site-location {
+	top: 80px;
+	right: 36px;
+}
+
+.wall-item-photo, .photo, .contact-block-img, .my-comment-photo {
+	border-radius: 3px;
+	-moz-border-radius: 3px;
+	margin-top: 15px;
+}
+
+.wall-item-photo.comment {
+	margin-top: 26px;
+}
+
+
+.triangle-isosceles {
+	position:relative;
+	padding:15px;
+	margin:1em 0 3em;
+	color:#000;
+	background:#EEEEEE; /* default background for browsers without gradient support */
+	/* css3 */
+	background:-webkit-gradient(linear, 0 0, 0 100%, from(#EEEEEE), to(#ffffff));
+	background:-moz-linear-gradient(#EEEEEE, #ffffff);
+	background:-o-linear-gradient(#EEEEEE, #ffffff);
+	background:linear-gradient(#EEEEEE, #ffffff);
+	-webkit-border-radius:10px;
+	-moz-border-radius:10px;
+	border-radius:10px;
+}
+
+/* Variant : for left/right positioned triangle
+------------------------------------------ */
+
+.triangle-isosceles.left {
+	margin-left:30px;
+	background:#F8F8F8;
+	border: 2px solid #CCCCCC;
+}
+
+/* THE TRIANGLE
+------------------------------------------------------------------------------------------------------------------------------- */
+
+/* creates triangle */
+.triangle-isosceles:after {
+	content:"";
+	position:absolute;
+	bottom:-8px; /* value = - border-top-width - border-bottom-width */
+	left:30px; /* controls horizontal position */
+	border-width:15px 15px 0; /* vary these values to change the angle of the vertex */
+	border-style:solid;
+	border-color:#f8f8f8 transparent;
+    /* reduce the damage in FF3.0 */
+    display:block; 
+    width:0;
+}
+
+/* Variant : left
+------------------------------------------ */
+
+.triangle-isosceles.left:after {
+	top:12px; /* controls vertical position */
+	left:-30px; /* value = - border-left-width - border-right-width */
+	bottom:auto;
+	border-width:10px 30px 10px 0;
+	border-color:transparent #f8f8f8;
+}

view/theme/comix-plain/theme.php

@@ -0,0 +1,60 @@
+<?php
+
+/*
+ * Name: Comix-Plain
+ * Description: Comix theme with a standard font
+ * Version: 1.0
+ * Author: Mike Macgirvin <mike@macgirvin.com>
+ */
+
+
+$a->theme_info = array(
+  'extends' => 'duepuntozero',
+);
+
+$a->page['htmlhead'] .= <<< EOT
+<script>
+$(document).ready(function() {
+
+$('html').click(function() { $("#nav-notifications-menu" ).hide(); });
+
+$('.group-edit-icon').hover(
+	function() {
+		$(this).addClass('icon'); $(this).removeClass('iconspacer');},
+	function() {
+		$(this).removeClass('icon'); $(this).addClass('iconspacer');}
+	);
+
+$('.sidebar-group-element').hover(
+	function() {
+		id = $(this).attr('id');
+		$('#edit-' + id).addClass('icon'); $('#edit-' + id).removeClass('iconspacer');},
+
+	function() {
+		id = $(this).attr('id');
+		$('#edit-' + id).removeClass('icon');$('#edit-' + id).addClass('iconspacer');}
+	);
+
+
+$('.savedsearchdrop').hover(
+	function() {
+		$(this).addClass('drop'); $(this).addClass('icon'); $(this).removeClass('iconspacer');},
+	function() {
+		$(this).removeClass('drop'); $(this).removeClass('icon'); $(this).addClass('iconspacer');}
+	);
+
+$('.savedsearchterm').hover(
+	function() {
+		id = $(this).attr('id');
+		$('#drop-' + id).addClass('icon'); 	$('#drop-' + id).addClass('drophide'); $('#drop-' + id).removeClass('iconspacer');},
+
+	function() {
+		id = $(this).attr('id');
+		$('#drop-' + id).removeClass('icon');$('#drop-' + id).removeClass('drophide'); $('#drop-' + id).addClass('iconspacer');}
+	);
+
+});
+
+
+</script>
+EOT;

view/theme/comix-plain/wall_item.tpl

@@ -0,0 +1,78 @@
+<div class="wall-item-outside-wrapper$item.indent$item.previewing" id="wall-item-outside-wrapper-$item.id" >
+	<div class="wall-item-content-wrapper$item.indent" id="wall-item-content-wrapper-$item.id" >
+		<div class="wall-item-info" id="wall-item-info-$item.id">
+			<div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-$item.id" 
+				 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="wall-item-photo-link" id="wall-item-photo-link-$item.id">
+					<img src="$item.thumb" class="wall-item-photo$item.sparkle$item.indent" id="wall-item-photo-$item.id" style="height: 80px; width: 80px;" alt="$item.name" />
+				</a>
+				<span onclick="openClose('wall-item-photo-menu-$item.id');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-$item.id">menu</span>
+				<div class="wall-item-photo-menu" id="wall-item-photo-menu-$item.id">
+					<ul>
+						$item.item_photo_menu
+					</ul>
+				</div>
+			</div>
+			<div class="wall-item-photo-end"></div>
+			<div class="wall-item-wrapper" id="wall-item-wrapper-$item.id" >
+				{{ if $item.lock }}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="$item.lock" onclick="lockview(event,$item.id);" /></div>
+				{{ else }}<div class="wall-item-lock"></div>{{ endif }}	
+				<div class="wall-item-location" id="wall-item-location-$item.id">$item.location</div>				
+			</div>
+		</div>
+		<div class="wall-item-author">
+				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle" id="wall-item-name-$item.id" >$item.name</span></a>
+				<div class="wall-item-ago"  id="wall-item-ago-$item.id">$item.ago</div>
+				
+		</div>	
+		<div class="wall-item-content" id="wall-item-content-$item.id" >
+			<div class="wall-item-title" id="wall-item-title-$item.id">$item.title</div>
+			<div class="wall-item-title-end"></div>
+			<div class="wall-item-body triangle-isosceles left" id="wall-item-body-$item.id" >$item.body
+					<div class="body-tag">
+						{{ for $item.tags as $tag }}
+							<span class='tag'>$tag</span>
+						{{ endfor }}
+					</div>
+			</div>
+		</div>
+		<div class="wall-item-tools" id="wall-item-tools-$item.id">
+			{{ if $item.vote }}
+			<div class="wall-item-like-buttons" id="wall-item-like-buttons-$item.id">
+				<a href="#" class="icon like" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false"></a>
+				<a href="#" class="icon dislike" title="$item.vote.dislike.0" onclick="dolike($item.id,'dislike'); return false"></a>
+				{{ if $item.vote.share }}<a href="#" class="icon recycle wall-item-share-buttons" title="$item.vote.share.0" onclick="jotShare($item.id); return false"></a>{{ endif }}
+				<img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
+			</div>
+			{{ endif }}
+			{{ if $item.plink }}
+				<div class="wall-item-links-wrapper"><a href="$item.plink.href" title="$item.plink.title" target="external-link" class="icon remote-link"></a></div>
+			{{ endif }}
+			{{ if $item.edpost }}
+				<a class="editpost icon pencil" href="$item.edpost.0" title="$item.edpost.1"></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"></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 filer-icon" title="$item.star.filer"></a>
+			{{ endif }}			
+			<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$item.id" >
+				{{ if $item.drop.dropping }}<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drophide" title="$item.drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }}
+			</div>
+				{{ if $item.drop.dropping }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$item.drop.select" class="item-select" name="itemselected[]" value="$item.id" />{{ endif }}
+			<div class="wall-item-delete-end"></div>
+		</div>
+	</div>
+	<div class="wall-item-wrapper-end"></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 class="wall-item-comment-wrapper" >
+	$item.comment
+	</div>
+
+<div class="wall-item-outside-wrapper-end$item.indent" ></div>
+</div>

view/theme/comix-plain/wallwall_item.tpl

@@ -0,0 +1,85 @@
+<div class="wall-item-outside-wrapper$item.indent$item.previewing wallwall" id="wall-item-outside-wrapper-$item.id" >
+	<div class="wall-item-content-wrapper$item.indent" id="wall-item-content-wrapper-$item.id" >
+		<div class="wall-item-info wallwall" id="wall-item-info-$item.id">
+			<div class="wall-item-photo-wrapper wwto" id="wall-item-ownerphoto-wrapper-$item.id" >
+				<a href="$item.owner_url" target="redir" title="$item.olinktitle" class="wall-item-photo-link" id="wall-item-ownerphoto-link-$item.id">
+				<img src="$item.owner_photo" class="wall-item-photo$item.osparkle" id="wall-item-ownerphoto-$item.id" style="height: 80px; width: 80px;" alt="$item.owner_name" /></a>
+			</div>
+			<div class="wall-item-arrowphoto-wrapper" ><img src="images/larrow.gif" alt="$item.wall" /></div>
+			<div class="wall-item-photo-wrapper wwfrom" id="wall-item-photo-wrapper-$item.id" 
+				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="wall-item-photo-link" id="wall-item-photo-link-$item.id">
+				<img src="$item.thumb" class="wall-item-photo$item.sparkle$item.indent" id="wall-item-photo-$item.id" style="height: 80px; width: 80px;" alt="$item.name" /></a>
+				<span onclick="openClose('wall-item-photo-menu-$item.id');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-$item.id">menu</span>
+                <div class="wall-item-photo-menu" id="wall-item-photo-menu-$item.id">
+                    <ul>
+                        $item.item_photo_menu
+                    </ul>
+                </div>
+
+			</div>
+			<div class="wall-item-photo-end"></div>
+			<div class="wall-item-wrapper" id="wall-item-wrapper-$item.id" >
+				{{ if $item.lock }}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="$item.lock" onclick="lockview(event,$item.id);" /></div>
+				{{ else }}<div class="wall-item-lock"></div>{{ endif }}	
+				<div class="wall-item-location" id="wall-item-location-$item.id">$item.location</div>
+			</div>
+		</div>
+		<div class="wall-item-author">
+				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle" id="wall-item-name-$item.id" >$item.name</span></a> $item.to <a href="$item.owner_url" target="redir" title="$item.olinktitle" class="wall-item-name-link"><span class="wall-item-name$item.osparkle" id="wall-item-ownername-$item.id">$item.owner_name</span></a> $item.vwall<br />
+				<div class="wall-item-ago"  id="wall-item-ago-$item.id">$item.ago</div>				
+		</div>			
+		<div class="wall-item-content" id="wall-item-content-$item.id" >
+			<div class="wall-item-title" id="wall-item-title-$item.id">$item.title</div>
+			<div class="wall-item-title-end"></div>
+			<div class="wall-item-body triangle-isosceles left" id="wall-item-body-$item.id" >$item.body
+					<div class="body-tag">
+						{{ for $item.tags as $tag }}
+							<span class='tag'>$tag</span>
+						{{ endfor }}
+					</div>
+			</div>
+		</div>
+		<div class="wall-item-tools" id="wall-item-tools-$item.id">
+			{{ if $item.vote }}
+			<div class="wall-item-like-buttons" id="wall-item-like-buttons-$item.id">
+				<a href="#" class="icon like" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false"></a>
+				<a href="#" class="icon dislike" title="$item.vote.dislike.0" onclick="dolike($item.id,'dislike'); return false"></a>
+				{{ if $item.vote.share }}<a href="#" class="icon recycle wall-item-share-buttons" title="$item.vote.share.0" onclick="jotShare($item.id); return false"></a>{{ endif }}
+				<img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
+			</div>
+			{{ endif }}
+			{{ if $item.plink }}
+				<div class="wall-item-links-wrapper"><a href="$item.plink.href" title="$item.plink.title" target="external-link" class="icon remote-link"></a></div>
+			{{ endif }}
+			{{ if $item.edpost }}
+				<a class="editpost icon pencil" href="$item.edpost.0" title="$item.edpost.1"></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"></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 filer-icon" title="$item.star.filer"></a>
+			{{ endif }}			
+			
+			<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$item.id" >
+				{{ if $item.drop.dropping }}<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drophide" title="$item.drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }}
+			</div>
+				{{ if $item.drop.dropping }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$item.drop.select" class="item-select" name="itemselected[]" value="$item.id" />{{ endif }}
+			<div class="wall-item-delete-end"></div>
+		</div>
+	</div>	
+	<div class="wall-item-wrapper-end"></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 class="wall-item-comment-separator"></div>
+	<div class="wall-item-comment-wrapper" >
+	$item.comment
+	</div>
+
+<div class="wall-item-outside-wrapper-end$item.indent" ></div>
+</div>
+

view/theme/comix/comment_item.tpl

@@ -0,0 +1,32 @@
+		<div class="comment-wwedit-wrapper" id="comment-edit-wrapper-$id" style="display: block;">
+			<form class="comment-edit-form" id="comment-edit-form-$id" action="item" method="post" onsubmit="post_comment($id); return false;">
+				<input type="hidden" name="type" value="$type" />
+				<input type="hidden" name="profile_uid" value="$profile_uid" />
+				<input type="hidden" name="parent" value="$parent" />
+				<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" />
+
+				<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>
+				</div>
+				<div class="comment-edit-photo-end"></div>
+				<textarea id="comment-edit-text-$id" class="comment-edit-text-empty triangle-isosceles left" style="display: block;" name="body" onFocus="commentOpen(this,$id);" onBlur="commentClose(this,$id);" >$comment</textarea>
+				{{ if $qcomment }}
+				{{ for $qcomment as $qc }}				
+					<span class="fakelink qcomment" onclick="commentInsert(this,$id); return false;" >$qc</span>
+					&nbsp;
+				{{ endfor }}
+				{{ endif }}
+
+				<div class="comment-edit-text-end"></div>
+				<div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-$id" style="display: none;" >
+					<input type="submit" onclick="post_comment($id); return false;" id="comment-edit-submit-$id" class="comment-edit-submit" name="submit" value="$submit" />
+					<span onclick="preview_comment($id);" id="comment-edit-preview-link-$id" class="fakelink">$preview</span>
+					<div id="comment-edit-preview-$id" class="comment-edit-preview" style="display:none;"></div>
+				</div>
+
+				<div class="comment-edit-end"></div>
+			</form>
+
+		</div>

view/theme/diabook-blue/photo_album.tpl

@@ -1,7 +0,0 @@
-<div class="photo-album-image-wrapper" id="photo-album-image-wrapper-$id">
-	<a href="$imgsrc" rel="gallery" class="fancy-album" id="photo-album-photo-link-$id" title="$phototitle">
-		<img src="$imgsrc" alt="$imgalt" title="$phototitle" class="photo-album-photo lframe  resize" id="photo-album-photo-$id" />
-		<p class='caption'>$desc</p>		
-	</a>
-</div>
-<div class="photo-album-image-wrapper-end"></div>

view/theme/diabook-blue/photo_top.tpl

@@ -1,7 +0,0 @@
-
-<div class="photo-top-image-wrapper lframe" id="photo-top-image-wrapper-$id">
-	<a href="$photo.src" rel="$photo.album.name" class="fancy-album" id="photo-top-photo-link-$photo.id" title="$photo.title">
-		<img src="$photo.src" alt="$photo.alt" title="$photo.title" class="photo-top-album-img" id="photo-top-photo-$photo.id" />
-	</a>
-	<div class="photo-top-album-name"><a href="$photo.album.link" class="photo-top-album-link" title="$photo.album.alt" >$photo.album.name</a></div>
-</div>

view/theme/diabook-blue/style.css

@@ -102,6 +102,7 @@
 .icon.recycle 	{ background-image: url("../../../view/theme/diabook-blue/icons/recycle.png");}
 .icon.remote-link { background-image: url("../../../view/theme/diabook-blue/icons/remote.png");}
 .icon.tagged    { background-image: url("../../../view/theme/diabook-blue/icons/tagged.png");}
+.icon.file-as { background-image: url("../../../view/theme/diabook-blue/icons/file_as.png");}
 .star-item.icon.unstarred { background-image: url("../../../view/theme/diabook-blue/icons/unstarred.png");}
 .star-item.icon.starred { background-image: url("../../../view/theme/diabook-blue/icons/starred.png");}
 .icon.link		{ background-image: url("../../../view/theme/diabook-blue/icons/link.png");}
@@ -2411,21 +2412,22 @@ float: left;
    -moz-box-shadow: 0 0 5px #888;
    -webkit-box-shadow: 0 0 5px #888;
    box-shadow: 0 0 5px #888;
-  background-color: #EEE;
+  background-color: #000;
    -webkit-border-radius: 5px;
    -moz-border-radius: 5px;
   border-radius: 5px;
   padding-bottom: 20px;
   position: relative;
   margin: 0 10px 10px 0;
+  width: 200px; height: 140px;
   overflow: hidden;  
-  float: left;
-  position: relative;
 }
 .photo-top-album-name {
+        width: 100%;
         position: absolute; 
-  bottom: 0;
+        bottom: 0px; 
-  padding: 0 5px;
+        padding-left: 3px;
+        background-color: #EEE;
 }
 .photo-top-album-link{
   color: #1872A2;

view/theme/diabook-blue/wall_item.tpl

@@ -66,6 +66,10 @@
 				<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 }}
 			
 					

view/theme/diabook/profile_side.tpl

@@ -7,12 +7,12 @@
 	</div>
 	
 <ul id="profile-side-menu" class="menu-profile-side">
-	<li id="profile-side-status" class="menu-profile-list"><a class="menu-profile-list-item" href="$ps.usermenu.status.0">$ps.usermenu.status.1</a></li>
+	<li id="profile-side-status" class="menu-profile-list home"><a class="menu-profile-list-item" href="$ps.usermenu.status.0">$ps.usermenu.status.1</a></li>
-	<li id="profile-side-photos" class="menu-profile-list"><a class="menu-profile-list-item" href="$ps.usermenu.photos.0">$ps.usermenu.photos.1</a></li>
+	<li id="profile-side-photos" class="menu-profile-list photos"><a class="menu-profile-list-item" href="$ps.usermenu.photos.0">$ps.usermenu.photos.1</a></li>
-	<li id="profile-side-events" class="menu-profile-list"><a class="menu-profile-list-item" href="$ps.usermenu.events.0">$ps.usermenu.events.1</a></li>
+	<li id="profile-side-events" class="menu-profile-list events"><a class="menu-profile-list-item" href="$ps.usermenu.events.0">$ps.usermenu.events.1</a></li>
-	<li id="profile-side-notes" class="menu-profile-list"><a class="menu-profile-list-item" href="$ps.usermenu.notes.0">$ps.usermenu.notes.1</a></li>
+	<li id="profile-side-notes" class="menu-profile-list notes"><a class="menu-profile-list-item" href="$ps.usermenu.notes.0">$ps.usermenu.notes.1</a></li>
-	<li id="profile-side-foren" class="menu-profile-list"><a class="menu-profile-list-item" href="http://dir.friendika.com/directory/forum" target="blanc">Public Groups</a></li>
+	<li id="profile-side-foren" class="menu-profile-list foren"><a class="menu-profile-list-item" href="http://dir.friendika.com/directory/forum" target="blanc">Public Groups</a></li>
-	<li id="profile-side-foren" class="menu-profile-list"><a class="menu-profile-list-item" href="$ps.usermenu.community.0">$ps.usermenu.community.1</a></li>
+	<li id="profile-side-foren" class="menu-profile-list com_side"><a class="menu-profile-list-item" href="$ps.usermenu.community.0">$ps.usermenu.community.1</a></li>
 </ul>
 
 </div>

view/theme/diabook/style.css

@@ -102,6 +102,7 @@
 .icon.recycle 	{ background-image: url("../../../view/theme/diabook/icons/recycle.png");}
 .icon.remote-link { background-image: url("../../../view/theme/diabook/icons/remote.png");}
 .icon.tagged    { background-image: url("../../../view/theme/diabook/icons/tagged.png");}  
+.icon.file-as { background-image: url("../../../view/theme/diabook/icons/file_as.png");}
 .star-item.icon.unstarred { background-image: url("../../../view/theme/diabook/icons/unstarred.png");}
 .star-item.icon.starred { background-image: url("../../../view/theme/diabook/icons/starred.png");}
 .icon.link		{ background-image: url("../../../view/theme/diabook/icons/link.png");}
@@ -882,21 +883,46 @@ ul.menu-popup .empty {
 	}
 .menu-profile-side{
   list-style: none;	
-  padding-left: 16px;
+  padding-left: 0px;
-  min-height: 16px;
+  min-height: 0px;
 	}
 .menu-profile-list{
   height: auto;
   overflow: auto;
   padding-top: 3px;
   padding-bottom: 3px;
+  padding-left: 16px;
+  min-height: 16px;
+  list-style: none;
 	}
 .menu-profile-list:hover{
 	background: #EEE;
 	}
+.menu-profile-list-item{
+	padding-left: 5px;
+	}	
 .menu-profile-list-item:hover{	
 	text-decoration: none;
    }
+/*http://prothemedesign.com/circular-icons/*/
+.menu-profile-list.home{
+	background: url("../../../view/theme/diabook-blue/icons/home.png") no-repeat;
+	}
+.menu-profile-list.photos{
+	background: url("../../../view/theme/diabook-blue/icons/mess_side.png") no-repeat;
+	}
+.menu-profile-list.events{
+	background: url("../../../view/theme/diabook-blue/icons/events.png") no-repeat;
+	}
+.menu-profile-list.notes{
+	background: url("../../../view/theme/diabook-blue/icons/notes.png") no-repeat;
+	}
+.menu-profile-list.foren{
+	background: url("../../../view/theme/diabook-blue/icons/pubgroups.png") no-repeat;
+	}
+.menu-profile-list.com_side{
+	background: url("../../../view/theme/diabook-blue/icons/com_side.png") no-repeat;
+	}
 
 /* aside */
 aside {
@@ -2348,7 +2374,13 @@ float: left;
 .contact-details {
   color: #999999;
 }
-
+#side-bar-photos-albums li{
+list-style-type: disc;
+}
+#side-bar-photos-albums ul li{
+  margin-left: 30px;
+  padding-left: 0px;
+	}
 #side-bar-photos-albums{
 	margin-top: 15px;	
 	}
@@ -2362,39 +2394,40 @@ float: left;
    -moz-box-shadow: 0 0 5px #888;
    -webkit-box-shadow: 0 0 5px #888;
    box-shadow: 0 0 5px #888;
-  background-color: #EEE;
+  background-color: #000;
    -webkit-border-radius: 5px;
    -moz-border-radius: 5px;
   border-radius: 5px;
   padding-bottom: 20px;
   position: relative;
   margin: 0 10px 10px 0;
+  width: 200px; height: 140px;
+  overflow: hidden;  
 }
+/*
 .photo-top-album-name {
   position: absolute;
   bottom: 0;
   padding: 0 5px;
-}
+}*/
-.photo-top-album-link{
-  color: #1872A2;
-	}
 /*.photo-top-image-wrapper {
         position: relative;
         float: left;
         margin-top: 15px;
         margin-right: 15px;
         width: 200px; height: 200px; 
-        overflow: hidden; 
+        
-}
+}*/
 .photo-top-album-name {
         width: 100%;
-        min-height: 2em;
         position: absolute; 
         bottom: 0px; 
-        padding: 0px 3px;
+        padding-left: 3px;
-        padding-top: 0.5em;
+        background-color: #EEE;
-        background-color: rgb(255, 255, 255);
+}
-}*/
+.photo-top-album-link{
+  color: #3465A4;
+	}
 #photo-top-end {
         clear: both;
 }

view/theme/diabook/theme.php

@@ -1,8 +1,8 @@
 <?php
 
 /*
- * Name: Diabook-blue
+ * Name: Diabook
- * Description: Diabook-blue: report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu
+ * Description: Diabook: report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu
  * Version: 
  * Author: 
  */

view/theme/diabook/wall_item.tpl

@@ -66,6 +66,10 @@
 				<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 }}