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 190872d01e7ac9da10db81ca17d46761efaa336a..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,13 +86,13 @@ $(document).ready(function() {
             $('.floaterflip').css({
                 backgroundPosition: '-210px -60px' 
             });
-                       $('.search-box').slideDown('fast');
+                       $('.search-box').slideUp('fast');
         } else {
             $('#nav-floater').slideDown('fast');
             $('.floaterflip').css({
                 backgroundPosition: '-190px -60px'
             });
-                       $('.search-box').slideUp('fast');
+                       $('.search-box').slideDown('fast');
         }
     };
        // our trigger for the toolbar button
@@ -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;
@@ -156,10 +137,7 @@ function dispy_community_info() {
        $a->page['aside_bottom'] = replace_macros($tpl, $aside);
 }
 
-// use our 'default.php' instead of the system-wide one
-$a->page['template'] = "theme/dispy-dark/default";
-
 // aside on profile page
-if ($a->argv[0] === "profile") {
+if (($a->argv[0] . $a->argv[1]) === ("profile" . $a->user['nickname'])) {
        dispy_community_info();
 }