From 9faa940f044dd47687a008272c727f8f8dac9fec Mon Sep 17 00:00:00 2001
From: tommy tomson <thomas.bierey@gmx.de>
Date: Mon, 2 Apr 2012 15:06:55 +0200
Subject: diabook-themes: bugfixes / css-fixes

---
 view/theme/diabook/theme.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'view/theme/diabook/theme.php')

diff --git a/view/theme/diabook/theme.php b/view/theme/diabook/theme.php
index d6ee57316..a535ed07e 100755
--- a/view/theme/diabook/theme.php
+++ b/view/theme/diabook/theme.php
@@ -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'])
 	);
 
-- 
cgit v1.2.3


From b5d57d5313b61842a72f0e2ad002cf633aa72dd7 Mon Sep 17 00:00:00 2001
From: tommy tomson <thomas.bierey@gmx.de>
Date: Mon, 2 Apr 2012 17:17:14 +0200
Subject: diabook-themes: fixed pageheader

---
 view/theme/diabook/theme.php | 68 +++++++++++++++++++++-----------------------
 1 file changed, 33 insertions(+), 35 deletions(-)

(limited to 'view/theme/diabook/theme.php')

diff --git a/view/theme/diabook/theme.php b/view/theme/diabook/theme.php
index a535ed07e..34e5535de 100755
--- a/view/theme/diabook/theme.php
+++ b/view/theme/diabook/theme.php
@@ -265,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(
@@ -324,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";
 			};}
@@ -381,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
-- 
cgit v1.2.3


From 076b1b374b864a4d45add31c72e447495dbe0339 Mon Sep 17 00:00:00 2001
From: tommy tomson <thomas.bierey@gmx.de>
Date: Mon, 2 Apr 2012 18:16:58 +0200
Subject: diabook-themes: fixes in js

---
 view/theme/diabook/theme.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'view/theme/diabook/theme.php')

diff --git a/view/theme/diabook/theme.php b/view/theme/diabook/theme.php
index 34e5535de..d8f96e9f7 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: 0.010)
  * Author: 
  */
 
-- 
cgit v1.2.3


From 6dfd55668f39d2cfb27d468cc982471abaad5165 Mon Sep 17 00:00:00 2001
From: tommy tomson <thomas.bierey@gmx.de>
Date: Mon, 2 Apr 2012 20:30:27 +0200
Subject: diabook-themes: css-fixes

---
 view/theme/diabook/theme.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'view/theme/diabook/theme.php')

diff --git a/view/theme/diabook/theme.php b/view/theme/diabook/theme.php
index d8f96e9f7..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: 0.010)
+ * Version: (Version: 1.011)
  * Author: 
  */
 
-- 
cgit v1.2.3


From 8a71191d6d45f74e200bb6e279916375c2416b05 Mon Sep 17 00:00:00 2001
From: tommy tomson <thomas.bierey@gmx.de>
Date: Tue, 3 Apr 2012 20:59:00 +0200
Subject: make right_aside translatable and provide german translation... and
 some css-fixes

---
 view/theme/diabook/theme.php | 36 +++++++++++++++++++++++++++++++-----
 1 file changed, 31 insertions(+), 5 deletions(-)

(limited to 'view/theme/diabook/theme.php')

diff --git a/view/theme/diabook/theme.php b/view/theme/diabook/theme.php
index 2fe985060..50a7c6974 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: 1.011)
+ * Version: (Version: 1.012)
  * Author: 
  */
 
@@ -143,7 +143,8 @@ function diabook_community_info(){
    //right_aside FIND FRIENDS
 	if(local_user()) {
 	$nv = array();
-	$nv['directory'] = Array('directory', t('Local').' '.t('Directory'), "", "");
+	$nv['title'] = Array("", t('Find Friends'), "", "");
+	$nv['directory'] = Array('directory', t('Local Directory'), "", "");
 	$nv['global_directory'] = Array('http://dir.friendica.com/', t('Global Directory'), "", "");
 	$nv['match'] = Array('match', t('Similar Interests'), "", "");
 	$nv['suggest'] = Array('suggest', t('Friend Suggestions'), "", "");
@@ -193,9 +194,28 @@ function diabook_community_info(){
 		
 		$aside['$page'] = $page;	
 	}
-  //END Community Page		
-     
-   
+  //END Community Page	
+  //helpers
+   $helpers = array();
+	$helpers['title'] = Array("", t('Help or @NewHere ?'), "", "");
+	
+	$aside['$helpers'] = $helpers;
+   //end helpers
+   //connectable services
+   $con_services = array();
+	$con_services['title'] = Array("", t('Connect Services'), "", "");
+	
+	$aside['$con_services'] = $con_services;
+   //end connectable services
+   //postit
+   $postit = array();
+	$postit['title'] = Array("", t('PostIt to Friendica'), t('Post to Friendica'), "");
+	$postit['text'] = Array("", t(' from anywhere by bookmarking this Link.'), "", "");
+	
+	$aside['$postit'] = $postit;
+   //end postit
+  
+   //get_baseurl
    $url = $a->get_baseurl($ssl_state);   
    $aside['$url'] = $url;
 
@@ -330,6 +350,12 @@ $a->page['htmlhead'] .= '
  $(function() {
 	$("a.lightbox").fancybox(); // Select all links with lightbox class
  });
+ 
+ $(document).ready(function (){
+	$("iframe").each(function(){
+		var url = $(this).attr("src");
+		$(this).attr("src",url+"?wmode=transparent"); });
+    });
   
  </script>';
 
-- 
cgit v1.2.3


From f980b79edcff78a849d65de15f36f2b0475665d7 Mon Sep 17 00:00:00 2001
From: tommy tomson <thomas.bierey@gmx.de>
Date: Fri, 6 Apr 2012 11:19:12 +0200
Subject: new-contacts-introductions in contacts-drop-down and new-messages in
 messages-drop-down get each an additional indicator... profile-picture is now
 scaled right in firefox... fixed broken css on introductions-page in
 firefox...

---
 view/theme/diabook/theme.php | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)
 mode change 100644 => 100755 view/theme/diabook/theme.php

(limited to 'view/theme/diabook/theme.php')

diff --git a/view/theme/diabook/theme.php b/view/theme/diabook/theme.php
old mode 100644
new mode 100755
index 50a7c6974..0c83a0567
--- 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: 1.012)
+ * Version: (Version: 1.013)
  * Author: 
  */
 
