Merge pull request #182 from fabrixxm/master

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

diff --git a/view/theme/dispy/theme.php b/view/theme/dispy/theme.php
index 9db77d7f3e2f4c045f7d508af6b75cbcf0ab2e8b..15e54f7e215598b58988316d558b2822570e7034 100644 (file)
--- a/view/theme/dispy/theme.php
+++ b/view/theme/dispy/theme.php
@@ -6,7 +6,7 @@
  * 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>
  */
 
 
@@ -91,11 +91,13 @@ $(document).ready(function() {
             $('.floaterflip').css({
                 backgroundPosition: '-210px -60px' 
             });
+                       $('.search-box').slideDown('fast');
         } else {
             $('#nav-floater').slideDown('fast');
             $('.floaterflip').css({
                 backgroundPosition: '-190px -60px'
             });
+                       $('.search-box').slideUp('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,13 +146,21 @@ 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);
 }
 
+// use our 'default.php' instead of the system-wide one
+$theme_name = 'dispy';
+//$a->page['template'] = "theme/dispy/default";
+
+// aside on profile page
+if ($a->argv[0] === "profile") {
+       dispy_community_info();
+}