aboutsummaryrefslogtreecommitdiffstats
path: root/view/theme/dispy/theme.php
diff options
context:
space:
mode:
authorzottel <github@zottel.net>2012-03-30 09:03:43 +0200
committerzottel <github@zottel.net>2012-03-30 09:03:43 +0200
commit2212e6931096d188be2dea27bcb4877f16c5c2f8 (patch)
treea0a6b3cec6b1b4108c62ff689e8842d49226b982 /view/theme/dispy/theme.php
parent953840cf822718cba66a0727b576c674c6e44875 (diff)
parentd22b3a1d9c295f5545cc20e1af786cb79e6553a5 (diff)
downloadvolse-hubzilla-2212e6931096d188be2dea27bcb4877f16c5c2f8.tar.gz
volse-hubzilla-2212e6931096d188be2dea27bcb4877f16c5c2f8.tar.bz2
volse-hubzilla-2212e6931096d188be2dea27bcb4877f16c5c2f8.zip
Merge remote branch 'upstream/master'
Diffstat (limited to 'view/theme/dispy/theme.php')
-rw-r--r--view/theme/dispy/theme.php21
1 files changed, 1 insertions, 20 deletions
diff --git a/view/theme/dispy/theme.php b/view/theme/dispy/theme.php
index 9789fd0fa..f3c54caf9 100644
--- a/view/theme/dispy/theme.php
+++ b/view/theme/dispy/theme.php
@@ -9,11 +9,6 @@
* Screenshot: <a href="screenshot.jpg">Screenshot</a>
*/
-
-$a->theme_info = array(
- 'extends' => 'dispy'
-);
-
$a->page['htmlhead'] .= <<< EOT
<script>
$(document).ready(function() {
@@ -111,20 +106,6 @@ $(document).ready(function() {
$(this).css({color: '#eec'});
});
-/* $('#profile-photo-wrapper').mouseover(function() {
- $('.profile-edit-side-div').css({display: 'block'});
- }).mouseout(function() {
- $('.profile-edit-side-div').css({display: 'none'});
- return false;
- });
-
- $('img.photo').mouseover(function() {
- $('.profile-edit-side-div').css({display: 'block'});
- }).mouseout(function() {
- $('.profile-edit-side-div').css({display: 'none'});
- return false;
- });*/
-
});
</script>
EOT;
@@ -157,6 +138,6 @@ function dispy_community_info() {
}
// aside on profile page
-if ($a->argv[0] === "profile") {
+if (($a->argv[0] . $a->argv[1]) === ("profile" . $a->user['nickname'])) {
dispy_community_info();
}