@@ -339,9 +339,10 @@ if ($a->argv[0] === "settings"){
 if (!is_null($cssFile)) $a->page['htmlhead'] .= sprintf('<link rel="stylesheet" type="text/css" href="%s" />', $cssFile);
 
 //load jquery.cookie.js
-$cookieJS = $a->get_baseurl($ssl_state)."/view/theme/diabook-blue/js/jquery.cookie.js";
+$cookieJS = $a->get_baseurl($ssl_state)."/view/theme/diabook/js/jquery.cookie.js";
 $a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s" ></script>', $cookieJS);
 
+
 //js scripts
 
 $a->page['htmlhead'] .= '
@@ -350,15 +351,9 @@ $a->page['htmlhead'] .= '
  $(function() {
 	$("a.lightbox").fancybox(); // Select all links with lightbox class
  });
- 
- $(document).ready(function (){
-	$("iframe").each(function(){
-		var url = $(this).attr("src");
-		$(this).attr("src",url+"?wmode=transparent"); });
-    });
-  
+   
  </script>';
-
+ 
 
 if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname'] or $a->argv[0] === "network" && local_user()){
 $a->page['htmlhead'] .= '
-- 
cgit v1.2.3


From 1c0700f371f96466be113a4184d7ab9acd39e22f Mon Sep 17 00:00:00 2001
From: tommy tomson <thomas.bierey@gmx.de>
Date: Sat, 7 Apr 2012 16:39:43 +0200
Subject: changelog 1.014 : image-rezise via jquery-plugin in stream comments
 under uploaded pictues add Diabook's version-number in head-section

css-fixes:
tabs
youtube-iframe
title-bar in jot-wrapper
blockquote & .oembed
---
 view/theme/diabook/theme.php | 49 ++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 47 insertions(+), 2 deletions(-)

(limited to 'view/theme/diabook/theme.php')

diff --git a/view/theme/diabook/theme.php b/view/theme/diabook/theme.php
index 0c83a0567..fbe42a304 100755
--- a/view/theme/diabook/theme.php
+++ b/view/theme/diabook/theme.php
@@ -3,11 +3,14 @@
 /*
  * Name: Diabook
  * Description: Diabook: report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu
- * Version: (Version: 1.013)
+ * Version: (Version: 1.014)
  * Author: 
  */
 
 
+//print diabook-version for debugging
+$diabook_version = "Diabook (Version: 1.014)";
+$a->page['htmlhead'] .= sprintf('<script "%s" ></script>', $diabook_version);
 
 //change css on network and profilepages
 $cssFile = null;
@@ -285,6 +288,8 @@ if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname']){
 	}
 }
 
