Merge remote branch 'upstream/master'

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

diff --git a/view/theme/dispy-dark/theme.php b/view/theme/dispy-dark/theme.php
index 6f8243058720a3b7dc6d1a0f9e0442302fbc02d0..70013617399360b9d353678110106682a864765d 100644 (file)
--- a/view/theme/dispy-dark/theme.php
+++ b/view/theme/dispy-dark/theme.php
@@ -64,7 +64,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,17 +73,17 @@ $(document).ready(function() {
        $('#nav-notifications-linkmenu').click(function(event) {
                event.stopPropagation();
        });
+       // click outside profiles menu closes it
+       $('html').click(function() {
+               $('#profiles-menu-trigger').removeClass('selected');
+               document.getElementById("profiles-menu").style.display = "none";
+       });
 
-       // usermenu
-       //$('html').click(function() {
-//             $('#user-menu-popup').css('display: none');
-               //document.getElementById("usermenu-popup").style.display = "none";
-       //});
-
-       //$('#user-menu').click(function(event) {
-       //      event.stopPropagation();
-       //});
+       $('#profiles-menu').click(function(event) {
+               event.stopPropagation();
+       });
 
+       // main function in toolbar functioning
     function toggleToolbar() {
         if ( $('#nav-floater').is(':visible') ) {
             $('#nav-floater').slideUp('fast');
@@ -97,20 +97,31 @@ $(document).ready(function() {
             });
         }
     };
+       // our trigger for the toolbar button
     $('.floaterflip').click(function() {
         toggleToolbar();
         return false;
     });
 
+       // (attempt) to change the text colour in a top post
        $('#profile-jot-text').focusin(function() {
                $(this).css({color: '#eec'});
        });
 
-       $('#profile-photo-wrapper').mouseover(function() {
-               $('#profile-edit-side-div').css({display: 'block'});
+/*     $('#profile-photo-wrapper').mouseover(function() {
+               $('.profile-edit-side-div').css({display: 'block'});
        }).mouseout(function() {
-               $('#profile-edit-side-div').css({display: 'none'});
+               $('.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;