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:

8 files changed, 90 insertions, 53 deletions

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 }}