add options admin enabled chat red social BT#7683

1.10.x
aragonc 10 years ago
parent 1bc2b02f45
commit 10e5e53f0e
  1. 7
      main/inc/lib/social.lib.php
  2. 0
      main/search/session/about.php
  3. 0
      main/search/session/add_courses_to_session.php
  4. 0
      main/search/session/add_many_session_to_category.php
  5. 0
      main/search/session/add_students_to_session.php
  6. 0
      main/search/session/add_teachers_to_session.php
  7. 0
      main/search/session/add_users_to_session.php
  8. 0
      main/search/session/index.php
  9. 0
      main/search/session/resume_session.php
  10. 0
      main/search/session/session_add.php
  11. 0
      main/search/session/session_category_add.php
  12. 0
      main/search/session/session_category_edit.php
  13. 0
      main/search/session/session_category_list.php
  14. 0
      main/search/session/session_course_edit.php
  15. 0
      main/search/session/session_course_list.php
  16. 0
      main/search/session/session_course_user.php
  17. 0
      main/search/session/session_course_user_list.php
  18. 0
      main/search/session/session_edit.php
  19. 0
      main/search/session/session_export.php
  20. 0
      main/search/session/session_import.php
  21. 0
      main/search/session/session_import_drh.php
  22. 0
      main/search/session/session_list.php
  23. 0
      main/search/session/session_user_edit.php
  24. 0
      main/search/session/session_user_import.php
  25. 5
      main/template/default/social/user_block.tpl

@ -599,6 +599,7 @@ class SocialManager extends UserManager
$skillBlock = $template->get_template('social/avatar_block.tpl'); $skillBlock = $template->get_template('social/avatar_block.tpl');
return $template->fetch($skillBlock); return $template->fetch($skillBlock);
} }
@ -753,7 +754,7 @@ class SocialManager extends UserManager
// Chat // Chat
//@todo check if user is online and if it's a friend to show the chat link //@todo check if user is online and if it's a friend to show the chat link
if (api_is_global_chat_enabled()) { /*if (api_is_global_chat_enabled()) {
$user_name = $user_info['complete_name']; $user_name = $user_info['complete_name'];
if ($user_friend_relation == USER_RELATION_TYPE_FRIEND) { if ($user_friend_relation == USER_RELATION_TYPE_FRIEND) {
@ -787,7 +788,7 @@ class SocialManager extends UserManager
} }
} }
} }
} }*/
$html .= '</ul></div></div>'; $html .= '</ul></div></div>';
@ -1537,6 +1538,8 @@ class SocialManager extends UserManager
$template->assign('gamification_points', $gamificationPoints); $template->assign('gamification_points', $gamificationPoints);
} }
$chatEnabled = api_is_global_chat_enabled();
$templateName = $template->assign('chat_enabled', $chatEnabled);
$templateName = $template->get_template('social/user_block.tpl'); $templateName = $template->get_template('social/user_block.tpl');

@ -9,10 +9,13 @@
<img src="{{ "instant_message.png" | icon }}" atl="{{ "Email" | get_lang }}"> <img src="{{ "instant_message.png" | icon }}" atl="{{ "Email" | get_lang }}">
{{ user.email}} {{ user.email}}
</div> </div>
{% if chat_enabled == 1 %}
{% if user.user_is_online_in_chat != 0 %} {% if user.user_is_online_in_chat != 0 %}
<div class="social-avatar-chat"> <div class="social-avatar-chat">
<a onclick="javascript:chatWith('{{ user.id }}', '{{ user.complete_name }}', '{{ user.user_is_online }}','{{ user.avatar_small }}')" href="javascript:void(0);">
<img src="{{ "online.png" | icon }}" alt="{{ "Online" | get_lang }}"> <img src="{{ "online.png" | icon }}" alt="{{ "Online" | get_lang }}">
{{ "Chat" | get_lang }} ({{ "Online" | get_lang }}) {{ "Chat" | get_lang }} ({{ "Online" | get_lang }})
</a>
</div> </div>
{% else %} {% else %}
<div class="social-avatar-chat"> <div class="social-avatar-chat">
@ -20,7 +23,7 @@
{{ "Chat" | get_lang }} ({{ "Offline" | get_lang }}) {{ "Chat" | get_lang }} ({{ "Offline" | get_lang }})
</div> </div>
{% endif %} {% endif %}
{% endif %}
{% if not profileEditionLink is empty %} {% if not profileEditionLink is empty %}
<p> <p>
<a class="btn btn-link" href="{{ profileEditionLink }}"> <a class="btn btn-link" href="{{ profileEditionLink }}">

Loading…
Cancel
Save