diabook-themes: bugfix

diff --git a/view/theme/diabook/admin_users.tpl b/view/theme/diabook/admin_users.tpl
index b465dc1b08b84e6bf34d152f6a8e48b8d1c27646..8aabb51ec9931bc694fdaf5098e6128ee516a6e5 100644 (file)
--- a/view/theme/diabook/admin_users.tpl
+++ b/view/theme/diabook/admin_users.tpl
@@ -14,8 +14,7 @@
        <h1>$title - $page</h1>
        
        <form action="$baseurl/admin/users" method="post">
-        <input type='hidden' name='form_security_token' value='$form_security_token'>
-               
+                       <input type='hidden' name='form_security_token' value='$form_security_token'>
                <h3>$h_pending</h3>
                {{ if $pending }}
                        <table id='pending'>

diff --git a/view/theme/diabook/diabook-aerith/admin_users.tpl b/view/theme/diabook/diabook-aerith/admin_users.tpl
index 40f94f5fef8aa507e542814c57fd569c0cbc0a55..8aabb51ec9931bc694fdaf5098e6128ee516a6e5 100644 (file)
--- a/view/theme/diabook/diabook-aerith/admin_users.tpl
+++ b/view/theme/diabook/diabook-aerith/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-aerith/nav.tpl b/view/theme/diabook/diabook-aerith/nav.tpl
index 5f316bcdd4f2023e0cfd4fe721c867b42f12d864..e3aabaa8b77bc4fd0389971fc9a77a0fadf778e8 100644 (file)
--- a/view/theme/diabook/diabook-aerith/nav.tpl
+++ b/view/theme/diabook/diabook-aerith/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-blue/admin_users.tpl b/view/theme/diabook/diabook-blue/admin_users.tpl
index 40f94f5fef8aa507e542814c57fd569c0cbc0a55..8aabb51ec9931bc694fdaf5098e6128ee516a6e5 100644 (file)
--- a/view/theme/diabook/diabook-blue/admin_users.tpl
+++ b/view/theme/diabook/diabook-blue/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-blue/nav.tpl b/view/theme/diabook/diabook-blue/nav.tpl
index 5f316bcdd4f2023e0cfd4fe721c867b42f12d864..e3aabaa8b77bc4fd0389971fc9a77a0fadf778e8 100644 (file)
--- a/view/theme/diabook/diabook-blue/nav.tpl
+++ b/view/theme/diabook/diabook-blue/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-dark/admin_users.tpl b/view/theme/diabook/diabook-dark/admin_users.tpl
index 40f94f5fef8aa507e542814c57fd569c0cbc0a55..8aabb51ec9931bc694fdaf5098e6128ee516a6e5 100644 (file)
--- a/view/theme/diabook/diabook-dark/admin_users.tpl
+++ b/view/theme/diabook/diabook-dark/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-dark/nav.tpl b/view/theme/diabook/diabook-dark/nav.tpl
index 5f316bcdd4f2023e0cfd4fe721c867b42f12d864..e3aabaa8b77bc4fd0389971fc9a77a0fadf778e8 100644 (file)
--- a/view/theme/diabook/diabook-dark/nav.tpl
+++ b/view/theme/diabook/diabook-dark/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-green/admin_users.tpl b/view/theme/diabook/diabook-green/admin_users.tpl
index 40f94f5fef8aa507e542814c57fd569c0cbc0a55..8aabb51ec9931bc694fdaf5098e6128ee516a6e5 100644 (file)
--- a/view/theme/diabook/diabook-green/admin_users.tpl
+++ b/view/theme/diabook/diabook-green/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-green/nav.tpl b/view/theme/diabook/diabook-green/nav.tpl
index 5f316bcdd4f2023e0cfd4fe721c867b42f12d864..e3aabaa8b77bc4fd0389971fc9a77a0fadf778e8 100644 (file)
--- a/view/theme/diabook/diabook-green/nav.tpl
+++ b/view/theme/diabook/diabook-green/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-pink/admin_users.tpl b/view/theme/diabook/diabook-pink/admin_users.tpl
index 40f94f5fef8aa507e542814c57fd569c0cbc0a55..8aabb51ec9931bc694fdaf5098e6128ee516a6e5 100644 (file)
--- a/view/theme/diabook/diabook-pink/admin_users.tpl
+++ b/view/theme/diabook/diabook-pink/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-pink/nav.tpl b/view/theme/diabook/diabook-pink/nav.tpl
index 5f316bcdd4f2023e0cfd4fe721c867b42f12d864..e3aabaa8b77bc4fd0389971fc9a77a0fadf778e8 100644 (file)
--- a/view/theme/diabook/diabook-pink/nav.tpl
+++ b/view/theme/diabook/diabook-pink/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/admin_users.tpl b/view/theme/diabook/diabook-red/admin_users.tpl
index 40f94f5fef8aa507e542814c57fd569c0cbc0a55..8aabb51ec9931bc694fdaf5098e6128ee516a6e5 100644 (file)
--- 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 5f316bcdd4f2023e0cfd4fe721c867b42f12d864..e3aabaa8b77bc4fd0389971fc9a77a0fadf778e8 100644 (file)
--- 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/nav.tpl b/view/theme/diabook/nav.tpl
index 29a89527c5e35d510cdf813926cc1226b535452b..e0ffa4f7b06bee2eec4a3622da1f8ddd7fbe84db 100644 (file)
--- a/view/theme/diabook/nav.tpl
+++ b/view/theme/diabook/nav.tpl
@@ -136,7 +136,7 @@
 </nav>
 
 
-<div style="position: fixed; bottom: 5px; right: 10px;"><a href="javascript:$('html, body').animate({scrollTop:0}, 'slow'); "><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/theme.php b/view/theme/diabook/theme.php
index dee9c28901d061914d39c4dfe787a6b754694a36..269015d0a3e5fa83e90d36d2353129f044f01192 100755 (executable)
--- a/view/theme/diabook/theme.php
+++ b/view/theme/diabook/theme.php
@@ -357,6 +357,11 @@ $(document).ready(function() {
         }
         else $(this).attr("src",ifr_source+"?"+wmode);
     });
+    
+    $("a[href=#top]").click(function() {
+                       $("html, body").animate({scrollTop:0}, "slow");
+                       return false;
+               });
       
 
 });