chamilo
/
chamilo-lms
mirror of https://github.com/chamilo/chamilo-lms/tree/1.11.x
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Minor changes in groups

Browse Source
skala
Julio Montoya 14 years ago
parent 656e69dd90
commit 906fa30cc8
7 changed files with 47 additions and 27 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 37
      main/css/base.css
  2. 3
      main/inc/lib/group_portal_manager.lib.php
  3. 3
      main/inc/lib/social.lib.php
  4. 8
      main/inc/lib/usermanager.lib.php
  5. 7
      main/social/groups.php
  6. 14
      main/social/home.php
  7. 2
      main/social/search.php

37
main/css/base.css
Unescape View File

@ -1648,14 +1648,14 @@ div.image-social-content center.friend {
font-family:Verdana, Geneva, sans-serif;
color:#000;
font-weight:normal;
font-size:13px;
font-size:10px;
vertical-align:bottom;
}
.social-menu-text-active {
font-family:Verdana, Geneva, sans-serif;
color:#000;
font-weight:bold;
font-size:13px;
font-size:10px;
vertical-align:bottom;
}
.social-menu-title-right {
@ -1669,6 +1669,23 @@ div.image-social-content center.friend {
/* BOX SHARED PROFILE */
.social_menu_items {
/* font-size:9px; */
}
.social_menu_option {
color: #999999;
font-size: 9px;
font-weight: bold;
margin-top: 12px;
margin-bottom:10px;
}
.social_user_information {
width:300px;
float:left;
}
.social-friend-container {
width:100%;
overflow:hidden;
@ -1777,10 +1794,11 @@ div.image-social-content center.friend {
/* border: 2px solid #cac9c9; */
}
.social-groups-home-title {
border-bottom:1pt dotted #000;
border-top: 1px solid #E2E2E2;
padding:2px;
margin-bottom:5px;
font-weight:bold;
background: #F2F2F2;
}
.social-home-users-online {
border:3px solid #E6E6E6;
@ -1920,7 +1938,7 @@ div.image-social-content center.friend {
float: left;
height: 70px;
margin: 0 8px 15px 15px;
padding: 16px 12px 5px;
padding: 16px 12px 27px;
width:600px;
}
@ -2652,3 +2670,14 @@ div.admin_section h4 {
.topics_grid_item {
margin-left:20px;
}
#div_content_table {
border-bottom:1px solid #EAEAEA;
margin-bottom:20px;
padding-bottom:10px;
}
.group_description {
word-wrap: break-word;
font-size:11px;
}

3
main/inc/lib/group_portal_manager.lib.php
Unescape View File

@ -912,7 +912,7 @@ class GroupPortalManager {
</style>';
//Loading group permission
$links = '';
switch ($my_group_role) {
case GROUP_USER_PERMISSION_READER:
@ -960,6 +960,7 @@ class GroupPortalManager {
//echo '<div align="center" class="social-menu-title"><span class="social-menu-text1">'.cut($group_info['name'], GROUP_TITLE_LENGTH, true).'</span></div>';
//echo Display::div(get_lang('Actions') ,array('class' => 'social_menu_option'));
echo '<ul class="social-menu-groups">';
echo Display::tag('li', $group_info['description'], array('class'=>'group_description'));
echo $links;
echo '</ul>';
}

3
main/inc/lib/social.lib.php
Unescape View File

@ -602,6 +602,7 @@ class SocialManager extends UserManager {
}
echo '</center></div>';
echo '</div>';
} else {
$img_array = UserManager::get_user_picture_path_by_id($user_id,'web',true,true);
@ -634,6 +635,8 @@ class SocialManager extends UserManager {
echo '</div>';*/
echo '<div class="social_menu_items"><ul>';
echo '<li><a href="'.api_get_path(WEB_PATH).'main/social/home.php">'.Display::return_icon('home.png',get_lang('Home'),array('hspace'=>'6')).'<span class="'.($show=='home'?'social-menu-text-active':'social-menu-text4').'" >'.get_lang('Home').'</span></a></li>';
echo '<li><a href="'.api_get_path(WEB_PATH).'main/messages/inbox.php?f=social">'.Display::return_icon('instant_message.png',get_lang('Messages'),array('hspace'=>'6')).'<span class="'.($show=='messages'?'social-menu-text-active':'social-menu-text4').'" >'.get_lang('Messages').$count_unread_message.'</span></a></li>';

8
main/inc/lib/usermanager.lib.php
Unescape View File

@ -2819,13 +2819,11 @@ class UserManager {
*
*/
public static function get_search_form($query) {
echo'<form method="GET" action="'.api_get_path(WEB_PATH).'main/social/search.php">
echo'<div class="social-groups-home-title"><b>'.get_lang('Search').'</b > ('.get_lang('UsersGroups').')</div>
<form method="GET" action="'.api_get_path(WEB_PATH).'main/social/search.php">
<table cellspacing="0" cellpadding="0">
<tr>
<td>
<div id="search_label">
<b>'.get_lang('Search').'</b > ('.get_lang('UsersGroups').')
<div>
<td>
<input type="text" size="25" value="'.api_htmlentities(Security::remove_XSS($query)).'" name="q"/> &nbsp;
<button class="search" type="submit" value="search">'.get_lang('Search').'</button>
</div>

7
main/social/groups.php
Unescape View File

@ -179,7 +179,7 @@ if ($group_id != 0 ) {
echo '<div id="social-content">';
echo '<div id="social-content-left">';
//this include the social menu div
if ($group_id != 0 ) {
if ($group_id != 0 ) {
SocialManager::show_social_menu('groups',$group_id);
} else {
$show_menu = 'browse_groups';
@ -220,9 +220,8 @@ if ($group_id != 0 ) {
echo '<div id="social-group-details">';
//Group's title
echo '<h1><a href="groups.php?id='.$group_id.'">'.$group_info['name'].'</a></h1>';
//Group's description
echo '<div class="social-group-details-info">'.$group_info['description'].'</div>';
echo '<div class="social-group-details-info"><a target="_blank" href="'.$group_info['url'].'">'.$group_info['url'].'</a></div>';
//echo '<div class="social-group-details-info"><a target="_blank" href="'.$group_info['url'].'">'.$group_info['url'].'</a></div>';
//Privacy
if (!$is_group_member) {

14
main/social/home.php
Unescape View File

@ -87,19 +87,9 @@ echo '<div id="social-content">';
<div><p><strong>'.get_lang('Email').'</strong><br /><span class="social-groups-text4">'.($user_info['email']?$user_info['email']:'').'</span></p></div>
<div class="box_description_group_actions" ><a href="'.api_get_path(WEB_PATH).'main/auth/profile.php">'.Display::return_icon('profile_edit.png', get_lang('EditProfile'), array('hspace'=>'6')).get_lang('EditProfile').'</a></div>';
echo '</div>';
/*
echo '<div class="rounded_div" style="width:280px">';
if (count($user_online_list) > 0) {
echo' <div class="clear"></div>
<h3>'.get_lang('UsersOnline').'</strong> </p></h3>';
echo '<center>'.SocialManager::display_user_list($user_online_list).'</center>';
}
echo '</div>';*/
//Search box
echo '<div class="social-box-right">';
echo '<br />';
echo '<div class="social-box-right">';
echo UserManager::get_search_form('');
echo '<br />';

2
main/social/search.php
Unescape View File

@ -74,7 +74,7 @@ echo '<div id="social-content">';
$results[] = array($img, $user['firstname'], $user['lastname'], $user['tag']);
}
echo '<div id="div_content_table" class="rounded_div">';
echo '<div id="div_content_table">';
Display::display_sortable_grid('online', array(), $results, array('hide_navigation'=>true, 'per_page' => 5), $query_vars, false ,true);
echo '</div>';
}

Write Preview
Loading…
Cancel
Save