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-aerith/oembed_video.tpl  |  4 +++
 view/theme/diabook-aerith/style-network.css |  2 +-
 view/theme/diabook-aerith/style-profile.css |  2 +-
 view/theme/diabook-aerith/style.css         |  4 +--
 view/theme/diabook-aerith/theme.php         | 45 +++++++++++++++++++++++---
 view/theme/diabook-blue/oembed_video.tpl    |  4 +++
 view/theme/diabook-blue/style-network.css   |  2 +-
 view/theme/diabook-blue/style-profile.css   |  2 +-
 view/theme/diabook-blue/style.css           |  4 +--
 view/theme/diabook-blue/theme.php           | 48 +++++++++++++++++++++++----
 view/theme/diabook-red/oembed_video.tpl     |  4 +++
 view/theme/diabook-red/style-network.css    |  2 +-
 view/theme/diabook-red/style-profile.css    |  2 +-
 view/theme/diabook-red/style.css            |  4 +--
 view/theme/diabook-red/theme.php            | 50 +++++++++++++++++++++++++----
 view/theme/diabook/oembed_video.tpl         |  2 +-
 view/theme/diabook/style-network.css        |  3 +-
 view/theme/diabook/style-profile.css        |  3 +-
 view/theme/diabook/style-settings.css       |  2 +-
 view/theme/diabook/style.css                |  5 ++-
 view/theme/diabook/theme.php                | 30 +++++++++++++----
 21 files changed, 179 insertions(+), 45 deletions(-)
 create mode 100644 view/theme/diabook-aerith/oembed_video.tpl
 create mode 100644 view/theme/diabook-blue/oembed_video.tpl
 create mode 100644 view/theme/diabook-red/oembed_video.tpl

(limited to 'view')

