aragonc пре 9 година
родитељ
комит
72eadfc8f8
4 измењених фајлова са 77 додато и 127 уклоњено
  1. 23 42
      app/Resources/public/css/base.css
  2. 28 14
      main/inc/lib/social.lib.php
  3. 13 3
      main/template/default/social/whoisonline.tpl
  4. 13 68
      whoisonline.php

+ 23 - 42
app/Resources/public/css/base.css

@@ -35,6 +35,7 @@ footer #footer_right{
 select {
   width : auto;
 }
+
 /*------------------------------*/
 .admin-block-version{
  font-size: 12px;
@@ -5193,48 +5194,6 @@ ul.holder li.bit-box{
 #panel-thematic .views ul li{
   font-size: 12px;
 }
-/* end thematic progress*/
-.card {
-  overflow: hidden;
-  position: relative;
-  border: 1px solid #CCC;
-  border-radius: 8px;
-  text-align: center;
-  padding: 0;
-  /* background-color: #284c79; */
-  color: rgb(136, 172, 217);
-  margin-bottom: 20px;
-}
-.card .header-bg {
-  /* This stretches the canvas across the entire hero unit */
-  position: absolute;
-  top: 0;
-  left: 0;
-  width: 100%;
-  height: 70px;
-  border-bottom: 1px #FFF solid;
-  /* This positions the canvas under the text */
-  z-index: 1;
-}
-
-.card .avatar {
-  position: relative;
-  margin-top: 15px;
-  z-index: 100;
-}
-
-.card .content {
-  margin-bottom: 15px;
-}
-
-.card .avatar img {
-  width: 100px;
-  height: 100px;
-  -webkit-border-radius: 50%;
-  -moz-border-radius: 50%;
-  border-radius: 50%;
-  border: 5px solid rgba(0,0,30,0.8);
-}
 
 .question_options .exercise-unique-answer-image .radio{
   padding-left: 10px;
@@ -6179,6 +6138,28 @@ div#chat-remote-video video {
 .filler-report .filler-report-data-init{
   width: 60%;
 }
+#whoisonline .items-user{
+  text-align: center;
+  //border:1px solid #dddddd;
+  padding: 15px;
+  border-radius: 4px;
+  -moz-border-radius: 4px;
+  -webkit-border-radius: 4px;
+  box-shadow: 0 2px 3px #C8C8C8;
+  border: 1px solid #e6e6e6;
+  margin-bottom: 20px;
+  min-height: 240px;
+}
+#whoisonline .items-user-name{
+  font-size: 12px;
+  padding-top: 10px;
+  line-height: 15px;
+}
+.search-user label{
+  font-weight: normal;
+  padding-left: 10px;
+  padding-right: 10px;
+}
 /* CSS NEW TOP ******************************************************************************/
 /* CSS Responsive */
 @media (min-width: 1025px) and (max-width: 1200px) {

+ 28 - 14
main/inc/lib/social.lib.php

@@ -869,6 +869,7 @@ class SocialManager extends UserManager
         }
         $column_size = '12';
         $add_row = false;
+        //var_dump(api_set_anonymous());
         if (api_is_anonymous()) {
             $add_row = true;
         }
