aboutsummaryrefslogtreecommitdiffstats
path: root/view/theme/dispy/theme.php
diff options
context:
space:
mode:
authorMichael Vogel <icarus@dabo.de>2012-04-01 14:11:37 +0200
committerMichael Vogel <icarus@dabo.de>2012-04-01 14:11:37 +0200
commit7d23149a61f75923b2c71a288a722ee219f5e6ba (patch)
treedea64e1cfc15eb6f95e7440e532258dfb909c21c /view/theme/dispy/theme.php
parent59b45f7fc12027c387f04a2121ea398c1d534626 (diff)
parentbb67ca9f1c61f96db6da15aee646a20c0b77a255 (diff)
downloadvolse-hubzilla-7d23149a61f75923b2c71a288a722ee219f5e6ba.tar.gz
volse-hubzilla-7d23149a61f75923b2c71a288a722ee219f5e6ba.tar.bz2
volse-hubzilla-7d23149a61f75923b2c71a288a722ee219f5e6ba.zip
Merge commit '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();
}