aboutsummaryrefslogtreecommitdiffstats
path: root/view/theme/diabook-aerith/theme.php
diff options
context:
space:
mode:
authorMichael Vogel <icarus@dabo.de>2012-04-07 18:35:29 +0200
committerMichael Vogel <icarus@dabo.de>2012-04-07 18:35:29 +0200
commitcb05801a9031254f5882038de07a3ee4d5f89dd0 (patch)
tree186d9d1a4c591ec23e0e5bbebd08301143b5c157 /view/theme/diabook-aerith/theme.php
parent7308dbae282194356c2e95936aecc15ea059f356 (diff)
parent0fa3b7f348c3deeb85cb5f5f9bd35ba47b0e92ee (diff)
downloadvolse-hubzilla-cb05801a9031254f5882038de07a3ee4d5f89dd0.tar.gz
volse-hubzilla-cb05801a9031254f5882038de07a3ee4d5f89dd0.tar.bz2
volse-hubzilla-cb05801a9031254f5882038de07a3ee4d5f89dd0.zip
Merge commit 'upstream/master'
Diffstat (limited to 'view/theme/diabook-aerith/theme.php')
-rwxr-xr-xview/theme/diabook-aerith/theme.php27
1 files changed, 26 insertions, 1 deletions
diff --git a/view/theme/diabook-aerith/theme.php b/view/theme/diabook-aerith/theme.php
index e56f0ab74..a1ea51e82 100755
--- a/view/theme/diabook-aerith/theme.php
+++ b/view/theme/diabook-aerith/theme.php
@@ -3,11 +3,16 @@
/*
* 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.012)
+ * Version: (Version: 1.014)
* Author:
*/
+//print diabook-version for debugging
+$diabook_version = "Diabook-aerith (Version: 1.014)";
+$a->page['htmlhead'] .= sprintf('<script "%s" ></script>', $diabook_version);
+
+
//change css on network and profilepages
$cssFile = null;
@@ -333,8 +338,24 @@ if (!is_null($cssFile)) $a->page['htmlhead'] .= sprintf('<link rel="stylesheet"
$cookieJS = $a->get_baseurl($ssl_state)."/view/theme/diabook-aerith/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-aerith/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")