Merge pull request #1992 from aragonc/1.11.x

fix hidden count_message in menu

main/inc/ajax/message.ajax.php

@@ -42,7 +42,7 @@ switch ($action) {
             }
             $total_invitations = intval($number_of_new_messages_of_friend) + $group_pending_invitations + intval($count_unread_message);
         }
-        $total_invitations = !empty($total_invitations) ? Display::badge($total_invitations) : '';
+        //$total_invitations = !empty($total_invitations) ? Display::badge($total_invitations) : '';
 
         echo $total_invitations;
         break;

main/template/default/layout/menu.tpl

@@ -24,16 +24,22 @@
             {% if _u.logged == 1 %}
                 <script>
                     $(document).ready(function () {
-                        $("#count_message")
+                        $.get('{{ _p.web_main }}inc/ajax/message.ajax.php?a=get_count_message', function(data){
-                            .load('{{ _p.web_main }}inc/ajax/message.ajax.php?a=get_count_message', function () {
+                            var message = data;
+                            if( message === "0"){
+                                $("#count_message_li").addClass('hidden');
+                            } else {
                                 $("#count_message_li").removeClass('hidden');
-                            });
+                                $("#count_message").append(message);
+                            }
+                        });
                     });
                 </script>
+                
                 <ul class="nav navbar-nav navbar-right">
                     <li id="count_message_li" class="hidden">
                         <a href="{{ message_url }}">
-                            <span id="count_message"></span>
+                            <span id="count_message" class="badge badge-warning"></span>
                         </a>
                     </li>
                     {% if _u.status != 6 %}