Merge pull request #215 from tomtom84/master

fixes in diabook-themes

diff --git a/view/theme/diabook-aerith/oembed_video.tpl b/view/theme/diabook-aerith/oembed_video.tpl
new file mode 100644 (file)
index 0000000..d6d29f7
--- /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 3b461e6db032c4f894c67b3da28be27e95068b9a..07bda6a24a2c1cd0dae81b6a8f67228921ae8dca 100644 (file)
--- 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 73f46e9ee46a0fcda457d6570f4b94c0d8576297..8909f08701c6d3818a98ab9a28ef11d2cdfb102d 100644 (file)
--- 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 f826521542b01aa92c791e0f311cb2ab69ca94e5..23ae05940d06037569935364268f62622971fe2f 100644 (file)
--- 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 a1ea51e82f8f6e5d7b8544234ddccc3fdecf7f0d..40093e5458e49faf1e2a455639be2e88990fc58a 100755 (executable)
--- 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 (file)
index 0000000..d6d29f7
--- /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 bd1cb249cfe182161e0ee23716a2f96126527c3f..9baa83e8ad864ae1df0180006f16fbcb99fde6cf 100644 (file)
--- 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 da826d74c97878763de7334a2818c380107bbbc7..1a0674771bf4bbed6fc25f66090a7d7f22709eeb 100644 (file)
--- 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 ebf6847083a87b4c414fb9e96534457957170432..a0202856c1c9fe344e9e000cdbcd143bc3a8a2b1 100644 (file)
--- 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 a8b4fcd6c9bee376dba115e7a0c88aa2b93c60fe..190533d176ab2c632378390298396042f321f9bf 100755 (executable)
--- 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 (file)
index 0000000..d6d29f7
--- /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 efbec090a7840123ceab2029cffcd9e2581f8bf6..8d5e3fec9831454fb549b153aa97b6894bb958d1 100644 (file)
--- 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 ef6fd860162e5d87a515d268b8ff76290159c1fc..570057b47a1f5f7ac07409aabe112f09db194c93 100644 (file)
--- 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 ef06ef5ca695514f170c5b6b87b2e35a2f002bed..883f113740b2e9cd24361f913b13c80505ea3954 100644 (file)
--- 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 fae26ae7014e03cf63c6d218b39dd60f7c42c2cc..85206baec944724b407c009b1172e983decc256d 100755 (executable)
--- 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 026007271687b79a39ad70a4754f7a3e25549aae..d6d29f724498a1699761772bddf75a06db43d056 100644 (file)
--- 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 af6e4027a17e7c206e29edda17fd1dec3b0c7508..9e57c17d2cb6b49ffe392a62138d047c87b34532 100644 (file)
--- 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 6b05903d3827c9350bca5f98b46c5d4a7ff89ee6..95e9061babdcfe735096a87ffbeca620605560da 100644 (file)
--- 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 60e2f336b2644815d8d3f5f8d2d80b0b770a9e0b..fdb4f24c74c44e131a3d68a1e21e3e7a6479442a 100644 (file)
--- 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 e99aa564460d845a9cf7003e6275fddc1d6af261..d11e3191ab903d023fc9130f0897f00249fc32f7 100644 (file)
--- 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 fbe42a304ac75431df3d47aba0a6d51d07a33ab8..924639625e2e10df67bf7b22605e6313955895ca 100755 (executable)
--- 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