Merge remote branch 'upstream/master'

[friendica.git] / view / theme / dispy / theme.php

diff --git a/view/theme/dispy/theme.php b/view/theme/dispy/theme.php
index d451a6b9319ccd978f4e0fe3d2a9013a2bfccaf1..f3c54caf9eaf00beef3f45d26588bd25276d675c 100644 (file)
--- 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() {
@@ -91,11 +86,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
@@ -109,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;
@@ -131,14 +114,12 @@ function dispy_community_info() {
        $a = get_app();
 
        $fostitJS = "javascript: (function() {
-               the_url = '".$a->get_baseurl($ssl_state)."/view/theme/dispy/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));
+               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));
                a_funct = function() {
-                       if ( !window.open(the_url, 'fpostit', 'location=yes, links=no, scrollbars=no, toolbar=no, width=600, height=300') ) {
+                       if (!window.open(the_url, 'fpostit', 'location=yes,links=no,scrollbars=no,toolbar=no,width=600,height=300')) {
                                location.href = the_url;
                        }
                        if (/Firefox/.test(navigator.userAgent)) {
@@ -153,11 +134,10 @@ function dispy_community_info() {
        $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);
 }
 
-//aside at profile pages
-if ($a->argv[0] === "profile") {
+// aside on profile page
+if (($a->argv[0] . $a->argv[1]) === ("profile" . $a->user['nickname'])) {
        dispy_community_info();
 }
-