fix list groups in groups.tpl refs - CT#7539

app/Resources/public/css/base.css

@@ -1425,107 +1425,6 @@ a.unread {
     text-align:right;
 }
 
-#group_description {
-    margin: 10px 0px 10px 0px;
-}
-
-#group_privacy {
-    margin: 10px 0px 10px 0px;
-}
-
-#group_permissions {
-    -moz-background-clip:border;
-    -moz-background-inline-policy:continuous;
-    -moz-background-origin:padding;
-    -moz-border-radius-bottomleft:8px;
-    -moz-border-radius-bottomright:8px;
-    -moz-border-radius-topleft:8px;
-    -moz-border-radius-topright:8px;
-    background:#EEE none repeat scroll 0 0;
-    margin: 20px 0px 20px 0px;
-}
-
-#group_permissions ul {
-    list-style-image:none;
-    list-style-position:outside;
-    list-style-type:none;
-    margin:0;
-    padding:0;
-}
-
-#group_permissions ul li {
-    margin: 10px 0px 10px 5px;
-}
-
-/* Groups boxes */
-
-.groups_grid_container {
-    width:100%;
-}
-.groups_grid_item {
-    width:80px;
-    float:left;
-    margin:5px;
-}
-.groups_grid_element_0 { width:100px; float:left; text-align:center; margin-bottom:5px;}
-.groups_grid_element_1 { width:100px; float:left; text-align:left;  margin-bottom:5px;}
-.groups_grid_element_2 { width:150px; float:left;}
-
-/*MY GROUPS*/
-
-.mygroups_grid_item {
-    border-bottom:1px solid #EAEAEA;
-    float: left;
-    height: 70px;
-    margin: 0 8px 15px 15px;
-    padding: 16px 12px 40px 0px;
-    width:600px;
-}
-
-.topic_div {
-    width:620px;
-    border-bottom:1px solid #EAEAEA;
-    margin-bottom: 20px;
-    height: 96px;
-}
-
-.box_description_group_member {
-    color: #999999;
-    font-size: 10px;
-}
-
-.mygroups_grid_element_1 {
-    width:600px;
-    height:100px;
-    overflow:hidden;
-}
-
-.box_description_group_title h2 {
-    margin-bottom:4px;
-    margin-top: 0px;
-}
-
-.box_description_group_title {
-    float:right;
-    width:530px;
-}
-.box_description_group_content {
-    float:right;
-    width:530px;
-    margin-top:5px;
-    /* height:45px;*/
-    font-family:Verdana, Geneva, sans-serif;
-    font-size:12px;
-    color:#666666;
-}
-.box_description_group_actions {
-    float:right;
-    width:530px;
-    text-align:right;
-    margin-top:4px;
-    margin-right:4px;
-}
-
 /* Big icons course home page styles */
 #course_tools .big_icon {
     padding:10px;
@@ -4122,6 +4021,10 @@ i.size-32.icon-new-work{
   padding-bottom: 0px;
   font-size: 11px;
 }
