Merge branch 'ofaj' of github.com:chamilo/chamilo-lms into ofaj

app/Resources/public/css/themes/rainbow/default.css

@@ -549,11 +549,17 @@ legend{
     padding-right: 10px;
     padding-top: 5px;
 }
+#carousel-announcement .carousel-indicators li{
+    border: 1px solid #162A83;
+}
 @media (max-width: 480px) {
     .item-menu{
         width: 100%;
         text-align: center;
     }
+    #carousel-announcement{
+        min-height: auto;
+    }    
 }
 
 .required:before {

main/template/rainbow/social/avatar_block.tpl

@@ -1,22 +1,25 @@
-<div class="social-profile text-center">
+<div class="sm-groups">
+    <div class="social-profile text-center">
         {% if show_group %}
-        <img src="{{ user_group_image.file }}" class="img-profile img-responsive img-circle">
+            <img src="{{ user_group_image.file }}" class="img-responsive">
             <div class="caption">
                 <h4 class="group-title">
                     <a href="{{ _p.web_main ~ 'social/group_view.php?id=' ~ group_id }}">{{ user_group.name }}</a>
                 </h4>
                 <p class="group-description">{{ user_group.description }}</p>
                 {% if user_is_group_admin %}
-                <div id="edit_image">
+                    <div id="edit_image" class="buttom-subscribed">
                         <a class="btn btn-default" href="{{ _p.web_main ~ 'social/group_edit.php?id=' ~ group_id }}">
                             {{ 'EditGroup'|get_lang }}
                         </a>
                     </div>
+                    <br />
                 {% endif %}
             </div>
         {% elseif show_user %}
             <a href="{{ user_image.big }}" class="expand-image">
-            <img class="img-responsive img-circle" src="{{ user_image.normal }}">
+                <img class="img-responsive img-circle" src="{{ user_image.big }}">
             </a>
         {% endif %}
+    </div>
 </div>

main/template/rainbow/social/form_modals.tpl

@@ -21,7 +21,7 @@
 </div>
 
 <script>
-    $(document).on('ready', function() {
+$(document).on('ready', function() {
     var $sendInvitationModal = $('#send-invitation-modal');
     var sendToUser = 0;
 
@@ -43,5 +43,5 @@
             window.location.reload();
         });
     });
-    });
+});
 </script>

main/template/rainbow/social/group_block.tpl

@@ -1 +1 @@
-    {{ social_avatar_block }}
+{{ social_avatar_block }}

main/template/rainbow/social/group_view.tpl

@@ -6,10 +6,33 @@
         <div class="sm-groups">
             {{ social_avatar_block }}
             {{ social_menu_block }}
+            
+            <!-- Block chat list -->    
+            <div class="chat-friends">
+                <div class="panel-group" id="blocklistFriends" role="tablist" aria-multiselectable="true">
+                    <div class="panel panel-default">
+                        <div class="panel-heading" role="tab" id="headingOne">
+                            <h4 class="panel-title">
+                                <a role="button" data-toggle="collapse" data-parent="#blocklistFriends" href="#listFriends" aria-expanded="true" aria-controls="listFriends">
+                                    {{ "SocialFriend" | get_lang }}
+                                </a>
+                            </h4>
+                        </div>
+                        <div id="listFriends" class="panel-collapse collapse in" role="tabpanel" aria-labelledby="headingOne">
+                            <div class="panel-body">
+                                {{ social_friend_block }}
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            
         </div>
     </div>
     <div class="col-md-9">
+        <div class="sm-groups-content">
         {{ create_link }}
+        
         {% if is_group_member == false %}
             <div class="social-group-details-info">
                 {{ 'Privacy' | get_lang }}
@@ -22,11 +45,19 @@
             </div>
         {% endif %}
         
+        <div class="group-info">
+            <h2 class="title">{{ group_info.name }}</h2>
+            <p class="description">{{ group_info.description }}</p>
+        </div>
+        <div class="group-list">
+            {{ social_forum }}
+        </div>
+        
         {{ social_right_content }}
 
         <div id="display_response_id" class="col-md-5"></div>
         {{ social_auto_extend_link }}
         </div>
-
+    </div>
 </div>
 {% endblock %}

main/template/rainbow/social/group_waiting_list.tpl

@@ -29,9 +29,7 @@
                     </div>
                 </div>
             </div>
-
             {% endfor %}
-
         </div>
         <div id="display_response_id" class="col-md-5"></div>
         {{ social_auto_extend_link }}

main/template/rainbow/social/groups_topics.tpl

