Merge remote branch 'upstream/master'

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();
 }