@@ -883,9 +884,25 @@ class SocialManager extends UserManager
         $html .= '<div class="row">';
 
         foreach ($user_list as $uid) {
-            $user_info = api_get_user_info($uid);
-            $name = $user_info['complete_name'];
+            $user_info = api_get_user_info($uid, $checkIfUserOnline = true);
+            $lastname = $user_info['lastname'];
+            $firstname =  $user_info['firstname'];
+            $completeName = $firstname.', '.$lastname;
+
+            $user_rol = $user_info['status'] == 1 ? Display::return_icon('teacher.png',get_lang('Teacher'),null,ICON_SIZE_TINY) : Display::return_icon('user.png',get_lang('Student'),null,ICON_SIZE_TINY);
+            $status_icon_chat = null;
+            if($user_info['user_is_online_in_chat'] == 1){
+                $status_icon_chat = Display::return_icon('online.png',get_lang('Online'));
+            }else{
+                $status_icon_chat = Display::return_icon('offline.png',get_lang('Offline'));
+            }
+
+            if($user_info)
 
+            $userPicture = $user_info['avatar'];
+            $img = '<img class="img-responsive img-circle" title = "'.$completeName.'" alt="'.$completeName.'" src="'.$userPicture.'">';
+
+            $url =  null;
             // Anonymous users can't have access to the profile
             if (!api_is_anonymous()) {
                 if (api_get_setting('allow_social_tool') == 'true') {
@@ -893,23 +910,20 @@ class SocialManager extends UserManager
                 } else {
                     $url = '?id='.$uid.$course_url;
                 }
-            } else {
-                $url = '#';
-            }
 
-            $user_status = $user_info['status'] == 1 ? Display::span('', array('class' => 'teacher_online')) : Display::span('', array('class' => 'student_online'));
-            $status_icon = Display::span('', array('class' => 'online_user_in_text'));
-            $userPicture = $user_info['avatar'];
+            } else {
+                $url = null;
 
-            $img = '<img title = "'.$name.'" alt="'.$name.'" src="'.$userPicture.'">';
-            $name = '<a href="'.$url.'">'.$status_icon.$user_status.$name.'</a>';
+            }
+            $name = '<a href="'.$url.'">'.$firstname.'<br>'.$lastname.'</a>';
 
-            $html .= '<div class="col-md-4">
-                        <div class="card">
-                            <div class="avatar">'.$img.'</div>
-                            <div class="content">
+            $html .= '<div class="col-xs-6 col-md-2">
+                        <div class="items-user">
+                            <div class="items-user-avatar">'.$img.'</div>
+                            <div class="items-user-name">
                             '.$name.'
                             </div>
+                            <div class="items-user-status">'.$status_icon_chat.' '.$user_rol.'</div>
                         </div>
                       </div>';
 

+ 13 - 3
main/template/default/social/whoisonline.tpl

@@ -3,10 +3,20 @@
 {% block content %}
     <div class="row">
         <div class="col-md-12">
+            <div class="search-user">
+                <div class="panel panel-default">
+                    <div class="panel-heading">
+                        {{ 'SearchUsers' | get_lang}}
+                    </div>
+                    <div class="panel-body">
+                        {{ social_search }}
+                    </div>
+                </div>
+            </div>
+            <div id="whoisonline">
 
-            {{ social_right_content }}
-
-
+                {{ whoisonline }}
+            </div>
         </div>
     </div>
 {% endblock %}

+ 13 - 68
whoisonline.php

