Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  diabook-themes: css-fixes
  diabook-themes: fixes in js
  diabook-themes: fixed pageheader
  diabook-themes: bugfixes / css-fixes
  make the "new calendar" (javascript interactive) the default
  remove zrl from query string
  catch a couple more Oo smilies
  add page_content_top hook

* master:

35 files changed, 378 insertions, 217 deletions

diff --git a/include/text.php b/include/text.php
index f204e3f9b..5456b5ad3 100644
--- a/include/text.php
+++ b/include/text.php
@@ -225,6 +225,9 @@ if(! function_exists('paginate')) {
 function paginate(&$a) {
 	$o = '';
 	$stripped = preg_replace('/(&page=[0-9]*)/','',$a->query_string);
+
+//	$stripped = preg_replace('/&zrl=(.*?)([\?&]|$)/ism','',$stripped);
+
 	$stripped = str_replace('q=','',$stripped);
 	$stripped = trim($stripped,'/');
 	$pagenum = $a->pager['page'];
@@ -725,6 +728,8 @@ function smilies($s, $sample = false) {
 		'\\o/', 
 		'o.O', 
 		'O.o', 
+		'o_O', 
+		'O_o', 
 		":'(", 
 		":-!", 
 		":-/", 
@@ -759,6 +764,8 @@ function smilies($s, $sample = false) {
 		'<img src="' . $a->get_baseurl() . '/images/smiley-thumbsup.gif" alt="\\o/" />',
 		'<img src="' . $a->get_baseurl() . '/images/smiley-Oo.gif" alt="o.O" />',
 		'<img src="' . $a->get_baseurl() . '/images/smiley-Oo.gif" alt="O.o" />',
+		'<img src="' . $a->get_baseurl() . '/images/smiley-Oo.gif" alt="o_O" />',
+		'<img src="' . $a->get_baseurl() . '/images/smiley-Oo.gif" alt="O_o" />',
 		'<img src="' . $a->get_baseurl() . '/images/smiley-cry.gif" alt=":\'(" />',
 		'<img src="' . $a->get_baseurl() . '/images/smiley-foot-in-mouth.gif" alt=":-!" />',
 		'<img src="' . $a->get_baseurl() . '/images/smiley-undecided.gif" alt=":-/" />',
diff --git a/index.php b/index.php
index 2faac1f28..e7227962f 100755
--- a/index.php
+++ b/index.php
@@ -95,6 +95,7 @@ if((x($_SESSION,'language')) && ($_SESSION['language'] !== $lang)) {
 
 if(x($_GET,'zrl')) {
 	$_SESSION['my_url'] = $_GET['zrl'];
+	$a->query_string = preg_replace('/[\?&]zrl=(.*?)([\?&]|$)/is','',$a->query_string);
 }
 
 /**
@@ -243,6 +244,8 @@ if (file_exists($theme_info_file)){
 if(! x($a->page,'content'))
 	$a->page['content'] = '';
 
+if(! $install)
+	call_hooks('page_content_top',$a->page['content']);
 
 /**
  * Call module functions
diff --git a/mod/events.php b/mod/events.php
index 0906d16c2..e66a2dc44 100755
--- a/mod/events.php
+++ b/mod/events.php
@@ -284,11 +284,11 @@ function events_content(&$a) {
 		if (x($_GET,'id')){
 			$tpl =  get_markup_template("event.tpl");
 		} else {
-			if (get_config('experimentals','new_calendar')==1){
+//			if (get_config('experimentals','new_calendar')==1){
 				$tpl = get_markup_template("events-js.tpl");
-			} else {
-				$tpl = get_markup_template("events.tpl");
-			}
+//			} else {
+//				$tpl = get_markup_template("events.tpl");
+//			}
 		}
 		$o = replace_macros($tpl, array(
 			'$baseurl'	=> $a->get_baseurl(),
diff --git a/view/theme/diabook-aerith/jot.tpl b/view/theme/diabook-aerith/jot.tpl
index 59066a19c..ee30da7bf 100755
--- a/view/theme/diabook-aerith/jot.tpl
+++ b/view/theme/diabook-aerith/jot.tpl
@@ -2,7 +2,6 @@
 <div id="profile-jot-wrapper" >
 	<div id="profile-jot-banner-wrapper">
 		<div id="profile-jot-desc" >&nbsp;</div>
-		<div id="character-counter" class="grey"></div>
 	</div>
 	<div id="profile-jot-banner-end"></div>
 
@@ -15,6 +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">
+		<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>
 
diff --git a/view/theme/diabook-aerith/profile_vcard.tpl b/view/theme/diabook-aerith/profile_vcard.tpl
index 918cfc97c..e28ec2909 100644
--- a/view/theme/diabook-aerith/profile_vcard.tpl
+++ b/view/theme/diabook-aerith/profile_vcard.tpl
@@ -21,9 +21,9 @@
 	</div>
 				
 	
-	{{ if $pdesc }}<div class="title">$profile.pdesc</div>{{ endif }}
-	<div id="profile-photo-wrapper"><img class="photo" width="155" height="155" src="$profile.photo?rev=$profile.picdate" alt="$profile.name" /></div>
 
+	<div id="profile-photo-wrapper"><img class="photo" width="155" height="155" src="$profile.photo?rev=$profile.picdate" alt="$profile.name" /></div>
+	{{ if $pdesc }}<div class="title">$profile.pdesc</div>{{ endif }}
 
 
 	{{ if $location }}
diff --git a/view/theme/diabook-aerith/style-network.css b/view/theme/diabook-aerith/style-network.css
index f6c7bc69a..7e2c8f02b 100644
--- a/view/theme/diabook-aerith/style-network.css
+++ b/view/theme/diabook-aerith/style-network.css
@@ -1198,10 +1198,14 @@ section {
 
 body .pageheader{
   text-align: center;
-  margin-top: 25px;
-  font-size: 0px;
+  font-size: 20px;
+  margin-bottom: 20px;
+  margin-top: 0px;
+  max-width: 575px;
+	}
+.qcomment{
+  max-width: 122px;	
 	}
-
 #id_username {
   width: 173px;	
 	}
@@ -1256,7 +1260,7 @@ right_aside {
   /* background: #F1F1F1; */
 }
 right_aside a{color: #3465A4;}
-right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 5px; margin-bottom: 0px; 
+right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 3px; margin-bottom: 0px; 
 margin-top:30px;}
 right_aside .directory-item {	width: 50px; height: 50px; vertical-align: center; text-align: center; }
 right_aside .directory-photo { margin: 0px; }
@@ -1613,6 +1617,11 @@ transition: all 0.2s ease-in-out;
   padding: 0.3em;
   margin-bottom: 10px;
 }
+.grey
+{
+  display: inline;
+  float: right;	
+	}
 #jot #jot-tools {
   margin: 0px;
   padding: 0px;
diff --git a/view/theme/diabook-aerith/style-profile.css b/view/theme/diabook-aerith/style-profile.css
index c4f89359a..29982c8c5 100644
--- a/view/theme/diabook-aerith/style-profile.css
+++ b/view/theme/diabook-aerith/style-profile.css
@@ -1193,10 +1193,14 @@ section {
 
 body .pageheader{
   text-align: center;
-  margin-top: 25px;
-  font-size: 0px;
+  font-size: 20px;
+  margin-bottom: 20px;
+  margin-top: 0px;
+  max-width: 575px;
+	}
+.qcomment{
+  max-width: 122px;	
 	}
-
 #id_username {
   width: 173px;	
 	}
@@ -1251,7 +1255,7 @@ right_aside {
   /* background: #F1F1F1; */
 }
 right_aside a{color: #3465A4;}
-right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 5px; margin-bottom: 0px; 
+right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 3px; margin-bottom: 0px; 
 margin-top:30px;}
 right_aside .directory-item {	width: 50px; height: 50px; vertical-align: center; text-align: center; }
 right_aside .directory-photo { margin: 0px; }
@@ -1603,6 +1607,11 @@ transition: all 0.2s ease-in-out;
   padding: 0.3em;
   margin-bottom: 10px;
 }
+.grey
+{
+  display: inline;
+  float: right;	
+	}
 #jot #jot-tools {
   margin: 0px;
   padding: 0px;
@@ -2076,6 +2085,7 @@ box-shadow: 2px 2px 5px 0px #000000;
 margin: 2px 5px 2px 5px;
 max-height: 85%;
 max-width: 85%;
+border-radius: 10px;
 }
 .lframe {
   float: left;
diff --git a/view/theme/diabook-aerith/style-settings.css b/view/theme/diabook-aerith/style-settings.css
index 0326dbcfc..8963065ca 100644
--- a/view/theme/diabook-aerith/style-settings.css
+++ b/view/theme/diabook-aerith/style-settings.css
@@ -1191,8 +1191,10 @@ section {
 
 body .pageheader{
   text-align: center;
-  margin-top: 25px;
-  font-size: 0px;
+  font-size: 20px;
+  margin-bottom: 20px;
+  margin-top: 0px;
+  max-width: 575px;
 	}
 
 #id_username {
diff --git a/view/theme/diabook-aerith/style.css b/view/theme/diabook-aerith/style.css
index 796af62ed..14bbb6cda 100644
--- a/view/theme/diabook-aerith/style.css
+++ b/view/theme/diabook-aerith/style.css
@@ -1,4 +1,4 @@
-/opt/lampp/htdocs/friendica/view/theme/diabook/search_item.tpl/**
+/**
  * Fabio Comuni <http://kirgroup.com/profile/fabrixxm>
  * Additional Changes: Michael Vogel <icarus@dabo.de>
  **/
@@ -1062,6 +1062,7 @@ aside {
   float: left;
   /* background: #F1F1F1; */
 }
+aside #page-sidebar{display: none;}
 aside .vcard .fn {
   font-size: 18px;
   font-weight: bold;
@@ -1254,10 +1255,14 @@ section {
 }
 body .pageheader{
   text-align: center;
-  margin-top: 25px;
-  font-size: 0px;
+  font-size: 20px;
+  margin-bottom: 20px;
+  margin-top: 0px;
+  max-width: 575px;
+	}
+.qcomment{
+  max-width: 122px;	
 	}
-
 #id_username {
   width: 173px;	
 	}
@@ -1622,6 +1627,11 @@ body .pageheader{
   padding: 0.3em;
   margin-bottom: 10px;
 }
+.grey
+{
+  display: inline;
+  float: right;	
+	}
 #jot #jot-tools {
   margin: 0px;
   padding: 0px;
@@ -2096,6 +2106,7 @@ box-shadow: 2px 2px 5px 0px #000000;
 margin: 2px 5px 2px 5px;
 max-height: 85%;
 max-width: 85%;
+border-radius: 10px;
 }
 .lframe {
   float: left;
diff --git a/view/theme/diabook-aerith/theme.php b/view/theme/diabook-aerith/theme.php
index 490010750..008e80c14 100755
--- a/view/theme/diabook-aerith/theme.php
+++ b/view/theme/diabook-aerith/theme.php
@@ -3,7 +3,7 @@
 /*
  * Name: Diabook-aerith
  * Description: Diabook-aerith : report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu
- * Version: 
+ * Version: (Version: 1.011)
  * Author: 
  */
 
@@ -164,7 +164,8 @@ function diabook_aerith_community_info(){
 	$pagelist = array();
 
 	$contacts = q("SELECT `id`, `url`, `name`, `micro`FROM `contact`
-			WHERE `network`= 'dfrn' AND `forum` = 1 AND `uid` = %d",
+			WHERE `network`= 'dfrn' AND `forum` = 1 AND `uid` = %d
+			ORDER BY `name` ASC",
 			intval($a->user['uid'])
 	);
 
@@ -316,56 +317,58 @@ $a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s" ></scrip
 
 //js scripts
 
-$a->page['htmlhead'] .= <<< EOT
+$a->page['htmlhead'] .= '
 
 <script>
  $(function() {
-	$('a.lightbox').fancybox(); // Select all links with lightbox class
-	
+	$("a.lightbox").fancybox(); // Select all links with lightbox class
  });
+  
+ </script>';
 
-</script>
 
+if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname'] or $a->argv[0] === "network" && local_user()){
+$a->page['htmlhead'] .= '
 <script>
 
 $("right_aside").ready(function(){
 	
-	if($.cookie('close_pages') == '1') 
+	if($.cookie("close_pages") == "1") 
 		{
 		document.getElementById( "close_pages" ).style.display = "none";
 			};
 	
-	if($.cookie('close_helpers') == '1') 
+	if($.cookie("close_helpers") == "1") 
 		{
 		document.getElementById( "close_helpers" ).style.display = "none";
 			};
 			
-	if($.cookie('close_services') == '1') 
+	if($.cookie("close_services") == "1") 
 		{
 		document.getElementById( "close_services" ).style.display = "none";
 			};
 			
-	if($.cookie('close_friends') == '1') 
+	if($.cookie("close_friends") == "1") 
 		{
 		document.getElementById( "close_friends" ).style.display = "none";
 			};
 	
-	if($.cookie('close_postit') == '1') 
+	if($.cookie("close_postit") == "1") 
 		{
 		document.getElementById( "close_postit" ).style.display = "none";
 			};
 			
-	if($.cookie('close_lastusers') == '1') 
+	if($.cookie("close_lastusers") == "1") 
 		{
 		document.getElementById( "close_lastusers" ).style.display = "none";
 			};
 			
-	if($.cookie('close_lastphotos') == '1') 
+	if($.cookie("close_lastphotos") == "1") 
 		{
 		document.getElementById( "close_lastphotos" ).style.display = "none";
 			};
 			
-	if($.cookie('close_lastlikes') == '1') 
+	if($.cookie("close_lastlikes") == "1") 
 		{
 		document.getElementById( "close_lastlikes" ).style.display = "none";
 			};}
@@ -374,57 +377,55 @@ $("right_aside").ready(function(){
 
 function close_pages(){
  document.getElementById( "close_pages" ).style.display = "none";
- $.cookie('close_pages','1', { expires: 365, path: '/' });
+ $.cookie("close_pages","1", { expires: 365, path: "/" });
  };
  
 function close_helpers(){
  document.getElementById( "close_helpers" ).style.display = "none";
-  $.cookie('close_helpers','1', { expires: 365, path: '/' });
+  $.cookie("close_helpers","1", { expires: 365, path: "/" });
  };
 
 function close_services(){
  document.getElementById( "close_services" ).style.display = "none";
- $.cookie('close_services','1', { expires: 365, path: '/' });
+ $.cookie("close_services","1", { expires: 365, path: "/" });
  };
  
 function close_friends(){
  document.getElementById( "close_friends" ).style.display = "none";
- $.cookie('close_friends','1', { expires: 365, path: '/' });
+ $.cookie("close_friends","1", { expires: 365, path: "/" });
  };
 
 function close_postit(){
  document.getElementById( "close_postit" ).style.display = "none";
- $.cookie('close_postit','1', { expires: 365, path: '/' });
+ $.cookie("close_postit","1", { expires: 365, path: "/" });
  };
  
 function close_lastusers(){
  document.getElementById( "close_lastusers" ).style.display = "none";
- $.cookie('close_lastusers','1', { expires: 365, path: '/' });
+ $.cookie("close_lastusers","1", { expires: 365, path: "/" });
  };
 
 function close_lastphotos(){
  document.getElementById( "close_lastphotos" ).style.display = "none";
- $.cookie('close_lastphotos','1', { expires: 365, path: '/' });
+ $.cookie("close_lastphotos","1", { expires: 365, path: "/" });
  };
  
 function close_lastlikes(){
  document.getElementById( "close_lastlikes" ).style.display = "none";
- $.cookie('close_lastlikes','1', { expires: 365, path: '/' });
+ $.cookie("close_lastlikes","1", { expires: 365, path: "/" });
  };
-
-function restore_boxes(){
-	$.cookie('close_pages','2', { expires: 365, path: '/' });
-	$.cookie('close_helpers','2', { expires: 365, path: '/' });
-	$.cookie('close_services','2', { expires: 365, path: '/' });
-	$.cookie('close_friends','2', { expires: 365, path: '/' });
-	$.cookie('close_postit','2', { expires: 365, path: '/' });
-	$.cookie('close_lastusers','2', { expires: 365, path: '/' });
-	$.cookie('close_lastphotos','2', { expires: 365, path: '/' });
-	$.cookie('close_lastlikes','2', { expires: 365, path: '/' });
-	alert('Right-hand column was restored. Please refresh your browser');
-  }; 
  
-</script>
-
-EOT;
+ 
 
+function restore_boxes(){
+	$.cookie("close_pages","2", { expires: 365, path: "/" });
+	$.cookie("close_helpers","2", { expires: 365, path: "/" });
+	$.cookie("close_services","2", { expires: 365, path: "/" });
+	$.cookie("close_friends","2", { expires: 365, path: "/" });
+	$.cookie("close_postit","2", { expires: 365, path: "/" });
+	$.cookie("close_lastusers","2", { expires: 365, path: "/" });
+	$.cookie("close_lastphotos","2", { expires: 365, path: "/" });
+	$.cookie("close_lastlikes","2", { expires: 365, path: "/" });
+	alert("Right-hand column was restored. Please refresh your browser");
+  };
+</script>';}
\ No newline at end of file
diff --git a/view/theme/diabook-aerith/wallwall_item.tpl b/view/theme/diabook-aerith/wallwall_item.tpl
index c5b6b36b5..6a0c93f88 100644
--- a/view/theme/diabook-aerith/wallwall_item.tpl
+++ b/view/theme/diabook-aerith/wallwall_item.tpl
@@ -71,6 +71,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 }}
 			
 					
diff --git a/view/theme/diabook-blue/jot.tpl b/view/theme/diabook-blue/jot.tpl
index 9aef99787..bd43994b5 100755
--- a/view/theme/diabook-blue/jot.tpl
+++ b/view/theme/diabook-blue/jot.tpl
@@ -2,7 +2,6 @@
 <div id="profile-jot-wrapper" >
 	<div id="profile-jot-banner-wrapper">
 		<div id="profile-jot-desc" >&nbsp;</div>
-		<div id="character-counter" class="grey"></div>
 	</div>
 	<div id="profile-jot-banner-end"></div>
 
@@ -15,6 +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">
+		<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>
 
diff --git a/view/theme/diabook-blue/profile_vcard.tpl b/view/theme/diabook-blue/profile_vcard.tpl
index 918cfc97c..e28ec2909 100644
--- a/view/theme/diabook-blue/profile_vcard.tpl
+++ b/view/theme/diabook-blue/profile_vcard.tpl
@@ -21,9 +21,9 @@
 	</div>
 				
 	
-	{{ if $pdesc }}<div class="title">$profile.pdesc</div>{{ endif }}
-	<div id="profile-photo-wrapper"><img class="photo" width="155" height="155" src="$profile.photo?rev=$profile.picdate" alt="$profile.name" /></div>
 
+	<div id="profile-photo-wrapper"><img class="photo" width="155" height="155" src="$profile.photo?rev=$profile.picdate" alt="$profile.name" /></div>
+	{{ if $pdesc }}<div class="title">$profile.pdesc</div>{{ endif }}
 
 
 	{{ if $location }}
diff --git a/view/theme/diabook-blue/style-network.css b/view/theme/diabook-blue/style-network.css
index 5d16cde9e..3542dc00c 100644
--- a/view/theme/diabook-blue/style-network.css
+++ b/view/theme/diabook-blue/style-network.css
@@ -1160,10 +1160,14 @@ section {
 
 body .pageheader{
   text-align: center;
-  margin-top: 25px;
-  font-size: 0px;
+  font-size: 20px;
+  margin-bottom: 20px;
+  margin-top: 0px;
+  max-width: 575px;
+	}
+.qcomment{
+  max-width: 122px;	
 	}
-
 #id_username {
   width: 173px;	
 	}
@@ -1215,7 +1219,7 @@ right_aside {
   /* background: #F1F1F1; */
 }
 right_aside a{color: #1872A2;}
-right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 5px; margin-bottom: 0px; 
+right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 3px; margin-bottom: 0px; 
 margin-top:30px;}
 right_aside .directory-item {	width: 50px; height: 50px; vertical-align: center; text-align: center; }
 right_aside .directory-photo { margin: 0px; }
@@ -1571,6 +1575,11 @@ transition: all 0.2s ease-in-out;
   padding: 0.3em;
   margin-bottom: 10px;
 }
+.grey
+{
+  display: inline;
+  float: right;	
+	}
 #jot #jot-tools {
   margin: 0px;
   padding: 0px;
diff --git a/view/theme/diabook-blue/style-profile.css b/view/theme/diabook-blue/style-profile.css
index 528327ac3..0b27e4a77 100644
--- a/view/theme/diabook-blue/style-profile.css
+++ b/view/theme/diabook-blue/style-profile.css
@@ -1159,10 +1159,14 @@ section {
 
 body .pageheader{
   text-align: center;
-  margin-top: 25px;
-  font-size: 0px;
+  font-size: 20px;
+  margin-bottom: 20px;
+  margin-top: 0px;
+  max-width: 575px;
+	}
+.qcomment{
+  max-width: 122px;	
 	}
-
 #id_username {
   width: 173px;	
 	}
@@ -1214,7 +1218,7 @@ right_aside {
   /* background: #F1F1F1; */
 }
 right_aside a{color: #1872A2;}
-right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 5px; margin-bottom: 0px; 
+right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 3px; margin-bottom: 0px; 
 margin-top:30px;}
 right_aside .directory-item {	width: 50px; height: 50px; vertical-align: center; text-align: center; }
 right_aside .directory-photo { margin: 0px; }
@@ -1566,6 +1570,11 @@ transition: all 0.2s ease-in-out;
   padding: 0.3em;
   margin-bottom: 10px;
 }
+.grey
+{
+  display: inline;
+  float: right;	
+	}
 #jot #jot-tools {
   margin: 0px;
   padding: 0px;
@@ -2035,6 +2044,7 @@ box-shadow: 2px 2px 5px 0px #000000;
 margin: 2px 5px 2px 5px;
 max-height: 85%;
 max-width: 85%;
+border-radius: 10px;
 }
 .lframe {
   float: left;
diff --git a/view/theme/diabook-blue/style-settings.css b/view/theme/diabook-blue/style-settings.css
index 197b53d30..2e7db1e1f 100644
--- a/view/theme/diabook-blue/style-settings.css
+++ b/view/theme/diabook-blue/style-settings.css
@@ -1156,8 +1156,10 @@ section {
 
 body .pageheader{
   text-align: center;
-  margin-top: 25px;
-  font-size: 0px;
+  font-size: 20px;
+  margin-bottom: 20px;
+  margin-top: 0px;
+  max-width: 575px;
 	}
 
 #id_username {
diff --git a/view/theme/diabook-blue/style.css b/view/theme/diabook-blue/style.css
index b4289dc0f..8d3d854ba 100644
--- a/view/theme/diabook-blue/style.css
+++ b/view/theme/diabook-blue/style.css
@@ -1030,6 +1030,7 @@ aside {
   float: left;
   /* background: #F1F1F1; */
 }
+aside #page-sidebar{display: none;}
 aside .vcard .fn {
   font-size: 18px;
   font-weight: bold;
@@ -1210,10 +1211,14 @@ section {
 }
 body .pageheader{
   text-align: center;
-  margin-top: 25px;
-  font-size: 0px;
+  font-size: 20px;
+  margin-bottom: 20px;
+  margin-top: 0px;
+  max-width: 575px;
+	}
+.qcomment{
+  max-width: 122px;	
 	}
-
 #id_username {
   width: 173px;	
 	}
@@ -1575,6 +1580,11 @@ body .pageheader{
   padding: 0.3em;
   margin-bottom: 10px;
 }
+.grey
+{
+  display: inline;
+  float: right;	
+	}
 #jot #jot-tools {
   margin: 0px;
   padding: 0px;
@@ -2044,6 +2054,7 @@ box-shadow: 2px 2px 5px 0px #000000;
 margin: 2px 5px 2px 5px;
 max-height: 85%;
 max-width: 85%;
+border-radius: 10px;
 }
 .lframe {
   float: left;
diff --git a/view/theme/diabook-blue/theme.php b/view/theme/diabook-blue/theme.php
index 891c13cbf..19468779e 100755
--- a/view/theme/diabook-blue/theme.php
+++ b/view/theme/diabook-blue/theme.php
@@ -3,7 +3,7 @@
 /*
  * Name: Diabook-blue
  * Description: Diabook-blue: report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu
- * Version: 
+ * Version: (Version: 1.011)
  * Author: 
  */
 
@@ -164,7 +164,8 @@ function diabook_blue_community_info(){
 	$pagelist = array();
 
 	$contacts = q("SELECT `id`, `url`, `name`, `micro`FROM `contact`
-			WHERE `network`= 'dfrn' AND `forum` = 1 AND `uid` = %d",
+			WHERE `network`= 'dfrn' AND `forum` = 1 AND `uid` = %d
+			ORDER BY `name` ASC",
 			intval($a->user['uid'])
 	);
 
@@ -316,56 +317,58 @@ $a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s" ></scrip
 
 //js scripts
 
-$a->page['htmlhead'] .= <<< EOT
+$a->page['htmlhead'] .= '
 
 <script>
  $(function() {
-	$('a.lightbox').fancybox(); // Select all links with lightbox class
-	
+	$("a.lightbox").fancybox(); // Select all links with lightbox class
  });
+  
+ </script>';
 
-</script>
 
+if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname'] or $a->argv[0] === "network" && local_user()){
+$a->page['htmlhead'] .= '
 <script>
 
 $("right_aside").ready(function(){
 	
-	if($.cookie('close_pages') == '1') 
+	if($.cookie("close_pages") == "1") 
 		{
 		document.getElementById( "close_pages" ).style.display = "none";
 			};
 	
-	if($.cookie('close_helpers') == '1') 
+	if($.cookie("close_helpers") == "1") 
 		{
 		document.getElementById( "close_helpers" ).style.display = "none";
 			};
 			
-	if($.cookie('close_services') == '1') 
+	if($.cookie("close_services") == "1") 
 		{
 		document.getElementById( "close_services" ).style.display = "none";
 			};
 			
-	if($.cookie('close_friends') == '1') 
+	if($.cookie("close_friends") == "1") 
 		{
 		document.getElementById( "close_friends" ).style.display = "none";
 			};
 	
-	if($.cookie('close_postit') == '1') 
+	if($.cookie("close_postit") == "1") 
 		{
 		document.getElementById( "close_postit" ).style.display = "none";
 			};
 			
-	if($.cookie('close_lastusers') == '1') 
+	if($.cookie("close_lastusers") == "1") 
 		{
 		document.getElementById( "close_lastusers" ).style.display = "none";
 			};
 			
-	if($.cookie('close_lastphotos') == '1') 
+	if($.cookie("close_lastphotos") == "1") 
 		{
 		document.getElementById( "close_lastphotos" ).style.display = "none";
 			};
 			
-	if($.cookie('close_lastlikes') == '1') 
+	if($.cookie("close_lastlikes") == "1") 
 		{
 		document.getElementById( "close_lastlikes" ).style.display = "none";
 			};}
@@ -374,57 +377,55 @@ $("right_aside").ready(function(){
 
 function close_pages(){
  document.getElementById( "close_pages" ).style.display = "none";
- $.cookie('close_pages','1', { expires: 365, path: '/' });
+ $.cookie("close_pages","1", { expires: 365, path: "/" });
  };
  
 function close_helpers(){
  document.getElementById( "close_helpers" ).style.display = "none";
-  $.cookie('close_helpers','1', { expires: 365, path: '/' });
+  $.cookie("close_helpers","1", { expires: 365, path: "/" });
  };
 
 function close_services(){
  document.getElementById( "close_services" ).style.display = "none";
- $.cookie('close_services','1', { expires: 365, path: '/' });
+ $.cookie("close_services","1", { expires: 365, path: "/" });
  };
  
 function close_friends(){
  document.getElementById( "close_friends" ).style.display = "none";
- $.cookie('close_friends','1', { expires: 365, path: '/' });
+ $.cookie("close_friends","1", { expires: 365, path: "/" });
  };
 
 function close_postit(){
  document.getElementById( "close_postit" ).style.display = "none";
- $.cookie('close_postit','1', { expires: 365, path: '/' });
+ $.cookie("close_postit","1", { expires: 365, path: "/" });
  };
  
 function close_lastusers(){
  document.getElementById( "close_lastusers" ).style.display = "none";
- $.cookie('close_lastusers','1', { expires: 365, path: '/' });
+ $.cookie("close_lastusers","1", { expires: 365, path: "/" });
  };
 
 function close_lastphotos(){
  document.getElementById( "close_lastphotos" ).style.display = "none";
- $.cookie('close_lastphotos','1', { expires: 365, path: '/' });
+ $.cookie("close_lastphotos","1", { expires: 365, path: "/" });
  };
  
 function close_lastlikes(){
  document.getElementById( "close_lastlikes" ).style.display = "none";
- $.cookie('close_lastlikes','1', { expires: 365, path: '/' });
+ $.cookie("close_lastlikes","1", { expires: 365, path: "/" });
  };
-
-function restore_boxes(){
-	$.cookie('close_pages','2', { expires: 365, path: '/' });
-	$.cookie('close_helpers','2', { expires: 365, path: '/' });
-	$.cookie('close_services','2', { expires: 365, path: '/' });
-	$.cookie('close_friends','2', { expires: 365, path: '/' });
-	$.cookie('close_postit','2', { expires: 365, path: '/' });
-	$.cookie('close_lastusers','2', { expires: 365, path: '/' });
-	$.cookie('close_lastphotos','2', { expires: 365, path: '/' });
-	$.cookie('close_lastlikes','2', { expires: 365, path: '/' });
-	alert('Right-hand column was restored. Please refresh your browser');
-  }; 
  
-</script>
-
-EOT;
+ 
 
+function restore_boxes(){
+	$.cookie("close_pages","2", { expires: 365, path: "/" });
+	$.cookie("close_helpers","2", { expires: 365, path: "/" });
+	$.cookie("close_services","2", { expires: 365, path: "/" });
+	$.cookie("close_friends","2", { expires: 365, path: "/" });
+	$.cookie("close_postit","2", { expires: 365, path: "/" });
+	$.cookie("close_lastusers","2", { expires: 365, path: "/" });
+	$.cookie("close_lastphotos","2", { expires: 365, path: "/" });
+	$.cookie("close_lastlikes","2", { expires: 365, path: "/" });
+	alert("Right-hand column was restored. Please refresh your browser");
+  };
+</script>';}
diff --git a/view/theme/diabook-blue/wallwall_item.tpl b/view/theme/diabook-blue/wallwall_item.tpl
index c5b6b36b5..bee75ad99 100644
--- a/view/theme/diabook-blue/wallwall_item.tpl
+++ b/view/theme/diabook-blue/wallwall_item.tpl
@@ -71,6 +71,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 }}
 			
 					
diff --git a/view/theme/diabook-red/jot.tpl b/view/theme/diabook-red/jot.tpl
index 9aef99787..bd43994b5 100755
--- a/view/theme/diabook-red/jot.tpl
+++ b/view/theme/diabook-red/jot.tpl
@@ -2,7 +2,6 @@
 <div id="profile-jot-wrapper" >
 	<div id="profile-jot-banner-wrapper">
 		<div id="profile-jot-desc" >&nbsp;</div>
-		<div id="character-counter" class="grey"></div>
 	</div>
 	<div id="profile-jot-banner-end"></div>
 
@@ -15,6 +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">
+		<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>
 
diff --git a/view/theme/diabook-red/profile_vcard.tpl b/view/theme/diabook-red/profile_vcard.tpl
index 918cfc97c..e28ec2909 100644
--- a/view/theme/diabook-red/profile_vcard.tpl
+++ b/view/theme/diabook-red/profile_vcard.tpl
@@ -21,9 +21,9 @@
 	</div>
 				
 	
-	{{ if $pdesc }}<div class="title">$profile.pdesc</div>{{ endif }}
-	<div id="profile-photo-wrapper"><img class="photo" width="155" height="155" src="$profile.photo?rev=$profile.picdate" alt="$profile.name" /></div>
 
+	<div id="profile-photo-wrapper"><img class="photo" width="155" height="155" src="$profile.photo?rev=$profile.picdate" alt="$profile.name" /></div>
+	{{ if $pdesc }}<div class="title">$profile.pdesc</div>{{ endif }}
 
 
 	{{ if $location }}
diff --git a/view/theme/diabook-red/style-network.css b/view/theme/diabook-red/style-network.css
index c7063860f..bbd4ceeee 100644
--- a/view/theme/diabook-red/style-network.css
+++ b/view/theme/diabook-red/style-network.css
@@ -1198,10 +1198,14 @@ section {
 
 body .pageheader{
   text-align: center;
-  margin-top: 25px;
-  font-size: 0px;
+  font-size: 20px;
+  margin-bottom: 20px;
+  margin-top: 0px;
+  max-width: 575px;
+	}
+.qcomment{
+  max-width: 122px;	
 	}
-
 #id_username {
   width: 173px;	
 	}
@@ -1253,7 +1257,7 @@ right_aside {
   /* background: #F1F1F1; */
 }
 right_aside a{color: red;}
-right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 5px; margin-bottom: 0px; 
+right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 3px; margin-bottom: 0px; 
 margin-top:30px;}
 right_aside .directory-item {	width: 50px; height: 50px; vertical-align: center; text-align: center; }
 right_aside .directory-photo { margin: 0px; }
@@ -1609,6 +1613,11 @@ transition: all 0.2s ease-in-out;
   padding: 0.3em;
   margin-bottom: 10px;
 }
+.grey
+{
+  display: inline;
+  float: right;	
+	}
 #jot #jot-tools {
   margin: 0px;
   padding: 0px;
diff --git a/view/theme/diabook-red/style-profile.css b/view/theme/diabook-red/style-profile.css
index 5124ed8c0..74217acf3 100644
--- a/view/theme/diabook-red/style-profile.css
+++ b/view/theme/diabook-red/style-profile.css
@@ -1176,10 +1176,14 @@ section {
 
 body .pageheader{
   text-align: center;
-  margin-top: 25px;
-  font-size: 0px;
+  font-size: 20px;
+  margin-bottom: 20px;
+  margin-top: 0px;
+  max-width: 575px;
+	}
+.qcomment{
+  max-width: 122px;	
 	}
-
 #id_username {
   width: 173px;	
 	}
@@ -1231,7 +1235,7 @@ right_aside {
   /* background: #F1F1F1; */
 }
 right_aside a{color: red;}
-right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 5px; margin-bottom: 0px; 
+right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 3px; margin-bottom: 0px; 
 margin-top:30px;}
 right_aside .directory-item {	width: 50px; height: 50px; vertical-align: center; text-align: center; }
 right_aside .directory-photo { margin: 0px; }
@@ -1583,6 +1587,11 @@ transition: all 0.2s ease-in-out;
   padding: 0.3em;
   margin-bottom: 10px;
 }
+.grey
+{
+  display: inline;
+  float: right;	
+	}
 #jot #jot-tools {
   margin: 0px;
   padding: 0px;
@@ -2057,6 +2066,7 @@ box-shadow: 2px 2px 5px 0px #000000;
 margin: 2px 5px 2px 5px;
 max-height: 85%;
 max-width: 85%;
+border-radius: 10px;
 }
 .lframe {
   float: left;
diff --git a/view/theme/diabook-red/style-settings.css b/view/theme/diabook-red/style-settings.css
index 9407c68f9..43bb3d037 100644
--- a/view/theme/diabook-red/style-settings.css
+++ b/view/theme/diabook-red/style-settings.css
@@ -1173,8 +1173,10 @@ section {
 
 body .pageheader{
   text-align: center;
-  margin-top: 25px;
-  font-size: 0px;
+  font-size: 20px;
+  margin-bottom: 20px;
+  margin-top: 0px;
+  max-width: 575px;
 	}
 
 #id_username {
diff --git a/view/theme/diabook-red/style.css b/view/theme/diabook-red/style.css
index 578a5473a..16c8fe6c5 100644
--- a/view/theme/diabook-red/style.css
+++ b/view/theme/diabook-red/style.css
@@ -1061,6 +1061,7 @@ aside {
   float: left;
   /* background: #F1F1F1; */
 }
+aside #page-sidebar{display: none;}
 aside .vcard .fn {
   font-size: 18px;
   font-weight: bold;
@@ -1243,10 +1244,14 @@ section {
 }
 body .pageheader{
   text-align: center;
-  margin-top: 25px;
-  font-size: 0px;
+  font-size: 20px;
+  margin-bottom: 20px;
+  margin-top: 0px;
+  max-width: 575px;
+	}
+.qcomment{
+  max-width: 122px;	
 	}
-
 #id_username {
   width: 173px;	
 	}
@@ -1608,6 +1613,11 @@ body .pageheader{
   padding: 0.3em;
   margin-bottom: 10px;
 }
+.grey
+{
+  display: inline;
+  float: right;	
+	}
 #jot #jot-tools {
   margin: 0px;
   padding: 0px;
@@ -2081,6 +2091,7 @@ box-shadow: 2px 2px 5px 0px #000000;
 margin: 2px 5px 2px 5px;
 max-height: 85%;
 max-width: 85%;
+border-radius: 10px;
 }
 .lframe {
   float: left;
diff --git a/view/theme/diabook-red/theme.php b/view/theme/diabook-red/theme.php
index 44a76a5e4..a6b2ea823 100755
--- a/view/theme/diabook-red/theme.php
+++ b/view/theme/diabook-red/theme.php
@@ -3,7 +3,7 @@
 /*
  * Name: Diabook-red
  * Description: Diabook-red: report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu
- * Version: 
+ * Version: (Version: 1.011)
  * Author: 
  */
 
@@ -164,7 +164,8 @@ function diabook_red_community_info(){
 	$pagelist = array();
 
 	$contacts = q("SELECT `id`, `url`, `name`, `micro`FROM `contact`
-			WHERE `network`= 'dfrn' AND `forum` = 1 AND `uid` = %d",
+			WHERE `network`= 'dfrn' AND `forum` = 1 AND `uid` = %d
+			ORDER BY `name` ASC",
 			intval($a->user['uid'])
 	);
 
@@ -317,56 +318,58 @@ $a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s" ></scrip
 
 //js scripts
 
-$a->page['htmlhead'] .= <<< EOT
+$a->page['htmlhead'] .= '
 
 <script>
  $(function() {
-	$('a.lightbox').fancybox(); // Select all links with lightbox class
-	
+	$("a.lightbox").fancybox(); // Select all links with lightbox class
  });
+  
+ </script>';
 
-</script>
 
+if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname'] or $a->argv[0] === "network" && local_user()){
+$a->page['htmlhead'] .= '
 <script>
 
 $("right_aside").ready(function(){
 	
-	if($.cookie('close_pages') == '1') 
+	if($.cookie("close_pages") == "1") 
 		{
 		document.getElementById( "close_pages" ).style.display = "none";
 			};
 	
-	if($.cookie('close_helpers') == '1') 
+	if($.cookie("close_helpers") == "1") 
 		{
 		document.getElementById( "close_helpers" ).style.display = "none";
 			};
 			
-	if($.cookie('close_services') == '1') 
+	if($.cookie("close_services") == "1") 
 		{
 		document.getElementById( "close_services" ).style.display = "none";
 			};
 			
-	if($.cookie('close_friends') == '1') 
+	if($.cookie("close_friends") == "1") 
 		{
 		document.getElementById( "close_friends" ).style.display = "none";
 			};
 	
-	if($.cookie('close_postit') == '1') 
+	if($.cookie("close_postit") == "1") 
 		{
 		document.getElementById( "close_postit" ).style.display = "none";
 			};
 			
-	if($.cookie('close_lastusers') == '1') 
+	if($.cookie("close_lastusers") == "1") 
 		{
 		document.getElementById( "close_lastusers" ).style.display = "none";
 			};
 			
-	if($.cookie('close_lastphotos') == '1') 
+	if($.cookie("close_lastphotos") == "1") 
 		{
 		document.getElementById( "close_lastphotos" ).style.display = "none";
 			};
 			
-	if($.cookie('close_lastlikes') == '1') 
+	if($.cookie("close_lastlikes") == "1") 
 		{
 		document.getElementById( "close_lastlikes" ).style.display = "none";
 			};}
@@ -375,57 +378,55 @@ $("right_aside").ready(function(){
 
 function close_pages(){
  document.getElementById( "close_pages" ).style.display = "none";
- $.cookie('close_pages','1', { expires: 365, path: '/' });
+ $.cookie("close_pages","1", { expires: 365, path: "/" });
  };
  
 function close_helpers(){
  document.getElementById( "close_helpers" ).style.display = "none";
-  $.cookie('close_helpers','1', { expires: 365, path: '/' });
+  $.cookie("close_helpers","1", { expires: 365, path: "/" });
  };
 
 function close_services(){
  document.getElementById( "close_services" ).style.display = "none";
- $.cookie('close_services','1', { expires: 365, path: '/' });
+ $.cookie("close_services","1", { expires: 365, path: "/" });
  };
  
 function close_friends(){
  document.getElementById( "close_friends" ).style.display = "none";
- $.cookie('close_friends','1', { expires: 365, path: '/' });
+ $.cookie("close_friends","1", { expires: 365, path: "/" });
  };
 
 function close_postit(){
  document.getElementById( "close_postit" ).style.display = "none";
- $.cookie('close_postit','1', { expires: 365, path: '/' });
+ $.cookie("close_postit","1", { expires: 365, path: "/" });
  };
  
 function close_lastusers(){
  document.getElementById( "close_lastusers" ).style.display = "none";
- $.cookie('close_lastusers','1', { expires: 365, path: '/' });
+ $.cookie("close_lastusers","1", { expires: 365, path: "/" });
  };
 
 function close_lastphotos(){
  document.getElementById( "close_lastphotos" ).style.display = "none";
- $.cookie('close_lastphotos','1', { expires: 365, path: '/' });
+ $.cookie("close_lastphotos","1", { expires: 365, path: "/" });
  };
  
 function close_lastlikes(){
  document.getElementById( "close_lastlikes" ).style.display = "none";
- $.cookie('close_lastlikes','1', { expires: 365, path: '/' });
+ $.cookie("close_lastlikes","1", { expires: 365, path: "/" });
  };
-
-function restore_boxes(){
-	$.cookie('close_pages','2', { expires: 365, path: '/' });
-	$.cookie('close_helpers','2', { expires: 365, path: '/' });
-	$.cookie('close_services','2', { expires: 365, path: '/' });
-	$.cookie('close_friends','2', { expires: 365, path: '/' });
-	$.cookie('close_postit','2', { expires: 365, path: '/' });
-	$.cookie('close_lastusers','2', { expires: 365, path: '/' });
-	$.cookie('close_lastphotos','2', { expires: 365, path: '/' });
-	$.cookie('close_lastlikes','2', { expires: 365, path: '/' });
-	alert('Right-hand column was restored. Please refresh your browser');
-  }; 
  
-</script>
-
-EOT;
+ 
 
+function restore_boxes(){
+	$.cookie("close_pages","2", { expires: 365, path: "/" });
+	$.cookie("close_helpers","2", { expires: 365, path: "/" });
+	$.cookie("close_services","2", { expires: 365, path: "/" });
+	$.cookie("close_friends","2", { expires: 365, path: "/" });
+	$.cookie("close_postit","2", { expires: 365, path: "/" });
+	$.cookie("close_lastusers","2", { expires: 365, path: "/" });
+	$.cookie("close_lastphotos","2", { expires: 365, path: "/" });
+	$.cookie("close_lastlikes","2", { expires: 365, path: "/" });
+	alert("Right-hand column was restored. Please refresh your browser");
+  };
+</script>';}
diff --git a/view/theme/diabook-red/wallwall_item.tpl b/view/theme/diabook-red/wallwall_item.tpl
index c5b6b36b5..bee75ad99 100644
--- a/view/theme/diabook-red/wallwall_item.tpl
+++ b/view/theme/diabook-red/wallwall_item.tpl
@@ -71,6 +71,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 }}
 			
 					
diff --git a/view/theme/diabook/jot.tpl b/view/theme/diabook/jot.tpl
index 9aef99787..bd43994b5 100755
--- a/view/theme/diabook/jot.tpl
+++ b/view/theme/diabook/jot.tpl
@@ -2,7 +2,6 @@
 <div id="profile-jot-wrapper" >
 	<div id="profile-jot-banner-wrapper">
 		<div id="profile-jot-desc" >&nbsp;</div>
-		<div id="character-counter" class="grey"></div>
 	</div>
 	<div id="profile-jot-banner-end"></div>
 
@@ -15,6 +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">
+		<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>
 
diff --git a/view/theme/diabook/profile_vcard.tpl b/view/theme/diabook/profile_vcard.tpl
index 918cfc97c..e28ec2909 100644
--- a/view/theme/diabook/profile_vcard.tpl
+++ b/view/theme/diabook/profile_vcard.tpl
@@ -21,9 +21,9 @@
 	</div>
 				
 	
-	{{ if $pdesc }}<div class="title">$profile.pdesc</div>{{ endif }}
-	<div id="profile-photo-wrapper"><img class="photo" width="155" height="155" src="$profile.photo?rev=$profile.picdate" alt="$profile.name" /></div>
 
+	<div id="profile-photo-wrapper"><img class="photo" width="155" height="155" src="$profile.photo?rev=$profile.picdate" alt="$profile.name" /></div>
+	{{ if $pdesc }}<div class="title">$profile.pdesc</div>{{ endif }}
 
 
 	{{ if $location }}
diff --git a/view/theme/diabook/style-network.css b/view/theme/diabook/style-network.css
index 518e7b88d..d226c70fd 100644
--- a/view/theme/diabook/style-network.css
+++ b/view/theme/diabook/style-network.css
@@ -1144,8 +1144,13 @@ section {
 
 body .pageheader{
   text-align: center;
-  margin-top: 25px;
-  font-size: 0px;
+  font-size: 20px;
+  margin-bottom: 20px;
+  margin-top: 0px;
+  max-width: 575px;
+	}
+.qcomment{
+  max-width: 122px;	
 	}
 
 #id_username {
@@ -1196,7 +1201,7 @@ right_aside {
   
   /* background: #F1F1F1; */
 }
-right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 5px; margin-bottom: 0px; 
+right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 3px; margin-bottom: 0px; 
 margin-top:30px;}
 right_aside .directory-item {	width: 50px; height: 50px; vertical-align: center; text-align: center; }
 right_aside .directory-photo { margin: 0px; }
@@ -1544,6 +1549,11 @@ transition: all 0.2s ease-in-out;
   padding: 0.3em;
   margin-bottom: 10px;
 }
+.grey
+{
+  display: inline;
+  float: right;	
+	}
 #jot #jot-tools {
   margin: 0px;
   padding: 0px;
diff --git a/view/theme/diabook/style-profile.css b/view/theme/diabook/style-profile.css
index 0077510a1..f1672f4b4 100644
--- a/view/theme/diabook/style-profile.css
+++ b/view/theme/diabook/style-profile.css
@@ -1138,10 +1138,14 @@ section {
 
 body .pageheader{
   text-align: center;
-  margin-top: 25px;
-  font-size: 0px;
+  font-size: 20px;
+  margin-bottom: 20px;
+  margin-top: 0px;
+  max-width: 575px;
+	}
+.qcomment{
+  max-width: 122px;	
 	}
-
 #id_username {
   width: 173px;	
 	}
@@ -1191,7 +1195,7 @@ right_aside {
   
   /* background: #F1F1F1; */
 }
-right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 5px; margin-bottom: 0px; 
+right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 3px; margin-bottom: 0px; 
 margin-top:30px;}
 right_aside .directory-item {	width: 50px; height: 50px; vertical-align: center; text-align: center; }
 right_aside .directory-photo { margin: 0px; }
@@ -1539,6 +1543,11 @@ transition: all 0.2s ease-in-out;
   padding: 0.3em;
   margin-bottom: 10px;
 }
+.grey
+{
+  display: inline;
+  float: right;	
+	}
 #jot #jot-tools {
   margin: 0px;
   padding: 0px;
@@ -2003,6 +2012,9 @@ ul.tabs li .active {
   float: left;
 }
 /* photo */
+.photo {
+border-radius: 10px;	
+	}
 .lframe {
   float: left;
 }
diff --git a/view/theme/diabook/style-settings.css b/view/theme/diabook/style-settings.css
index 46f7e957e..b23c2bb1b 100644
--- a/view/theme/diabook/style-settings.css
+++ b/view/theme/diabook/style-settings.css
@@ -1135,8 +1135,11 @@ section {
 
 body .pageheader{
   text-align: center;
-  margin-top: 25px;
-  font-size: 0px;
+  font-size: 20px;
+  max-width: 575px;
+  margin-bottom: 20px;
+  margin-top: 0px;
+  max-width: 575px;
 	}
 
 #id_username {
diff --git a/view/theme/diabook/style.css b/view/theme/diabook/style.css
index 97a26a41d..c8efeab33 100644
--- a/view/theme/diabook/style.css
+++ b/view/theme/diabook/style.css
@@ -1022,7 +1022,7 @@ aside {
   float: left;
   /* background: #F1F1F1; */
 }
-
+aside #page-sidebar{display: none;}
 aside .vcard .fn {
   font-size: 18px;
   font-weight: bold;
@@ -1190,10 +1190,14 @@ section {
 
 body .pageheader{
   text-align: center;
-  margin-top: 25px;
-  font-size: 0px;
+  font-size: 20px;
+  margin-bottom: 20px;
+  margin-top: 0px;
+  max-width: 575px;
+	}
+.qcomment{
+  max-width: 122px;	
 	}
-
 #id_username {
   width: 173px;	
 	}
@@ -1550,6 +1554,11 @@ body .pageheader{
   padding: 0.3em;
   margin-bottom: 10px;
 }
+.grey
+{
+  display: inline;
+  float: right;	
+	}
 #jot #jot-tools {
   margin: 0px;
   padding: 0px;
@@ -2014,6 +2023,9 @@ ul.tabs li .active {
   float: left;
 }
 /* photo */
+.photo {
+border-radius: 10px;	
+	}
 .lframe {
   float: left;
 }
diff --git a/view/theme/diabook/theme.php b/view/theme/diabook/theme.php
index d6ee57316..2fe985060 100755
--- a/view/theme/diabook/theme.php
+++ b/view/theme/diabook/theme.php
@@ -3,7 +3,7 @@
 /*
  * Name: Diabook
  * Description: Diabook: report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu
- * Version: 
+ * Version: (Version: 1.011)
  * Author: 
  */
 
@@ -169,7 +169,8 @@ function diabook_community_info(){
 	$pagelist = array();
 
 	$contacts = q("SELECT `id`, `url`, `name`, `micro`FROM `contact`
-			WHERE `network`= 'dfrn' AND `forum` = 1 AND `uid` = %d",
+			WHERE `network`= 'dfrn' AND `forum` = 1 AND `uid` = %d
+			ORDER BY `name` ASC",
 			intval($a->user['uid'])
 	);
 
@@ -264,7 +265,7 @@ if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname']){
 	}
 }
 
-//tabs at right_aside on settings page
+//tabs at aside on settings page
 if ($a->argv[0] === "settings"){
 	
 	$tabs = array(
@@ -323,55 +324,58 @@ $a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s" ></scrip
 
 //js scripts
 
-$a->page['htmlhead'] .= <<< EOT
+$a->page['htmlhead'] .= '
 
 <script>
  $(function() {
-	$('a.lightbox').fancybox(); // Select all links with lightbox class
+	$("a.lightbox").fancybox(); // Select all links with lightbox class
  });
   
- </script>
+ </script>';
 
+
+if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname'] or $a->argv[0] === "network" && local_user()){
+$a->page['htmlhead'] .= '
 <script>
 
 $("right_aside").ready(function(){
 	
-	if($.cookie('close_pages') == '1') 
+	if($.cookie("close_pages") == "1") 
 		{
 		document.getElementById( "close_pages" ).style.display = "none";
 			};
 	
-	if($.cookie('close_helpers') == '1') 
+	if($.cookie("close_helpers") == "1") 
 		{
 		document.getElementById( "close_helpers" ).style.display = "none";
 			};
 			
-	if($.cookie('close_services') == '1') 
+	if($.cookie("close_services") == "1") 
 		{
 		document.getElementById( "close_services" ).style.display = "none";
 			};
 			
-	if($.cookie('close_friends') == '1') 
+	if($.cookie("close_friends") == "1") 
 		{
 		document.getElementById( "close_friends" ).style.display = "none";
 			};
 	
-	if($.cookie('close_postit') == '1') 
+	if($.cookie("close_postit") == "1") 
 		{
 		document.getElementById( "close_postit" ).style.display = "none";
 			};
 			
-	if($.cookie('close_lastusers') == '1') 
+	if($.cookie("close_lastusers") == "1") 
 		{
 		document.getElementById( "close_lastusers" ).style.display = "none";
 			};
 			
-	if($.cookie('close_lastphotos') == '1') 
+	if($.cookie("close_lastphotos") == "1") 
 		{
 		document.getElementById( "close_lastphotos" ).style.display = "none";
 			};
 			
-	if($.cookie('close_lastlikes') == '1') 
+	if($.cookie("close_lastlikes") == "1") 
 		{
 		document.getElementById( "close_lastlikes" ).style.display = "none";
 			};}
@@ -380,60 +384,55 @@ $("right_aside").ready(function(){
 
 function close_pages(){
  document.getElementById( "close_pages" ).style.display = "none";
- $.cookie('close_pages','1', { expires: 365, path: '/' });
+ $.cookie("close_pages","1", { expires: 365, path: "/" });
  };
  
 function close_helpers(){
  document.getElementById( "close_helpers" ).style.display = "none";
-  $.cookie('close_helpers','1', { expires: 365, path: '/' });
+  $.cookie("close_helpers","1", { expires: 365, path: "/" });
  };
 
 function close_services(){
  document.getElementById( "close_services" ).style.display = "none";
- $.cookie('close_services','1', { expires: 365, path: '/' });
+ $.cookie("close_services","1", { expires: 365, path: "/" });
  };
  
 function close_friends(){
  document.getElementById( "close_friends" ).style.display = "none";
- $.cookie('close_friends','1', { expires: 365, path: '/' });
+ $.cookie("close_friends","1", { expires: 365, path: "/" });
  };
 
 function close_postit(){
  document.getElementById( "close_postit" ).style.display = "none";
- $.cookie('close_postit','1', { expires: 365, path: '/' });
+ $.cookie("close_postit","1", { expires: 365, path: "/" });
  };
  
 function close_lastusers(){
  document.getElementById( "close_lastusers" ).style.display = "none";
- $.cookie('close_lastusers','1', { expires: 365, path: '/' });
+ $.cookie("close_lastusers","1", { expires: 365, path: "/" });
  };
 
 function close_lastphotos(){
  document.getElementById( "close_lastphotos" ).style.display = "none";
- $.cookie('close_lastphotos','1', { expires: 365, path: '/' });
+ $.cookie("close_lastphotos","1", { expires: 365, path: "/" });
  };
  
 function close_lastlikes(){
  document.getElementById( "close_lastlikes" ).style.display = "none";
- $.cookie('close_lastlikes','1', { expires: 365, path: '/' });
+ $.cookie("close_lastlikes","1", { expires: 365, path: "/" });
  };
  
  
 
 function restore_boxes(){
-	$.cookie('close_pages','2', { expires: 365, path: '/' });
-	$.cookie('close_helpers','2', { expires: 365, path: '/' });
-	$.cookie('close_services','2', { expires: 365, path: '/' });
-	$.cookie('close_friends','2', { expires: 365, path: '/' });
-	$.cookie('close_postit','2', { expires: 365, path: '/' });
-	$.cookie('close_lastusers','2', { expires: 365, path: '/' });
-	$.cookie('close_lastphotos','2', { expires: 365, path: '/' });
-	$.cookie('close_lastlikes','2', { expires: 365, path: '/' });
-	alert('Right-hand column was restored. Please refresh your browser');
+	$.cookie("close_pages","2", { expires: 365, path: "/" });
+	$.cookie("close_helpers","2", { expires: 365, path: "/" });
+	$.cookie("close_services","2", { expires: 365, path: "/" });
+	$.cookie("close_friends","2", { expires: 365, path: "/" });
+	$.cookie("close_postit","2", { expires: 365, path: "/" });
+	$.cookie("close_lastusers","2", { expires: 365, path: "/" });
+	$.cookie("close_lastphotos","2", { expires: 365, path: "/" });
+	$.cookie("close_lastlikes","2", { expires: 365, path: "/" });
+	alert("Right-hand column was restored. Please refresh your browser");
   };
-
- 
-</script>
- 
- 
-EOT;
+</script>';}
\ No newline at end of file
diff --git a/view/theme/diabook/wallwall_item.tpl b/view/theme/diabook/wallwall_item.tpl
index c5b6b36b5..bee75ad99 100644
--- a/view/theme/diabook/wallwall_item.tpl
+++ b/view/theme/diabook/wallwall_item.tpl
@@ -71,6 +71,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 }}