@@ -0,0 +1,36 @@
+{% extends template ~ "/layout/layout_1_col.tpl" %}
+
+{% block content %}
+    <div class="row">
+        <div class="col-md-3">
+            <div class="sm-groups">
+            {{ social_avatar_block }}
+            {{ social_menu_block }}
+
+            <!-- Block chat list -->
+            <div class="chat-friends">
+                <div class="panel-group" id="blocklistFriends" role="tablist" aria-multiselectable="true">
+                    <div class="panel panel-default">
+                        <div class="panel-heading" role="tab" id="headingOne">
+                            <h4 class="panel-title">
+                                <a role="button" data-toggle="collapse" data-parent="#blocklistFriends" href="#listFriends" aria-expanded="true" aria-controls="listFriends">
+                                    {{ "SocialFriend" | get_lang }}
+                                </a>
+                            </h4>
+                        </div>
+                        <div id="listFriends" class="panel-collapse collapse in" role="tabpanel" aria-labelledby="headingOne">
+                            <div class="panel-body">
+                                {{ social_friend_block }}
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            </div>
+        </div>
+        <div class="col-md-9">
+            {{ group_message }}
+            {{ social_right_content }}
+        </div>
+    </div>
+{% endblock %}

main/template/rainbow/social/home.tpl

@@ -4,7 +4,6 @@
     <div class="row">
         <div class="col-md-3">
             {{ social_avatar_block }}
-
             <div class="social-network-menu">
             {{ social_menu_block }}
             </div>
@@ -65,7 +64,6 @@
                 </div>
              </div>
              {% endif %}
-         
         </div>
     </div>
 {% endblock %}

main/template/rainbow/social/profile.tpl

@@ -66,7 +66,7 @@
         </div>
         {% endif %}
         <!-- Block session list -->
-        {% if sessionList != null %}
+        {% if session_list != null %}
         <div class="panel-group" id="session-block" role="tablist" aria-multiselectable="true">
             <div class="panel panel-default">
                 <div class="panel-heading" role="tab" id="headingOne">
@@ -79,7 +79,7 @@
                 <div id="sessionList" class="panel-collapse collapse in" role="tabpanel" aria-labelledby="headingOne">
                     <div class="panel-body">
                         <ul class="list-group">
-                            {% for session in sessionList %}
+                            {% for session in session_list %}
                             <li id="session_{{ session.id }}" class="list-group-item" style="min-height:65px;">
                                 <img class="img-session" src="{{ session.image }}"/>
                                 <span class="title">{{ session.name }}</span>
@@ -91,12 +91,13 @@
             </div>
          </div>
         {% endif %}
-
+        {{ invitations }}
         {{ social_rss_block }}
         {{ social_right_information }}
     </div>
 </div>
-    {% if form_modals is defined %}
+
+{% if form_modals is defined %}
     {{ form_modals }}
-    {% endif %}
+{% endif %}
 {% endblock %}

main/template/rainbow/social/search.tpl

@@ -9,14 +9,12 @@
         </div>
     </div>
     <div class="col-md-9">
-        
         <div class="form-search-sm">
             {{ search_form }}
         </div>
         <div class="list-search-sm">
             {{ social_search }}
         </div>
-        
     </div>
 </div>
 

main/template/rainbow/social/skills_block.tpl

@@ -1,3 +1,8 @@
+<script>
+jQuery(document).ready(function(){
+    jQuery('.scrollbar-inner').scrollbar();
+});
+</script>
 <div class="panel-group" id="skill-block" role="tablist" aria-multiselectable="true">
     <div class="panel panel-default">
         <div class="panel-heading" role="tab" id="headingOne">
@@ -15,7 +20,6 @@
                                 <a href="{{ _p.web_main ~ 'social/my_skills_report.php' }}"> {{'SkillsReport'|get_lang }}</a>
                             </li>
                         {% endif %}
-
                         <li>
                             <a href="{{ _p.web_main ~ 'social/skills_wheel.php' }}"> {{ 'SkillsWheel'|get_lang }}</a>
                         </li>
@@ -26,20 +30,14 @@
                 </div>
             </h4>
         </div>
-        <script type="text/javascript">
-            jQuery(document).ready(function(){
-            jQuery('.scrollbar-inner').scrollbar();
-        });
-                        </script>                
         <div id="skillList" class="panel-collapse collapse in" role="tabpanel" aria-labelledby="headingOne">
             <div class="panel-body">
                 {% if skills %}
-               
                     <div class="scrollbar-inner badges-sidebar">
                         <ul class="list-unstyled list-badges">
                             {% for skill in skills %}
                                 <li class="thumbnail">
-                                <a href="{{ _p.web }}badge/{{ skill.id }}/user/{{ user_id }}" target="_blank">
+                                    <a href="{{ _p.web }}skill/{{ skill.id }}/user/{{ user_id }}" target="_blank">
                                         <img title="{{ skill.name }}" class="img-responsive" src="{{ skill.icon ? skill.web_icon_thumb_path : 'badges-default.png'|icon(64) }}" width="64" height="64" alt="{{ skill.name }}">
                                         <div class="caption">
                                             <p class="text-center">{{ skill.name }}</p>
