aboutsummaryrefslogtreecommitdiffstats
path: root/view/theme/dispy/theme.php
diff options
context:
space:
mode:
authorzottel <github@zottel.net>2012-03-29 10:23:45 +0200
committerzottel <github@zottel.net>2012-03-29 10:23:45 +0200
commit953840cf822718cba66a0727b576c674c6e44875 (patch)
treea924cf0031d16f6f15b7d84d5f519ca4257042b4 /view/theme/dispy/theme.php
parentfb817a29a934a68f194a42c29d3ed11da2da558f (diff)
parent3ee529d095ac7e83ae1e71d86cbe6d443885d54e (diff)
downloadvolse-hubzilla-953840cf822718cba66a0727b576c674c6e44875.tar.gz
volse-hubzilla-953840cf822718cba66a0727b576c674c6e44875.tar.bz2
volse-hubzilla-953840cf822718cba66a0727b576c674c6e44875.zip
Merge remote branch 'upstream/master'
Diffstat (limited to 'view/theme/dispy/theme.php')
-rw-r--r--view/theme/dispy/theme.php11
1 files changed, 6 insertions, 5 deletions
diff --git a/view/theme/dispy/theme.php b/view/theme/dispy/theme.php
index db8cf5ccd..9789fd0fa 100644
--- a/view/theme/dispy/theme.php
+++ b/view/theme/dispy/theme.php
@@ -91,11 +91,13 @@ $(document).ready(function() {
$('.floaterflip').css({
backgroundPosition: '-210px -60px'
});
+ $('.search-box').slideUp('fast');
} else {
$('#nav-floater').slideDown('fast');
$('.floaterflip').css({
backgroundPosition: '-190px -60px'
});
+ $('.search-box').slideDown('fast');
}
};
// our trigger for the toolbar button
@@ -131,7 +133,7 @@ function dispy_community_info() {
$a = get_app();
$fostitJS = "javascript: (function() {
- the_url = '".$a->get_baseurl($ssl_state)."/view/theme/dispy/fpostit/fpostit.php?url=' +
+ the_url = '".$a->get_baseurl($ssl_state)."/view/theme/dispy-dark/fpostit/fpostit.php?url=' +
encodeURIComponent(window.location.href) + '&title=' + encodeURIComponent(document.title) + '&text=' +
encodeURIComponent(''+(window.getSelection ? window.getSelection() : document.getSelection ?
document.getSelection() : document.selection.createRange().text));
@@ -144,18 +146,17 @@ function dispy_community_info() {
} else {
a_funct();
}
- })();" ;
+ })();";
$aside['$fostitJS'] = $fostitJS;
$url = $a->get_baseurl($ssl_state);
$aside['$url'] = $url;
$tpl = file_get_contents(dirname(__file__).'/communityhome.tpl');
- $a->page['aside'] = replace_macros($tpl, $aside);
+ $a->page['aside_bottom'] = replace_macros($tpl, $aside);
}
-//right_aside at profile pages
+// aside on profile page
if ($a->argv[0] === "profile") {
- // COMMUNITY
dispy_community_info();
}