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 cbfcb09e675f416f9d00253559a320f109d2945a..f3c54caf9eaf00beef3f45d26588bd25276d675c 100644 (file)
--- a/view/theme/dispy/theme.php
+++ b/view/theme/dispy/theme.php
@@ -3,16 +3,12 @@
 /*
  * Name: Dispy
  * Description: Dispy, Friendica theme
- * Version: 0.9
+ * Version: 1.0
  * Author: unknown
  * Maintainer: Simon <http://simon.kisikew.org/>
+ * Screenshot: <a href="screenshot.jpg">Screenshot</a>
  */
 
-
-$a->theme_info = array(
-       'extends' => 'dispy'
-);
-
 $a->page['htmlhead'] .= <<< EOT
 <script>
 $(document).ready(function() {
@@ -64,7 +60,7 @@ $(document).ready(function() {
             $('#drop-' + id).addClass('iconspacer'); }
         );
 
-       // notifications
+       // click outside notifications menu closes it
        $('html').click(function() {
                $('#nav-notifications-linkmenu').removeClass('selected');
                document.getElementById("nav-notifications-menu").style.display = "none";
@@ -73,41 +69,75 @@ $(document).ready(function() {
        $('#nav-notifications-linkmenu').click(function(event) {
                event.stopPropagation();
        });
-
-       // usermenu
+       // click outside profiles menu closes it
        $('html').click(function() {
-               $('#nav-user-linkmenu').removeClass('selected');
-               document.getElementById("nav-user-menu").style.display = "none";
+               $('#profiles-menu-trigger').removeClass('selected');
+               document.getElementById("profiles-menu").style.display = "none";
        });
 
-       $('#nav-user-linkmenu').click(function(event) {
+       $('#profiles-menu').click(function(event) {
                event.stopPropagation();
        });
 
+       // main function in toolbar functioning
     function toggleToolbar() {
         if ( $('#nav-floater').is(':visible') ) {
             $('#nav-floater').slideUp('fast');
             $('.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
     $('.floaterflip').click(function() {
         toggleToolbar();
         return false;
     });
-});
-</script>
-<script>
-$(document).ready(function() {
+
+       // (attempt) to change the text colour in a top post
        $('#profile-jot-text').focusin(function() {
-               $(this).css('color: #eec;');
+               $(this).css({color: '#eec'});
        });
+
 });
 </script>
 EOT;
+
+function dispy_community_info() {
+       $a = get_app();
+
+       $fostitJS = "javascript: (function() {
+               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')) {
+                               location.href = the_url;
+                       }
+                       if (/Firefox/.test(navigator.userAgent)) {
+                               setTimeout(a_funct, 0)
+                       } 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_bottom'] = replace_macros($tpl, $aside);
+}
+
+// aside on profile page
+if (($a->argv[0] . $a->argv[1]) === ("profile" . $a->user['nickname'])) {
+       dispy_community_info();
+}