+.sm-groups .social-profile .img-responsive{
+  display: inline-block;
+  width: 100px;
+}
 .social-post .mediaPost{
   padding-top:10px;
   padding-bottom: 5px;

main/inc/lib/text.lib.php

@@ -633,7 +633,7 @@ function _split_str_by_whitespace( $string, $goal ) {
 function cut($text, $maxchar, $embed = false) {
     if (api_strlen($text) > $maxchar) {
         if ($embed) {
-            return '<span title="'.$text.'">'.api_substr($text, 0, $maxchar).'...</span>';
+            return '<p title="'.$text.'">'.api_substr($text, 0, $maxchar).'...</p>';
         }
         return api_substr($text, 0, $maxchar).' ...';
     }

main/social/groups.php

@@ -64,15 +64,15 @@ if (is_array($results) && count($results) > 0) {
         $result['name'] = Security::remove_XSS($result['name'], STUDENT, true);
         $result['description'] = Security::remove_XSS($result['description'], STUDENT, true);
         $my_group_list[] = $id;
-        $url_open  = '<a href="group_view.php?id='.$id.'">';
-        $url_close = '</a>';
-
         $name = cut($result['name'], GROUP_TITLE_LENGTH, true);
+        
         if ($result['relation_type'] == GROUP_USER_PERMISSION_ADMIN) {
             $name .= ' '.Display::return_icon('social_group_admin.png', get_lang('Admin'), array('style'=>'vertical-align:middle'));
         } elseif ($result['relation_type'] == GROUP_USER_PERMISSION_MODERATOR) {
             $name .= ' '.Display::return_icon('social_group_moderator.png', get_lang('Moderator'), array('style'=>'vertical-align:middle'));
         }
+        $url  = '<a href="group_view.php?id='.$id.'">' . $name . '</a>';
+        
         $count_users_group = count($usergroup->get_users_by_group($id, false, array(GROUP_USER_PERMISSION_ADMIN, GROUP_USER_PERMISSION_READER, GROUP_USER_PERMISSION_MODERATOR), 0 , 1000));
         if ($count_users_group == 1 ) {
             $count_users_group = $count_users_group.' '.get_lang('Member');
@@ -82,19 +82,26 @@ 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'].'" />';
-        $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'));
-
-        $item_2 = '';
-        $item_3 = '';
+        
+        $members = Display::returnFontAwesomeIcon('user').$count_users_group;
+        $html = '<div class="row">';
+        $html .= '<div class="col-md-2">';
+        $html .= $result['picture'];
+        $html .= '</div>';
+        $html .= '<div class="col-md-10">';
+        $html .= '<div class="title-groups">';
+        $html .= Display::tag('h5', $url);
+        $html .= '</div>';
+        $html .= '<div class="members-groups">' . $members . '</div>';
         if ($result['description'] != '') {
-            $item_3 = '<div class="box_description_group_content" >'.cut($result['description'],100,true).'</div>';
+            $html .= '<div class="description-groups">' . cut($result['description'],100,true) . '</div>';
         } else {
-            $item_2 = '<div class="box_description_group_title" ><span class="social-groups-text2"></span></div>';
-            $item_3 = '<div class="box_description_group_content" ></div>';
+            $html .= '';
         }
-        $grid_item_2 = $item_0.$item_1.$item_2.$item_3;
+        $html .= '</div>';
+        $html .= '</div>';
+        
+        $grid_item_2 = $html;
         $grid_my_groups[]= array($grid_item_2);
     }
 }
@@ -107,8 +114,8 @@ foreach ($results as $result) {
     $result['name'] = Security::remove_XSS($result['name'], STUDENT, true);
     $result['description'] = Security::remove_XSS($result['description'], STUDENT, true);
     $id = $result['id'];
-    $url_open  = '<a href="group_view.php?id='.$id.'">';
-    $url_close = '</a>';
+    $name = cut($result['name'], GROUP_TITLE_LENGTH, true);
+    
     $count_users_group = count($usergroup->get_users_by_group($id, false, array(GROUP_USER_PERMISSION_ADMIN, GROUP_USER_PERMISSION_READER, GROUP_USER_PERMISSION_MODERATOR), 0 , 1000));
     if ($count_users_group == 1 ) {
         $count_users_group = $count_users_group.' '.get_lang('Member');
@@ -116,30 +123,38 @@ foreach ($results as $result) {
         $count_users_group = $count_users_group.' '.get_lang('Members');
     }
 
-    $name = cut($result['name'],GROUP_TITLE_LENGTH,true);
+    $url  = '<a href="group_view.php?id='.$id.'">' . $name . '</a>';
+    
     $picture = $usergroup->get_picture_group($result['id'], $result['picture'],80);
     $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'));
-    $item_2 = '';
-    $item_3 = '';
-
+    $members = Display::returnFontAwesomeIcon('user').$count_users_group;
+    
+    $html = '<div class="row">';
+    $html .= '<div class="col-md-2">';
+    $html .= $result['picture'];
+    $html .= '</div>';
+    $html .= '<div class="col-md-10">';
+    $html .= '<div class="title-groups">';
+    $html .= Display::tag('h5', $url);
+    $html .= '</div>';
+    $html .= '<div class="members-groups">' . $members . '</div>';
     if ($result['description'] != '') {
-        $item_3 = '<div class="box_description_group_content" >'.cut($result['description'],100,true).'</div>';
+        $html .= '<div class="description-groups">' . cut($result['description'],100,true) . '</div>';
     } else {
-        $item_2 = '<div class="box_description_group_title" ><span class="social-groups-text2"></span></div>';
-        $item_3 = '<div class="box_description_group_content" ></div>';
+        $html .= '';
     }
     //Avoiding my groups
-    $join_url = '';
+
     if (!in_array($id,$my_group_list)) {
-        $join_url = '<a class="btn" href="group_view.php?id='.$id.'&action=join&u='.api_get_user_id().'">'.get_lang('JoinGroup').'</a> ';
+        $html .= '<a class="btn" href="group_view.php?id='.$id.'&action=join&u='.api_get_user_id().'">'.get_lang('JoinGroup').'</a> ';
     }
-
-    $item_4 = '<div class="box_description_group_actions" >'.$join_url.'</div>';
-    $grid_item_2 = $item_0.$item_1.$item_2.$item_3.$item_4;
+    
+    $html .= '<div class="group-actions" >'.$join_url.'</div>';
+    $html .= '</div>';
+    $html .= '</div>';
+    
+    
+    $grid_item_2 = $html;
 
     $grid_newest_groups[]= array($grid_item_2);
 }
@@ -153,8 +168,7 @@ if (is_array($results) && count($results) > 0) {
         $result['name'] = Security::remove_XSS($result['name'], STUDENT, true);
         $result['description'] = Security::remove_XSS($result['description'], STUDENT, true);
         $id = $result['id'];
-        $url_open  = '<a href="group_view.php?id='.$id.'">';
-        $url_close = '</a>';
+        $name = cut($result['name'],GROUP_TITLE_LENGTH,true);
 
         $count_users_group = count($usergroup->get_users_by_group($id, false, array(GROUP_USER_PERMISSION_ADMIN, GROUP_USER_PERMISSION_READER, GROUP_USER_PERMISSION_MODERATOR), 0 , 1000));
         if ($count_users_group == 1 ) {
@@ -163,28 +177,36 @@ if (is_array($results) && count($results) > 0) {
             $count_users_group = $count_users_group.' '.get_lang('Members');
         }
 
-        $name = cut($result['name'],GROUP_TITLE_LENGTH,true);
+        $url  = '<a href="group_view.php?id='.$id.'">' . $name . '</a>';
+        
         $picture = $usergroup->get_picture_group($result['id'], $result['picture'],80);
         $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'));
-
+        $html = '<div class="row">';
+        $html .= '<div class="col-md-2">';
+        $html .= $result['picture'];
+        $html .= '</div>';
+        $html .= '<div class="col-md-10">';
+        $html .= '<div class="title-groups">';
+        $html .= Display::tag('h5', $url);
+        $html .= '</div>';
+        $html .= '<div class="members-groups">' . $members . '</div>';
         if ($result['description'] != '') {
-            $item_3 = '<div class="box_description_group_content" >'.cut($result['description'],100,true).'</div>';
+            $html .= '<div class="description-groups">' . cut($result['description'],100,true) . '</div>';
         } else {
-            $item_2 = '<div class="box_description_group_title" ><span class="social-groups-text2"></span></div>';
-            $item_3 = '<div class="box_description_group_content" ></div>';
+            $html .= '';
         }
+        //Avoiding my groups
 
-        $join_url = '';
         if (!in_array($id,$my_group_list)) {
-            $join_url = '<a class="btn" href="group_view.php?id='.$id.'&action=join&u='.api_get_user_id().'">'.get_lang('JoinGroup').'</a> ';
+            $html .= '<a class="btn" href="group_view.php?id='.$id.'&action=join&u='.api_get_user_id().'">'.get_lang('JoinGroup').'</a> ';
         }
-        $item_4 = '<div class="box_description_group_actions" >'.$join_url.'</div>';
 
-        $grid_item_2 = $item_0.$item_1.$item_2.$item_3.$item_4;
+        $html .= '<div class="group-actions" >'.$join_url.'</div>';
+        $html .= '</div>';
+        $html .= '</div>';
+
+        $grid_item_2 = $html;
         $grid_pop_groups[]= array($grid_item_2);
     }
 }

main/template/default/social/group_view.tpl

@@ -3,7 +3,7 @@
 {% block content %}
 <div class="row" xmlns="http://www.w3.org/1999/html">
     <div class="col-md-3">
-        <div class="social-groups">
+        <div class="sm-groups">
             {{ social_avatar_block }}
             {{ social_menu_block }}
         </div>

main/template/default/social/groups.tpl

@@ -8,18 +8,8 @@
             {{ social_menu_block }}
         </div>
     </div>
-    <div 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 class="col-md-9">
+        {{ social_right_content }}
     </div>
-
 </div>
 {% endblock %}