fix red social and chat BT#7683

11 years ago · 5e9a2555a8
parent 7a9b4629e9
commit 5e9a2555a8
15 changed files with 142 additions and 109 deletions
--- a/app/Resources/public/css/base.css
+++ b/app/Resources/public/css/base.css
@ -4765,25 +4765,42 @@ i.size-32.icon-new-work{

 .social-avatar{
  text-align: center;
-  padding-top: 10px;
 }
-.social-avatar .avatar-profile{
+.social-avatar .img-profile{
  margin-bottom: 5px;
+  padding-left: 50px;
+  padding-right: 50px;
+  padding-top: 20px;
+}
+.social-avatar .social-profile{
+  text-align: center;
+  padding-top: 10px;
 }
-.social-avatar .avatar-profile .img-responsive{
+.social-avatar .social-profile .img-responsive{
  display: inline-block;
  margin: auto;
 }
 .social-avatar .lastname{
-  font-size: 18px;
+  font-size: 14px;
  font-weight: bold;
  color: #4d4d4d;
+  margin-bottom: 5px;
 }
 .social-avatar .firstname{
-  font-size: 16px;
+  font-size: 14px;
  font-weight: bold;
  color: #4d4d4d;
-  margin-bottom: 5px;
+  margin-bottom: 0px;
+}
+.social-avatar .social-avatar-email,
+.social-avatar .social-avatar-chat{
+  font-size: 12px;
+  padding-top: 2px;
+  padding-bottom: 2px;
+  color: #666666;
+}
+.social-avatar .social-avatar-chat{
+  margin-bottom: 15px;
 }
 .social-avatar .edit-profile{
  margin-top: 15px;
@ -4797,6 +4814,14 @@ i.size-32.icon-new-work{
  font-weight: bold;
  font-size: 14px;
 }
+.social-profile .group-description{
+  font-size: 12px;
+  padding-left: 10px;
+  padding-right: 10px;
+  color: #666666;
+  margin-bottom: 10px;
+  margin-top: 10px;
+}
 .social-skill .list-badges{
  list-style: none;
  padding-left: 8px;
@ -4893,7 +4918,7 @@ i.size-32.icon-new-work{
 }
 .top-mediapost .user-image .avatar-thumb,
 .sub-mediapost .user-image .avatar-thumb{
-  padding: 5px;
+  padding: 2px;
  border: 1px solid #dddddd;
  margin-bottom: 5px;
  margin-right: 5px;
@ -6110,9 +6135,9 @@ div#chat-remote-video video {
  text-align: left;
  padding-left: 15px;
 }
-form input.form-control{
+/*form input.form-control{
  margin-top: 10px;
-}
+}*/
 #whoisonline .items-user{
  text-align: center;
  /*border:1px solid #dddddd; */
@ -6135,6 +6160,15 @@ form input.form-control{
  padding-left: 10px;
  padding-right: 10px;
 }
+.course-items .course-items-session{
+  font-size: 12px;
+}
+.course-items .course-items-title{
+  font-size:16px;
+}
+.report_section .table{
+  font-size: 12px;
+}
 /* CSS NEW TOP ******************************************************************************/
 /* CSS Responsive */
@media (min-width: 1025px) and (max-width: 1200px) {
--- a/main/inc/lib/course.lib.php
+++ b/main/inc/lib/course.lib.php
@ -3154,11 +3154,11 @@ class CourseManager
            $html .= '<small>' . $params['subtitle'] . '</small>';
        }
        if (!empty($params['teachers'])) {
-            $html .= '<h5>' . Display::return_icon('teacher.png', get_lang('Teacher'), array(),
+            $html .= '<h5 class="teacher">' . Display::return_icon('teacher.png', get_lang('Teacher'), array(),
                    ICON_SIZE_TINY) . $params['teachers'] . '</h5>';
        }
        if (!empty($params['coaches'])) {
-            $html .= '<h5>' . Display::return_icon('teacher.png', get_lang('Coach'), array(),
+            $html .= '<h5 class="teacher">' . Display::return_icon('teacher.png', get_lang('Coach'), array(),
                    ICON_SIZE_TINY) . $params['coaches'] . '</h5>';
        }

@ -3233,7 +3233,7 @@ class CourseManager

        $html .= '<div class="col-md-10 ' . $param_class . '">';
        $html .= '<div class="pull-right">' . $params['right_actions'] . '</div>';
-        $html .= '<h4 class="title">' . $params['title'] . $notifications . '</h4> ';
+        $html .= '<h4 class="course-items-title">' . $params['title'] . $notifications . '</h4> ';

        if (isset($params['show_description'], $params['description']) && $params['show_description'] == 1) {
            $html .= '<p class="description-session">' . $params['description'] . '</p>';
@ -3242,12 +3242,12 @@ class CourseManager
            $html .= '<div class="subtitle-session">' . $params['subtitle'] . '</div>';
        }
        if (!empty($params['teachers'])) {
-            $html .= '<h5>' .
+            $html .= '<h5 class="course-items-session">' .
                    Display::return_icon('teacher.png', get_lang('Teacher'), array(), ICON_SIZE_TINY) .
                $params['teachers'] . '</h5>';
        }
        if (!empty($params['coaches'])) {
-            $html .= '<h5>' .
+            $html .= '<h5 class="course-items-session">' .
                Display::return_icon('teacher.png', get_lang('Coach'), array(), ICON_SIZE_TINY) .
                $params['coaches'] . '</h5>';
        }
--- a/main/inc/lib/javascript/chat/css/chat.css
+++ b/main/inc/lib/javascript/chat/css/chat.css
@ -1,32 +1,42 @@
 .chatboxmain {
 	position: fixed;
-	position:expression("absolute");
-	width: 225px;	
+	width: 225px;
 	z-index: 9000;
-    bottom: 0px; 
-    right: 20px; 
-    display: block;
+  bottom: 0px;
+  right: 20px;
+  display: block;
 }
 .chatboxheadmain {	
 	padding: 5px;
-	color: #333333;		
-	background-color: #EBEEF4;		
-    border-top: 1px solid rgba(29, 49, 91, 0.3);
-    border-left: 1px solid rgba(29, 49, 91, 0.3);
-    border-right: 1px solid rgba(29, 49, 91, 0.3);
+	color: #333333;
+  color: #ffffff;
+  border-right:1px solid #222;
+  border-left:1px solid #222;
+  background-color: #222;
+  background-repeat: repeat-x;
+  background-image: -khtml-gradient(linear, left top, left bottom, from(#333333), to(#222222));
+  background-image: -moz-linear-gradient(top, #333333, #222222);
+  background-image: -ms-linear-gradient(top, #333333, #222222);
+  background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #333333), color-stop(100%, #222222));
+  background-image: -webkit-linear-gradient(top, #333333, #222222);
+  background-image: -o-linear-gradient(top, #333333, #222222);
+  background-image: linear-gradient(top, #333333, #222222);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0);
+  -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1);
+  -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1);
+  box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1);
+  min-height: 34px;
 }

 #chatboxtitlemain {
-    font-weight: bold;
+  font-weight: normal;
 	float: left;
-	font-size: 13px;
-	width: 160px;
+	font-size: 12px;
+  padding-top: 2px;
 	cursor:pointer;
 }
-
-
 .user_status_main {
-	width:16px;
+	width:30px;
 	display:inline;
 	float:left;
 	padding: 0px 4px 0px 4px;	
@ -48,15 +58,15 @@
 }

 .chatboxtitle {
-	font-weight: bold;
+	font-weight: normal;
 	float: left;
-	font-size: 13px;
+	font-size: 12px;
 	width: 130px;
 	cursor:pointer;
-        overflow: hidden;
-        padding-left: 2px;
-        text-overflow: ellipsis;
-        white-space: nowrap;
+  overflow: hidden;
+  padding-left: 2px;
+  text-overflow: ellipsis;
+  white-space: nowrap;
 }

 .chatboxhead {
@ -65,7 +75,6 @@
 	color: #ffffff;
 	border-right:1px solid #222;
 	border-left:1px solid #222;
-	
 	background-color: #222;	
 	background-repeat: repeat-x;
 	background-image: -khtml-gradient(linear, left top, left bottom, from(#333333), to(#222222));
--- a/main/inc/lib/javascript/chat/js/chat.js
+++ b/main/inc/lib/javascript/chat/js/chat.js
@ -110,7 +110,7 @@ function showChatConnect() {
    }
    $("<div />" ).attr("id","chatmain")
 	.addClass("chatboxmain")
-	.html('<div class="chatboxheadmain"><div class="user_status_main">'+button+'</div><div id="chatboxtitlemain">'+label+'</div><div class="chatboxoptions"></div><br clear="all"/></div></div>')
+	.html('<div class="chatboxheadmain"><div class="user_status_main">'+button+'</div><div id="chatboxtitlemain">'+label+'</div><div class="chatboxoptions"></div></div>')
 	.appendTo($( "body" ));
 }

--- a/main/inc/lib/social.lib.php
+++ b/main/inc/lib/social.lib.php
@ -559,6 +559,7 @@ class SocialManager extends UserManager
        if (in_array($show, $show_groups) && !empty($group_id)) {
            // Group image
            $userGroup = new UserGroup();
+
            $group_info = $userGroup->get($group_id);

            $userGroupImage = $userGroup->get_picture_group(
@ -571,6 +572,7 @@ class SocialManager extends UserManager
            $template->assign('show_group', true);
            $template->assign('group_id', $group_id);
            $template->assign('user_group_image', $userGroupImage);
+            $template->assign('user_group', $group_info);
            $template->assign(
                'user_is_group_admin',
                $userGroup->is_group_admin(
@ -1520,6 +1522,7 @@ class SocialManager extends UserManager
        }

        $userInfo = api_get_user_info($userId, true, false, true);
+
        $template->assign('user', $userInfo);
        $template->assign('socialAvatarBlock', $socialAvatarBlock);
        $template->assign('profileEditionLink', $profileEditionLink);
@ -1536,6 +1539,7 @@ class SocialManager extends UserManager
        $templateName = $template->get_template('social/user_block.tpl');

        if (in_array($groupBlock, ['groups', 'group_edit', 'member_list'])) {
+
            $templateName = $template->get_template('social/group_block.tpl');
        }

--- a/main/inc/lib/usergroup.lib.php
+++ b/main/inc/lib/usergroup.lib.php
@ -2018,16 +2018,13 @@ class UserGroup extends Model
        }

        if (!empty($links)) {
-            $html .= '<div class="well sidebar-nav"><ul class="nav nav-list">';
-            if (!empty($group_info['description'])) {
-                $html .= Display::tag(
-                    'li',
-                    Security::remove_XSS($group_info['description'], STUDENT, true),
-                    array('class'=>'group_description')
-                );
-            }
+            $html .= '<div class="panel panel-default">';
+            $html .= '<div class="panel-body">';
+            $html .= '<ul class="nav nav-pills nav-stacked">';
            $html .= $links;
-            $html .= '</ul></div>';
+            $html .= '</ul>';
+            $html .= '</div>';
+            $html .= '</div>';
        }

        return $html;
--- a/main/social/group_view.php
+++ b/main/social/group_view.php
@ -181,10 +181,10 @@ if ($is_group_member || $group_info['visibility'] == GROUP_PERMISSION_OPEN) {
    $content = MessageManager::display_messages_for_group($group_id);
    if ($is_group_member) {
        if (empty($content)) {
-            $create_thread_link =  '<a href="'.api_get_path(WEB_CODE_PATH).'social/message_for_group_form.inc.php?view_panel=1&height=400&width=800&&user_friend='.api_get_user_id().'&group_id='.$group_id.'&action=add_message_group" class="ajax btn" title="'.get_lang('ComposeMessage').'">'.
+            $create_thread_link =  '<a href="'.api_get_path(WEB_CODE_PATH).'social/message_for_group_form.inc.php?view_panel=1&height=400&width=800&&user_friend='.api_get_user_id().'&group_id='.$group_id.'&action=add_message_group" class="ajax btn btn-default" title="'.get_lang('ComposeMessage').'">'.
                get_lang('YouShouldCreateATopic').'</a></li>';
        } else {
-            $create_thread_link = '<a href="'.api_get_path(WEB_CODE_PATH).'social/message_for_group_form.inc.php?view_panel=1&height=400&width=610&&user_friend='.api_get_user_id().'&group_id='.$group_id.'&action=add_message_group" class="ajax btn" title="'.get_lang('ComposeMessage').'">'.
+            $create_thread_link = '<a href="'.api_get_path(WEB_CODE_PATH).'social/message_for_group_form.inc.php?view_panel=1&height=400&width=610&&user_friend='.api_get_user_id().'&group_id='.$group_id.'&action=add_message_group" class="ajax btn btn-default" title="'.get_lang('ComposeMessage').'">'.
                get_lang('NewTopic').'</a>';
        }
    }
@ -216,14 +216,14 @@ if ($is_group_member || $group_info['visibility'] == GROUP_PERMISSION_OPEN) {

                $member_content .= '<div class="">';
                $member_name = Display::url(api_get_person_name(cut($member['firstname'],15),cut($member['lastname'],15)).'&nbsp;'.$icon, $member['user_info']['profile_url']);
-                $member_content .= Display::div('<img height="44" border="2" align="middle" vspace="10" class="social-groups-image" src="'.$userPicture.'"/>&nbsp'.$member_name);
+                $member_content .= Display::div('<img class="social-groups-image" src="'.$userPicture.'"/>&nbsp'.$member_name);
                $member_content .= '</div>';
            }
        }
    }

    if (!empty($create_thread_link)) {
-        $create_thread_link =  Display::div($create_thread_link, array('style'=>'padding-top:2px;height:40px'));
+        $create_thread_link =  Display::div($create_thread_link, array('class'=>'pull-right'));
    }
    $headers = array(get_lang('Discussions'), get_lang('Members'));
    $social_right_content .= Display::tabs($headers, array($content, $member_content),'tabs');
--- a/main/social/groups.php
+++ b/main/social/groups.php
@ -81,7 +81,7 @@ if (is_array($results) && count($results) > 0) {
        }

        $picture = $usergroup->get_picture_group($result['id'], $result['picture'],80);
-        $result['picture'] = '<img class="social-groups-image" src="'.$picture['file'].'" hspace="4" height="50" border="2" align="left" width="50" />';
+        $result['picture'] = '<img class="social-groups-image" src="'.$picture['file'].'" />';
        $item_0  = Display::div($result['picture'], array('class'=>'box_description_group_image'));
        $members = Display::span($count_users_group, array('class'=>'box_description_group_member'));
        $item_1  = Display::div(Display::tag('h4', $url_open.$name.$url_close).$members, array('class'=>'box_description_group_title'));
@ -118,7 +118,7 @@ foreach ($results as $result) {

    $name = cut($result['name'],GROUP_TITLE_LENGTH,true);
    $picture = $usergroup->get_picture_group($result['id'], $result['picture'],80);
-    $result['picture'] = '<img class="social-groups-image" src="'.$picture['file'].'" hspace="4" height="50" border="2" align="left" width="50" />';
+    $result['picture'] = '<img class="social-groups-image" src="'.$picture['file'].'" />';

    $item_0 = Display::div($result['picture'], array('class'=>'box_description_group_image'));
    $members = Display::span($count_users_group, array('class'=>'box_description_group_member'));
@ -163,7 +163,7 @@ if (is_array($results) && count($results) > 0) {

        $name = cut($result['name'],GROUP_TITLE_LENGTH,true);
        $picture = $usergroup->get_picture_group($result['id'], $result['picture'],80);
-        $result['picture'] = '<img class="social-groups-image" src="'.$picture['file'].'" hspace="4" height="50" border="2" align="left" width="50" />';
+        $result['picture'] = '<img class="social-groups-image" src="'.$picture['file'].'" />';

        $item_0 = Display::div($result['picture'], array('class'=>'box_description_group_image'));
        $members = Display::span($count_users_group, array('class'=>'box_description_group_member'));
--- a/main/social/profile_friends_and_groups.inc.php
+++ b/main/social/profile_friends_and_groups.inc.php
@ -117,7 +117,7 @@ if (isset($_GET['view']) && in_array($_GET['view'], $views)) {
                }

                $result['picture_uri'] = '<div class="box_shared_profile_group_image">
-                                          <img class="social-groups-image" src="' . $picture['file'] . '" hspace="4" height="50" border="2" align="left" width="50" /></div>';
+                                          <img class="social-groups-image" src="' . $picture['file'] . '" /></div>';
                $item_actions = '';
                if (api_get_user_id() == $user_id) {
                    $item_actions = '<div class="box_shared_profile_group_actions"><a href="group_view.php?id=' . $id . '">' .
--- a/main/template/default/social/add_groups.tpl
+++ b/main/template/default/social/add_groups.tpl
@ -8,22 +8,8 @@
            {{ social_menu_block }}
        </div>
    </div>
-    <div id="wallMessages" class="col-md-9" style="min-height:1px">
-        <div class="row">
-            <div class="col-md-12">
-                <div id="message_ajax_reponse" class=""></div>
-            </div>
-        </div>
-        <div class="row">
-            {{ social_right_content }}
-        </div>
-        <div id="display_response_id" class="col-md-5"></div>
-        {{ social_auto_extend_link }}
-    </div>
-    <div class="col-md-4">
-        <div class="row">
-            {{ social_right_information }}
-        </div>
+    <div class="col-md-9">
+       {{ social_right_content }}
    </div>
 </div>
 {% endblock %}
--- a/main/template/default/social/avatar_block.tpl
+++ b/main/template/default/social/avatar_block.tpl
@ -1,19 +1,22 @@
-<div class="avatar-profile">
+<div class="social-profile">
    {% if show_group %}
+    <div class="img-profile">
        <a href="{{ _p.web_main ~ 'social/group_view.php?id=' ~ group_id }}">
-            <img src="{{ user_group_image.file }}" class="social-groups-image">
+            <img src="{{ user_group_image.file }}" class="img-responsive img-circle">
        </a>
-
-        {% if user_is_group_admin %}
-            <div id="edit_image">
-                <a href="{{ _p.web_main ~ 'social/group_edit.php?id=' ~ group_id }}">
-                    {{ 'EditGroup'|get_lang }}
-                </a>
-            </div>
-        {% endif %}
+    </div>
+    <div class="group-title"><h4>{{ user_group.name }}</h4></div>
+    <div class="group-description">{{ user_group.description }}</div>
+    {% if user_is_group_admin %}
+        <div id="edit_image">
+            <a class="btn btn-default" href="{{ _p.web_main ~ 'social/group_edit.php?id=' ~ group_id }}">
+                {{ 'EditGroup'|get_lang }}
+            </a>
+        </div>
+    {% endif %}
    {% elseif show_user %}
        <a href="{{ user_image.big }}" class="expand-image">
-            <img class="img-responsive" src="{{ user_image.normal }}">
+            <img class="img-responsive img-circle" src="{{ user_image.normal }}">
        </a>
    {% endif %}
 </div>
--- a/main/template/default/social/group_block.tpl
+++ b/main/template/default/social/group_block.tpl
@ -1,4 +1,4 @@
-<div class="panel panel-info social-avatar">
+<div class="panel panel-default social-avatar">
    {{ socialAvatarBlock }}
    <p class="lead">{{ group_info.complete_name }}</p>
 </div>
--- a/main/template/default/social/group_view.tpl
+++ b/main/template/default/social/group_view.tpl
@ -3,19 +3,13 @@
 {% block content %}
 <div class="row" xmlns="http://www.w3.org/1999/html">
    <div class="col-md-3">
-        <div class="social-menu">
+        <div class="social-groups">
            {{ social_avatar_block }}
            {{ social_menu_block }}
        </div>
    </div>
-    <div class="col-md-9" style="min-height:1px">
-
-        <div id="social-group-details">
-            <h4>{{ group_info.name }}</h4>
-        </div>
-
+    <div class="col-md-9">
        {{ create_link }}
-
        {% if is_group_member == false %}
            <div class="social-group-details-info">
                {{ 'Privacy' | get_lang }}
--- a/main/template/default/social/user_block.tpl
+++ b/main/template/default/social/user_block.tpl
@ -1,28 +1,34 @@
-<div class="panel panel-info social-avatar">
-    {{ socialAvatarBlock }}
-    <p class="lead">{{ user.complete_name }}</p>
-    <p>
-        <img src="{{ "instant_message.png" | icon }}" atl="{{ "Email" | get_lang }}">
-        {{ user.email}}
-    </p>
-    {% if user.user_is_online_in_chat != 0 %}
-        <p>
+<div class="social-avatar">
+    <div class="panel panel-default">
+        {{ socialAvatarBlock }}
+        <div class="social-avatar-name">
+            <p class="firstname">{{ user.firstname }}</p>
+            <p class="lastname">{{ user.lastname }}</p>
+        </div>
+        <div class="social-avatar-email">
+            <img src="{{ "instant_message.png" | icon }}" atl="{{ "Email" | get_lang }}">
+            {{ user.email}}
+        </div>
+        {% if user.user_is_online_in_chat != 0 %}
+        <div class="social-avatar-chat">
            <img src="{{ "online.png" | icon }}" alt="{{ "Online" | get_lang }}">
            {{ "Chat" | get_lang }} ({{ "Online" | get_lang }})
-        </p>
-    {% else %}
-        <p>
+        </div>
+        {% else %}
+        <div class="social-avatar-chat">
            <img src="{{ "offline.png" | icon }}" alt="{{ "Online" | get_lang }}">
            {{ "Chat" | get_lang }} ({{ "Offline" | get_lang }})
-        </p>
-    {% endif %}
+        </div>
+        {% endif %}

-    {% if not profileEditionLink is empty %}
+        {% if not profileEditionLink is empty %}
        <p>
            <a class="btn btn-link" href="{{ profileEditionLink }}">
                <i class="fa fa-edit"></i>
                {{ "EditProfile" | get_lang }}
            </a>
        </p>
-    {% endif %}
+        {% endif %}
+    </div>
 </div>
+
--- a/main/template/default/user_portal/session.tpl
+++ b/main/template/default/user_portal/session.tpl
@ -39,11 +39,11 @@
                    {% endif %}

                    {% if session.teachers %}
-                        <h5>{{ "teacher.png"|icon(16) ~ session.teachers }}</h5>
+                        <h5 class="teacher-name">{{ "teacher.png"|icon(16) ~ session.teachers }}</h5>
                    {% endif %}

                    {% if session.coaches %}
-                        <h5>{{ "teacher.png"|icon(16) ~ session.coaches }}</h5>
+                        <h5 class="teacher-name">{{ "teacher.png"|icon(16) ~ session.coaches }}</h5>
                    {% endif %}
                </div>