diff options
59 files changed, 139 insertions, 128 deletions
diff --git a/view/theme/diabook/admin_users.tpl b/view/theme/diabook/admin_users.tpl index b465dc1b0..8aabb51ec 100644 --- 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 40f94f5fe..8aabb51ec 100644 --- 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 5f316bcdd..e3aabaa8b 100644 --- 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-aerith/style-network-wide.css b/view/theme/diabook/diabook-aerith/style-network-wide.css index 28f47552e..d5c91c9a4 100644 --- a/view/theme/diabook/diabook-aerith/style-network-wide.css +++ b/view/theme/diabook/diabook-aerith/style-network-wide.css @@ -121,7 +121,7 @@ display: block; width: 28px; height: 28px; background-repeat: no-repeat; } .video { background-image: url("../diabook-aerith/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-aerith/icons/audio.png"); display: block; width: 28px; height: 28px; background-repeat: no-repeat; @@ -1395,7 +1395,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-aerith/style-network.css b/view/theme/diabook/diabook-aerith/style-network.css index c78ed53d9..21273c19c 100644 --- a/view/theme/diabook/diabook-aerith/style-network.css +++ b/view/theme/diabook/diabook-aerith/style-network.css @@ -121,7 +121,7 @@ display: block; width: 28px; height: 28px; background-repeat: no-repeat; } .video { background-image: url("../diabook-aerith/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-aerith/icons/audio.png"); display: block; width: 28px; height: 28px; background-repeat: no-repeat; @@ -1388,7 +1388,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-aerith/style-profile-wide.css b/view/theme/diabook/diabook-aerith/style-profile-wide.css index 19ebd9569..1b8e38481 100644 --- a/view/theme/diabook/diabook-aerith/style-profile-wide.css +++ b/view/theme/diabook/diabook-aerith/style-profile-wide.css @@ -121,7 +121,7 @@ display: block; width: 28px; height: 28px; background-repeat: no-repeat; } .video { background-image: url("../diabook-aerith/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-aerith/icons/audio.png"); display: block; width: 28px; height: 28px; background-repeat: no-repeat; @@ -1370,7 +1370,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-aerith/style-profile.css b/view/theme/diabook/diabook-aerith/style-profile.css index 4dc84e95c..e21432d4e 100644 --- a/view/theme/diabook/diabook-aerith/style-profile.css +++ b/view/theme/diabook/diabook-aerith/style-profile.css @@ -121,7 +121,7 @@ display: block; width: 28px; height: 28px; background-repeat: no-repeat; } .video { background-image: url("../diabook-aerith/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-aerith/icons/audio.png"); display: block; width: 28px; height: 28px; background-repeat: no-repeat; @@ -1362,7 +1362,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-aerith/style-wide.css b/view/theme/diabook/diabook-aerith/style-wide.css index 759e2a15a..388a05b46 100644 --- a/view/theme/diabook/diabook-aerith/style-wide.css +++ b/view/theme/diabook/diabook-aerith/style-wide.css @@ -150,7 +150,7 @@ display: block; width: 28px; height: 28px; background-repeat: no-repeat; } .video { background-image: url("../../../view/theme/diabook/diabook-aerith/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-aerith/icons/audio.png"); display: block; width: 28px; height: 28px; background-repeat: no-repeat; @@ -1624,7 +1624,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-aerith/style.css b/view/theme/diabook/diabook-aerith/style.css index 18873ebc5..1f3e65cca 100644 --- a/view/theme/diabook/diabook-aerith/style.css +++ b/view/theme/diabook/diabook-aerith/style.css @@ -150,7 +150,7 @@ display: block; width: 28px; height: 28px; background-repeat: no-repeat; } .video { background-image: url("../../../view/theme/diabook/diabook-aerith/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-aerith/icons/audio.png"); display: block; width: 28px; height: 28px; background-repeat: no-repeat; @@ -1616,7 +1616,7 @@ body .pageheader{ max-width: 720px; word-wrap: break-word; - margin-bottom: 14px; + } .wall-item-container .wall-item-content img { diff --git a/view/theme/diabook/diabook-blue/admin_users.tpl b/view/theme/diabook/diabook-blue/admin_users.tpl index 40f94f5fe..8aabb51ec 100644 --- 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 5f316bcdd..e3aabaa8b 100644 --- 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-blue/style-network-wide.css b/view/theme/diabook/diabook-blue/style-network-wide.css index 9cf8bb3a7..eb1cee255 100644 --- a/view/theme/diabook/diabook-blue/style-network-wide.css +++ b/view/theme/diabook/diabook-blue/style-network-wide.css @@ -121,7 +121,7 @@ display: block; width: 28px; height: 28px; background-repeat: no-repeat; } .video { background-image: url("../diabook-blue/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-blue/icons/audio.png"); display: block; width: 28px; height: 28px; background-repeat: no-repeat; @@ -1357,7 +1357,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-blue/style-network.css b/view/theme/diabook/diabook-blue/style-network.css index df646f456..3a972b832 100644 --- a/view/theme/diabook/diabook-blue/style-network.css +++ b/view/theme/diabook/diabook-blue/style-network.css @@ -121,7 +121,7 @@ display: block; width: 28px; height: 28px; background-repeat: no-repeat; } .video { background-image: url("../diabook-blue/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-blue/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: 420px; word-wrap: break-word; - margin-bottom: 14px; + } .wall-item-container .wall-item-content img { diff --git a/view/theme/diabook/diabook-blue/style-profile-wide.css b/view/theme/diabook/diabook-blue/style-profile-wide.css index 04d2a73ef..ad6b7ca21 100644 --- a/view/theme/diabook/diabook-blue/style-profile-wide.css +++ b/view/theme/diabook/diabook-blue/style-profile-wide.css @@ -121,7 +121,7 @@ display: block; width: 28px; height: 28px; background-repeat: no-repeat; } .video { background-image: url("../diabook-blue/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-blue/icons/audio.png"); display: block; width: 28px; height: 28px; background-repeat: no-repeat; @@ -1337,7 +1337,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-blue/style-profile.css b/view/theme/diabook/diabook-blue/style-profile.css index 958b32f9c..50fb980d6 100644 --- a/view/theme/diabook/diabook-blue/style-profile.css +++ b/view/theme/diabook/diabook-blue/style-profile.css @@ -121,7 +121,7 @@ display: block; width: 28px; height: 28px; background-repeat: no-repeat; } .video { background-image: url("../diabook-blue/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-blue/icons/audio.png"); display: block; width: 28px; height: 28px; background-repeat: no-repeat; @@ -1329,7 +1329,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-blue/style-wide.css b/view/theme/diabook/diabook-blue/style-wide.css index 92664ff86..7745e7e2d 100644 --- a/view/theme/diabook/diabook-blue/style-wide.css +++ b/view/theme/diabook/diabook-blue/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-blue/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-blue/icons/audio.png"); display: block; width: 28px; height: 28px; background-repeat: no-repeat; @@ -1581,7 +1581,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-blue/style.css b/view/theme/diabook/diabook-blue/style.css index 7cecfd34d..12648bffb 100644 --- a/view/theme/diabook/diabook-blue/style.css +++ b/view/theme/diabook/diabook-blue/style.css @@ -149,7 +149,7 @@ display: block; width: 28px; height: 28px; background-repeat: no-repeat; } .video { background-image: url("../../../view/theme/diabook/diabook-blue/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-blue/icons/audio.png"); display: block; width: 28px; height: 28px; background-repeat: no-repeat; @@ -1574,7 +1574,7 @@ body .pageheader{ max-width: 720px; word-wrap: break-word; - margin-bottom: 14px; + } .wall-item-container .wall-item-content img { diff --git a/view/theme/diabook/diabook-dark/admin_users.tpl b/view/theme/diabook/diabook-dark/admin_users.tpl index 40f94f5fe..8aabb51ec 100644 --- 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 5f316bcdd..e3aabaa8b 100644 --- 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-dark/style-network-wide.css b/view/theme/diabook/diabook-dark/style-network-wide.css index 87efd8aa7..23118a2cd 100644 --- a/view/theme/diabook/diabook-dark/style-network-wide.css +++ b/view/theme/diabook/diabook-dark/style-network-wide.css @@ -121,7 +121,7 @@ display: block; width: 28px; height: 28px; background-repeat: no-repeat; } .video { background-image: url("../diabook-dark/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-dark/icons/audio.png"); display: block; width: 28px; height: 28px; background-repeat: no-repeat; @@ -1372,7 +1372,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-dark/style-network.css b/view/theme/diabook/diabook-dark/style-network.css index 4111bdb5b..5639bde29 100644 --- a/view/theme/diabook/diabook-dark/style-network.css +++ b/view/theme/diabook/diabook-dark/style-network.css @@ -121,7 +121,7 @@ display: block; width: 28px; height: 28px; background-repeat: no-repeat; } .video { background-image: url("../diabook-dark/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-dark/icons/audio.png"); display: block; width: 28px; height: 28px; background-repeat: no-repeat; @@ -1351,7 +1351,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-dark/style-profile-wide.css b/view/theme/diabook/diabook-dark/style-profile-wide.css index 04d2a73ef..ad6b7ca21 100644 --- a/view/theme/diabook/diabook-dark/style-profile-wide.css +++ b/view/theme/diabook/diabook-dark/style-profile-wide.css @@ -121,7 +121,7 @@ display: block; width: 28px; height: 28px; background-repeat: no-repeat; } .video { background-image: url("../diabook-blue/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-blue/icons/audio.png"); display: block; width: 28px; height: 28px; background-repeat: no-repeat; @@ -1337,7 +1337,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-dark/style-profile.css b/view/theme/diabook/diabook-dark/style-profile.css index d4c99ac51..8824d18fe 100644 --- a/view/theme/diabook/diabook-dark/style-profile.css +++ b/view/theme/diabook/diabook-dark/style-profile.css @@ -121,7 +121,7 @@ display: block; width: 28px; height: 28px; background-repeat: no-repeat; } .video { background-image: url("../diabook-dark/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-dark/icons/audio.png"); display: block; width: 28px; height: 28px; background-repeat: no-repeat; @@ -1329,7 +1329,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-dark/style-wide.css b/view/theme/diabook/diabook-dark/style-wide.css index 0a7cabcb0..73d0e4c0f 100644 --- a/view/theme/diabook/diabook-dark/style-wide.css +++ b/view/theme/diabook/diabook-dark/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-blue/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-blue/icons/audio.png"); display: block; width: 28px; height: 28px; background-repeat: no-repeat; @@ -1581,7 +1581,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-dark/style.css b/view/theme/diabook/diabook-dark/style.css index 631628a07..24de9f262 100644 --- a/view/theme/diabook/diabook-dark/style.css +++ b/view/theme/diabook/diabook-dark/style.css @@ -149,7 +149,7 @@ display: block; width: 28px; height: 28px; background-repeat: no-repeat; } .video { background-image: url("../../../view/theme/diabook/diabook-dark/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-dark/icons/audio.png"); display: block; width: 28px; height: 28px; background-repeat: no-repeat; @@ -1574,7 +1574,7 @@ body .pageheader{ max-width: 720px; word-wrap: break-word; - margin-bottom: 14px; + } .wall-item-container .wall-item-content img { diff --git a/view/theme/diabook/diabook-green/admin_users.tpl b/view/theme/diabook/diabook-green/admin_users.tpl index 40f94f5fe..8aabb51ec 100644 --- 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 5f316bcdd..e3aabaa8b 100644 --- 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-green/style-network-wide.css b/view/theme/diabook/diabook-green/style-network-wide.css index 5cdcb9132..cc598b9fe 100644 --- a/view/theme/diabook/diabook-green/style-network-wide.css +++ b/view/theme/diabook/diabook-green/style-network-wide.css @@ -121,7 +121,7 @@ display: block; width: 28px; height: 28px; background-repeat: no-repeat; } .video { background-image: url("../diabook-green/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-green/icons/audio.png"); display: block; width: 28px; height: 28px; background-repeat: no-repeat; @@ -1371,7 +1371,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-green/style-network.css b/view/theme/diabook/diabook-green/style-network.css index 41ddc7442..786547711 100644 --- a/view/theme/diabook/diabook-green/style-network.css +++ b/view/theme/diabook/diabook-green/style-network.css @@ -121,7 +121,7 @@ display: block; width: 28px; height: 28px; background-repeat: no-repeat; } .video { background-image: url("../diabook-green/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-green/icons/audio.png"); display: block; width: 28px; height: 28px; background-repeat: no-repeat; @@ -1365,7 +1365,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-green/style-profile-wide.css b/view/theme/diabook/diabook-green/style-profile-wide.css index f1bf0d5ff..65b7f2ba3 100644 --- a/view/theme/diabook/diabook-green/style-profile-wide.css +++ b/view/theme/diabook/diabook-green/style-profile-wide.css @@ -121,7 +121,7 @@ display: block; width: 28px; height: 28px; background-repeat: no-repeat; } .video { background-image: url("../diabook-green/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-green/icons/audio.png"); display: block; width: 28px; height: 28px; background-repeat: no-repeat; @@ -1346,7 +1346,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-green/style-profile.css b/view/theme/diabook/diabook-green/style-profile.css index ef196bede..dcc7b373a 100644 --- a/view/theme/diabook/diabook-green/style-profile.css +++ b/view/theme/diabook/diabook-green/style-profile.css @@ -121,7 +121,7 @@ display: block; width: 28px; height: 28px; background-repeat: no-repeat; } .video { background-image: url("../diabook-green/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-green/icons/audio.png"); display: block; width: 28px; height: 28px; background-repeat: no-repeat; @@ -1338,7 +1338,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-green/style-wide.css b/view/theme/diabook/diabook-green/style-wide.css index e7243f4cb..e07af7c69 100644 --- a/view/theme/diabook/diabook-green/style-wide.css +++ b/view/theme/diabook/diabook-green/style-wide.css @@ -150,7 +150,7 @@ display: block; width: 28px; height: 28px; background-repeat: no-repeat; } .video { background-image: url("../../../view/theme/diabook/diabook-green/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-green/icons/audio.png"); display: block; width: 28px; height: 28px; background-repeat: no-repeat; @@ -1601,7 +1601,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-green/style.css b/view/theme/diabook/diabook-green/style.css index 273f4b5a8..d4e2052a7 100644 --- a/view/theme/diabook/diabook-green/style.css +++ b/view/theme/diabook/diabook-green/style.css @@ -150,7 +150,7 @@ display: block; width: 28px; height: 28px; background-repeat: no-repeat; } .video { background-image: url("../../../view/theme/diabook/diabook-green/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-green/icons/audio.png"); display: block; width: 28px; height: 28px; background-repeat: no-repeat; @@ -1600,7 +1600,7 @@ body .pageheader{ max-width: 720px; word-wrap: break-word; - margin-bottom: 14px; + } .wall-item-container .wall-item-content img { diff --git a/view/theme/diabook/diabook-pink/admin_users.tpl b/view/theme/diabook/diabook-pink/admin_users.tpl index 40f94f5fe..8aabb51ec 100644 --- 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 5f316bcdd..e3aabaa8b 100644 --- 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-pink/style-network-wide.css b/view/theme/diabook/diabook-pink/style-network-wide.css index c66432e84..0a83955df 100644 --- a/view/theme/diabook/diabook-pink/style-network-wide.css +++ b/view/theme/diabook/diabook-pink/style-network-wide.css @@ -121,7 +121,7 @@ display: block; width: 28px; height: 28px; background-repeat: no-repeat; } .video { background-image: url("../diabook-pink/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-pink/icons/audio.png"); display: block; width: 28px; height: 28px; background-repeat: no-repeat; @@ -1371,7 +1371,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-pink/style-network.css b/view/theme/diabook/diabook-pink/style-network.css index 7e8263e1a..3a4f49877 100644 --- a/view/theme/diabook/diabook-pink/style-network.css +++ b/view/theme/diabook/diabook-pink/style-network.css @@ -121,7 +121,7 @@ display: block; width: 28px; height: 28px; background-repeat: no-repeat; } .video { background-image: url("../diabook-pink/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-pink/icons/audio.png"); display: block; width: 28px; height: 28px; background-repeat: no-repeat; @@ -1365,7 +1365,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-pink/style-profile-wide.css b/view/theme/diabook/diabook-pink/style-profile-wide.css index c7cfd111e..080551896 100644 --- a/view/theme/diabook/diabook-pink/style-profile-wide.css +++ b/view/theme/diabook/diabook-pink/style-profile-wide.css @@ -121,7 +121,7 @@ display: block; width: 28px; height: 28px; background-repeat: no-repeat; } .video { background-image: url("../diabook-pink/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-pink/icons/audio.png"); display: block; width: 28px; height: 28px; background-repeat: no-repeat; @@ -1346,7 +1346,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-pink/style-profile.css b/view/theme/diabook/diabook-pink/style-profile.css index 8d32cf028..8f3753061 100644 --- a/view/theme/diabook/diabook-pink/style-profile.css +++ b/view/theme/diabook/diabook-pink/style-profile.css @@ -121,7 +121,7 @@ display: block; width: 28px; height: 28px; background-repeat: no-repeat; } .video { background-image: url("../diabook-pink/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-pink/icons/audio.png"); display: block; width: 28px; height: 28px; background-repeat: no-repeat; @@ -1338,7 +1338,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-pink/style-wide.css b/view/theme/diabook/diabook-pink/style-wide.css index 8442a8880..65e22aa90 100644 --- a/view/theme/diabook/diabook-pink/style-wide.css +++ b/view/theme/diabook/diabook-pink/style-wide.css @@ -150,7 +150,7 @@ display: block; width: 28px; height: 28px; background-repeat: no-repeat; } .video { background-image: url("../../../view/theme/diabook/diabook-pink/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-pink/icons/audio.png"); display: block; width: 28px; height: 28px; background-repeat: no-repeat; @@ -1601,7 +1601,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-pink/style.css b/view/theme/diabook/diabook-pink/style.css index 15b25d5cb..c223e6439 100644 --- a/view/theme/diabook/diabook-pink/style.css +++ b/view/theme/diabook/diabook-pink/style.css @@ -150,7 +150,7 @@ display: block; width: 28px; height: 28px; background-repeat: no-repeat; } .video { background-image: url("../../../view/theme/diabook/diabook-pink/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-pink/icons/audio.png"); display: block; width: 28px; height: 28px; background-repeat: no-repeat; @@ -1600,7 +1600,7 @@ body .pageheader{ max-width: 720px; word-wrap: break-word; - margin-bottom: 14px; + } .wall-item-container .wall-item-content img { 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 { diff --git a/view/theme/diabook/footer.tpl b/view/theme/diabook/footer.tpl new file mode 100644 index 000000000..8d3c65162 --- /dev/null +++ b/view/theme/diabook/footer.tpl @@ -0,0 +1,4 @@ +<div style="display: table-cell"></div> +<div style="border-top: 1px solid #D2D2D2; width: 100%;margin-top: 30px;"> +<a style="float:right; color:#333;margin-right:10px;display: table;margin-top: 5px;" href="friendica" title="Site Info / Impressum" >Info / Impressum</a> +</div>
\ No newline at end of file diff --git a/view/theme/diabook/nav.tpl b/view/theme/diabook/nav.tpl index 29a89527c..e0ffa4f7b 100644 --- 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/oembed_video.tpl b/view/theme/diabook/oembed_video.tpl index d6d29f724..5e046d8c5 100644 --- a/view/theme/diabook/oembed_video.tpl +++ b/view/theme/diabook/oembed_video.tpl @@ -1,4 +1,4 @@ -<a class="embed_yt" href='$embedurl' onclick='this.innerHTML=Base64.decode("$escapedhtml"); yt_iframe(); return false;' style='float:left; margin: 1em; position: relative;'> +<a class="embed_yt" href='$embedurl' onclick='this.innerHTML=Base64.decode("$escapedhtml"); yt_iframe();javascript:$(this).parent().css("height", "370px"); return false;' style='float:left; margin: 1em; position: relative;'> <img width='$tw' height='$th' src='$turl' > <div style='position: absolute; top: 0px; left: 0px; width: $twpx; height: $thpx; background: url(images/icons/48/play.png) no-repeat center center;'></div> </a> diff --git a/view/theme/diabook/style-network-wide.css b/view/theme/diabook/style-network-wide.css index a31007f0a..13801b6ba 100644 --- a/view/theme/diabook/style-network-wide.css +++ b/view/theme/diabook/style-network-wide.css @@ -122,7 +122,7 @@ display: block; width: 28px; height: 28px; background-repeat: no-repeat; } .video { background-image: url("../../../view/theme/diabook/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/icons/audio.png"); display: block; width: 28px; height: 28px; background-repeat: no-repeat; @@ -1334,7 +1334,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 { @@ -1480,14 +1480,14 @@ transition: all 0.2s ease-in-out; } .tag { /*background: url("../../../images/tag_b.png") repeat-x center left;*/ - color: #3465A4; + color: #999; padding-left: 3px; font-size: 12px; } .tag a { padding-right: 5px; /*background: url("../../../images/tag.png") no-repeat center right;*/ - color: #3465A4; + color: #999; } .wwto { position: absolute !important; diff --git a/view/theme/diabook/style-network.css b/view/theme/diabook/style-network.css index 00c4d303a..502e46f23 100644 --- a/view/theme/diabook/style-network.css +++ b/view/theme/diabook/style-network.css @@ -122,7 +122,7 @@ display: block; width: 28px; height: 28px; background-repeat: no-repeat; } .video { background-image: url("../../../view/theme/diabook/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/icons/audio.png"); display: block; width: 28px; height: 28px; background-repeat: no-repeat; @@ -1326,7 +1326,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 { @@ -1471,14 +1471,14 @@ transition: all 0.2s ease-in-out; } .tag { /*background: url("../../../images/tag_b.png") repeat-x center left;*/ - color: #3465A4; + color: #999; padding-left: 3px; font-size: 12px; } .tag a { padding-right: 5px; /*background: url("../../../images/tag.png") no-repeat center right;*/ - color: #3465A4; + color: #999; } .wwto { position: absolute !important; diff --git a/view/theme/diabook/style-profile-wide.css b/view/theme/diabook/style-profile-wide.css index 30b5e6422..1c8257b7e 100644 --- a/view/theme/diabook/style-profile-wide.css +++ b/view/theme/diabook/style-profile-wide.css @@ -121,7 +121,7 @@ display: block; width: 28px; height: 28px; background-repeat: no-repeat; } .video { background-image: url("../../../view/theme/diabook/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/icons/audio.png"); display: block; width: 28px; height: 28px; background-repeat: no-repeat; @@ -1309,7 +1309,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 { @@ -1455,14 +1455,14 @@ transition: all 0.2s ease-in-out; } .tag { /*background: url("../../../images/tag_b.png") repeat-x center left;*/ - color: #3465A4; + color: #999; padding-left: 3px; font-size: 12px; } .tag a { padding-right: 5px; /*background: url("../../../images/tag.png") no-repeat center right;*/ - color: #3465A4; + color: #999; } .wwto { position: absolute !important; diff --git a/view/theme/diabook/style-profile.css b/view/theme/diabook/style-profile.css index 9cd8386e3..cb7f1df69 100644 --- a/view/theme/diabook/style-profile.css +++ b/view/theme/diabook/style-profile.css @@ -121,7 +121,7 @@ display: block; width: 28px; height: 28px; background-repeat: no-repeat; } .video { background-image: url("../../../view/theme/diabook/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/icons/audio.png"); display: block; width: 28px; height: 28px; background-repeat: no-repeat; @@ -1302,7 +1302,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 { @@ -1447,14 +1447,14 @@ transition: all 0.2s ease-in-out; } .tag { /*background: url("../../../images/tag_b.png") repeat-x center left;*/ - color: #3465A4; + color: #999; padding-left: 3px; font-size: 12px; } .tag a { padding-right: 5px; /*background: url("../../../images/tag.png") no-repeat center right;*/ - color: #3465A4; + color: #999; } .wwto { position: absolute !important; diff --git a/view/theme/diabook/style-wide.css b/view/theme/diabook/style-wide.css index 19abf267d..abd10476a 100644 --- a/view/theme/diabook/style-wide.css +++ b/view/theme/diabook/style-wide.css @@ -150,7 +150,7 @@ display: block; width: 28px; height: 28px; background-repeat: no-repeat; } .video { background-image: url("../../../view/theme/diabook/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/icons/audio.png"); display: block; width: 28px; height: 28px; background-repeat: no-repeat; @@ -1457,7 +1457,7 @@ body .pageheader{ max-width: 690px; word-wrap: break-word; - margin-bottom: 14px; + } /*marker*/ .wall-item-photo-container .wall-item-content { @@ -1690,14 +1690,14 @@ body .pageheader{ } .tag { /*background: url("../../../images/tag_b.png") repeat-x center left;*/ - color: #3465A4; + color: #999; padding-left: 3px; font-size: 12px; } .tag a { padding-right: 5px; /*background: url("../../../images/tag.png") no-repeat center right;*/ - color: #3465A4; + color: #999; } .wwto { position: absolute !important; diff --git a/view/theme/diabook/style.css b/view/theme/diabook/style.css index edc87df98..23f8ac465 100644 --- a/view/theme/diabook/style.css +++ b/view/theme/diabook/style.css @@ -150,7 +150,7 @@ display: block; width: 28px; height: 28px; background-repeat: no-repeat; } .video { background-image: url("../../../view/theme/diabook/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/icons/audio.png"); display: block; width: 28px; height: 28px; background-repeat: no-repeat; @@ -1457,7 +1457,7 @@ body .pageheader{ max-width: 720px; word-wrap: break-word; - margin-bottom: 14px; + } .wall-item-photo-container .wall-item-content { @@ -1688,14 +1688,14 @@ body .pageheader{ } .tag { /*background: url("../../../images/tag_b.png") repeat-x center left;*/ - color: #3465A4; + color: #999; padding-left: 3px; font-size: 12px; } .tag a { padding-right: 5px; /*background: url("../../../images/tag.png") no-repeat center right;*/ - color: #3465A4; + color: #999; } .wwto { position: absolute !important; 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"); |