@@ -17,79 +17,20 @@ if (isset($_GET['cidReq']) && strlen($_GET['cidReq']) > 0) {
 
 $_SESSION['who_is_online_counter'] = 2;
 
-$htmlHeadXtra[] = api_get_js('jquery.endless-scroll.js');
+//$htmlHeadXtra[] = api_get_js('jquery.endless-scroll.js');
 //social tab
 $this_section = SECTION_SOCIAL;
 // table definitions
 $track_user_table = Database::get_main_table(TABLE_MAIN_USER);
 $htmlHeadXtra[] = '<script>
 
-function show_image(image,width,height) {
-    width = parseInt(width) + 20;
-    height = parseInt(height) + 20;
-    window_x = window.open(image,\'windowX\',\'width=\'+ width + \', height=\'+ height + \'\');
-}
-
-$(document).ready(function (){
-    $("input#id_btn_send_invitation").bind("click", function(){
-        if (confirm("'.get_lang('SendMessageInvitation', '').'")) {
-            $("#form_register_friend").submit();
-        }
-    });
-});
-
-function display_hide () {
-    setTimeout("hide_display_message()",3000);
-}
-function hide_display_message () {
-    $("div#display_response_id").html("");
-    try {
-        $("#txt_subject_id").val("");
-        $("#txt_area_invite").val("");
-    }catch(e) {
-        $("#txt_area_invite").val("");
-    }
-}
-
-function show_icon_edit(element_html) {
-    ident="#edit_image";
-    $(ident).show();
-}
-
-function hide_icon_edit(element_html)  {
-    ident="#edit_image";
-    $(ident).hide();
-}
-
-$(document).ready(function() {
 
-    $("#link_load_more_items").click(function() {
-        page = $("#link_load_more_items").attr("data_link");
-        $.ajax({
-            beforeSend: function(objeto) {
-                $("#display_response_id").html("'.addslashes(get_lang('Loading')).'");
-            },
-            type: "GET",
-            url: "main/inc/ajax/online.ajax.php?a=load_online_user",
-            data: "online_page_nr="+page,
-            success: function(data) {
-                $("#display_response_id").html("");
-                if (data != "end") {
-                    $("#link_load_more_items").remove();
-                    var last = $("#online_grid_container li:last");
-                    last.after(data);
-                } else {
-                    $("#link_load_more_items").remove();
-                }
-            }
-        });
-    });
-});
 </script>';
 
 $social_right_content = null;
+$whoisonline_list = null;
 
-if (isset($_GET['chatid'])) {
+/* if (isset($_GET['chatid'])) {
     //send out call request
     $time = time();
     $time = date("Y-m-d H:i:s", $time);
@@ -102,7 +43,7 @@ if (isset($_GET['chatid'])) {
         exit;
     }
 }
-
+*/
 // This if statement prevents users accessing the who's online feature when it has been disabled.
 if ((api_get_setting('showonline', 'world') == 'true' && !$_user['user_id']) ||
     ((api_get_setting('showonline', 'users') == 'true' || api_get_setting('showonline', 'course') == 'true') && $_user['user_id'])
@@ -113,7 +54,7 @@ if ((api_get_setting('showonline', 'world') == 'true' && !$_user['user_id']) ||
     } else {
         $user_list = who_is_online(0, 9);
     }
-    if (!isset($_GET['id'])) {
+    /* if (!isset($_GET['id'])) {
         if (api_get_setting('allow_social_tool') == 'true') {
             if (!api_is_anonymous()) {
                 //this include the social menu div
@@ -121,19 +62,22 @@ if ((api_get_setting('showonline', 'world') == 'true' && !$_user['user_id']) ||
             }
         }
     }
-
+*/
     if ($user_list) {
         if (!isset($_GET['id'])) {
             if (api_get_setting('allow_social_tool') == 'true') {
                 if (!api_is_anonymous()) {
                     $query = isset($_GET['q']) ? $_GET['q']: null;
-                    $social_right_content .= UserManager::get_search_form($query);
+                    $social_search .= UserManager::get_search_form($query);
                 }
             }
-            $social_right_content .= SocialManager::display_user_list($user_list);
+            //$social_right_content .= SocialManager::display_user_list($user_list);
         }
     }
 
+    $whoisonline_list .= SocialManager::display_user_list($user_list);
+
+
     if (isset($_GET['id'])) {
         if (api_get_setting('allow_social_tool') == 'true' && api_user_is_login()) {
             header("Location: ".api_get_path(WEB_CODE_PATH)."social/profile.php?u=".intval($_GET['id']));
@@ -150,7 +94,8 @@ if ((api_get_setting('showonline', 'world') == 'true' && !$_user['user_id']) ||
 $tpl = new Template(get_lang('UsersOnLineList'));
 
 if (api_get_setting('allow_social_tool') == 'true' && !api_is_anonymous()) {
-    $tpl->assign('social_search_block', $social_right_content);
+    $tpl->assign('whoisonline', $whoisonline_list);
+    $tpl->assign('social_search', $social_search);
     $social_layout = $tpl->get_template('social/whoisonline.tpl');
     $tpl->display($social_layout);
 } else {