Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  bug #388 - notify_comment received after post deleted
  don't allow non-existent themes as choices
  diabook-themes: bugfix
  diabook-themes: fixed youtube-bug and added "Info/Impressum" to footer
  api: add support for StatusNet-style media param to API
  Add a hook

* master:

1 files changed, 12 insertions, 4 deletions

diff --git a/view/theme/diabook/theme.php b/view/theme/diabook/theme.php
index 84d9f888e..269015d0a 100755
--- a/view/theme/diabook/theme.php
+++ b/view/theme/diabook/theme.php
@@ -3,13 +3,13 @@
 /*
  * Name: Diabook
  * Description: Diabook: report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu
- * Version: (Version: 1.021)
+ * Version: (Version: 1.022)
  * Author: 
  */
 
 
 //print diabook-version for debugging
-$diabook_version = "Diabook (Version: 1.021)";
+$diabook_version = "Diabook (Version: 1.022)";
 $a->page['htmlhead'] .= sprintf('<script "%s" ></script>', $diabook_version);
 
 //change css on network and profilepages
@@ -291,7 +291,9 @@ if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname']){
 // custom css
 if (!is_null($cssFile)) $a->page['htmlhead'] .= sprintf('<link rel="stylesheet" type="text/css" href="%s" />', $cssFile);
 
-
+//footer
+$tpl = get_markup_template('footer.tpl');
+$a->page['footer'] .= replace_macros($tpl, array());
 
 //load jquery.cookie.js
 $cookieJS = $a->get_baseurl($ssl_state)."/view/theme/diabook/js/jquery.cookie.js";
@@ -355,12 +357,18 @@ $(document).ready(function() {
         }
         else $(this).attr("src",ifr_source+"?"+wmode);
     });
+    
+    $("a[href=#top]").click(function() {
+			$("html, body").animate({scrollTop:0}, "slow");
+			return false;
+		});
       
 
 });
 
 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");