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:

8 files changed, 16 insertions, 16 deletions

diff --git a/view/theme/diabook/diabook-red/admin_users.tpl b/view/theme/diabook/diabook-red/admin_users.tpl
index 40f94f5fe..8aabb51ec 100644
--- a/view/theme/diabook/diabook-red/admin_users.tpl
+++ b/view/theme/diabook/diabook-red/admin_users.tpl
@@ -14,7 +14,7 @@
 	<h1>$title - $page</h1>
 	
 	<form action="$baseurl/admin/users" method="post">
-		
+		        <input type='hidden' name='form_security_token' value='$form_security_token'>
 		<h3>$h_pending</h3>
 		{{ if $pending }}
 			<table id='pending'>
@@ -72,8 +72,8 @@
 						<td class='login_date'>$u.page-flags</td>
 						<td class="checkbox"><input type="checkbox" class="users_ckbx" id="id_user_$u.uid" name="user[]" value="$u.uid"/></td>
 						<td class="tools" style="width:60px;">
-							<a href="$baseurl/admin/users/block/$u.uid" title='{{ if $u.blocked }}$unblock{{ else }}$block{{ endif }}'><span class='icon block {{ if $u.blocked==0 }}dim{{ endif }}'></span></a>
-							<a href="$baseurl/admin/users/delete/$u.uid" title='$delete' onclick="return confirm_delete('$u.name')"><span class='icon ad_drop'></span></a>
+							<a href="$baseurl/admin/users/block/$u.uid?t=$form_security_token" title='{{ if $u.blocked }}$unblock{{ else }}$block{{ endif }}'><span class='icon block {{ if $u.blocked==0 }}dim{{ endif }}'></span></a>
+							<a href="$baseurl/admin/users/delete/$u.uid?t=$form_security_token" title='$delete' onclick="return confirm_delete('$u.name')"><span class='icon ad_drop'></span></a>
 						</td>
 					</tr>
 				{{ endfor }}
diff --git a/view/theme/diabook/diabook-red/nav.tpl b/view/theme/diabook/diabook-red/nav.tpl
index 5f316bcdd..e3aabaa8b 100644
--- a/view/theme/diabook/diabook-red/nav.tpl
+++ b/view/theme/diabook/diabook-red/nav.tpl
@@ -138,7 +138,7 @@
 </nav>
 
 
-<div style="position: fixed; bottom: 5px; right: 10px;"><a href="javascript:scroll(0,0); "><img src="view/theme/diabook/icons/scroll_top.png" title="scroll to top"></a></div>
+<div id="scrollup" style="position: fixed; bottom: 5px; right: 10px;"><a href="#top"><img src="view/theme/diabook/icons/scroll_top.png" alt="back to top" title="Back to top"></a></div>
 <div style="position: fixed; bottom: 3px; left: 25px;">$langselector</div>
 <div style="position: fixed; bottom: 23px; left: 5px;"><a href="http://pad.toktan.org/p/diabook" target="blank" ><img src="view/theme/diabook/icons/bluebug.png" title="report bugs for the theme diabook"/></a></div>
 