+
+
 //tabs at aside on settings page
 if ($a->argv[0] === "settings"){
 	
@@ -340,10 +345,27 @@ if (!is_null($cssFile)) $a->page['htmlhead'] .= sprintf('<link rel="stylesheet"
 
 //load jquery.cookie.js
 $cookieJS = $a->get_baseurl($ssl_state)."/view/theme/diabook/js/jquery.cookie.js";
-$a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s" ></script>', $cookieJS);
+$a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s"></script>', $cookieJS);
+
+//load jquery.ae.image.resize.js
+$imageresizeJS = $a->get_baseurl($ssl_state)."/view/theme/diabook/js/jquery.ae.image.resize.js";
+$a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s" ></script>', $imageresizeJS);
 
 
 //js scripts
+//comment-edit-wrapper on photo_view
+if ($a->argv[0].$a->argv[2] === "photos"."image"){
+
+$a->page['htmlhead'] .= '
+<script>
+	$(function(){
+	
+		$(".comment-edit-form").css("display","table");
+			
+			});
+    </script>';
+	
+}
 
 $a->page['htmlhead'] .= '
 
@@ -354,11 +376,34 @@ $a->page['htmlhead'] .= '
    
  </script>';
  
+$a->page['htmlhead'] .= '
+ <script>
+ 
+$(document).ready(function() {
+    $(".embed_yt iframe").each(function(){
+        var ifr_source = $(this).attr("src");
+        var wmode = "wmode=transparent";
+        if(ifr_source.indexOf("?") != -1) {
+            var getQString = ifr_source.split("?");
+            var oldString = getQString[1];
+            var newString = getQString[0];
+            $(this).attr("src",newString+"?"+wmode+"&"+oldString);
+        }
+        else $(this).attr("src",ifr_source+"?"+wmode);
+    });
+});
+  
+ </script>';
+ 
 
 if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname'] or $a->argv[0] === "network" && local_user()){
 $a->page['htmlhead'] .= '
 <script>
 
+ $(function() {
+	$(".oembed.photo img").aeImageResize({height: 400, width: 400});
+  });
+
 $("right_aside").ready(function(){
 	
 	if($.cookie("close_pages") == "1") 
-- 
cgit v1.2.3


From 7d018f651d5f5b21a650d81ab5ea16a224585da6 Mon Sep 17 00:00:00 2001
From: tommy tomson <thomas.bierey@gmx.de>
Date: Mon, 9 Apr 2012 00:02:48 +0200
Subject: fixed z-index of youtube-vids  fixed bug to hide right_side

---
 view/theme/diabook/theme.php | 30 ++++++++++++++++++++++++------
 1 file changed, 24 insertions(+), 6 deletions(-)

(limited to 'view/theme/diabook/theme.php')

diff --git a/view/theme/diabook/theme.php b/view/theme/diabook/theme.php
index fbe42a304..924639625 100755
--- a/view/theme/diabook/theme.php
+++ b/view/theme/diabook/theme.php
@@ -3,13 +3,13 @@
 /*
  * Name: Diabook
  * Description: Diabook: report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu
- * Version: (Version: 1.014)
+ * Version: (Version: 1.015)
  * Author: 
  */
 
 
 //print diabook-version for debugging
-$diabook_version = "Diabook (Version: 1.014)";
+$diabook_version = "Diabook (Version: 1.015)";
 $a->page['htmlhead'] .= sprintf('<script "%s" ></script>', $diabook_version);
 
 //change css on network and profilepages
@@ -376,11 +376,12 @@ $a->page['htmlhead'] .= '
    
  </script>';
  
+ 
 $a->page['htmlhead'] .= '
  <script>
  
 $(document).ready(function() {
-    $(".embed_yt iframe").each(function(){
+    $("iframe").each(function(){
         var ifr_source = $(this).attr("src");
         var wmode = "wmode=transparent";
         if(ifr_source.indexOf("?") != -1) {
@@ -391,7 +392,18 @@ $(document).ready(function() {
         }
         else $(this).attr("src",ifr_source+"?"+wmode);
     });
+      
+
 });
+
+function yt_iframe() {
+	
+	$("iframe").load(function() { 
+	var ifr_src = $(this).contents().find("body iframe").attr("src");
+	$("iframe").contents().find("body iframe").attr("src", ifr_src+"&wmode=transparent");
+    });
+
+	};
   
  </script>';
  
@@ -403,7 +415,12 @@ $a->page['htmlhead'] .= '
  $(function() {
 	$(".oembed.photo img").aeImageResize({height: 400, width: 400});
   });
+</script>';
 
+
+	if($ccCookie != "8") {
+$a->page['htmlhead'] .= '
+<script>
 $("right_aside").ready(function(){
 	
 	if($.cookie("close_pages") == "1") 
@@ -487,9 +504,10 @@ function close_lastlikes(){
  document.getElementById( "close_lastlikes" ).style.display = "none";
  $.cookie("close_lastlikes","1", { expires: 365, path: "/" });
  };
- 
- 
+</script>';}
 
+$a->page['htmlhead'] .= ' 
+<script>
 function restore_boxes(){
 	$.cookie("close_pages","2", { expires: 365, path: "/" });
 	$.cookie("close_helpers","2", { expires: 365, path: "/" });
@@ -500,5 +518,5 @@ function restore_boxes(){
 	$.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
-- 
cgit v1.2.3


From 0d4fab4ee3cba6db669d6b7e608bfbbba8e8d3dc Mon Sep 17 00:00:00 2001
From: tommy tomson <thomas.bierey@gmx.de>
Date: Tue, 10 Apr 2012 00:55:39 +0200
Subject: bbcode toolbar attached to the comment text field minor css-fixes

---
 view/theme/diabook/theme.php | 33 ++++++++++++++++++++++++++++++---
 1 file changed, 30 insertions(+), 3 deletions(-)

(limited to 'view/theme/diabook/theme.php')

diff --git a/view/theme/diabook/theme.php b/view/theme/diabook/theme.php
index 924639625..bf31c08eb 100755
--- a/view/theme/diabook/theme.php
+++ b/view/theme/diabook/theme.php
@@ -3,13 +3,13 @@
 /*
  * Name: Diabook
  * Description: Diabook: report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu
- * Version: (Version: 1.015)
+ * Version: (Version: 1.016)
  * Author: 
  */
 
 
 //print diabook-version for debugging
-$diabook_version = "Diabook (Version: 1.015)";
+$diabook_version = "Diabook (Version: 1.016)";
 $a->page['htmlhead'] .= sprintf('<script "%s" ></script>', $diabook_version);
 
 //change css on network and profilepages
@@ -519,4 +519,31 @@ function restore_boxes(){
 	$.cookie("close_lastlikes","2", { expires: 365, path: "/" });
 	alert("Right-hand column was restored. Please refresh your browser");
   }
-</script>';}
\ No newline at end of file
+</script>';}
+
+$a->page['htmlhead'] .= ' 
+
+<script type="text/javascript">
+function insertFormatting(BBcode,id) {
+	
+		var tmpStr = $("#comment-edit-text-" + id).val();
+		if(tmpStr == "Kommentar") {
+			tmpStr = "";
+			$("#comment-edit-text-" + id).addClass("comment-edit-text-full");
+			$("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
+			openMenu("comment-edit-submit-wrapper-" + id);
+											}
+
+	textarea = document.getElementById("comment-edit-text-" +id);
+	if (document.selection) {
+		textarea.focus();
+		selected = document.selection.createRange();
+		selected.text = "["+BBcode+"]" + selected.text + "[/"+BBcode+"]";
+	} else if (textarea.selectionStart || textarea.selectionStart == "0") {
+		var start = textarea.selectionStart;
+		var end = textarea.selectionEnd;
+		textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
+	}
+	return true;
+}
+</script> ';
\ No newline at end of file
-- 
cgit v1.2.3


From 6db33fc5138e55f5ae95fe7b24b3e93f8e20408c Mon Sep 17 00:00:00 2001
From: tommy tomson <thomas.bierey@gmx.de>
Date: Tue, 10 Apr 2012 15:13:34 +0200
Subject: diabook-themes: smal fix in bbcode-js

---
 view/theme/diabook/theme.php | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'view/theme/diabook/theme.php')

diff --git a/view/theme/diabook/theme.php b/view/theme/diabook/theme.php
index bf31c08eb..4acb058e5 100755
--- a/view/theme/diabook/theme.php
+++ b/view/theme/diabook/theme.php
@@ -538,10 +538,16 @@ function insertFormatting(BBcode,id) {
 	if (document.selection) {
 		textarea.focus();
 		selected = document.selection.createRange();
+		if (BBcode == "url"){
+			selected.text = "["+BBcode+"]" + "http://" +  selected.text + "[/"+BBcode+"]";
+			} else			
 		selected.text = "["+BBcode+"]" + selected.text + "[/"+BBcode+"]";
 	} else if (textarea.selectionStart || textarea.selectionStart == "0") {
 		var start = textarea.selectionStart;
 		var end = textarea.selectionEnd;
+		if (BBcode == "url"){
+			textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + "http://" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
+			} else
 		textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
 	}
 	return true;
-- 
cgit v1.2.3


From e3af552bbfff2632bbcf2ce94c3e08ad4a5142d2 Mon Sep 17 00:00:00 2001
From: tommy tomson <thomas.bierey@gmx.de>
Date: Thu, 12 Apr 2012 22:00:18 +0200
Subject: diabook-themes: fixed css for settings aside-links

---
 view/theme/diabook/theme.php | 58 +++-----------------------------------------
 1 file changed, 3 insertions(+), 55 deletions(-)

(limited to 'view/theme/diabook/theme.php')

diff --git a/view/theme/diabook/theme.php b/view/theme/diabook/theme.php
index 4acb058e5..612650e90 100755
--- a/view/theme/diabook/theme.php
+++ b/view/theme/diabook/theme.php
@@ -3,13 +3,13 @@
 /*
  * Name: Diabook
  * Description: Diabook: report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu
- * Version: (Version: 1.016)
+ * Version: (Version: 1.017)
  * Author: 
  */
 
 
 //print diabook-version for debugging
-$diabook_version = "Diabook (Version: 1.016)";
+$diabook_version = "Diabook (Version: 1.017)";
 $a->page['htmlhead'] .= sprintf('<script "%s" ></script>', $diabook_version);
 
 //change css on network and profilepages
@@ -24,7 +24,7 @@ $cssFile = null;
  
 function diabook_community_info(){
 	$a = get_app();
-	//right_aside at networkpages
+
 
 	// last 12 users
 	$aside['$lastusers_title'] = t('Last users');
@@ -288,58 +288,6 @@ if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname']){
 	}
 }
 
-
-
-//tabs at aside on settings page
-if ($a->argv[0] === "settings"){
-	
-	$tabs = array(
-		array(
-			'label'	=> t('Account settings'),
-			'url' 	=> $a->get_baseurl(true).'/settings',
-			'sel'	=> (($a->argc == 1)?'active':''),
-		),	
-		array(
-			'label'	=> t('Display settings'),
-			'url' 	=> $a->get_baseurl(true).'/settings/display',
-			'sel'	=> (($a->argc > 1) && ($a->argv[1] === 'display')?'active':''),
-		),	
-		array(
-			'label'	=> t('Edit/Manage Profiles'),
-			'url' 	=> $a->get_baseurl(true).'/profiles',
-		),	
-		array(
-			'label'	=> t('Connector settings'),
-			'url' 	=> $a->get_baseurl(true).'/settings/connectors',
-			'sel'	=> (($a->argc > 1) && ($a->argv[1] === 'connectors')?'active':''),
-		),
-		array(
-			'label'	=> t('Plugin settings'),
-			'url' 	=> $a->get_baseurl(true).'/settings/addon',
-			'sel'	=> (($a->argc > 1) && ($a->argv[1] === 'addon')?'active':''),
-		),
-		array(
-			'label' => t('Connections'),
-			'url' => $a->get_baseurl(true) . '/settings/oauth',
-			'sel' => (($a->argc > 1) && ($a->argv[1] === 'oauth')?'active':''),
-		),
-		array(
-			'label' => t('Export personal data'),
-			'url' => $a->get_baseurl(true) . '/uexport',
-			'sel' => ''
-		)
-	);
-	$tabtpl = file_get_contents(dirname(__file__).'/rs_common_tabs.tpl') ;
-	$a->page['aside'] = replace_macros($tabtpl, array(
-		'$tabs' => $tabs,
-	));
-	
-	
-	// CUSTOM CSS
-	$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook/style-settings.css";
-	
-}
-
 // custom css
 if (!is_null($cssFile)) $a->page['htmlhead'] .= sprintf('<link rel="stylesheet" type="text/css" href="%s" />', $cssFile);
 
-- 
cgit v1.2.3


From 615cd53e51a2ae121846771a9a1ef2ce22550be3 Mon Sep 17 00:00:00 2001
From: tommy tomson <thomas.bierey@gmx.de>
Date: Fri, 13 Apr 2012 18:28:11 +0200
Subject: diabook-themes: small fixes

---
 view/theme/diabook/theme.php | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'view/theme/diabook/theme.php')

diff --git a/view/theme/diabook/theme.php b/view/theme/diabook/theme.php
index 612650e90..a341d01c6 100755
--- a/view/theme/diabook/theme.php
+++ b/view/theme/diabook/theme.php
@@ -469,18 +469,19 @@ function restore_boxes(){
   }
 </script>';}
 
+
 $a->page['htmlhead'] .= ' 
 
-<script type="text/javascript">
-function insertFormatting(BBcode,id) {
+<script>
+function insertFormatting(comment,BBcode,id) {
 	
 		var tmpStr = $("#comment-edit-text-" + id).val();
-		if(tmpStr == "Kommentar") {
+		if(tmpStr == comment) {
 			tmpStr = "";
 			$("#comment-edit-text-" + id).addClass("comment-edit-text-full");
 			$("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
 			openMenu("comment-edit-submit-wrapper-" + id);
-											}
+								}
 
 	textarea = document.getElementById("comment-edit-text-" +id);
 	if (document.selection) {
-- 
cgit v1.2.3


From 2c843466a93a5083a8f27dee308d5b8514c756de Mon Sep 17 00:00:00 2001
From: tommy tomson <thomas.bierey@gmx.de>
Date: Fri, 13 Apr 2012 21:34:21 +0200
Subject: diabook: theme-settings: users can set font-size and line-height for
 posts and comments

---
 view/theme/diabook/theme.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'view/theme/diabook/theme.php')

diff --git a/view/theme/diabook/theme.php b/view/theme/diabook/theme.php
index a341d01c6..b039e1b82 100755
--- a/view/theme/diabook/theme.php
+++ b/view/theme/diabook/theme.php
@@ -3,13 +3,13 @@
 /*
  * Name: Diabook
  * Description: Diabook: report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu
- * Version: (Version: 1.017)
+ * Version: (Version: 1.018)
  * Author: 
  */
 
 
 //print diabook-version for debugging
-$diabook_version = "Diabook (Version: 1.017)";
+$diabook_version = "Diabook (Version: 1.018)";
 $a->page['htmlhead'] .= sprintf('<script "%s" ></script>', $diabook_version);
 
 //change css on network and profilepages
-- 
cgit v1.2.3


From 41d74c08681db9fca60a1b70cfae0c0481f57a81 Mon Sep 17 00:00:00 2001
From: Vasudev Kamath <kamathvasudev@gmail.com>
Date: Sat, 14 Apr 2012 20:16:06 +0530
Subject: Another bunch of executable permission removal

---
 view/theme/diabook/theme.php | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100755 => 100644 view/theme/diabook/theme.php

(limited to 'view/theme/diabook/theme.php')

diff --git a/view/theme/diabook/theme.php b/view/theme/diabook/theme.php
old mode 100755
new mode 100644
-- 
cgit v1.2.3


From 170c15ceb9cac013146b7f9687b83a376a3a21ff Mon Sep 17 00:00:00 2001
From: tommy tomson <thomas.bierey@gmx.de>
Date: Sun, 15 Apr 2012 02:50:16 +0200
Subject: diabook: theme-settings: add a wide-option

---
 view/theme/diabook/theme.php | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)
 mode change 100644 => 100755 view/theme/diabook/theme.php

(limited to 'view/theme/diabook/theme.php')

diff --git a/view/theme/diabook/theme.php b/view/theme/diabook/theme.php
old mode 100644
new mode 100755
index b039e1b82..4b4064a6c
--- a/view/theme/diabook/theme.php
+++ b/view/theme/diabook/theme.php
@@ -14,7 +14,9 @@ $a->page['htmlhead'] .= sprintf('<script "%s" ></script>', $diabook_version);
 
 //change css on network and profilepages
 $cssFile = null;
-
+$resolution=false;
+$resolution = get_pconfig(local_user(), "diabook", "resolution");
+if ($resolution===false) $resolution="normal";
 
 /**
  * prints last community activity
@@ -267,9 +269,10 @@ if ($a->argv[0] === "network" && local_user()){
 	if($ccCookie != "8") {
 	// COMMUNITY
 	diabook_community_info();
-	
+
 	// CUSTOM CSS
-	$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook/style-network.css";
+	if($resolution == "normal") {$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook/style-network.css";}
+	if($resolution == "wide") {$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook/style-network-wide.css";}
 	}
 }
 
@@ -282,8 +285,8 @@ if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname']){
 	diabook_community_info();
 	
 	// CUSTOM CSS
-	$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook/style-profile.css";
-	
+	if($resolution == "normal") {$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook/style-profile.css";}
+	if($resolution == "wide") {$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook/style-profile-wide.css";}
 	
 	}
 }
@@ -291,6 +294,8 @@ if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname']){
 // custom css
 if (!is_null($cssFile)) $a->page['htmlhead'] .= sprintf('<link rel="stylesheet" type="text/css" href="%s" />', $cssFile);
 
+
+
 //load jquery.cookie.js
 $cookieJS = $a->get_baseurl($ssl_state)."/view/theme/diabook/js/jquery.cookie.js";
 $a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s"></script>', $cookieJS);
-- 
cgit v1.2.3


From dddf3307af24de71a8b6e52a984ba2f2e310c3b7 Mon Sep 17 00:00:00 2001
From: tommy tomson <thomas.bierey@gmx.de>
Date: Sun, 15 Apr 2012 04:39:33 +0200
Subject: diabook-themes: added js for auto-growing comment-textareas

---
 view/theme/diabook/theme.php | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'view/theme/diabook/theme.php')

diff --git a/view/theme/diabook/theme.php b/view/theme/diabook/theme.php
index 4b4064a6c..8c5521eec 100755
--- a/view/theme/diabook/theme.php
+++ b/view/theme/diabook/theme.php
@@ -304,6 +304,9 @@ $a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s"></script
 $imageresizeJS = $a->get_baseurl($ssl_state)."/view/theme/diabook/js/jquery.ae.image.resize.js";
 $a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s" ></script>', $imageresizeJS);
 
+//load jquery.autogrow-textarea.js
+$autogrowJS = $a->get_baseurl($ssl_state)."/view/theme/diabook/js/jquery.autogrow.textarea.js";
+$a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s" ></script>', $autogrowJS);
 
 //js scripts
 //comment-edit-wrapper on photo_view
@@ -329,6 +332,15 @@ $a->page['htmlhead'] .= '
    
  </script>';
  
+$a->page['htmlhead'] .= '
+
+<script type="text/javascript">
+
+function tautogrow(id){
+		$("textarea#comment-edit-text-" +id).autogrow(); 	
+ 	};
+ </script>';
+ 
  
 $a->page['htmlhead'] .= '
  <script>
-- 
cgit v1.2.3


From 15dc8f4b212a0554844fcc3104942fe6fc944918 Mon Sep 17 00:00:00 2001
From: tommy tomson <thomas.bierey@gmx.de>
Date: Mon, 16 Apr 2012 18:51:08 +0200
Subject: diabook-themes: small bug/css-fixes ---> ver. 1.019

---
 view/theme/diabook/theme.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'view/theme/diabook/theme.php')

diff --git a/view/theme/diabook/theme.php b/view/theme/diabook/theme.php
index 8c5521eec..490a647f3 100755
--- a/view/theme/diabook/theme.php
+++ b/view/theme/diabook/theme.php
@@ -3,13 +3,13 @@
 /*
  * Name: Diabook
  * Description: Diabook: report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu
- * Version: (Version: 1.018)
+ * Version: (Version: 1.019)
  * Author: 
  */
 
 
 //print diabook-version for debugging
-$diabook_version = "Diabook (Version: 1.018)";
+$diabook_version = "Diabook (Version: 1.019)";
 $a->page['htmlhead'] .= sprintf('<script "%s" ></script>', $diabook_version);
 
 //change css on network and profilepages
-- 
cgit v1.2.3


From f08844a8a58f46d539753831a8ff99995fc3c1ae Mon Sep 17 00:00:00 2001
From: tommy tomson <thomas.bierey@gmx.de>
Date: Mon, 16 Apr 2012 19:23:11 +0200
Subject: diabook-themes: bugfix (sry, necessary)

---
 view/theme/diabook/theme.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'view/theme/diabook/theme.php')

diff --git a/view/theme/diabook/theme.php b/view/theme/diabook/theme.php
index 490a647f3..0fdcbf701 100755
--- a/view/theme/diabook/theme.php
+++ b/view/theme/diabook/theme.php
@@ -41,7 +41,7 @@ function diabook_community_info(){
 		0,
 		9
 	);
-	$tpl = file_get_contents( dirname(__file__).'/directory_item.tpl');
+	$tpl = file_get_contents( dirname(__file__).'/ch_directory_item.tpl');
 	if(count($r)) {
 		$photo = 'thumb';
 		foreach($r as $rr) {
@@ -120,7 +120,7 @@ function diabook_community_info(){
 				dbesc(t('Profile Photos'))
 				);
 		if(count($r)) {
-		$tpl = file_get_contents( dirname(__file__).'/directory_item.tpl');
+		$tpl = file_get_contents( dirname(__file__).'/ch_directory_item.tpl');
 		foreach($r as $rr) {
 			$photo_page = $a->get_baseurl() . '/photos/' . $rr['nickname'] . '/image/' . $rr['resource-id'];
 			$photo_url = $a->get_baseurl() . '/photo/' .  $rr['resource-id'] . '-' . $rr['scale'] .'.jpg';
-- 
cgit v1.2.3


From b30c761aae7e01e6fe727232e48b14303484a228 Mon Sep 17 00:00:00 2001
From: tommy tomson <thomas.bierey@gmx.de>
Date: Tue, 17 Apr 2012 16:15:49 +0200
Subject: diabook-themes: removed fpostit due to security issues and small fix
 in german translation

---
 view/theme/diabook/theme.php | 38 ++++++++------------------------------
 1 file changed, 8 insertions(+), 30 deletions(-)

(limited to 'view/theme/diabook/theme.php')

diff --git a/view/theme/diabook/theme.php b/view/theme/diabook/theme.php
index 0fdcbf701..3ce0cc39d 100755
--- a/view/theme/diabook/theme.php
+++ b/view/theme/diabook/theme.php
@@ -3,13 +3,13 @@
 /*
  * Name: Diabook
  * Description: Diabook: report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu
- * Version: (Version: 1.019)
+ * Version: (Version: 1.020)
  * Author: 
  */
 
 
 //print diabook-version for debugging
-$diabook_version = "Diabook (Version: 1.019)";
+$diabook_version = "Diabook (Version: 1.020)";
 $a->page['htmlhead'] .= sprintf('<script "%s" ></script>', $diabook_version);
 
 //change css on network and profilepages
@@ -136,14 +136,7 @@ function diabook_community_info(){
 		}
 	}
 	
-	$fostitJS = "javascript: (function() {
-    					the_url = '".$a->get_baseurl($ssl_state)."/view/theme/diabook/fpostit/fpostit.php?url=' + encodeURIComponent(window.location.href) + '&title=' + encodeURIComponent(document.title) + '&text=' + encodeURIComponent(''+(window.getSelection ? window.getSelection() : document.getSelection ? document.getSelection() : document.selection.createRange().text));
-    						a_funct = function() {
-        						if (!window.open(the_url, 'fpostit', 'location=yes,links=no,scrollbars=no,toolbar=no,width=600,height=300')) location.href = the_url};
-    							if (/Firefox/.test(navigator.userAgent)) {setTimeout(a_funct, 0)} 
-    							else {a_funct()}})()" ;
-  
-   $aside['$fostitJS'] = $fostitJS;
+	
    
    //right_aside FIND FRIENDS
 	if(local_user()) {
@@ -212,13 +205,7 @@ function diabook_community_info(){
 	
 	$aside['$con_services'] = $con_services;
    //end connectable services
-   //postit
-   $postit = array();
-	$postit['title'] = Array("", t('PostIt to Friendica'), t('Post to Friendica'), "");
-	$postit['text'] = Array("", t(' from anywhere by bookmarking this Link.'), "", "");
-	
-	$aside['$postit'] = $postit;
-   //end postit
+  
   
    //get_baseurl
    $url = $a->get_baseurl($ssl_state);   
@@ -264,9 +251,9 @@ if ($a->argv[0] === "network" && local_user()){
 
 	}
 	
-	$ccCookie = $_COOKIE['close_pages'] + $_COOKIE['close_helpers'] + $_COOKIE['close_services'] + $_COOKIE['close_friends'] + $_COOKIE['close_postit'] + $_COOKIE['close_lastusers'] + $_COOKIE['close_lastphotos'] + $_COOKIE['close_lastlikes'];
+	$ccCookie = $_COOKIE['close_pages'] + $_COOKIE['close_helpers'] + $_COOKIE['close_services'] + $_COOKIE['close_friends'] + $_COOKIE['close_lastusers'] + $_COOKIE['close_lastphotos'] + $_COOKIE['close_lastlikes'];
 	
-	if($ccCookie != "8") {
+	if($ccCookie != "7") {
 	// COMMUNITY
 	diabook_community_info();
 
@@ -280,7 +267,7 @@ if ($a->argv[0] === "network" && local_user()){
 
 //right_aside at profile pages
 if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname']){
-	if($ccCookie != "8") {
+	if($ccCookie != "7") {
 	// COMMUNITY
 	diabook_community_info();
 	
@@ -383,7 +370,7 @@ $a->page['htmlhead'] .= '
 </script>';
 
 
-	if($ccCookie != "8") {
+	if($ccCookie != "7") {
 $a->page['htmlhead'] .= '
 <script>
 $("right_aside").ready(function(){
@@ -408,10 +395,6 @@ $("right_aside").ready(function(){
 		document.getElementById( "close_friends" ).style.display = "none";
 			};
 	
-	if($.cookie("close_postit") == "1") 
-		{
-		document.getElementById( "close_postit" ).style.display = "none";
-			};
 			
 	if($.cookie("close_lastusers") == "1") 
 		{
@@ -450,10 +433,6 @@ function close_friends(){
  $.cookie("close_friends","1", { expires: 365, path: "/" });
  };
 
-function close_postit(){
- document.getElementById( "close_postit" ).style.display = "none";
- $.cookie("close_postit","1", { expires: 365, path: "/" });
- };
  
 function close_lastusers(){
  document.getElementById( "close_lastusers" ).style.display = "none";
@@ -478,7 +457,6 @@ function restore_boxes(){
 	$.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: "/" });
-- 
cgit v1.2.3


From f5f1956e8b855ab5aeab531fc44a1a773427bf64 Mon Sep 17 00:00:00 2001
From: tommy tomson <thomas.bierey@gmx.de>
Date: Fri, 20 Apr 2012 01:44:20 +0200
Subject: diabook-themes: theme-settings: add "colour scheme"-option, add
 diabook-pink and some bug/css-fixes

---
 view/theme/diabook/theme.php | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

(limited to 'view/theme/diabook/theme.php')

diff --git a/view/theme/diabook/theme.php b/view/theme/diabook/theme.php
index 3ce0cc39d..9ad378b21 100755
--- a/view/theme/diabook/theme.php
+++ b/view/theme/diabook/theme.php
@@ -3,13 +3,13 @@
 /*
  * Name: Diabook
  * Description: Diabook: report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu
- * Version: (Version: 1.020)
+ * Version: (Version: 1.021)
  * Author: 
  */
 
 
 //print diabook-version for debugging
-$diabook_version = "Diabook (Version: 1.020)";
+$diabook_version = "Diabook (Version: 1.021)";
 $a->page['htmlhead'] .= sprintf('<script "%s" ></script>', $diabook_version);
 
 //change css on network and profilepages
@@ -17,6 +17,15 @@ $cssFile = null;
 $resolution=false;
 $resolution = get_pconfig(local_user(), "diabook", "resolution");
 if ($resolution===false) $resolution="normal";
+$color = false;
+$color = get_pconfig(local_user(), "diabook", "color");
+if ($color===false) $color="diabook";
+if ($color=="diabook") $color_path = "/";
+if ($color=="aerith") $color_path = "/diabook-aerith/";
+if ($color=="blue") $color_path = "/diabook-blue/";
+if ($color=="red") $color_path = "/diabook-red/";
+if ($color=="pink") $color_path = "/diabook-pink/";
+
 
 /**
  * prints last community activity
@@ -258,8 +267,8 @@ if ($a->argv[0] === "network" && local_user()){
 	diabook_community_info();
 
 	// CUSTOM CSS
-	if($resolution == "normal") {$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook/style-network.css";}
-	if($resolution == "wide") {$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook/style-network-wide.css";}
+	if($resolution == "normal") {$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook".$color_path."style-network.css";}
+	if($resolution == "wide") {$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook".$color_path."style-network-wide.css";}
 	}
 }
 
@@ -272,8 +281,8 @@ if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname']){
 	diabook_community_info();
 	
 	// CUSTOM CSS
-	if($resolution == "normal") {$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook/style-profile.css";}
-	if($resolution == "wide") {$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook/style-profile-wide.css";}
+	if($resolution == "normal") {$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook".$color_path."style-profile.css";}
+	if($resolution == "wide") {$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook".$color_path."style-profile-wide.css";}
 	
 	}
 }
-- 
cgit v1.2.3


From e052be606c9c2c4e615cb557572a68af2181cc17 Mon Sep 17 00:00:00 2001
From: tommy tomson <thomas.bierey@gmx.de>
Date: Fri, 20 Apr 2012 17:16:42 +0200
Subject: diabook-themes: add diabook-green and some minor css/bug-fixes

---
 view/theme/diabook/theme.php | 34 ++++++++++++++++++----------------
 1 file changed, 18 insertions(+), 16 deletions(-)

(limited to 'view/theme/diabook/theme.php')

diff --git a/view/theme/diabook/theme.php b/view/theme/diabook/theme.php
index 9ad378b21..29e71c611 100755
--- a/view/theme/diabook/theme.php
+++ b/view/theme/diabook/theme.php
@@ -25,6 +25,7 @@ if ($color=="aerith") $color_path = "/diabook-aerith/";
 if ($color=="blue") $color_path = "/diabook-blue/";
 if ($color=="red") $color_path = "/diabook-red/";
 if ($color=="pink") $color_path = "/diabook-pink/";
+if ($color=="green") $color_path = "/diabook-green/";
 
 
 /**
@@ -368,6 +369,22 @@ function yt_iframe() {
   
  </script>';
  
+if($a->argv[0] === "settings" && local_user()) {
+$a->page['htmlhead'] .= ' 
+<script>
+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_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>';}
+
+
 
 if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname'] or $a->argv[0] === "network" && local_user()){
 $a->page['htmlhead'] .= '
@@ -457,22 +474,7 @@ function close_lastlikes(){
  document.getElementById( "close_lastlikes" ).style.display = "none";
  $.cookie("close_lastlikes","1", { expires: 365, path: "/" });
  };
-</script>';}
-
-$a->page['htmlhead'] .= ' 
-<script>
-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_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>';}
-
+</script>';}}
 
 $a->page['htmlhead'] .= ' 
 
-- 
cgit v1.2.3


From 8809e96310048518ffdcc0ffd6a7faed112ab17a Mon Sep 17 00:00:00 2001
From: tommy tomson <thomas.bierey@gmx.de>
Date: Sat, 21 Apr 2012 01:06:17 +0200
Subject: diabook-themes: add diabook-dark

---
 view/theme/diabook/theme.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'view/theme/diabook/theme.php')

diff --git a/view/theme/diabook/theme.php b/view/theme/diabook/theme.php
index 29e71c611..a74e8c026 100755
--- a/view/theme/diabook/theme.php
+++ b/view/theme/diabook/theme.php
@@ -26,6 +26,7 @@ if ($color=="blue") $color_path = "/diabook-blue/";
 if ($color=="red") $color_path = "/diabook-red/";
 if ($color=="pink") $color_path = "/diabook-pink/";
 if ($color=="green") $color_path = "/diabook-green/";
+if ($color=="dark") $color_path = "/diabook-dark/";
 
 
 /**
-- 
cgit v1.2.3


From fe6567cb88eb129887253be8f2b62002d92ad769 Mon Sep 17 00:00:00 2001
From: tommy tomson <thomas.bierey@gmx.de>
Date: Sun, 22 Apr 2012 03:15:06 +0200
Subject: diabook-themes: deleted obsolete diabook-folder & minor bug-fixes

---
 view/theme/diabook/theme.php | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

(limited to 'view/theme/diabook/theme.php')

diff --git a/view/theme/diabook/theme.php b/view/theme/diabook/theme.php
index a74e8c026..e8518a1c6 100755
--- a/view/theme/diabook/theme.php
+++ b/view/theme/diabook/theme.php
@@ -147,7 +147,6 @@ function diabook_community_info(){
 		}
 	}
 	
-	
    
    //right_aside FIND FRIENDS
 	if(local_user()) {
@@ -330,6 +329,7 @@ $a->page['htmlhead'] .= '
    
  </script>';
  
+ 
 $a->page['htmlhead'] .= '
 
 <script type="text/javascript">
@@ -480,7 +480,7 @@ function close_lastlikes(){
 $a->page['htmlhead'] .= ' 
 
 <script>
-function insertFormatting(comment,BBcode,id) {
+function insertFormatting(BBcode,id) {
 	
 		var tmpStr = $("#comment-edit-text-" + id).val();
 		if(tmpStr == comment) {
@@ -508,4 +508,12 @@ function insertFormatting(comment,BBcode,id) {
 	}
 	return true;
 }
+
+function cmtBbOpen(id) {
+	$(".comment-edit-bb-" + id).show();
+}
+function cmtBbClose(id) {
+	$(".comment-edit-bb-" + id).hide();
+}
+
 </script> ';
\ No newline at end of file
-- 
cgit v1.2.3


From c0a377e0de2a71197152281b61d5e8518dab1356 Mon Sep 17 00:00:00 2001
From: tommy tomson <thomas.bierey@gmx.de>
Date: Sun, 22 Apr 2012 12:59:00 +0200
Subject: diabook-themes: comment-bbcode-bugfix

---
 view/theme/diabook/theme.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'view/theme/diabook/theme.php')

diff --git a/view/theme/diabook/theme.php b/view/theme/diabook/theme.php
index e8518a1c6..84d9f888e 100755
--- a/view/theme/diabook/theme.php
+++ b/view/theme/diabook/theme.php
@@ -480,7 +480,7 @@ function close_lastlikes(){
 $a->page['htmlhead'] .= ' 
 
 <script>
-function insertFormatting(BBcode,id) {
+function insertFormatting(comment,BBcode,id) {
 	
 		var tmpStr = $("#comment-edit-text-" + id).val();
 		if(tmpStr == comment) {
-- 
cgit v1.2.3


From d6c8a14fb0f56825b1f5f8dc4108a89d8aa583db Mon Sep 17 00:00:00 2001
From: tommy tomson <thomas.bierey@gmx.de>
Date: Sun, 22 Apr 2012 22:31:44 +0200
Subject: diabook-themes: fixed youtube-bug and added "Info/Impressum" to
 footer

---
 view/theme/diabook/theme.php | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'view/theme/diabook/theme.php')

diff --git a/view/theme/diabook/theme.php b/view/theme/diabook/theme.php
index 84d9f888e..dee9c2890 100755
--- a/view/theme/diabook/theme.php
+++ b/view/theme/diabook/theme.php
@@ -3,13 +3,13 @@
 /*
  * Name: Diabook
  * Description: Diabook: report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu
- * Version: (Version: 1.021)
+ * Version: (Version: 1.022)
  * Author: 
  */
 
 
 //print diabook-version for debugging
-$diabook_version = "Diabook (Version: 1.021)";
+$diabook_version = "Diabook (Version: 1.022)";
 $a->page['htmlhead'] .= sprintf('<script "%s" ></script>', $diabook_version);
 
 //change css on network and profilepages
@@ -291,7 +291,9 @@ if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname']){
 // custom css
 if (!is_null($cssFile)) $a->page['htmlhead'] .= sprintf('<link rel="stylesheet" type="text/css" href="%s" />', $cssFile);
 
-
+//footer
+$tpl = get_markup_template('footer.tpl');
+$a->page['footer'] .= replace_macros($tpl, array());
 
 //load jquery.cookie.js
 $cookieJS = $a->get_baseurl($ssl_state)."/view/theme/diabook/js/jquery.cookie.js";
@@ -360,7 +362,8 @@ $(document).ready(function() {
 });
 
 function yt_iframe() {
-	
+
+
 	$("iframe").load(function() { 
 	var ifr_src = $(this).contents().find("body iframe").attr("src");
 	$("iframe").contents().find("body iframe").attr("src", ifr_src+"&wmode=transparent");
-- 
cgit v1.2.3


From e74ae8b0310fd4b638ff5da674ba16b47fc5f294 Mon Sep 17 00:00:00 2001
From: tommy tomson <thomas.bierey@gmx.de>
Date: Sun, 22 Apr 2012 23:58:34 +0200
Subject: diabook-themes: bugfix

---
 view/theme/diabook/theme.php | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'view/theme/diabook/theme.php')

diff --git a/view/theme/diabook/theme.php b/view/theme/diabook/theme.php
index dee9c2890..269015d0a 100755
--- a/view/theme/diabook/theme.php
+++ b/view/theme/diabook/theme.php
@@ -357,6 +357,11 @@ $(document).ready(function() {
         }
         else $(this).attr("src",ifr_source+"?"+wmode);
     });
+    
+    $("a[href=#top]").click(function() {
+			$("html, body").animate({scrollTop:0}, "slow");
+			return false;
+		});
       
 
 });
-- 
cgit v1.2.3