diff --git a/view/theme/diabook-aerith/oembed_video.tpl b/view/theme/diabook-aerith/oembed_video.tpl
new file mode 100644
index 000000000..d6d29f724
--- /dev/null
+++ b/view/theme/diabook-aerith/oembed_video.tpl
@@ -0,0 +1,4 @@
+<a class="embed_yt" href='$embedurl' onclick='this.innerHTML=Base64.decode("$escapedhtml"); yt_iframe(); return false;' style='float:left; margin: 1em; position: relative;'>
+	<img width='$tw' height='$th' src='$turl' >
+	<div style='position: absolute; top: 0px; left: 0px; width: $twpx; height: $thpx; background: url(images/icons/48/play.png) no-repeat center center;'></div>
+</a>
diff --git a/view/theme/diabook-aerith/style-network.css b/view/theme/diabook-aerith/style-network.css
index 3b461e6db..07bda6a24 100644
--- a/view/theme/diabook-aerith/style-network.css
+++ b/view/theme/diabook-aerith/style-network.css
@@ -2173,7 +2173,7 @@ blockquote {
 	 color: #777;
 }
 .oembed {
-	font-size: large;
+	
 	font-weight: bold;
 }
 .aprofile dt{
diff --git a/view/theme/diabook-aerith/style-profile.css b/view/theme/diabook-aerith/style-profile.css
index 73f46e9ee..8909f0870 100644
--- a/view/theme/diabook-aerith/style-profile.css
+++ b/view/theme/diabook-aerith/style-profile.css
@@ -2162,7 +2162,7 @@ blockquote {
 	 color: #777;
 }
 .oembed {
-	font-size: large;
+	
 	font-weight: bold;
 }
 .aprofile dt{
diff --git a/view/theme/diabook-aerith/style.css b/view/theme/diabook-aerith/style.css
index f82652154..23ae05940 100644
--- a/view/theme/diabook-aerith/style.css
+++ b/view/theme/diabook-aerith/style.css
@@ -1276,7 +1276,7 @@ body .pageheader{
   font-size: 20px;
   margin-bottom: 20px;
   margin-top: 0px;
-  max-width: 575px;
+  max-width: 775px;
 	}
 .qcomment{
   max-width: 122px;	
@@ -2324,7 +2324,7 @@ blockquote {
     color: #777;
 }
 .oembed {
-	font-size: large;
+	
 	font-weight: bold;
 }
 .aprofile dt{
diff --git a/view/theme/diabook-aerith/theme.php b/view/theme/diabook-aerith/theme.php
index a1ea51e82..40093e545 100755
--- a/view/theme/diabook-aerith/theme.php
+++ b/view/theme/diabook-aerith/theme.php
@@ -3,13 +3,13 @@
 /*
  * 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: 1.014)
+ * Version: (Version: 1.015)
  * Author: 
  */
 
 
 //print diabook-version for debugging
-$diabook_version = "Diabook-aerith (Version: 1.014)";
+$diabook_version = "Diabook-aerith (Version: 1.015)";
 $a->page['htmlhead'] .= sprintf('<script "%s" ></script>', $diabook_version);
 
 
@@ -366,6 +366,35 @@ $a->page['htmlhead'] .= '
   
  </script>';
 
+$a->page['htmlhead'] .= '
+ <script>
+ 
+$(document).ready(function() {
+    $("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);
+    });
+      
+
+});
+
+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>';
 
 if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname'] or $a->argv[0] === "network" && local_user()){
 $a->page['htmlhead'] .= '
@@ -374,7 +403,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") 
@@ -458,9 +492,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: "/" });
@@ -471,5 +506,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
diff --git a/view/theme/diabook-blue/oembed_video.tpl b/view/theme/diabook-blue/oembed_video.tpl
new file mode 100644
index 000000000..d6d29f724
--- /dev/null
+++ b/view/theme/diabook-blue/oembed_video.tpl
@@ -0,0 +1,4 @@
+<a class="embed_yt" href='$embedurl' onclick='this.innerHTML=Base64.decode("$escapedhtml"); yt_iframe(); return false;' style='float:left; margin: 1em; position: relative;'>
+	<img width='$tw' height='$th' src='$turl' >
+	<div style='position: absolute; top: 0px; left: 0px; width: $twpx; height: $thpx; background: url(images/icons/48/play.png) no-repeat center center;'></div>
+</a>
diff --git a/view/theme/diabook-blue/style-network.css b/view/theme/diabook-blue/style-network.css
index bd1cb249c..9baa83e8a 100644
--- a/view/theme/diabook-blue/style-network.css
+++ b/view/theme/diabook-blue/style-network.css
@@ -2134,7 +2134,7 @@ blockquote {
 	 color: #777;
 }
 .oembed {
-	font-size: large;
+	
 	font-weight: bold;
 }
 .aprofile dt{
diff --git a/view/theme/diabook-blue/style-profile.css b/view/theme/diabook-blue/style-profile.css
index da826d74c..1a0674771 100644
--- a/view/theme/diabook-blue/style-profile.css
+++ b/view/theme/diabook-blue/style-profile.css
@@ -2129,7 +2129,7 @@ blockquote {
 	 color: #777;
 }
 .oembed {
-	font-size: large;
+	
 	font-weight: bold;
 }
 .aprofile dt{
diff --git a/view/theme/diabook-blue/style.css b/view/theme/diabook-blue/style.css
index ebf684708..a0202856c 100644
--- a/view/theme/diabook-blue/style.css
+++ b/view/theme/diabook-blue/style.css
@@ -1236,7 +1236,7 @@ body .pageheader{
   font-size: 20px;
   margin-bottom: 20px;
   margin-top: 0px;
-  max-width: 575px;
+  max-width: 775px;
 	}
 .qcomment{
   max-width: 122px;	
@@ -2281,7 +2281,7 @@ blockquote {
 	 color: #777;
 }
 .oembed {
-	font-size: large;
+	
 	font-weight: bold;
 }
 .aprofile dt{
diff --git a/view/theme/diabook-blue/theme.php b/view/theme/diabook-blue/theme.php
index a8b4fcd6c..190533d17 100755
--- a/view/theme/diabook-blue/theme.php
+++ b/view/theme/diabook-blue/theme.php
@@ -3,13 +3,13 @@
 /*
  * 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: 1.014)
+ * Version: (Version: 1.015)
  * Author: 
  */
 
 
 //print diabook-version for debugging
-$diabook_version = "Diabook-blue (Version: 1.014)";
+$diabook_version = "Diabook-blue (Version: 1.015)";
 $a->page['htmlhead'] .= sprintf('<script "%s" ></script>', $diabook_version);
 
 //change css on network and profilepages
@@ -366,15 +366,50 @@ $a->page['htmlhead'] .= '
   
  </script>';
 
+$a->page['htmlhead'] .= '
+ <script>
+ 
+$(document).ready(function() {
+    $("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);
+    });
+      
+
+});
+
+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>';
+
 
 if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname'] or $a->argv[0] === "network" && local_user()){
 $a->page['htmlhead'] .= '
 <script>
 
-$(function() {
+ $(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") 
@@ -458,9 +493,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: "/" });
@@ -471,5 +507,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>';}
diff --git a/view/theme/diabook-red/oembed_video.tpl b/view/theme/diabook-red/oembed_video.tpl
new file mode 100644
index 000000000..d6d29f724
--- /dev/null
+++ b/view/theme/diabook-red/oembed_video.tpl
@@ -0,0 +1,4 @@
+<a class="embed_yt" href='$embedurl' onclick='this.innerHTML=Base64.decode("$escapedhtml"); yt_iframe(); return false;' style='float:left; margin: 1em; position: relative;'>
+	<img width='$tw' height='$th' src='$turl' >
+	<div style='position: absolute; top: 0px; left: 0px; width: $twpx; height: $thpx; background: url(images/icons/48/play.png) no-repeat center center;'></div>
+</a>
diff --git a/view/theme/diabook-red/style-network.css b/view/theme/diabook-red/style-network.css
index efbec090a..8d5e3fec9 100644
--- a/view/theme/diabook-red/style-network.css
+++ b/view/theme/diabook-red/style-network.css
@@ -2171,7 +2171,7 @@ blockquote {
 	 color: #777;
 }
 .oembed {
-	font-size: large;
+	
 	font-weight: bold;
 }
 .aprofile dt{
diff --git a/view/theme/diabook-red/style-profile.css b/view/theme/diabook-red/style-profile.css
index ef6fd8601..570057b47 100644
--- a/view/theme/diabook-red/style-profile.css
+++ b/view/theme/diabook-red/style-profile.css
@@ -2143,7 +2143,7 @@ blockquote {
 	 color: #777;
 }
 .oembed {
-	font-size: large;
+	
 	font-weight: bold;
 }
 .aprofile dt{
diff --git a/view/theme/diabook-red/style.css b/view/theme/diabook-red/style.css
index ef06ef5ca..883f11374 100644
--- a/view/theme/diabook-red/style.css
+++ b/view/theme/diabook-red/style.css
@@ -1266,7 +1266,7 @@ body .pageheader{
   font-size: 20px;
   margin-bottom: 20px;
   margin-top: 0px;
-  max-width: 575px;
+  max-width: 775px;
 	}
 .qcomment{
   max-width: 122px;	
@@ -2310,7 +2310,7 @@ blockquote {
 	 color: #777;
 }
 .oembed {
-	font-size: large;
+	
 	font-weight: bold;
 }
 .aprofile dt{
diff --git a/view/theme/diabook-red/theme.php b/view/theme/diabook-red/theme.php
index fae26ae70..85206baec 100755
--- a/view/theme/diabook-red/theme.php
+++ b/view/theme/diabook-red/theme.php
@@ -3,13 +3,13 @@
 /*
  * 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: 1.014)
+ * Version: (Version: 1.015)
  * Author: 
  */
 
 
 //print diabook-version for debugging
-$diabook_version = "Diabook-red (Version: 1.014)";
+$diabook_version = "Diabook-red (Version: 1.015)";
 $a->page['htmlhead'] .= sprintf('<script "%s" ></script>', $diabook_version);
 
 //change css on network and profilepages
@@ -367,15 +367,50 @@ $a->page['htmlhead'] .= '
   
  </script>';
 
+$a->page['htmlhead'] .= '
+ <script>
+ 
+$(document).ready(function() {
+    $("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);
+    });
+      
+
+});
+
+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>';
+
 
 if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname'] or $a->argv[0] === "network" && local_user()){
 $a->page['htmlhead'] .= '
 <script>
 
-$(function() {
+ $(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") 
@@ -459,9 +494,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: "/" });
@@ -472,5 +508,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>';}
+  }
+</script>';}
\ No newline at end of file
diff --git a/view/theme/diabook/oembed_video.tpl b/view/theme/diabook/oembed_video.tpl
index 026007271..d6d29f724 100644
--- a/view/theme/diabook/oembed_video.tpl
+++ b/view/theme/diabook/oembed_video.tpl
@@ -1,4 +1,4 @@
-<a class="embed_yt" href='$embedurl' onclick='this.innerHTML=Base64.decode("$escapedhtml"); return false;' style='float:left; margin: 1em; position: relative;'>
+<a class="embed_yt" href='$embedurl' onclick='this.innerHTML=Base64.decode("$escapedhtml"); yt_iframe(); return false;' style='float:left; margin: 1em; position: relative;'>
 	<img width='$tw' height='$th' src='$turl' >
 	<div style='position: absolute; top: 0px; left: 0px; width: $twpx; height: $thpx; background: url(images/icons/48/play.png) no-repeat center center;'></div>
 </a>
diff --git a/view/theme/diabook/style-network.css b/view/theme/diabook/style-network.css
index af6e4027a..9e57c17d2 100644
--- a/view/theme/diabook/style-network.css
+++ b/view/theme/diabook/style-network.css
@@ -2103,7 +2103,6 @@ blockquote {
     color: #777;
 }
 .oembed {
-	font-size: large;
 	font-weight: bold;
 }
 .aprofile dt{
@@ -2549,4 +2548,4 @@ list-style-type: disc;
 #photos-upload-newalbum-div {
         float: left;
         width: 175px;
-}
+}
\ No newline at end of file
diff --git a/view/theme/diabook/style-profile.css b/view/theme/diabook/style-profile.css
index 6b05903d3..95e9061ba 100644
--- a/view/theme/diabook/style-profile.css
+++ b/view/theme/diabook/style-profile.css
@@ -2100,7 +2100,6 @@ blockquote {
     color: #777;
 }
 .oembed {
-	font-size: large;
 	font-weight: bold;
 }
 .aprofile dt{
@@ -2546,4 +2545,4 @@ list-style-type: disc;
 #photos-upload-newalbum-div {
         float: left;
         width: 175px;
-}
+}
\ No newline at end of file
diff --git a/view/theme/diabook/style-settings.css b/view/theme/diabook/style-settings.css
index 60e2f336b..fdb4f24c7 100644
--- a/view/theme/diabook/style-settings.css
+++ b/view/theme/diabook/style-settings.css
@@ -2526,4 +2526,4 @@ list-style-type: disc;
 #photos-upload-newalbum-div {
         float: left;
         width: 175px;
-}
+}
\ No newline at end of file
diff --git a/view/theme/diabook/style.css b/view/theme/diabook/style.css
index e99aa5644..d11e3191a 100644
--- a/view/theme/diabook/style.css
+++ b/view/theme/diabook/style.css
@@ -1219,7 +1219,7 @@ body .pageheader{
   font-size: 20px;
   margin-bottom: 20px;
   margin-top: 0px;
-  max-width: 575px;
+  max-width: 775px;
 	}
 .qcomment{
   max-width: 122px;	
@@ -2246,7 +2246,6 @@ blockquote {
 	 color: #777;
 }
 .oembed {
-	font-size: large;
 	font-weight: bold;
 }
 .aprofile dt{
@@ -2687,4 +2686,4 @@ list-style-type: disc;
 #photos-upload-newalbum-div {
         float: left;
         width: 175px;
-}
+}
\ No newline at end of file
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 5183d4f77d59b80964d6d1fab1696815eb7235a3 Mon Sep 17 00:00:00 2001
From: zottel <github@zottel.net>
Date: Mon, 9 Apr 2012 02:30:18 +0200
Subject: Some new German translations

---
 view/de/messages.po | 118 ++++++++++++++++++++++++++--------------------------
 view/de/strings.php |  10 ++---
 2 files changed, 64 insertions(+), 64 deletions(-)

(limited to 'view')

diff --git a/view/de/messages.po b/view/de/messages.po
index 1036e7b75..c67aebb76 100644
--- a/view/de/messages.po
+++ b/view/de/messages.po
@@ -16,9 +16,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: http://bugs.friendica.com/\n"
-"POT-Creation-Date: 2012-04-05 10:00-0700\n"
-"PO-Revision-Date: 2012-04-06 10:40+0000\n"
-"Last-Translator: bavatar <tobias.diekershoff@gmx.net>\n"
+"POT-Creation-Date: 2012-04-06 10:00-0700\n"
+"PO-Revision-Date: 2012-04-08 23:57+0000\n"
+"Last-Translator: zottel <transifex@zottel.net>\n"
 "Language-Team: German (http://www.transifex.net/projects/p/friendica/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -216,7 +216,7 @@ msgstr "l, F j"
 msgid "Edit event"
 msgstr "Veranstaltung bearbeiten"
 
-#: ../../mod/events.php:272 ../../include/text.php:1050
+#: ../../mod/events.php:272 ../../include/text.php:1053
 msgid "link to source"
 msgstr "Link zum Originalbeitrag"
 
@@ -410,7 +410,7 @@ msgstr "wurde getaggt in einem"
 #: ../../view/theme/diabook-red/theme.php:82
 #: ../../view/theme/diabook-blue/theme.php:82
 #: ../../view/theme/diabook/theme.php:86
-#: ../../view/theme/diabook-aerith/theme.php:82 ../../include/text.php:1294
+#: ../../view/theme/diabook-aerith/theme.php:82 ../../include/text.php:1297
 #: ../../include/diaspora.php:1654 ../../include/conversation.php:53
 #: ../../include/conversation.php:126
 msgid "photo"
@@ -2234,7 +2234,7 @@ msgstr "Markierte"
 msgid "Shared Links"
 msgstr "Geteilte Links"
 
-#: ../../mod/network.php:270
+#: ../../mod/network.php:274
 #, php-format
 msgid "Warning: This group contains %s member from an insecure network."
 msgid_plural ""
@@ -2242,31 +2242,31 @@ msgid_plural ""
 msgstr[0] "Warnung: Diese Gruppe beinhaltet %s Person aus einem unsicheren Netzwerk."
 msgstr[1] "Warnung: Diese Gruppe beinhaltet %s Personen aus unsicheren Netzwerken."
 
-#: ../../mod/network.php:273
+#: ../../mod/network.php:277
 msgid "Private messages to this group are at risk of public disclosure."
 msgstr "Private Nachrichten an diese Gruppe könnten an die Öffentlichkeit geraten."
 
-#: ../../mod/network.php:318
+#: ../../mod/network.php:322
 msgid "No such group"
 msgstr "Es gibt keine solche Gruppe"
 
-#: ../../mod/network.php:329
+#: ../../mod/network.php:333
 msgid "Group is empty"
 msgstr "Gruppe ist leer"
 
-#: ../../mod/network.php:333
+#: ../../mod/network.php:337
 msgid "Group: "
 msgstr "Gruppe: "
 
-#: ../../mod/network.php:343
+#: ../../mod/network.php:347
 msgid "Contact: "
 msgstr "Kontakt: "
 
-#: ../../mod/network.php:345
+#: ../../mod/network.php:349
 msgid "Private messages to this person are at risk of public disclosure."
 msgstr "Private Nachrichten an diese Person könnten an die Öffentlichkeit gelangen."
 
-#: ../../mod/network.php:350
+#: ../../mod/network.php:354
 msgid "Invalid contact."
 msgstr "Ungültiger Kontakt."
 
@@ -2275,7 +2275,7 @@ msgid "Personal Notes"
 msgstr "Persönliche Notizen"
 
 #: ../../mod/notes.php:63 ../../mod/filer.php:30
-#: ../../addon/facebook/facebook.php:673 ../../include/text.php:649
+#: ../../addon/facebook/facebook.php:673 ../../include/text.php:652
 msgid "Save"
 msgstr "Speichern"
 
@@ -2538,7 +2538,7 @@ msgstr "Alle Kontakte (mit gesichertem Profilzugriff)"
 msgid "No contacts."
 msgstr "Keine Kontakte."
 
-#: ../../mod/viewcontacts.php:76 ../../include/text.php:586
+#: ../../mod/viewcontacts.php:76 ../../include/text.php:589
 msgid "View Contacts"
 msgstr "Kontakte anzeigen"
 
@@ -4397,7 +4397,7 @@ msgstr "Neueste Favoriten"
 #: ../../view/theme/diabook-red/theme.php:74
 #: ../../view/theme/diabook-blue/theme.php:74
 #: ../../view/theme/diabook/theme.php:78
-#: ../../view/theme/diabook-aerith/theme.php:74 ../../include/text.php:1292
+#: ../../view/theme/diabook-aerith/theme.php:74 ../../include/text.php:1295
 #: ../../include/conversation.php:45 ../../include/conversation.php:118
 msgid "event"
 msgstr "Veranstaltung"
@@ -5223,21 +5223,21 @@ msgstr "Verbinde Dienste"
 #: ../../view/theme/diabook/theme.php:212
 #: ../../view/theme/diabook-aerith/theme.php:207
 msgid "PostIt to Friendica"
-msgstr "PostIt nach Friendica"
+msgstr "Bei Friendica posten"
 
 #: ../../view/theme/diabook-red/theme.php:207
 #: ../../view/theme/diabook-blue/theme.php:207
 #: ../../view/theme/diabook/theme.php:212
 #: ../../view/theme/diabook-aerith/theme.php:207
 msgid "Post to Friendica"
-msgstr "Bei Friendica veröffentlichen"
+msgstr "Wenn du diesen Link"
 
 #: ../../view/theme/diabook-red/theme.php:208
 #: ../../view/theme/diabook-blue/theme.php:208
 #: ../../view/theme/diabook/theme.php:213
 #: ../../view/theme/diabook-aerith/theme.php:208
 msgid " from anywhere by bookmarking this Link."
-msgstr " von überall her indem du diesen Link zu deinen Lesezeichen hinzufügst."
+msgstr "zu deinen Lesezeichen hinzufügst, kannst du von überallher Links bei Friendica veröffentlichen."
 
 #: ../../view/theme/diabook-red/theme.php:236
 #: ../../view/theme/diabook-blue/theme.php:236
@@ -5695,158 +5695,158 @@ msgstr "(kein Betreff)"
 msgid "noreply"
 msgstr "noreply"
 
-#: ../../include/text.php:240
+#: ../../include/text.php:243
 msgid "prev"
 msgstr "vorige"
 
-#: ../../include/text.php:242
+#: ../../include/text.php:245
 msgid "first"
 msgstr "erste"
 
-#: ../../include/text.php:271
+#: ../../include/text.php:274
 msgid "last"
 msgstr "letzte"
 
-#: ../../include/text.php:274
+#: ../../include/text.php:277
 msgid "next"
 msgstr "nächste"
 
-#: ../../include/text.php:565
+#: ../../include/text.php:568
 msgid "No contacts"
 msgstr "Keine Kontakte"
 
-#: ../../include/text.php:574
+#: ../../include/text.php:577
 #, php-format
 msgid "%d Contact"
 msgid_plural "%d Contacts"
 msgstr[0] "%d Kontakt"
 msgstr[1] "%d Kontakte"
 
-#: ../../include/text.php:647 ../../include/nav.php:91
+#: ../../include/text.php:650 ../../include/nav.php:91
 msgid "Search"
 msgstr "Suche"
 
-#: ../../include/text.php:828
+#: ../../include/text.php:831
 msgid "Monday"
 msgstr "Montag"
 
-#: ../../include/text.php:828
+#: ../../include/text.php:831
 msgid "Tuesday"
 msgstr "Dienstag"
 
-#: ../../include/text.php:828
+#: ../../include/text.php:831
 msgid "Wednesday"
 msgstr "Mittwoch"
 
-#: ../../include/text.php:828
+#: ../../include/text.php:831
 msgid "Thursday"
 msgstr "Donnerstag"
 
-#: ../../include/text.php:828
+#: ../../include/text.php:831
 msgid "Friday"
 msgstr "Freitag"
 
-#: ../../include/text.php:828
+#: ../../include/text.php:831
 msgid "Saturday"
 msgstr "Samstag"
 
-#: ../../include/text.php:828
+#: ../../include/text.php:831
 msgid "Sunday"
 msgstr "Sonntag"
 
-#: ../../include/text.php:832
+#: ../../include/text.php:835
 msgid "January"
 msgstr "Januar"
 
-#: ../../include/text.php:832
+#: ../../include/text.php:835
 msgid "February"
 msgstr "Februar"
 
-#: ../../include/text.php:832
+#: ../../include/text.php:835
 msgid "March"
 msgstr "März"
 
-#: ../../include/text.php:832
+#: ../../include/text.php:835
 msgid "April"
 msgstr "April"
 
-#: ../../include/text.php:832
+#: ../../include/text.php:835
 msgid "May"
 msgstr "Mai"
 
-#: ../../include/text.php:832
+#: ../../include/text.php:835
 msgid "June"
 msgstr "Juni"
 
-#: ../../include/text.php:832
+#: ../../include/text.php:835
 msgid "July"
 msgstr "Juli"
 
-#: ../../include/text.php:832
+#: ../../include/text.php:835
 msgid "August"
 msgstr "August"
 
-#: ../../include/text.php:832
+#: ../../include/text.php:835
 msgid "September"
 msgstr "September"
 
-#: ../../include/text.php:832
+#: ../../include/text.php:835
 msgid "October"
 msgstr "Oktober"
 
-#: ../../include/text.php:832
+#: ../../include/text.php:835
 msgid "November"
 msgstr "November"
 
-#: ../../include/text.php:832
+#: ../../include/text.php:835
 msgid "December"
 msgstr "Dezember"
 
-#: ../../include/text.php:916
+#: ../../include/text.php:919
 msgid "bytes"
 msgstr "Byte"
 
-#: ../../include/text.php:933
+#: ../../include/text.php:936
 msgid "Categories:"
 msgstr "Kategorien:"
 
-#: ../../include/text.php:945
+#: ../../include/text.php:948
 msgid "remove"
 msgstr "löschen"
 
-#: ../../include/text.php:945
+#: ../../include/text.php:948
 msgid "[remove]"
 msgstr "[löschen]"
 
-#: ../../include/text.php:948
+#: ../../include/text.php:951
 msgid "Filed under:"
 msgstr "Abgelegt unter:"
 
-#: ../../include/text.php:964 ../../include/text.php:976
+#: ../../include/text.php:967 ../../include/text.php:979
 msgid "Click to open/close"
 msgstr "Zum öffnen/schließen klicken"
 
-#: ../../include/text.php:1068
+#: ../../include/text.php:1071
 msgid "Select an alternate language"
 msgstr "Alternative Sprache auswählen"
 
-#: ../../include/text.php:1080
+#: ../../include/text.php:1083
 msgid "default"
 msgstr "standard"
 
-#: ../../include/text.php:1296
+#: ../../include/text.php:1299
 msgid "activity"
 msgstr "Aktivität"
 
-#: ../../include/text.php:1298
+#: ../../include/text.php:1301
 msgid "comment"
 msgstr "Kommentar"
 
-#: ../../include/text.php:1299
+#: ../../include/text.php:1302
 msgid "post"
 msgstr "Beitrag"
 
-#: ../../include/text.php:1454
+#: ../../include/text.php:1457
 msgid "Item filed"
 msgstr "Beitrag abgelegt"
 
@@ -6220,7 +6220,7 @@ msgstr "%s hat dir eine neue private Nachricht auf %s geschrieben."
 #: ../../include/enotify.php:42
 #, php-format
 msgid "%s sent you %s."
-msgstr "%s hat Dir geschickt %s"
+msgstr "%s hat Dir %s geschickt"
 
 #: ../../include/enotify.php:42
 msgid "a private message"
@@ -6316,7 +6316,7 @@ msgstr "%s markierte %s"
 
 #: ../../include/enotify.php:121
 msgid "your post"
-msgstr "Dein Beitrag"
+msgstr "Deinen Beitrag"
 
 #: ../../include/enotify.php:130
 msgid "[Friendica:Notify] Introduction received"
diff --git a/view/de/strings.php b/view/de/strings.php
index 28567396b..3b9601aca 100644
--- a/view/de/strings.php
+++ b/view/de/strings.php
@@ -1159,9 +1159,9 @@ $a->strings["Invite Friends"] = "Freunde einladen";
 $a->strings["Community Pages"] = "Foren";
 $a->strings["Help or @NewHere ?"] = "Hilfe oder @NewHere";
 $a->strings["Connect Services"] = "Verbinde Dienste";
-$a->strings["PostIt to Friendica"] = "PostIt nach Friendica";
-$a->strings["Post to Friendica"] = "Bei Friendica veröffentlichen";
-$a->strings[" from anywhere by bookmarking this Link."] = " von überall her indem du diesen Link zu deinen Lesezeichen hinzufügst.";
+$a->strings["PostIt to Friendica"] = "Bei Friendica posten";
+$a->strings["Post to Friendica"] = "Wenn du diesen Link";
+$a->strings[" from anywhere by bookmarking this Link."] = "zu deinen Lesezeichen hinzufügst, kannst du von überallher Links bei Friendica veröffentlichen.";
 $a->strings["Your posts and conversations"] = "Deine Beiträge und Unterhaltungen";
 $a->strings["Your profile page"] = "Deine Profilseite";
 $a->strings["Your contacts"] = "Deine Kontakte";
@@ -1401,7 +1401,7 @@ $a->strings["%s Administrator"] = "der Administrator von %s";
 $a->strings["%s <!item_type!>"] = "%s <!item_type!>";
 $a->strings["[Friendica:Notify] New mail received at %s"] = "[Friendica Meldung] Neue Nachricht erhalten von %s";
 $a->strings["%s sent you a new private message at %s."] = "%s hat dir eine neue private Nachricht auf %s geschrieben.";
-$a->strings["%s sent you %s."] = "%s hat Dir geschickt %s";
+$a->strings["%s sent you %s."] = "%s hat Dir %s geschickt";
 $a->strings["a private message"] = "eine private Nachricht";
 $a->strings["Please visit %s to view and/or reply to your private messages."] = "Bitte besuche %s, um deine privaten Nachrichten anzusehen und/oder zu beantworten.";
 $a->strings["%s's"] = "%s's";
@@ -1421,7 +1421,7 @@ $a->strings["tagged you"] = "erwähnte Dich";
 $a->strings["[Friendica:Notify] %s tagged your post"] = "[Friendica Meldung] %s markierte Deinen Beitrag";
 $a->strings["%s tagged your post at %s"] = "%s hat deinen Beitrag auf %s getaggt";
 $a->strings["%s tagged %s"] = "%s markierte %s";
-$a->strings["your post"] = "Dein Beitrag";
+$a->strings["your post"] = "Deinen Beitrag";
 $a->strings["[Friendica:Notify] Introduction received"] = "[Friendica Meldung] Kontaktanfrage erhalten";
 $a->strings["You've received an introduction from '%s' at %s"] = "Du hast eine Kontaktanfrage von '%s' auf %s erhalten";
 $a->strings["You've received %s from %s."] = "Du hast %s von %s erhalten.";
-- 
cgit v1.2.3


From c27c340de186631858763e630166d6fa24543e2f Mon Sep 17 00:00:00 2001
From: tommy tomson <thomas.bierey@gmx.de>
Date: Mon, 9 Apr 2012 16:41:23 +0200
Subject: diabook-nav-icons with gradient

---
 view/theme/diabook/icons/contacts.png       | Bin 559 -> 735 bytes
 view/theme/diabook/icons/contacts3.png      | Bin 0 -> 559 bytes
 view/theme/diabook/icons/messages.png       | Bin 488 -> 773 bytes
 view/theme/diabook/icons/messages3.png      | Bin 0 -> 488 bytes
 view/theme/diabook/icons/notifications.png  | Bin 714 -> 1072 bytes
 view/theme/diabook/icons/notifications3.png | Bin 0 -> 714 bytes
 view/theme/diabook/icons/notify.png         | Bin 534 -> 931 bytes
 view/theme/diabook/icons/notify3.png        | Bin 0 -> 534 bytes
 8 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 view/theme/diabook/icons/contacts3.png
 mode change 100755 => 100644 view/theme/diabook/icons/messages.png
 create mode 100644 view/theme/diabook/icons/messages3.png
 create mode 100755 view/theme/diabook/icons/notifications3.png
 create mode 100755 view/theme/diabook/icons/notify3.png

(limited to 'view')

diff --git a/view/theme/diabook/icons/contacts.png b/view/theme/diabook/icons/contacts.png
index 8a3e69ec1..f1c3649ef 100644
Binary files a/view/theme/diabook/icons/contacts.png and b/view/theme/diabook/icons/contacts.png differ
diff --git a/view/theme/diabook/icons/contacts3.png b/view/theme/diabook/icons/contacts3.png
new file mode 100644
index 000000000..8a3e69ec1
Binary files /dev/null and b/view/theme/diabook/icons/contacts3.png differ
diff --git a/view/theme/diabook/icons/messages.png b/view/theme/diabook/icons/messages.png
old mode 100755
new mode 100644
index 38e11ef88..fb77caf0e
Binary files a/view/theme/diabook/icons/messages.png and b/view/theme/diabook/icons/messages.png differ
diff --git a/view/theme/diabook/icons/messages3.png b/view/theme/diabook/icons/messages3.png
new file mode 100644
index 000000000..838231fce
Binary files /dev/null and b/view/theme/diabook/icons/messages3.png differ
diff --git a/view/theme/diabook/icons/notifications.png b/view/theme/diabook/icons/notifications.png
index 270997740..f35c621df 100755
Binary files a/view/theme/diabook/icons/notifications.png and b/view/theme/diabook/icons/notifications.png differ
diff --git a/view/theme/diabook/icons/notifications3.png b/view/theme/diabook/icons/notifications3.png
new file mode 100755
index 000000000..270997740
Binary files /dev/null and b/view/theme/diabook/icons/notifications3.png differ
diff --git a/view/theme/diabook/icons/notify.png b/view/theme/diabook/icons/notify.png
index 9b852d05b..cf94ea7c5 100755
Binary files a/view/theme/diabook/icons/notify.png and b/view/theme/diabook/icons/notify.png differ
diff --git a/view/theme/diabook/icons/notify3.png b/view/theme/diabook/icons/notify3.png
new file mode 100755
index 000000000..9b852d05b
Binary files /dev/null and b/view/theme/diabook/icons/notify3.png differ
-- 
cgit v1.2.3


From d25a9df99600b0ce204d88114f07f5ed1db9d5d3 Mon Sep 17 00:00:00 2001
From: tommy tomson <thomas.bierey@gmx.de>
Date: Mon, 9 Apr 2012 19:56:53 +0200
Subject: diabook-themes: small icon fix

---
 view/theme/diabook-aerith/icons/contacts.png       | Bin 568 -> 803 bytes
 view/theme/diabook-aerith/icons/contacts3.png      | Bin 0 -> 568 bytes
 view/theme/diabook-aerith/icons/messages.png       | Bin 579 -> 901 bytes
 view/theme/diabook-aerith/icons/messages3.png      | Bin 0 -> 579 bytes
 view/theme/diabook-aerith/icons/notifications.png  | Bin 754 -> 1033 bytes
 view/theme/diabook-aerith/icons/notifications3.png | Bin 0 -> 754 bytes
 view/theme/diabook-aerith/icons/notify.png         | Bin 795 -> 1100 bytes
 view/theme/diabook-aerith/icons/notify3.png        | Bin 0 -> 795 bytes
 view/theme/diabook/icons/contacts.png              | Bin 735 -> 773 bytes
 view/theme/diabook/icons/messages.png              | Bin 773 -> 777 bytes
 view/theme/diabook/icons/messages3.png             | Bin 488 -> 488 bytes
 view/theme/diabook/icons/notifications.png         | Bin 1072 -> 926 bytes
 view/theme/diabook/icons/notifications3.png        | Bin 714 -> 714 bytes
 view/theme/diabook/icons/notify.png                | Bin 931 -> 1001 bytes
 14 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 view/theme/diabook-aerith/icons/contacts3.png
 create mode 100755 view/theme/diabook-aerith/icons/messages3.png
 create mode 100755 view/theme/diabook-aerith/icons/notifications3.png
 create mode 100755 view/theme/diabook-aerith/icons/notify3.png

(limited to 'view')

diff --git a/view/theme/diabook-aerith/icons/contacts.png b/view/theme/diabook-aerith/icons/contacts.png
index cd0e289a7..79f6d497c 100644
Binary files a/view/theme/diabook-aerith/icons/contacts.png and b/view/theme/diabook-aerith/icons/contacts.png differ
diff --git a/view/theme/diabook-aerith/icons/contacts3.png b/view/theme/diabook-aerith/icons/contacts3.png
new file mode 100644
index 000000000..cd0e289a7
Binary files /dev/null and b/view/theme/diabook-aerith/icons/contacts3.png differ
diff --git a/view/theme/diabook-aerith/icons/messages.png b/view/theme/diabook-aerith/icons/messages.png
index e2bf7d24d..c83ba186a 100755
Binary files a/view/theme/diabook-aerith/icons/messages.png and b/view/theme/diabook-aerith/icons/messages.png differ
diff --git a/view/theme/diabook-aerith/icons/messages3.png b/view/theme/diabook-aerith/icons/messages3.png
new file mode 100755
index 000000000..e2bf7d24d
Binary files /dev/null and b/view/theme/diabook-aerith/icons/messages3.png differ
diff --git a/view/theme/diabook-aerith/icons/notifications.png b/view/theme/diabook-aerith/icons/notifications.png
index 2b4fbb818..2bcd74927 100755
Binary files a/view/theme/diabook-aerith/icons/notifications.png and b/view/theme/diabook-aerith/icons/notifications.png differ
diff --git a/view/theme/diabook-aerith/icons/notifications3.png b/view/theme/diabook-aerith/icons/notifications3.png
new file mode 100755
index 000000000..2b4fbb818
Binary files /dev/null and b/view/theme/diabook-aerith/icons/notifications3.png differ
diff --git a/view/theme/diabook-aerith/icons/notify.png b/view/theme/diabook-aerith/icons/notify.png
index 9765bfd53..159cd2c59 100755
Binary files a/view/theme/diabook-aerith/icons/notify.png and b/view/theme/diabook-aerith/icons/notify.png differ
diff --git a/view/theme/diabook-aerith/icons/notify3.png b/view/theme/diabook-aerith/icons/notify3.png
new file mode 100755
index 000000000..9765bfd53
Binary files /dev/null and b/view/theme/diabook-aerith/icons/notify3.png differ
diff --git a/view/theme/diabook/icons/contacts.png b/view/theme/diabook/icons/contacts.png
index f1c3649ef..1fb6d695b 100644
Binary files a/view/theme/diabook/icons/contacts.png and b/view/theme/diabook/icons/contacts.png differ
diff --git a/view/theme/diabook/icons/messages.png b/view/theme/diabook/icons/messages.png
index fb77caf0e..ab7b0f491 100644
Binary files a/view/theme/diabook/icons/messages.png and b/view/theme/diabook/icons/messages.png differ
diff --git a/view/theme/diabook/icons/messages3.png b/view/theme/diabook/icons/messages3.png
index 838231fce..4f3ce3693 100644
Binary files a/view/theme/diabook/icons/messages3.png and b/view/theme/diabook/icons/messages3.png differ
diff --git a/view/theme/diabook/icons/notifications.png b/view/theme/diabook/icons/notifications.png
index f35c621df..347f1519e 100755
Binary files a/view/theme/diabook/icons/notifications.png and b/view/theme/diabook/icons/notifications.png differ
diff --git a/view/theme/diabook/icons/notifications3.png b/view/theme/diabook/icons/notifications3.png
index 270997740..2c9c791c0 100755
Binary files a/view/theme/diabook/icons/notifications3.png and b/view/theme/diabook/icons/notifications3.png differ
diff --git a/view/theme/diabook/icons/notify.png b/view/theme/diabook/icons/notify.png
index cf94ea7c5..355abb1eb 100755
Binary files a/view/theme/diabook/icons/notify.png and b/view/theme/diabook/icons/notify.png differ
-- 
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-aerith/comment_item.tpl    |  39 ++++++++++++++++++++++++++
 view/theme/diabook-aerith/icons/bb-image.png  | Bin 0 -> 697 bytes
 view/theme/diabook-aerith/icons/bb-video.png  | Bin 0 -> 917 bytes
 view/theme/diabook-aerith/icons/bold.png      | Bin 0 -> 699 bytes
 view/theme/diabook-aerith/icons/italic.png    | Bin 0 -> 577 bytes
 view/theme/diabook-aerith/icons/underline.png | Bin 0 -> 604 bytes
 view/theme/diabook-aerith/style-network.css   |   3 +-
 view/theme/diabook-aerith/style-profile.css   |   3 +-
 view/theme/diabook-aerith/style.css           |  25 +++++++++++++++--
 view/theme/diabook-aerith/theme.php           |  33 ++++++++++++++++++++--
 view/theme/diabook-blue/comment_item.tpl      |  39 ++++++++++++++++++++++++++
 view/theme/diabook-blue/icons/bb-image.png    | Bin 0 -> 697 bytes
 view/theme/diabook-blue/icons/bb-video.png    | Bin 0 -> 917 bytes
 view/theme/diabook-blue/icons/bold.png        | Bin 0 -> 699 bytes
 view/theme/diabook-blue/icons/italic.png      | Bin 0 -> 577 bytes
 view/theme/diabook-blue/icons/underline.png   | Bin 0 -> 604 bytes
 view/theme/diabook-blue/style-network.css     |   3 +-
 view/theme/diabook-blue/style-profile.css     |   3 +-
 view/theme/diabook-blue/style.css             |  25 +++++++++++++++--
 view/theme/diabook-blue/theme.php             |  31 ++++++++++++++++++--
 view/theme/diabook-red/comment_item.tpl       |  39 ++++++++++++++++++++++++++
 view/theme/diabook-red/icons/bb-image.png     | Bin 0 -> 697 bytes
 view/theme/diabook-red/icons/bb-video.png     | Bin 0 -> 917 bytes
 view/theme/diabook-red/icons/bold.png         | Bin 0 -> 699 bytes
 view/theme/diabook-red/icons/italic.png       | Bin 0 -> 577 bytes
 view/theme/diabook-red/icons/underline.png    | Bin 0 -> 604 bytes
 view/theme/diabook-red/style-network.css      |   3 +-
 view/theme/diabook-red/style-profile.css      |   3 +-
 view/theme/diabook-red/style.css              |  25 +++++++++++++++--
 view/theme/diabook-red/theme.php              |  33 ++++++++++++++++++++--
 view/theme/diabook/comment_item.tpl           |  39 ++++++++++++++++++++++++++
 view/theme/diabook/icons/bb-image.png         | Bin 0 -> 697 bytes
 view/theme/diabook/icons/bb-video.png         | Bin 0 -> 917 bytes
 view/theme/diabook/icons/bold.png             | Bin 0 -> 699 bytes
 view/theme/diabook/icons/italic.png           | Bin 0 -> 577 bytes
 view/theme/diabook/icons/underline.png        | Bin 0 -> 604 bytes
 view/theme/diabook/style-network.css          |   3 +-
 view/theme/diabook/style-profile.css          |   3 +-
 view/theme/diabook/style.css                  |  24 +++++++++++++++-
 view/theme/diabook/theme.php                  |  33 ++++++++++++++++++++--
 40 files changed, 383 insertions(+), 26 deletions(-)
 create mode 100644 view/theme/diabook-aerith/comment_item.tpl
 create mode 100644 view/theme/diabook-aerith/icons/bb-image.png
 create mode 100644 view/theme/diabook-aerith/icons/bb-video.png
 create mode 100644 view/theme/diabook-aerith/icons/bold.png
 create mode 100644 view/theme/diabook-aerith/icons/italic.png
 create mode 100644 view/theme/diabook-aerith/icons/underline.png
 create mode 100644 view/theme/diabook-blue/comment_item.tpl
 create mode 100644 view/theme/diabook-blue/icons/bb-image.png
 create mode 100644 view/theme/diabook-blue/icons/bb-video.png
 create mode 100644 view/theme/diabook-blue/icons/bold.png
 create mode 100644 view/theme/diabook-blue/icons/italic.png
 create mode 100644 view/theme/diabook-blue/icons/underline.png
 create mode 100644 view/theme/diabook-red/comment_item.tpl
 create mode 100644 view/theme/diabook-red/icons/bb-image.png
 create mode 100644 view/theme/diabook-red/icons/bb-video.png
 create mode 100644 view/theme/diabook-red/icons/bold.png
 create mode 100644 view/theme/diabook-red/icons/italic.png
 create mode 100644 view/theme/diabook-red/icons/underline.png
 create mode 100644 view/theme/diabook/comment_item.tpl
 create mode 100644 view/theme/diabook/icons/bb-image.png
 create mode 100644 view/theme/diabook/icons/bb-video.png
 create mode 100644 view/theme/diabook/icons/bold.png
 create mode 100644 view/theme/diabook/icons/italic.png
 create mode 100644 view/theme/diabook/icons/underline.png

(limited to 'view')

diff --git a/view/theme/diabook-aerith/comment_item.tpl b/view/theme/diabook-aerith/comment_item.tpl
new file mode 100644
index 000000000..4668b9ce3
--- /dev/null
+++ b/view/theme/diabook-aerith/comment_item.tpl
@@ -0,0 +1,39 @@
+		<div class="comment-wwedit-wrapper" id="comment-edit-wrapper-$id" style="display: block;">
+			<form class="comment-edit-form" id="comment-edit-form-$id" action="item" method="post" onsubmit="post_comment($id); return false;">
+				<input type="hidden" name="type" value="$type" />
+				<input type="hidden" name="profile_uid" value="$profile_uid" />
+				<input type="hidden" name="parent" value="$parent" />
+				<input type="hidden" name="return" value="$return_path" />
+				<input type="hidden" name="jsreload" value="$jsreload" />
+				<input type="hidden" name="preview" id="comment-preview-inp-$id" value="0" />
+
+				<div class="comment-edit-photo" id="comment-edit-photo-$id" >
+					<a class="comment-edit-photo-link" href="$mylink" title="$mytitle"><img class="my-comment-photo" src="$myphoto" alt="$mytitle" title="$mytitle" /></a>
+				</div>
+				<div class="comment-edit-photo-end"></div>
+				<textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);" onBlur="commentClose(this,$id);" >$comment</textarea>
+				<a class="icon bb-video" onclick="insertFormatting('video',$id);">video</a>													
+				<a class="icon bb-image" onclick="insertFormatting('img',$id);">img</a>										
+				<a class="icon italic" onclick="insertFormatting('i',$id);">i</a>
+				<a class="icon underline" onclick="insertFormatting('u',$id);">u</a>
+				<a class="icon bold" onclick="insertFormatting('b',$id);">b</a>
+				{{ if $qcomment }}
+					<select id="qcomment-select-$id" name="qcomment-$id" class="qcomment" onchange="qCommentInsert(this,$id);" >
+					<option value=""></option>
+				{{ for $qcomment as $qc }}
+					<option value="$qc">$qc</option>				
+				{{ endfor }}
+					</select>
+				{{ endif }}
+
+				<div class="comment-edit-text-end"></div>
+				<div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-$id" style="display: none;" >
+					<input type="submit" onclick="post_comment($id); return false;" id="comment-edit-submit-$id" class="comment-edit-submit" name="submit" value="$submit" />
+					<span onclick="preview_comment($id);" id="comment-edit-preview-link-$id" class="fakelink">$preview</span>
+					<div id="comment-edit-preview-$id" class="comment-edit-preview" style="display:none;"></div>
+				</div>
+
+				<div class="comment-edit-end"></div>
+			</form>
+
+		</div>
diff --git a/view/theme/diabook-aerith/icons/bb-image.png b/view/theme/diabook-aerith/icons/bb-image.png
new file mode 100644
index 000000000..9a1b32113
Binary files /dev/null and b/view/theme/diabook-aerith/icons/bb-image.png differ
diff --git a/view/theme/diabook-aerith/icons/bb-video.png b/view/theme/diabook-aerith/icons/bb-video.png
new file mode 100644
index 000000000..bd323531e
Binary files /dev/null and b/view/theme/diabook-aerith/icons/bb-video.png differ
diff --git a/view/theme/diabook-aerith/icons/bold.png b/view/theme/diabook-aerith/icons/bold.png
new file mode 100644
index 000000000..8fab2a10f
Binary files /dev/null and b/view/theme/diabook-aerith/icons/bold.png differ
diff --git a/view/theme/diabook-aerith/icons/italic.png b/view/theme/diabook-aerith/icons/italic.png
new file mode 100644
index 000000000..bf4b2b81d
Binary files /dev/null and b/view/theme/diabook-aerith/icons/italic.png differ
diff --git a/view/theme/diabook-aerith/icons/underline.png b/view/theme/diabook-aerith/icons/underline.png
new file mode 100644
index 000000000..b1b4d3574
Binary files /dev/null and b/view/theme/diabook-aerith/icons/underline.png differ
diff --git a/view/theme/diabook-aerith/style-network.css b/view/theme/diabook-aerith/style-network.css
index 07bda6a24..385b58ac4 100644
--- a/view/theme/diabook-aerith/style-network.css
+++ b/view/theme/diabook-aerith/style-network.css
@@ -1298,6 +1298,7 @@ transition: all 0.2s ease-in-out;
   padding: 5px;
   margin-bottom: 0px;
   width: 575px;
+  padding-top: 10px;
 }
 .tread-wrapper a{
   color: #3465A4;
@@ -1447,7 +1448,7 @@ transition: all 0.2s ease-in-out;
 }
 
 .wall-item-comment-wrapper {
-  margin: 1px 0px 0px 80px;
+  margin: 1px 5px 17px 80px;
   background-color: #fff;
   width: 500px;
 }
diff --git a/view/theme/diabook-aerith/style-profile.css b/view/theme/diabook-aerith/style-profile.css
index 8909f0870..078b6d01f 100644
--- a/view/theme/diabook-aerith/style-profile.css
+++ b/view/theme/diabook-aerith/style-profile.css
@@ -1291,6 +1291,7 @@ transition: all 0.2s ease-in-out;
   padding: 5px;
   margin-bottom: 0px;
   width: 575px;
+  padding-top: 10px;
 }
 .tread-wrapper a{
   color: #3465A4;
@@ -1439,7 +1440,7 @@ transition: all 0.2s ease-in-out;
   padding-left: 12px;
 }
 .wall-item-comment-wrapper {
-  margin: 1px 5px 1px 80px;
+  margin: 1px 5px 17px 80px;
 }
 .wall-item-comment-wrapper .comment-edit-photo {
   display: none;
diff --git a/view/theme/diabook-aerith/style.css b/view/theme/diabook-aerith/style.css
index 23ae05940..2089090f1 100644
--- a/view/theme/diabook-aerith/style.css
+++ b/view/theme/diabook-aerith/style.css
@@ -82,7 +82,27 @@
 #adminpage table tr:hover { background-color: #eeeeee; }
 #adminpage .selectall { text-align: right; }
 /* icons */
-
+.icon.bold{
+  background-image: url("../../../view/theme/diabook-aerith/icons/bold.png");
+  float: right;
+  margin-top: 2px;}
+.icon.underline{
+  background-image: url("../../../view/theme/diabook-aerith/icons/underline.png");
+  float: right;
+  margin-top: 2px;}
+.icon.italic{
+  background-image: url("../../../view/theme/diabook-aerith/icons/italic.png");
+  float: right;
+  margin-top: 2px;}
+.icon.bb-image{
+  background-image: url("../../../view/theme/diabook-aerith/icons/bb-image.png");
+  float: right;
+  margin-top: 2px;}
+.icon.bb-video{
+  background-image: url("../../../view/theme/diabook-aerith/icons/bb-video.png");
+  float: right;
+  margin-top: 2px;}
+  
 .icon.contacts {
   background-image: url("../../../view/theme/diabook-aerith/icons/contacts.png");}
 .icon.notifications {
@@ -1331,6 +1351,7 @@ body .pageheader{
   padding: 5px;
   margin-bottom: 0px;
   width: 775px;
+  padding-top: 10px;
 }
 .tread-wrapper a{
   color: #3465A4;
@@ -1592,7 +1613,7 @@ body .pageheader{
   padding-left: 12px;
 }
 .wall-item-comment-wrapper {
-  margin: 1px 5px 1px 80px;
+  margin: 1px 5px 17px 80px;
 }
 .wall-item-comment-wrapper .comment-edit-photo {
   display: none;
diff --git a/view/theme/diabook-aerith/theme.php b/view/theme/diabook-aerith/theme.php
index 40093e545..1b26e47f8 100755
--- a/view/theme/diabook-aerith/theme.php
+++ b/view/theme/diabook-aerith/theme.php
@@ -3,13 +3,13 @@
 /*
  * 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: 1.015)
+ * Version: (Version: 1.016)
  * Author: 
  */
 
 
 //print diabook-version for debugging
-$diabook_version = "Diabook-aerith (Version: 1.015)";
+$diabook_version = "Diabook-aerith (Version: 1.016)";
 $a->page['htmlhead'] .= sprintf('<script "%s" ></script>', $diabook_version);
 
 
@@ -507,4 +507,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
diff --git a/view/theme/diabook-blue/comment_item.tpl b/view/theme/diabook-blue/comment_item.tpl
new file mode 100644
index 000000000..4668b9ce3
--- /dev/null
+++ b/view/theme/diabook-blue/comment_item.tpl
@@ -0,0 +1,39 @@
+		<div class="comment-wwedit-wrapper" id="comment-edit-wrapper-$id" style="display: block;">
+			<form class="comment-edit-form" id="comment-edit-form-$id" action="item" method="post" onsubmit="post_comment($id); return false;">
+				<input type="hidden" name="type" value="$type" />
+				<input type="hidden" name="profile_uid" value="$profile_uid" />
+				<input type="hidden" name="parent" value="$parent" />
+				<input type="hidden" name="return" value="$return_path" />
+				<input type="hidden" name="jsreload" value="$jsreload" />
+				<input type="hidden" name="preview" id="comment-preview-inp-$id" value="0" />
+
+				<div class="comment-edit-photo" id="comment-edit-photo-$id" >
+					<a class="comment-edit-photo-link" href="$mylink" title="$mytitle"><img class="my-comment-photo" src="$myphoto" alt="$mytitle" title="$mytitle" /></a>
+				</div>
+				<div class="comment-edit-photo-end"></div>
+				<textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);" onBlur="commentClose(this,$id);" >$comment</textarea>
+				<a class="icon bb-video" onclick="insertFormatting('video',$id);">video</a>													
+				<a class="icon bb-image" onclick="insertFormatting('img',$id);">img</a>										
+				<a class="icon italic" onclick="insertFormatting('i',$id);">i</a>
+				<a class="icon underline" onclick="insertFormatting('u',$id);">u</a>
+				<a class="icon bold" onclick="insertFormatting('b',$id);">b</a>
+				{{ if $qcomment }}
+					<select id="qcomment-select-$id" name="qcomment-$id" class="qcomment" onchange="qCommentInsert(this,$id);" >
+					<option value=""></option>
+				{{ for $qcomment as $qc }}
+					<option value="$qc">$qc</option>				
+				{{ endfor }}
+					</select>
+				{{ endif }}
+
+				<div class="comment-edit-text-end"></div>
+				<div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-$id" style="display: none;" >
+					<input type="submit" onclick="post_comment($id); return false;" id="comment-edit-submit-$id" class="comment-edit-submit" name="submit" value="$submit" />
+					<span onclick="preview_comment($id);" id="comment-edit-preview-link-$id" class="fakelink">$preview</span>
+					<div id="comment-edit-preview-$id" class="comment-edit-preview" style="display:none;"></div>
+				</div>
+
+				<div class="comment-edit-end"></div>
+			</form>
+
+		</div>
diff --git a/view/theme/diabook-blue/icons/bb-image.png b/view/theme/diabook-blue/icons/bb-image.png
new file mode 100644
index 000000000..9a1b32113
Binary files /dev/null and b/view/theme/diabook-blue/icons/bb-image.png differ
diff --git a/view/theme/diabook-blue/icons/bb-video.png b/view/theme/diabook-blue/icons/bb-video.png
new file mode 100644
index 000000000..bd323531e
Binary files /dev/null and b/view/theme/diabook-blue/icons/bb-video.png differ
diff --git a/view/theme/diabook-blue/icons/bold.png b/view/theme/diabook-blue/icons/bold.png
new file mode 100644
index 000000000..8fab2a10f
Binary files /dev/null and b/view/theme/diabook-blue/icons/bold.png differ
diff --git a/view/theme/diabook-blue/icons/italic.png b/view/theme/diabook-blue/icons/italic.png
new file mode 100644
index 000000000..bf4b2b81d
Binary files /dev/null and b/view/theme/diabook-blue/icons/italic.png differ
diff --git a/view/theme/diabook-blue/icons/underline.png b/view/theme/diabook-blue/icons/underline.png
new file mode 100644
index 000000000..b1b4d3574
Binary files /dev/null and b/view/theme/diabook-blue/icons/underline.png differ
diff --git a/view/theme/diabook-blue/style-network.css b/view/theme/diabook-blue/style-network.css
index 9baa83e8a..b37d82968 100644
--- a/view/theme/diabook-blue/style-network.css
+++ b/view/theme/diabook-blue/style-network.css
@@ -1260,6 +1260,7 @@ transition: all 0.2s ease-in-out;
   padding: 5px;
   margin-bottom: 0px;
   width: 575px;
+  padding-top: 10px;
 }
 .tread-wrapper a{
   color: #1872A2;
@@ -1409,7 +1410,7 @@ transition: all 0.2s ease-in-out;
 }
 
 .wall-item-comment-wrapper {
-  margin: 1px 0px 0px 80px;
+  margin: 1px 5px 17px 80px;
   background-color: #fff;
   width: 500px;
 }
diff --git a/view/theme/diabook-blue/style-profile.css b/view/theme/diabook-blue/style-profile.css
index 1a0674771..ae7fa8d14 100644
--- a/view/theme/diabook-blue/style-profile.css
+++ b/view/theme/diabook-blue/style-profile.css
@@ -1258,6 +1258,7 @@ transition: all 0.2s ease-in-out;
   padding: 5px;
   margin-bottom: 0px;
   width: 575px;
+  padding-top: 10px;
 }
 .tread-wrapper a{
   color: #1872A2;
@@ -1406,7 +1407,7 @@ transition: all 0.2s ease-in-out;
   padding-left: 12px;
 }
 .wall-item-comment-wrapper {
-  margin: 1px 5px 1px 80px;
+  margin: 1px 5px 17px 80px;
 }
 .wall-item-comment-wrapper .comment-edit-photo {
   display: none;
diff --git a/view/theme/diabook-blue/style.css b/view/theme/diabook-blue/style.css
index a0202856c..2f2369c46 100644
--- a/view/theme/diabook-blue/style.css
+++ b/view/theme/diabook-blue/style.css
@@ -82,7 +82,27 @@
 #adminpage table tr:hover { background-color: #eeeeee; }
 #adminpage .selectall { text-align: right; }
 /* icons */
-
+.icon.bold{
+  background-image: url("../../../view/theme/diabook-blue/icons/bold.png");
+  float: right;
+  margin-top: 2px;}
+.icon.underline{
+  background-image: url("../../../view/theme/diabook-blue/icons/underline.png");
+  float: right;
+  margin-top: 2px;}
+.icon.italic{
+  background-image: url("../../../view/theme/diabook-blue/icons/italic.png");
+  float: right;
+  margin-top: 2px;}
+.icon.bb-image{
+  background-image: url("../../../view/theme/diabook-blue/icons/bb-image.png");
+  float: right;
+  margin-top: 2px;}
+.icon.bb-video{
+  background-image: url("../../../view/theme/diabook-blue/icons/bb-video.png");
+  float: right;
+  margin-top: 2px;}
+  
 .icon.contacts {
   background-image: url("../../../view/theme/diabook-blue/icons/contacts.png");}
 .icon.notifications {
@@ -1287,6 +1307,7 @@ body .pageheader{
   padding: 5px;
   margin-bottom: 0px;
   width: 775px;
+  padding-top: 10px;
 }
 .tread-wrapper a{
   color: #1872A2;
@@ -1550,7 +1571,7 @@ body .pageheader{
   padding-left: 12px;
 }
 .wall-item-comment-wrapper {
-  margin: 1px 5px 1px 80px;
+  margin: 1px 5px 17px 80px;
 }
 .wall-item-comment-wrapper .comment-edit-photo {
   display: none;
diff --git a/view/theme/diabook-blue/theme.php b/view/theme/diabook-blue/theme.php
index 190533d17..f63f15fd9 100755
--- a/view/theme/diabook-blue/theme.php
+++ b/view/theme/diabook-blue/theme.php
@@ -3,13 +3,13 @@
 /*
  * 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: 1.015)
+ * Version: (Version: 1.016)
  * Author: 
  */
 
 
 //print diabook-version for debugging
-$diabook_version = "Diabook-blue (Version: 1.015)";
+$diabook_version = "Diabook-blue (Version: 1.016)";
 $a->page['htmlhead'] .= sprintf('<script "%s" ></script>', $diabook_version);
 
 //change css on network and profilepages
@@ -509,3 +509,30 @@ function restore_boxes(){
 	alert("Right-hand column was restored. Please refresh your browser");
   }
 </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> ';
diff --git a/view/theme/diabook-red/comment_item.tpl b/view/theme/diabook-red/comment_item.tpl
new file mode 100644
index 000000000..4668b9ce3
--- /dev/null
+++ b/view/theme/diabook-red/comment_item.tpl
@@ -0,0 +1,39 @@
+		<div class="comment-wwedit-wrapper" id="comment-edit-wrapper-$id" style="display: block;">
+			<form class="comment-edit-form" id="comment-edit-form-$id" action="item" method="post" onsubmit="post_comment($id); return false;">
+				<input type="hidden" name="type" value="$type" />
+				<input type="hidden" name="profile_uid" value="$profile_uid" />
+				<input type="hidden" name="parent" value="$parent" />
+				<input type="hidden" name="return" value="$return_path" />
+				<input type="hidden" name="jsreload" value="$jsreload" />
+				<input type="hidden" name="preview" id="comment-preview-inp-$id" value="0" />
+
+				<div class="comment-edit-photo" id="comment-edit-photo-$id" >
+					<a class="comment-edit-photo-link" href="$mylink" title="$mytitle"><img class="my-comment-photo" src="$myphoto" alt="$mytitle" title="$mytitle" /></a>
+				</div>
+				<div class="comment-edit-photo-end"></div>
+				<textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);" onBlur="commentClose(this,$id);" >$comment</textarea>
+				<a class="icon bb-video" onclick="insertFormatting('video',$id);">video</a>													
+				<a class="icon bb-image" onclick="insertFormatting('img',$id);">img</a>										
+				<a class="icon italic" onclick="insertFormatting('i',$id);">i</a>
+				<a class="icon underline" onclick="insertFormatting('u',$id);">u</a>
+				<a class="icon bold" onclick="insertFormatting('b',$id);">b</a>
+				{{ if $qcomment }}
+					<select id="qcomment-select-$id" name="qcomment-$id" class="qcomment" onchange="qCommentInsert(this,$id);" >
+					<option value=""></option>
+				{{ for $qcomment as $qc }}
+					<option value="$qc">$qc</option>				
+				{{ endfor }}
+					</select>
+				{{ endif }}
+
+				<div class="comment-edit-text-end"></div>
+				<div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-$id" style="display: none;" >
+					<input type="submit" onclick="post_comment($id); return false;" id="comment-edit-submit-$id" class="comment-edit-submit" name="submit" value="$submit" />
+					<span onclick="preview_comment($id);" id="comment-edit-preview-link-$id" class="fakelink">$preview</span>
+					<div id="comment-edit-preview-$id" class="comment-edit-preview" style="display:none;"></div>
+				</div>
+
+				<div class="comment-edit-end"></div>
+			</form>
+
+		</div>
diff --git a/view/theme/diabook-red/icons/bb-image.png b/view/theme/diabook-red/icons/bb-image.png
new file mode 100644
index 000000000..9a1b32113
Binary files /dev/null and b/view/theme/diabook-red/icons/bb-image.png differ
diff --git a/view/theme/diabook-red/icons/bb-video.png b/view/theme/diabook-red/icons/bb-video.png
new file mode 100644
index 000000000..bd323531e
Binary files /dev/null and b/view/theme/diabook-red/icons/bb-video.png differ
diff --git a/view/theme/diabook-red/icons/bold.png b/view/theme/diabook-red/icons/bold.png
new file mode 100644
index 000000000..8fab2a10f
Binary files /dev/null and b/view/theme/diabook-red/icons/bold.png differ
diff --git a/view/theme/diabook-red/icons/italic.png b/view/theme/diabook-red/icons/italic.png
new file mode 100644
index 000000000..bf4b2b81d
Binary files /dev/null and b/view/theme/diabook-red/icons/italic.png differ
diff --git a/view/theme/diabook-red/icons/underline.png b/view/theme/diabook-red/icons/underline.png
new file mode 100644
index 000000000..b1b4d3574
Binary files /dev/null and b/view/theme/diabook-red/icons/underline.png differ
diff --git a/view/theme/diabook-red/style-network.css b/view/theme/diabook-red/style-network.css
index 8d5e3fec9..8be39e374 100644
--- a/view/theme/diabook-red/style-network.css
+++ b/view/theme/diabook-red/style-network.css
@@ -1295,6 +1295,7 @@ transition: all 0.2s ease-in-out;
   padding: 5px;
   margin-bottom: 0px;
   width: 575px;
+  padding-top: 10px;
 }
 .tread-wrapper a{
   color: red;
@@ -1444,7 +1445,7 @@ transition: all 0.2s ease-in-out;
 }
 
 .wall-item-comment-wrapper {
-  margin: 1px 0px 0px 80px;
+  margin: 1px 5px 17px 80px;
   background-color: #fff;
   width: 500px;
 }
diff --git a/view/theme/diabook-red/style-profile.css b/view/theme/diabook-red/style-profile.css
index 570057b47..242c08c68 100644
--- a/view/theme/diabook-red/style-profile.css
+++ b/view/theme/diabook-red/style-profile.css
@@ -1271,6 +1271,7 @@ transition: all 0.2s ease-in-out;
   padding: 5px;
   margin-bottom: 0px;
   width: 575px;
+  padding-top: 10px;
 }
 .tread-wrapper a{
   color: red;
@@ -1419,7 +1420,7 @@ transition: all 0.2s ease-in-out;
   padding-left: 12px;
 }
 .wall-item-comment-wrapper {
-  margin: 1px 5px 1px 80px;
+  margin: 1px 5px 17px 80px;
 }
 .wall-item-comment-wrapper .comment-edit-photo {
   display: none;
diff --git a/view/theme/diabook-red/style.css b/view/theme/diabook-red/style.css
index 883f11374..0cf034a56 100644
--- a/view/theme/diabook-red/style.css
+++ b/view/theme/diabook-red/style.css
@@ -82,7 +82,27 @@
 #adminpage table tr:hover { background-color: #eeeeee; }
 #adminpage .selectall { text-align: right; }
 /* icons */
-
+.icon.bold{
+  background-image: url("../../../view/theme/diabook-red/icons/bold.png");
+  float: right;
+  margin-top: 2px;}
+.icon.underline{
+  background-image: url("../../../view/theme/diabook-red/icons/underline.png");
+  float: right;
+  margin-top: 2px;}
+.icon.italic{
+  background-image: url("../../../view/theme/diabook-red/icons/italic.png");
+  float: right;
+  margin-top: 2px;}
+.icon.bb-image{
+  background-image: url("../../../view/theme/diabook-red/icons/bb-image.png");
+  float: right;
+  margin-top: 2px;}
+.icon.bb-video{
+  background-image: url("../../../view/theme/diabook-red/icons/bb-video.png");
+  float: right;
+  margin-top: 2px;}
+  
 .icon.contacts {
   background-image: url("../../../view/theme/diabook-red/icons/contacts.png");}
 .icon.notifications {
@@ -1317,6 +1337,7 @@ body .pageheader{
   padding: 5px;
   margin-bottom: 0px;
   width: 775px;
+  padding-top: 10px;
 }
 .tread-wrapper a{
   color: red;
@@ -1579,7 +1600,7 @@ body .pageheader{
   padding-left: 12px;
 }
 .wall-item-comment-wrapper {
-  margin: 1px 5px 1px 80px;
+  margin: 1px 5px 17px 80px;
 }
 .wall-item-comment-wrapper .comment-edit-photo {
   display: none;
diff --git a/view/theme/diabook-red/theme.php b/view/theme/diabook-red/theme.php
index 85206baec..aec3ab95d 100755
--- a/view/theme/diabook-red/theme.php
+++ b/view/theme/diabook-red/theme.php
@@ -3,13 +3,13 @@
 /*
  * 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: 1.015)
+ * Version: (Version: 1.016)
  * Author: 
  */
 
 
 //print diabook-version for debugging
-$diabook_version = "Diabook-red (Version: 1.015)";
+$diabook_version = "Diabook-red (Version: 1.016)";
 $a->page['htmlhead'] .= sprintf('<script "%s" ></script>', $diabook_version);
 
 //change css on network and profilepages
@@ -509,4 +509,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
diff --git a/view/theme/diabook/comment_item.tpl b/view/theme/diabook/comment_item.tpl
new file mode 100644
index 000000000..4668b9ce3
--- /dev/null
+++ b/view/theme/diabook/comment_item.tpl
@@ -0,0 +1,39 @@
+		<div class="comment-wwedit-wrapper" id="comment-edit-wrapper-$id" style="display: block;">
+			<form class="comment-edit-form" id="comment-edit-form-$id" action="item" method="post" onsubmit="post_comment($id); return false;">
+				<input type="hidden" name="type" value="$type" />
+				<input type="hidden" name="profile_uid" value="$profile_uid" />
+				<input type="hidden" name="parent" value="$parent" />
+				<input type="hidden" name="return" value="$return_path" />
+				<input type="hidden" name="jsreload" value="$jsreload" />
+				<input type="hidden" name="preview" id="comment-preview-inp-$id" value="0" />
+
+				<div class="comment-edit-photo" id="comment-edit-photo-$id" >
+					<a class="comment-edit-photo-link" href="$mylink" title="$mytitle"><img class="my-comment-photo" src="$myphoto" alt="$mytitle" title="$mytitle" /></a>
+				</div>
+				<div class="comment-edit-photo-end"></div>
+				<textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);" onBlur="commentClose(this,$id);" >$comment</textarea>
+				<a class="icon bb-video" onclick="insertFormatting('video',$id);">video</a>													
+				<a class="icon bb-image" onclick="insertFormatting('img',$id);">img</a>										
+				<a class="icon italic" onclick="insertFormatting('i',$id);">i</a>
+				<a class="icon underline" onclick="insertFormatting('u',$id);">u</a>
+				<a class="icon bold" onclick="insertFormatting('b',$id);">b</a>
+				{{ if $qcomment }}
+					<select id="qcomment-select-$id" name="qcomment-$id" class="qcomment" onchange="qCommentInsert(this,$id);" >
+					<option value=""></option>
+				{{ for $qcomment as $qc }}
+					<option value="$qc">$qc</option>				
+				{{ endfor }}
+					</select>
+				{{ endif }}
+
+				<div class="comment-edit-text-end"></div>
+				<div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-$id" style="display: none;" >
+					<input type="submit" onclick="post_comment($id); return false;" id="comment-edit-submit-$id" class="comment-edit-submit" name="submit" value="$submit" />
+					<span onclick="preview_comment($id);" id="comment-edit-preview-link-$id" class="fakelink">$preview</span>
+					<div id="comment-edit-preview-$id" class="comment-edit-preview" style="display:none;"></div>
+				</div>
+
+				<div class="comment-edit-end"></div>
+			</form>
+
+		</div>
diff --git a/view/theme/diabook/icons/bb-image.png b/view/theme/diabook/icons/bb-image.png
new file mode 100644
index 000000000..9a1b32113
Binary files /dev/null and b/view/theme/diabook/icons/bb-image.png differ
diff --git a/view/theme/diabook/icons/bb-video.png b/view/theme/diabook/icons/bb-video.png
new file mode 100644
index 000000000..bd323531e
Binary files /dev/null and b/view/theme/diabook/icons/bb-video.png differ
diff --git a/view/theme/diabook/icons/bold.png b/view/theme/diabook/icons/bold.png
new file mode 100644
index 000000000..8fab2a10f
Binary files /dev/null and b/view/theme/diabook/icons/bold.png differ
diff --git a/view/theme/diabook/icons/italic.png b/view/theme/diabook/icons/italic.png
new file mode 100644
index 000000000..bf4b2b81d
Binary files /dev/null and b/view/theme/diabook/icons/italic.png differ
diff --git a/view/theme/diabook/icons/underline.png b/view/theme/diabook/icons/underline.png
new file mode 100644
index 000000000..b1b4d3574
Binary files /dev/null and b/view/theme/diabook/icons/underline.png differ
diff --git a/view/theme/diabook/style-network.css b/view/theme/diabook/style-network.css
index 9e57c17d2..ed7c76cbe 100644
--- a/view/theme/diabook/style-network.css
+++ b/view/theme/diabook/style-network.css
@@ -1241,6 +1241,7 @@ transition: all 0.2s ease-in-out;
   padding: 5px;
   margin-bottom: 0px;
   width: 575px;
+  padding-top: 10px;
 }
 .wall-item-decor {
   position: absolute;
@@ -1385,7 +1386,7 @@ transition: all 0.2s ease-in-out;
   padding-left: 12px;
 }
 .wall-item-comment-wrapper {
-  margin: 1px 5px 1px 80px;
+  margin: 1px 5px 17px 80px;
 }
 .wall-item-comment-wrapper .comment-edit-photo {
   display: none;
diff --git a/view/theme/diabook/style-profile.css b/view/theme/diabook/style-profile.css
index 95e9061ba..51eb61253 100644
--- a/view/theme/diabook/style-profile.css
+++ b/view/theme/diabook/style-profile.css
@@ -1235,6 +1235,7 @@ transition: all 0.2s ease-in-out;
   padding: 5px;
   margin-bottom: 0px;
   width: 575px;
+  padding-top: 10px;
 }
 .wall-item-decor {
   position: absolute;
@@ -1379,7 +1380,7 @@ transition: all 0.2s ease-in-out;
   padding-left: 12px;
 }
 .wall-item-comment-wrapper {
-  margin: 1px 5px 1px 80px;
+  margin: 1px 5px 17px 80px;
 }
 .wall-item-comment-wrapper .comment-edit-photo {
   display: none;
diff --git a/view/theme/diabook/style.css b/view/theme/diabook/style.css
index d11e3191a..229076484 100644
--- a/view/theme/diabook/style.css
+++ b/view/theme/diabook/style.css
@@ -83,6 +83,27 @@
 #adminpage .selectall { text-align: right; }
 /* icons */
 
+.icon.bold{
+  background-image: url("../../../view/theme/diabook/icons/bold.png");
+  float: right;
+  margin-top: 2px;}
+.icon.underline{
+  background-image: url("../../../view/theme/diabook/icons/underline.png");
+  float: right;
+  margin-top: 2px;}
+.icon.italic{
+  background-image: url("../../../view/theme/diabook/icons/italic.png");
+  float: right;
+  margin-top: 2px;}
+.icon.bb-image{
+  background-image: url("../../../view/theme/diabook/icons/bb-image.png");
+  float: right;
+  margin-top: 2px;}
+.icon.bb-video{
+  background-image: url("../../../view/theme/diabook/icons/bb-video.png");
+  float: right;
+  margin-top: 2px;}
+  
 .icon.contacts {
   background-image: url("../../../view/theme/diabook/icons/contacts.png");}
 .icon.notifications {
@@ -1269,6 +1290,7 @@ body .pageheader{
   padding: 5px;
   margin-bottom: 0px;
   width: 775px;
+  padding-top: 10px;
 }
 
 .wall-item-decor {
@@ -1516,7 +1538,7 @@ body .pageheader{
   padding-left: 12px;
 }
 .wall-item-comment-wrapper {
-  margin: 1px 5px 1px 80px;
+  margin: 1px 5px 17px 80px;
 }
 .wall-item-comment-wrapper .comment-edit-photo {
   display: none;
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