diff --git a/view/theme/diabook/diabook-red/style-network-wide.css b/view/theme/diabook/diabook-red/style-network-wide.css
index b761465bc..8c3b67cb6 100644
--- a/view/theme/diabook/diabook-red/style-network-wide.css
+++ b/view/theme/diabook/diabook-red/style-network-wide.css
@@ -121,7 +121,7 @@
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
 			  }	
 .video 	{ background-image: url("../diabook-red/icons/video.png"); 
-			  display: block; width: 100%; height: 28px; background-repeat: no-repeat;
+			  display: block; width: 100%; height: 140px; background-repeat: no-repeat;
 			  }
 .audio2 	{ background-image: url("../diabook-red/icons/audio.png"); 
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
@@ -1391,7 +1391,7 @@ transition: all 0.2s ease-in-out;
   max-width: 690px;
   word-wrap: break-word;
 
-  margin-bottom: 14px;
+
 }
 /*marker*/
 .wall-item-container .wall-item-content img {
diff --git a/view/theme/diabook/diabook-red/style-network.css b/view/theme/diabook/diabook-red/style-network.css
index 61fa69473..84fd5da48 100644
--- a/view/theme/diabook/diabook-red/style-network.css
+++ b/view/theme/diabook/diabook-red/style-network.css
@@ -121,7 +121,7 @@
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
 			  }	
 .video 	{ background-image: url("../diabook-red/icons/video.png"); 
-			  display: block; width: 100%; height: 28px; background-repeat: no-repeat;
+			  display: block; width: 100%; height: 140px; background-repeat: no-repeat;
 			  }
 .audio2 	{ background-image: url("../diabook-red/icons/audio.png"); 
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
@@ -1384,7 +1384,7 @@ transition: all 0.2s ease-in-out;
   max-width: 420px;
   word-wrap: break-word;
 
-  margin-bottom: 14px;
+
 }
 
 .wall-item-container .wall-item-content img {
diff --git a/view/theme/diabook/diabook-red/style-profile-wide.css b/view/theme/diabook/diabook-red/style-profile-wide.css
index 1e4688b23..acb6075f7 100644
--- a/view/theme/diabook/diabook-red/style-profile-wide.css
+++ b/view/theme/diabook/diabook-red/style-profile-wide.css
@@ -121,7 +121,7 @@
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
 			  }	
 .video 	{ background-image: url("../diabook-red/icons/video.png"); 
-			  display: block; width: 100%; height: 28px; background-repeat: no-repeat;
+			  display: block; width: 100%; height: 140px; background-repeat: no-repeat;
 			  }
 .audio2 	{ background-image: url("../diabook-red/icons/audio.png"); 
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
@@ -1350,7 +1350,7 @@ transition: all 0.2s ease-in-out;
   max-width: 690px;
   word-wrap: break-word;
 
-  margin-bottom: 14px;
+
 }
 /*marker*/
 .wall-item-container .wall-item-content img {
diff --git a/view/theme/diabook/diabook-red/style-profile.css b/view/theme/diabook/diabook-red/style-profile.css
index 45f27a311..a29eb3eb0 100644
--- a/view/theme/diabook/diabook-red/style-profile.css
+++ b/view/theme/diabook/diabook-red/style-profile.css
@@ -121,7 +121,7 @@
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
 			  }	
 .video 	{ background-image: url("../diabook-red/icons/video.png"); 
-			  display: block; width: 100%; height: 28px; background-repeat: no-repeat;
+			  display: block; width: 100%; height: 140px; background-repeat: no-repeat;
 			  }
 .audio2 	{ background-image: url("../diabook-red/icons/audio.png"); 
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
@@ -1342,7 +1342,7 @@ transition: all 0.2s ease-in-out;
   max-width: 420px;
   word-wrap: break-word;
 
-  margin-bottom: 14px;
+
 }
 
 .wall-item-container .wall-item-content img {
diff --git a/view/theme/diabook/diabook-red/style-wide.css b/view/theme/diabook/diabook-red/style-wide.css
index 7a037694b..1df0d56bc 100644
--- a/view/theme/diabook/diabook-red/style-wide.css
+++ b/view/theme/diabook/diabook-red/style-wide.css
@@ -149,7 +149,7 @@
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
 			  }	
 .video 	{ background-image: url("../../../view/theme/diabook/diabook-red/icons/video.png"); 
-			  display: block; width: 100%; height: 28px; background-repeat: no-repeat;
+			  display: block; width: 100%; height: 140px; background-repeat: no-repeat;
 			  }
 .audio2 	{ background-image: url("../../../view/theme/diabook/diabook-red/icons/audio.png"); 
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
@@ -1609,7 +1609,7 @@ body .pageheader{
   max-width: 690px;
   word-wrap: break-word;
 
-  margin-bottom: 14px;
+
 }
 
 .wall-item-container .wall-item-content img {
diff --git a/view/theme/diabook/diabook-red/style.css b/view/theme/diabook/diabook-red/style.css
index b45f5f593..856a5d08a 100644
--- a/view/theme/diabook/diabook-red/style.css
+++ b/view/theme/diabook/diabook-red/style.css
@@ -149,7 +149,7 @@
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
 			  }	
 .video 	{ background-image: url("../../../view/theme/diabook/diabook-red/icons/video.png"); 
-			  display: block; width: 100%; height: 28px; background-repeat: no-repeat;
+			  display: block; width: 100%; height: 140px; background-repeat: no-repeat;
 			  }
 .audio2 	{ background-image: url("../../../view/theme/diabook/diabook-red/icons/audio.png"); 
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
@@ -1602,7 +1602,7 @@ body .pageheader{
   max-width: 720px;
   word-wrap: break-word;
 
-  margin-bottom: 14px;
+
 }
 
 .wall-item-container .wall-item-content img {