34 files changed, 562 insertions, 63 deletions

diff --git a/include/plugin.php b/include/plugin.php
index a6780d701..c9490eb8a 100644
--- a/include/plugin.php
+++ b/include/plugin.php
@@ -406,8 +406,7 @@ function upgrade_bool_message($bbcode = false) {
 
 
 function head_add_css($src,$media = 'screen') {
-	get_app()->css_sources[] = array($src,$type);
-
+	get_app()->css_sources[] = array($src,$media);
 }
 
 function head_get_css() {
@@ -430,7 +429,7 @@ function format_css_if_exists($source) {
 	elseif(file_exists('view/css/' . $source[0]))
 		$path = 'view/css/' . $source[0];
 	if($path)
-		return '<link rel="stylesheet" href="' . $path . '" type="text/css" media="' . $source[1] . '" />';
+		return '<link rel="stylesheet" href="' . z_root() . '/' . $path . '" type="text/css" media="' . $source[1] . '" />' . "\r\n";
 		
 }
 
@@ -459,7 +458,7 @@ function format_js_if_exists($source) {
 	elseif(file_exists('view/js/' . $source))
 		$path = 'view/js/' . $source[0];
 	if($path)
-		return '<script src="' . $source . '" />';
+		return '<script src="' . z_root() . '/' . $source . '" ></script>' . "\r\n" ;
 
 }
 
diff --git a/index.php b/index.php
index 02d853d06..4de315520 100644
--- a/index.php
+++ b/index.php
@@ -336,30 +336,18 @@ if($a->module != 'install') {
  * Build the page - now that we have all the components
  */
 
+if(file_exists('view/theme/' . current_theme() . '/php/theme_init.php'))
+	require_once('view/theme/' . current_theme() . '/php/theme_init.php');
+elseif(file_exists('view/theme/' . $a->theme_info['extends'] . '/php/theme_init.php'))
+	require_once('view/theme/' . $a->theme_info['extends'] . '/php/theme_init.php');
+else
+	require_once('view/php/theme_init.php');
 
-$page_css = 'view/theme/' . current_theme() . '/css/' 
-	. ((x($a->page,'template')) ? $a->page['template'] : 'default' ) . '.css';
-
-if(! file_exists($page_css))
-	$page_css = str_replace('theme/' . current_theme() . '/', '', $page_css);
-
-$module_css = 'view/theme/' . current_theme() . '/css/mod_' . $a->module . '.css';  
-
-if(! file_exists($module_css))
-	$module_css = str_replace('theme/' . current_theme() . '/', '', $module_css);
-
-if(! file_exists($module_css)) 
-	$module_css = null;
-
-
-$module_js = 'view/theme/' . current_theme() . '/js/mod_' . $a->module . '.js';  
-
-if(! file_exists($module_js))
-	$module_js = str_replace('theme/' . current_theme() . '/', '', $module_js);
-
-if(! file_exists($module_js)) 
-	$module_js = null;
+head_add_css(((x($a->page,'template')) ? $a->page['template'] : 'default' ) . '.css');
+head_add_css('mod_' . $a->module . '.css');
+head_add_css('style.css');
 
+head_add_js('mod_' . $a->module . '.js');
 
 
 	$interval = ((local_user()) ? get_pconfig(local_user(),'system','update_interval') : 40000);
@@ -378,11 +366,9 @@ if(! file_exists($module_js))
 		'$showmore' => t('show more'),
 		'$showfewer' => t('show fewer'),
 		'$update_interval' => $interval,
-		'$page_css'   	 => $a->get_baseurl() . '/' . $page_css,
-		'$module_css'    => (($module_css) ? $a->get_baseurl() . '/' . $module_css : null),
-		'$module_js'    => (($module_js) ? $a->get_baseurl() . '/' . $module_js : null),
-		'$stylesheet'    => current_theme_url(),
-		'$theme'         => current_theme(),
+		'$head_css' => head_get_css(),
+		'$head_js' => head_get_js(),
+
 
 // localisations for jquery.timeago.js, see https://github.com/rmm5t/jquery-timeago
 // TRANSLATORS - only translate the conditionals if you require them!
diff --git a/view/php/theme_init.php b/view/php/theme_init.php
new file mode 100644
index 000000000..7a8f2d7a0
--- /dev/null
+++ b/view/php/theme_init.php
@@ -0,0 +1,26 @@
+<?php
+
+
+require_once('include/plugin.php');
+
+
+head_add_css('library/fancybox/jquery.fancybox-1.3.4.css');
+head_add_css('library/tiptip/tipTip.css');
+head_add_css('library/jgrowl/jquery.jgrowl.css');
+head_add_css('library/jslider/bin/jquery.slider.min.css');
+
+
+
+head_add_js('js/jquery.js');
+head_add_js('js/jquery.textinputsjs');
+head_add_js('js/fk.autocomplete.js');
+head_add_js('library/fancybox/jquery.fancybox-1.3.4.pack.js');
+head_add_js('library/jquery.timeago.js');
+head_add_js('library/jquery.divgrow/jquery.divgrow-1.3.1.js');
+head_add_js('library/tiptip/jquery/tipTip.minified.js');
+head_add_js('library/jgrowl/jquery.jgrowl_minimized.js');
+head_add_js('library/tinymce/jscripts/tiny_mce/tiny_mce_src.js');
+head_add_js('js/acl.js');
+head_add_js('js/webtoolkit.base64.js');
+head_add_js('js/main.js');
+head_add_js('library/jslider/bin/jquery.slider.min.js');
diff --git a/view/theme/quattro/birthdays_reminder.tpl b/view/theme/quattro/tpl/birthdays_reminder.tpl
index 8b1378917..8b1378917 100644
--- a/view/theme/quattro/birthdays_reminder.tpl
+++ b/view/theme/quattro/tpl/birthdays_reminder.tpl
diff --git a/view/theme/quattro/comment_item.tpl b/view/theme/quattro/tpl/comment_item.tpl
index ea24d95cc..ea24d95cc 100644
--- a/view/theme/quattro/comment_item.tpl
+++ b/view/theme/quattro/tpl/comment_item.tpl
diff --git a/view/theme/quattro/contact_template.tpl b/view/theme/quattro/tpl/contact_template.tpl
index b826acc65..b826acc65 100644
--- a/view/theme/quattro/contact_template.tpl
+++ b/view/theme/quattro/tpl/contact_template.tpl
diff --git a/view/theme/quattro/conversation.tpl b/view/theme/quattro/tpl/conversation.tpl
index 48ab4364a..48ab4364a 100644
--- a/view/theme/quattro/conversation.tpl
+++ b/view/theme/quattro/tpl/conversation.tpl
diff --git a/view/theme/quattro/events_reminder.tpl b/view/theme/quattro/tpl/events_reminder.tpl
index fc13fa68b..fc13fa68b 100644
--- a/view/theme/quattro/events_reminder.tpl
+++ b/view/theme/quattro/tpl/events_reminder.tpl
diff --git a/view/theme/quattro/fileas_widget.tpl b/view/theme/quattro/tpl/fileas_widget.tpl
index 1e5a76044..1e5a76044 100644
--- a/view/theme/quattro/fileas_widget.tpl
+++ b/view/theme/quattro/tpl/fileas_widget.tpl
diff --git a/view/theme/quattro/generic_links_widget.tpl b/view/theme/quattro/tpl/generic_links_widget.tpl
index 29580bbc7..29580bbc7 100644
--- a/view/theme/quattro/generic_links_widget.tpl
+++ b/view/theme/quattro/tpl/generic_links_widget.tpl
diff --git a/view/theme/quattro/group_side.tpl b/view/theme/quattro/tpl/group_side.tpl
index 596a8d13f..596a8d13f 100644
--- a/view/theme/quattro/group_side.tpl
+++ b/view/theme/quattro/tpl/group_side.tpl
diff --git a/view/theme/quattro/jot.tpl b/view/theme/quattro/tpl/jot.tpl
index 95c0ff6b1..95c0ff6b1 100644
--- a/view/theme/quattro/jot.tpl
+++ b/view/theme/quattro/tpl/jot.tpl
diff --git a/view/theme/quattro/mail_conv.tpl b/view/theme/quattro/tpl/mail_conv.tpl
index 989f17878..989f17878 100644
--- a/view/theme/quattro/mail_conv.tpl
+++ b/view/theme/quattro/tpl/mail_conv.tpl
diff --git a/view/theme/quattro/mail_display.tpl b/view/theme/quattro/tpl/mail_display.tpl
index e87eca485..e87eca485 100644
--- a/view/theme/quattro/mail_display.tpl
+++ b/view/theme/quattro/tpl/mail_display.tpl
diff --git a/view/theme/quattro/mail_list.tpl b/view/theme/quattro/tpl/mail_list.tpl
index 6bc6c84f6..6bc6c84f6 100644
--- a/view/theme/quattro/mail_list.tpl
+++ b/view/theme/quattro/tpl/mail_list.tpl
diff --git a/view/theme/quattro/message_side.tpl b/view/theme/quattro/tpl/message_side.tpl
index 9f1587096..9f1587096 100644
--- a/view/theme/quattro/message_side.tpl
+++ b/view/theme/quattro/tpl/message_side.tpl
diff --git a/view/theme/quattro/msg-header.tpl b/view/theme/quattro/tpl/msg-header.tpl
index 2d1ea7a61..2d1ea7a61 100644
--- a/view/theme/quattro/msg-header.tpl
+++ b/view/theme/quattro/tpl/msg-header.tpl
diff --git a/view/theme/quattro/nav.tpl b/view/theme/quattro/tpl/nav.tpl
index af1fc9414..af1fc9414 100644
--- a/view/theme/quattro/nav.tpl
+++ b/view/theme/quattro/tpl/nav.tpl
diff --git a/view/theme/quattro/nets.tpl b/view/theme/quattro/tpl/nets.tpl
index cbadf1361..cbadf1361 100644
--- a/view/theme/quattro/nets.tpl
+++ b/view/theme/quattro/tpl/nets.tpl
diff --git a/view/theme/quattro/photo_view.tpl b/view/theme/quattro/tpl/photo_view.tpl
index 3b7a66271..3b7a66271 100644
--- a/view/theme/quattro/photo_view.tpl
+++ b/view/theme/quattro/tpl/photo_view.tpl
diff --git a/view/theme/quattro/profile_vcard.tpl b/view/theme/quattro/tpl/profile_vcard.tpl
index 7cd02f164..7cd02f164 100644
--- a/view/theme/quattro/profile_vcard.tpl
+++ b/view/theme/quattro/tpl/profile_vcard.tpl
diff --git a/view/theme/quattro/saved_searches_aside.tpl b/view/theme/quattro/tpl/saved_searches_aside.tpl
index 9c10a26de..9c10a26de 100644
--- a/view/theme/quattro/saved_searches_aside.tpl
+++ b/view/theme/quattro/tpl/saved_searches_aside.tpl
diff --git a/view/theme/quattro/search_item.tpl b/view/theme/quattro/tpl/search_item.tpl
index 80d6678fb..80d6678fb 100644
--- a/view/theme/quattro/search_item.tpl
+++ b/view/theme/quattro/tpl/search_item.tpl
diff --git a/view/theme/quattro/theme_settings.tpl b/view/theme/quattro/tpl/theme_settings.tpl
index 9771ae162..9771ae162 100644
--- a/view/theme/quattro/theme_settings.tpl
+++ b/view/theme/quattro/tpl/theme_settings.tpl
diff --git a/view/theme/quattro/tpl/threaded_conversation.tpl b/view/theme/quattro/tpl/threaded_conversation.tpl
new file mode 100644
index 000000000..491c47302
--- /dev/null
+++ b/view/theme/quattro/tpl/threaded_conversation.tpl
@@ -0,0 +1,35 @@
+{{ for $threads as $item }}
+<div id="tread-wrapper-$item.id" class="tread-wrapper {{ if $item.threaded }}threaded{{ endif }}">
+       
+		{{ if $item.type == tag }}
+			{{ inc wall_item_tag.tpl }}{{ endinc }}
+		{{ else }}
+			{{ inc $item.template }}{{ endinc }}
+		{{ endif }}
+		
+</div>
+{{ endfor }}
+
+<div id="conversation-end"></div>
+
+{{ if $dropping }}
+<a href="#" onclick="deleteCheckedItems();return false;">
+	<span class="icon s22 delete text">$dropping</span>
+</a>
+{{ endif }}
+
+<script>
+// jquery color plugin from https://raw.github.com/gist/1891361/17747b50ad87f7a59a14b4e0f38d8f3fb6a18b27/gistfile1.js
+    (function(d){d.each(["backgroundColor","borderBottomColor","borderLeftColor","borderRightColor","borderTopColor","color","outlineColor"],function(f,e){d.fx.step[e]=function(g){if(!g.colorInit){g.start=c(g.elem,e);g.end=b(g.end);g.colorInit=true}g.elem.style[e]="rgb("+[Math.max(Math.min(parseInt((g.pos*(g.end[0]-g.start[0]))+g.start[0]),255),0),Math.max(Math.min(parseInt((g.pos*(g.end[1]-g.start[1]))+g.start[1]),255),0),Math.max(Math.min(parseInt((g.pos*(g.end[2]-g.start[2]))+g.start[2]),255),0)].join(",")+")"}});function b(f){var e;if(f&&f.constructor==Array&&f.length==3){return f}if(e=/rgb\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*\)/.exec(f)){return[parseInt(e[1]),parseInt(e[2]),parseInt(e[3])]}if(e=/rgb\(\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*\)/.exec(f)){return[parseFloat(e[1])*2.55,parseFloat(e[2])*2.55,parseFloat(e[3])*2.55]}if(e=/#([a-fA-F0-9]{2})([a-fA-F0-9]{2})([a-fA-F0-9]{2})/.exec(f)){return[parseInt(e[1],16),parseInt(e[2],16),parseInt(e[3],16)]}if(e=/#([a-fA-F0-9])([a-fA-F0-9])([a-fA-F0-9])/.exec(f)){return[parseInt(e[1]+e[1],16),parseInt(e[2]+e[2],16),parseInt(e[3]+e[3],16)]}if(e=/rgba\(0, 0, 0, 0\)/.exec(f)){return a.transparent}return a[d.trim(f).toLowerCase()]}function c(g,e){var f;do{f=d.curCSS(g,e);if(f!=""&&f!="transparent"||d.nodeName(g,"body")){break}e="backgroundColor"}while(g=g.parentNode);return b(f)}var a={transparent:[255,255,255]}})(jQuery);
+    var colWhite = {backgroundColor:'#EFF0F1'};
+    var colShiny = {backgroundColor:'#FCE94F'};
+</script>
+
+{{ if $mode == display }}
+<script>
+    var id = window.location.pathname.split("/").pop();
+    $(window).scrollTop($('#item-'+id).position().top);
+    $('#item-'+id).animate(colWhite, 1000).animate(colShiny).animate(colWhite, 2000);   
+</script>
+{{ endif }}
+
diff --git a/view/theme/quattro/wall_item.tpl b/view/theme/quattro/tpl/wall_item.tpl
index 411879def..411879def 100644
--- a/view/theme/quattro/wall_item.tpl
+++ b/view/theme/quattro/tpl/wall_item.tpl
diff --git a/view/theme/quattro/wall_item_tag.tpl b/view/theme/quattro/tpl/wall_item_tag.tpl
index 205fcfebc..205fcfebc 100644
--- a/view/theme/quattro/wall_item_tag.tpl
+++ b/view/theme/quattro/tpl/wall_item_tag.tpl
diff --git a/view/theme/quattro/tpl/wall_thread.tpl b/view/theme/quattro/tpl/wall_thread.tpl
new file mode 100644
index 000000000..4d454f00d
--- /dev/null
+++ b/view/theme/quattro/tpl/wall_thread.tpl
@@ -0,0 +1,127 @@
+{{if $mode == display}}
+{{ else }}
+{{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}}
+{{ endif }}
+
+
+<div class="wall-item-decor">
+	<span class="icon s22 star $item.isstarred" id="starred-$item.id" title="$item.star.starred">$item.star.starred</span>
+	{{ if $item.lock }}<span class="icon s22 lock fakelink" onclick="lockview(event,$item.id);" title="$item.lock">$item.lock</span>{{ endif }}	
+	<img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
+</div>
+
+<div class="wall-item-container $item.indent" id="item-$item.id">
+	<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 class="wall-item-location">$item.location</div>	
+		</div>
+		<div class="wall-item-content">
+			{{ if $item.title }}<h2><a href="$item.plink.href" class="$item.sparkle">$item.title</a></h2>{{ endif }}
+			$item.body
+		</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="">
+			{{ if $item.plink }}<a class="icon s16 link$item.sparkle" title="$item.plink.title" href="$item.plink.href">$item.plink.title</a>{{ endif }}
+		</div>
+		<div class="wall-item-actions">
+			<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">$item.ago</span>
+			</div>
+			
+			<div class="wall-item-actions-social">
+			{{ if $item.star }}
+				<a href="#" id="star-$item.id" onclick="dostar($item.id); return false;"  class="$item.star.classdo"  title="$item.star.do">$item.star.do</a>
+				<a href="#" id="unstar-$item.id" onclick="dostar($item.id); return false;"  class="$item.star.classundo"  title="$item.star.undo">$item.star.undo</a>
+				<a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="$item.star.classtagger" title="$item.star.tagger">$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.filer">$item.filer</a>
+			{{ endif }}			
+			
+			{{ if $item.vote }}
+				<a href="#" id="like-$item.id" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false">$item.vote.like.1</a>
+				<a href="#" id="dislike-$item.id" title="$item.vote.dislike.0" onclick="dolike($item.id,'dislike'); return false">$item.vote.dislike.1</a>
+			{{ endif }}
+						
+			{{ if $item.vote.share }}
+				<a href="#" id="share-$item.id" title="$item.vote.share.0" onclick="jotShare($item.id); return false">$item.vote.share.1</a>
+			{{ endif }}			
+			</div>
+			
+			<div class="wall-item-actions-tools">
+
+				{{ if $item.drop.dropping }}
+					<input type="checkbox" title="$item.drop.select" name="itemselected[]" class="item-select" value="$item.id" />
+					<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon delete s16" title="$item.drop.delete">$item.drop.delete</a>
+				{{ endif }}
+				{{ if $item.edpost }}
+					<a class="icon edit s16" href="$item.edpost.0" title="$item.edpost.1"></a>
+				{{ endif }}
+			</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>
+	{{ if $item.threaded }}{{ if $item.comment }}
+	<div class="wall-item-bottom">
+		<div class="wall-item-links"></div>
+		<div class="wall-item-comment-wrapper">
+					$item.comment
+		</div>
+	</div>
+	{{ endif }}{{ endif }}
+
+</div>
+
+
+{{ for $item.children as $item }}
+	<div class="children">
+		{{ if $item.type == tag }}
+			{{ inc wall_item_tag.tpl }}{{ endinc }}
+		{{ else }}
+			{{ inc $item.template }}{{ endinc }}
+		{{ endif }}
+	</div>
+{{ endfor }}
+
+{{if $mode == display}}
+{{ else }}
+{{if $item.comment_lastcollapsed}}</div>{{endif}}
+{{ endif }}
+
+{{ if $item.flatten }}
+<div class="wall-item-comment-wrapper" >
+	$item.comment
+</div>
+{{ endif }}
diff --git a/view/theme/quattro/wallwall_item.tpl b/view/theme/quattro/tpl/wallwall_item.tpl
index 2e3cf821f..2e3cf821f 100644
--- a/view/theme/quattro/wallwall_item.tpl
+++ b/view/theme/quattro/tpl/wallwall_item.tpl
diff --git a/view/theme/quattro/tpl/wallwall_thread.tpl b/view/theme/quattro/tpl/wallwall_thread.tpl
new file mode 100644
index 000000000..cc2f8e362
--- /dev/null
+++ b/view/theme/quattro/tpl/wallwall_thread.tpl
@@ -0,0 +1,134 @@
+{{if $mode == display}}
+{{ else }}
+{{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}}
+{{ endif }}
+
+<div class="wall-item-decor">
+	<span class="icon s22 star $item.isstarred" id="starred-$item.id" title="$item.star.starred">$item.star.starred</span>
+	{{ if $item.lock }}<span class="icon s22 lock fakelink" onclick="lockview(event,$item.id);" title="$item.lock">$item.lock</span>{{ endif }}	
+	<img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
+</div>
+
+<div class="wall-item-container $item.indent" id="item-$item.id">
+	<div class="wall-item-item">
+		<div class="wall-item-info">
+			<div class="contact-photo-wrapper mframe wwfrom"
+				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 class="contact-photo-wrapper mframe wwto" id="wall-item-ownerphoto-wrapper-$item.id" >
+				<a href="$item.owner_url" target="redir" title="$item.olinktitle" class="contact-photo-link" id="wall-item-ownerphoto-link-$item.id">
+					<img src="$item.owner_photo" class="contact-photo $item.osparkle" id="wall-item-ownerphoto-$item.id" alt="$item.owner_name" />
+				</a>
+			</div>			
+			<div class="wall-item-location">$item.location</div>	
+		</div>
+		<div class="wall-item-content">
+			{{ if $item.title }}<h2><a href="$item.plink.href" class="$item.sparkle">$item.title</a></h2>{{ endif }}
+			$item.body
+		</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="wall-item-links">
+			{{ if $item.plink }}<a class="icon s16 link$item.sparkle" title="$item.plink.title" href="$item.plink.href">$item.plink.title</a>{{ endif }}
+		</div>
+		<div class="wall-item-actions">
+			<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">$item.ago</span>
+				 <br/>$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
+				 
+			</div>
+			
+			<div class="wall-item-actions-social">
+			{{ if $item.star }}
+				<a href="#" id="star-$item.id" onclick="dostar($item.id); return false;"  class="$item.star.classdo"  title="$item.star.do">$item.star.do</a>
+				<a href="#" id="unstar-$item.id" onclick="dostar($item.id); return false;"  class="$item.star.classundo"  title="$item.star.undo">$item.star.undo</a>
+				<a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="$item.star.classtagger" title="$item.star.tagger">$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.filer">$item.filer</a>
+			{{ endif }}			
+			
+			{{ if $item.vote }}
+				<a href="#" id="like-$item.id" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false">$item.vote.like.1</a>
+				<a href="#" id="dislike-$item.id" title="$item.vote.dislike.0" onclick="dolike($item.id,'dislike'); return false">$item.vote.dislike.1</a>
+			{{ endif }}
+						
+			{{ if $item.vote.share }}
+				<a href="#" id="share-$item.id" title="$item.vote.share.0" onclick="jotShare($item.id); return false">$item.vote.share.1</a>
+			{{ endif }}			
+			</div>
+			
+			<div class="wall-item-actions-tools">
+
+				{{ if $item.drop.dropping }}
+					<input type="checkbox" title="$item.drop.select" name="itemselected[]" class="item-select" value="$item.id" />
+					<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon delete s16" title="$item.drop.delete">$item.drop.delete</a>
+				{{ endif }}
+				{{ if $item.edpost }}
+					<a class="icon edit s16" href="$item.edpost.0" title="$item.edpost.1"></a>
+				{{ endif }}
+			</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>
+	
+	{{ if $item.threaded }}{{ if $item.comment }}
+	<div class="wall-item-bottom">
+		<div class="wall-item-links"></div>
+		<div class="wall-item-comment-wrapper">
+					$item.comment
+		</div>
+	</div>
+	{{ endif }}{{ endif }}
+</div>
+
+
+{{ for $item.children as $item }}
+	<div class="children">
+		{{ if $item.type == tag }}
+			{{ inc wall_item_tag.tpl }}{{ endinc }}
+		{{ else }}
+			{{ inc $item.template }}{{ endinc }}
+		{{ endif }}
+	</div>
+{{ endfor }}
+
+{{if $mode == display}}
+{{ else }}
+{{if $item.comment_lastcollapsed}}</div>{{endif}}
+{{ endif }}
+
+{{ if $item.flatten }}
+<div class="wall-item-comment-wrapper" >
+	$item.comment
+</div>
+{{ endif }}
diff --git a/view/tpl/head.tpl b/view/tpl/head.tpl
index 7853361d9..08fe8303a 100644
--- a/view/tpl/head.tpl
+++ b/view/tpl/head.tpl
@@ -2,16 +2,13 @@
 <base href="$baseurl/" />
 <meta name="generator" content="$generator" />
 
-<link rel="stylesheet" href="$baseurl/library/fancybox/jquery.fancybox-1.3.4.css" type="text/css" media="screen" />
-<link rel="stylesheet" href="$baseurl/library/tiptip/tipTip.css" type="text/css" media="screen" />
-<link rel="stylesheet" href="$baseurl/library/jgrowl/jquery.jgrowl.css" type="text/css" media="screen" />
-<link rel="stylesheet" type="text/css" href="$baseurl/library/jslider/bin/jquery.slider.min.css" media="screen" />
+<!--[if IE]>
+<script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+<![endif]-->
 
-<link rel="stylesheet" type="text/css" href="$page_css" media="all" />
-{{ if $module_css }}
-<link rel="stylesheet" type="text/css" href="$module_css" media="all" />
-{{ endif }}
-<link rel="stylesheet" type="text/css" href="$stylesheet" media="all" />
+$head_css
+
+$head_js
 
 <link rel="shortcut icon" href="$baseurl/images/friendica-32.png" />
 <link rel="search"
@@ -19,29 +16,6 @@
          type="application/opensearchdescription+xml" 
          title="Search in Friendica" />
 
-<!--[if IE]>
-<script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-<![endif]-->
-<script src="$baseurl/js/jquery.js" ></script>
-<script src="$baseurl/js/jquery.textinputs.js" ></script>
-<script src="$baseurl/js/fk.autocomplete.js" ></script>
-<script src="$baseurl/library/fancybox/jquery.fancybox-1.3.4.pack.js"></script>
-<script src="$baseurl/library/jquery.timeago.js"></script>
-<script src="$baseurl/library/jquery.divgrow/jquery.divgrow-1.3.1.js"></script>
-<script src="$baseurl/library/tiptip/jquery.tipTip.minified.js"></script>
-<script src="$baseurl/library/jgrowl/jquery.jgrowl_minimized.js"></script>
-<script src="$baseurl/library/tinymce/jscripts/tiny_mce/tiny_mce_src.js" ></script>
-<script src="$baseurl/js/acl.js" ></script>
-<script src="$baseurl/js/webtoolkit.base64.js" ></script>
-<script src="$baseurl/js/main.js" ></script>
-
-{{ if $module_js }}
-<script src="$module_js" ></script>
-{{ endif }}
-
-<script src="$baseurl/library/jslider/bin/jquery.slider.min.js"></script>
-
-
 <script>
 
 	var updateInterval = $update_interval;
diff --git a/view/tpl/threaded_conversation.tpl b/view/tpl/threaded_conversation.tpl
new file mode 100644
index 000000000..f60839e49
--- /dev/null
+++ b/view/tpl/threaded_conversation.tpl
@@ -0,0 +1,13 @@
+{{ for $threads as $item }}
+{{ inc $item.template }}{{ endinc }}
+{{ endfor }}
+
+<div id="conversation-end"></div>
+
+{{ if $dropping }}
+<div id="item-delete-selected" class="fakelink" onclick="deleteCheckedItems();">
+  <div id="item-delete-selected-icon" class="icon drophide" title="$dropping" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></div>
+  <div id="item-delete-selected-desc" >$dropping</div>
+</div>
+<div id="item-delete-selected-end"></div>
+{{ endif }}
diff --git a/view/tpl/wall_thread.tpl b/view/tpl/wall_thread.tpl
new file mode 100644
index 000000000..600f755b1
--- /dev/null
+++ b/view/tpl/wall_thread.tpl
@@ -0,0 +1,100 @@
+{{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">
+<a name="$item.id" ></a>
+<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" 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$item.sparkle"></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.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>
+			{{ if $item.threaded }}
+			{{ if $item.comment }}
+			<div class="wall-item-comment-wrapper" >
+				$item.comment
+			</div>
+			{{ endif }}
+			{{ endif }}
+		</div>
+	</div>
+	<div class="wall-item-wrapper-end"></div>
+	<div class="wall-item-like $item.indent" id="wall-item-like-$item.id">$item.like</div>
+	<div class="wall-item-dislike $item.indent" id="wall-item-dislike-$item.id">$item.dislike</div>
+<div class="wall-item-outside-wrapper-end$item.indent" ></div>
+</div>
+{{ for $item.children as $item }}
+	{{ inc $item.template }}{{ endinc }}
+{{ endfor }}
+
+{{ if $item.flatten }}
+<div class="wall-item-comment-wrapper" >
+	$item.comment
+</div>
+{{ endif }}
+</div>
+{{if $item.comment_lastcollapsed}}</div>{{endif}}
diff --git a/view/tpl/wallwall_thread.tpl b/view/tpl/wallwall_thread.tpl
new file mode 100644
index 000000000..89f121f21
--- /dev/null
+++ b/view/tpl/wallwall_thread.tpl
@@ -0,0 +1,105 @@
+{{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">
+<a name="$item.id" ></a>
+<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" 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" 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$item.sparkle"></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.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>
+			{{ if $item.threaded }}
+			{{ if $item.comment }}
+			<div class="wall-item-comment-wrapper" >
+				$item.comment
+			</div>
+			{{ endif }}
+			{{ endif }}
+		</div>
+	</div>	
+	<div class="wall-item-wrapper-end"></div>
+	<div class="wall-item-like $item.indent" id="wall-item-like-$item.id">$item.like</div>
+	<div class="wall-item-dislike $item.indent" id="wall-item-dislike-$item.id">$item.dislike</div>
+<div class="wall-item-outside-wrapper-end$item.indent" ></div>
+</div>
+{{ for $item.children as $item }}
+	{{ inc $item.template }}{{ endinc }}
+{{ endfor }}
+
+{{ if $item.flatten }}
+<div class="wall-item-comment-wrapper" >
+	$item.comment
+</div>
+{{ endif }}
+</div>
+{{if $item.comment_lastcollapsed}}</div>{{endif}}