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 e898346ef5f0c0a666b16ea837a246dfdda38aa1..f3c54caf9eaf00beef3f45d26588bd25276d675c 100644 (file)
--- a/view/theme/dispy/theme.php
+++ b/view/theme/dispy/theme.php
@@ -6,14 +6,9 @@
  * Version: 1.0
  * Author: unknown
  * Maintainer: Simon <http://simon.kisikew.org/>
- * Screenshot: <a href="screenshot.png">Screenshot</a>
+ * 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;
@@ -144,13 +127,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['right_aside'] = replace_macros($tpl, $aside);
+       $a->page['aside_bottom'] = replace_macros($tpl, $aside);
 }
 
+// aside on profile page
+if (($a->argv[0] . $a->argv[1]) === ("profile" . $a->user['nickname'])) {
+       dispy_community_info();
+}