Merge commit 'upstream/master'

1 files changed, 26 insertions, 1 deletions

diff --git a/view/theme/diabook-blue/theme.php b/view/theme/diabook-blue/theme.php
index 2e7aca92a..a8b4fcd6c 100755
--- a/view/theme/diabook-blue/theme.php
+++ b/view/theme/diabook-blue/theme.php
@@ -3,11 +3,15 @@
 /*
  * 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.012)
+ * Version: (Version: 1.014)
  * Author: 
  */
 
 
+//print diabook-version for debugging
+$diabook_version = "Diabook-blue (Version: 1.014)";
+$a->page['htmlhead'] .= sprintf('<script "%s" ></script>', $diabook_version);
+
 //change css on network and profilepages
 $cssFile = null;
 
@@ -333,8 +337,25 @@ if (!is_null($cssFile)) $a->page['htmlhead'] .= sprintf('<link rel="stylesheet"
 $cookieJS = $a->get_baseurl($ssl_state)."/view/theme/diabook-blue/js/jquery.cookie.js";
 $a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s" ></script>', $cookieJS);
 
+//load jquery.ae.image.resize.js
+$imageresizeJS = $a->get_baseurl($ssl_state)."/view/theme/diabook-blue/js/jquery.ae.image.resize.js";
+$a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s" ></script>', $imageresizeJS);
 
 //js scripts
+//comment-edit-wrapper on photo_view
+if ($a->argv[0].$a->argv[2] === "photos"."image"){
+
+$a->page['htmlhead'] .= '
+<script>
+	$(function(){
+	
+		$(".comment-edit-form").css("display","table");
+			
+			});
+    </script>';
+	
+}
+
 
 $a->page['htmlhead'] .= '
 
@@ -350,6 +371,10 @@ if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname'] or $a->argv[0] ==
 $a->page['htmlhead'] .= '
 <script>
 
+$(function() {
+	$(".oembed.photo img").aeImageResize({height: 400, width: 400});
+  });
+
 $("right_aside").ready(function(){
 	
 	if($.cookie("close_pages") == "1")