@@ -49,7 +47,6 @@
                             {% endfor %}
                         </ul>
                     </div>
-                    
                 {% else %}
                     <p>{{ 'WithoutAchievedSkills'|get_lang }}</p>
                     <p>

main/template/rainbow/social/user_block.tpl

@@ -1,4 +1,4 @@
-    <div class="sidebar-avatar">
+<div class="sidebar-avatar">
     <div class="panel-group" id="sn-avatar" role="tablist" aria-multiselectable="true">
         <div class="panel panel-default">
             <div class="panel-heading" role="tab" id="heading-sn">
@@ -10,14 +10,12 @@
             </div>
             <div id="sn-avatar-one" class="panel-collapse collapse in" role="tabpanel" aria-labelledby="heading-sn">
                 <div class="panel-body">
-                        
                     {{ social_avatar_block }}
-                        
                     <ul class="list-user-data">
                         <li class="item">
                             {{ user.complete_name }}
                         </li>
-                            {% if vcard_user_link  %}
+                        {% if show_full_profile  %}
                             <li class="item">
                                 <a href="{{ _p.web }}main/messages/new_message.php">
                                 <img src="{{ "instant_message.png" | icon }}" alt="{{ "Email" | get_lang }}">
@@ -30,6 +28,34 @@
                                 {{ "BusinessCard" | get_lang }}
                                 </a>
                             </li>
+
+                            {% set skype_account = '' %}
+                            {% set linkedin_url = '' %}
+                            {% for extra in user.extra %}
+                                {% if extra.value.getField().getVariable() == 'skype' %}
+                                    {% set skype_account = extra.value.getValue() %}
+                                {% endif %}
+
+                                {% if extra.value.getField().getVariable() == 'linkedin_url' %}
+                                    {% set linkedin_url = extra.value.getValue() %}
+                                {% endif %}
+                            {% endfor %}
+
+                            {% if 'allow_show_skype_account'|get_setting == 'true' and not skype_account is empty %}
+                                <li class="item">
+                                    <a href="skype:{{ skype_account }}?chat">
+                                        <span class="fa fa-skype fa-fw" aria-hidden="true"></span> {{ 'Skype'|get_lang }}
+                                    </a>
+                                </li>
+                            {% endif %}
+
+                            {% if 'allow_show_linkedin_url'|get_setting == 'true' and not linkedin_url is empty %}
+                                <li class="item">
+                                    <a href="{{ linkedin_url }}" target="_blank">
+                                        <span class="fa fa-linkedin fa-fw" aria-hidden="true"></span> {{ 'LinkedIn'|get_lang }}
+                                    </a>
+                                </li>
+                            {% endif %}
                         {% endif %}
                         {% if chat_enabled == 1 %}
                             {% if user.user_is_online_in_chat != 0 %}
@@ -49,17 +75,16 @@
 
                     {% if not profile_edition_link is empty %}
                     <li class="item">
-                            <a class="btn link btn-sm btn-block" href="{{ profile_edition_link }}">
+                        <a class="btn btn-link btn-sm btn-block" href="{{ profile_edition_link }}">
                         <em class="fa fa-edit"></em>{{ "EditProfile" | get_lang }}
                         </a>
                     </li>
                     {% endif %}
-                        
                     </ul>
                 </div>
             </div>
         </div>
     </div>
-    </div>
+</div>
 
 

main/template/rainbow/social/whoisonline.tpl

@@ -14,8 +14,38 @@
                 </div>
             </div>
             <div id="whoisonline">
+                <div id="user-list" class="row">
                     {{ whoisonline }}
                 </div>
+                <div class="col-md-12">
+                    <a class="btn btn-large btn-default" id="link_load_more_items" data_link="2" >{{ 'More' | get_lang }}</a>
+                </div>
             </div>
         </div>
+    </div>
+    <script>
+        $(document).ready(function() {
+            $("#link_load_more_items").click(function() {
+                page = $("#link_load_more_items").attr("data_link");
+                $.ajax({
+                    beforeSend: function() {
+                        $("#link_load_more_items").html("{{ 'Loading' | get_lang }} <em class='fa fa-spinner fa-pulse fa-fw'></em>");
+                    },
+                    type: "GET",
+                    url: "main/inc/ajax/online.ajax.php?a=load_online_user",
+                    data: "online_page_nr=" + page,
+                    success: function(data) {
+                        if (data != "end") {
+                            $("#link_load_more_items").attr("data_link", parseInt(page) + 1);
+                            $("#user-list").append(data);
+                            $("#link_load_more_items").html("{{ 'More' | get_lang }}");
+                        } else {
+                            $("#link_load_more_items").remove();
+                        }
+                    }
+                });
+            });
+        });
+    </script>
 {% endblock %}
+