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

Added some styles for group messages - partial CT#446

Browse Source
skala
Cristian Fasanando 16 years ago
parent a6bfd278a3
commit 412a58f747
4 changed files with 127 additions and 82 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. 42
      main/css/blue_lagoon/default.css
  2. 16
      main/inc/lib/group_portal_manager.lib.php
  3. 101
      main/inc/lib/social.lib.php
  4. 50
      main/social/groups.php

42
main/css/blue_lagoon/default.css
Unescape View File

@ -2808,6 +2808,7 @@ a.unread {
}
.view-message-content {
line-height:150%;
font-size:110%;
@ -2940,7 +2941,12 @@ a.unread {
float:right;width:80%;
}
.box_description_group_content {
float:right;width:80%;height:40px;
float:right;
width:80%;
height:45px;
font-family:Verdana, Geneva, sans-serif;
font-size:12px;
color:#666666;
}
.box_description_group_actions {
float:right;width:80%;text-align:right;margin-top:4px;
@ -3118,7 +3124,7 @@ a.unread {
margin-bottom:10px;
}
.TitleRigth{
width:88%;
width:84%;
float:right;
height:20px;
background-color:#32578b;
@ -3140,7 +3146,12 @@ a.unread {
font-size:12px;
font-weight:bold;
}
.menuTex4{
font-family:Verdana, Geneva, sans-serif;
color:#000;
font-weight:normal;
font-size:12px;
}
/*BOX MY GROPUPS*/
#boxmyGroups{
@ -3176,23 +3187,40 @@ a.unread {
overflow:hidden;
}
.imageGroups{
.imageGroups {
border: 2px solid #cac9c9;
}
.groupTex1{
.groupTex1 {
font-family:Verdana, Geneva, sans-serif;
font-size:12px;
color:#686868;
color:#686868;
}
.groupText2{
.groupText2 {
font-family:Verdana, Geneva, sans-serif;
font-size:12px;
color:#666699;
font-weight:bold;
}
.groupText3 {
font-family:Verdana, Geneva, sans-serif;
font-size:12px;
color:#000;
font-weight:bold;
text-transform:capitalize;
margin-top:35px;
}
.groupText4 {
font-family:Verdana, Geneva, sans-serif;
font-size:12px;
color:#666666;
}
/* INVITATIONS */
.invitation_confirm {

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

@ -882,6 +882,19 @@ class GroupPortalManager
margin:0;
overflow:hidden; };
</style>';
/*
echo '<div align="center" class="menuTitle"><span class="menuTex1">Nombre del Grupo en que me encuentro</span></div>
<ul>
<li><img src="images/newtopic.png"/> <a href="#"><span>New Topic</span></a></li>
<li><img src="images/messagelist.png"/> <a href="#"><span>Message list</span></a></li>
<li><img src="images/edit.png"/> <a href="#"><span>Edit Group</span></a></li>
<li><img src="images/friends.jpg"/> <a href="#"><span>Members list</span></a></li>
<li><img src="images/groups.jpg"/> <a href="#"><span>Invite Friends</span></a></li>
</ul>';
*/
echo '<div id="layout-left" style="float: left; width: 270px; height: 100%;">';
//Group's title
@ -1009,7 +1022,8 @@ class GroupPortalManager
echo '</div>';
echo '</div>'; // end layout left
echo '</div>'; // end layout left
}
}
?>

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

@ -652,73 +652,64 @@ class SocialManager extends UserManager {
return $output;
}
public static function show_social_menu($show = '' ) {
public static function show_social_menu($show = '',$group_id = 0) {
/*
echo '<div class="socialMenu">';
echo '<ul>';
echo '<li>'.get_lang('Menu').'</li>';
echo '<li><a href="'.api_get_path(WEB_PATH).'main/social/home.php">'.Display::return_icon('home.gif').' '.get_lang('Home').'</a></li>';
echo '<li><a href="'.api_get_path(WEB_PATH).'main/messages/inbox.php?f=social">'.Display::return_icon('inbox.png').' '.get_lang('Messages').'</a></li>';
if ($show == 'messages') {
echo '<ul class="social_menu_messages">';
echo '<li><a href="'.api_get_path(WEB_PATH).'main/messages/inbox.php?f=social">'.Display::return_icon('inbox.png',get_lang('Inbox')).get_lang('Inbox').'</a></li>';
echo '<li><a href="'.api_get_path(WEB_PATH).'main/messages/new_message.php?f=social">'.Display::return_icon('message_new.png',get_lang('ComposeMessage')).get_lang('ComposeMessage').'</a></li>';
echo '<li><a href="'.api_get_path(WEB_PATH).'main/messages/outbox.php?f=social">'.Display::return_icon('outbox.png',get_lang('Outbox')).get_lang('Outbox').'</a></li>';
echo '</ul>';
}
echo '<li><a href="'.api_get_path(WEB_PATH).'main/social/invitations.php">'.Display::return_icon('lp_users.png').' '.get_lang('Invitations').'</a></li>';
echo '<li><a href="'.api_get_path(WEB_PATH).'main/social/profile.php">'.Display::return_icon('shared_profile.png').' '.get_lang('ViewMySharedProfile').'</a></li>';
echo '<li><a href="'.api_get_path(WEB_PATH).'main/social/friends.php">'.Display::return_icon('lp_users.png').' '.get_lang('Friends').'</a></li>';
echo '<li><a href="'.api_get_path(WEB_PATH).'main/social/groups.php">'.Display::return_icon('group.gif').' '.get_lang('Groups').'</a></li>';
if ($show == 'groups') {
echo '<ul class="social_menu_groups">';
echo '<li><a href="'.api_get_path(WEB_PATH).'main/social/group_add.php">'.Display::return_icon('edit.gif',get_lang('CreateAgroup')).get_lang('CreateAgroup').'</a></li>';
echo '<li><a href="'.api_get_path(WEB_PATH).'main/social/groups.php">'.Display::return_icon('group.gif',get_lang('MyGroups')).get_lang('MyGroups').'</a></li>';
echo '</ul>';
}
echo '<li><a href="'.api_get_path(WEB_PATH).'main/social/search.php">'.Display::return_icon('search.gif').' '.get_lang('Search').'</a></li>';
//echo '<a href="'.api_get_path(WEB_PATH).'main/auth/profile.php?show=1">'.Display::return_icon('edit.gif').' '.get_lang('EditProfile').'</a>';
//echo '<span style="float:right; padding-top:7px;">'.
// '<a href="/main/auth/profile.php?show=1">'.Display::return_icon('edit.gif').' '.get_lang('Configuration').'</a>';
//'</span>';
echo '</div>';
*/
// Everybody can create groups
if (api_get_setting('allow_students_to_create_groups_in_social') == 'true') {
$create_group_item = '<li class="socialMenuSubLevel"><a href="'.api_get_path(WEB_PATH).'main/social/group_add.php">'.Display::return_icon('edit.gif',get_lang('CreateAgroup'),array('hspace'=>'6')).get_lang('CreateAgroup').'</a></li>';
$create_group_item = '<li class="socialMenuSubLevel"><a href="'.api_get_path(WEB_PATH).'main/social/group_add.php">'.Display::return_icon('edit.gif',get_lang('CreateAgroup'),array('hspace'=>'6')).'<span class="menuTex4" >'.get_lang('CreateAgroup').'</span></a></li>';
} else {
// Only admins and teachers can create groups
if (api_is_allowed_to_edit(null,true)) {
$create_group_item = '<li class="socialMenuSubLevel"><a href="'.api_get_path(WEB_PATH).'main/social/group_add.php">'.Display::return_icon('edit.gif',get_lang('CreateAgroup'),array('hspace'=>'6')).get_lang('CreateAgroup').'</a></li>';
$create_group_item = '<li class="socialMenuSubLevel"><a href="'.api_get_path(WEB_PATH).'main/social/group_add.php">'.Display::return_icon('edit.gif',get_lang('CreateAgroup'),array('hspace'=>'6')).'<span class="menuTex4" >'.get_lang('CreateAgroup').'</span></a></li>';
}
}
echo '<div class="socialMenu" >
<div>
<ul>
<li><a href="'.api_get_path(WEB_PATH).'main/social/home.php">'.Display::return_icon('home.gif',get_lang('Home'),array('hspace'=>'6')).' '.get_lang('Home').'</a></li>
<li><a href="'.api_get_path(WEB_PATH).'main/messages/inbox.php?f=social">'.Display::return_icon('inbox.png',get_lang('Messages'),array('hspace'=>'6')).' '.get_lang('Messages').'</a></li>
<li><a href="'.api_get_path(WEB_PATH).'main/social/profile.php">'.Display::return_icon('shared_profile.png',get_lang('ViewMySharedProfile'),array('hspace'=>'6')).' '.get_lang('ViewMySharedProfile').'</a></li>
<li><a href="'.api_get_path(WEB_PATH).'main/social/friends.php">'.Display::return_icon('lp_users.png',get_lang('Friends'),array('hspace'=>'6')).' '.get_lang('Friends').'</a></li>
<li><a href="'.api_get_path(WEB_PATH).'main/social/groups.php">'.Display::return_icon('group.gif',get_lang('Groups'),array('hspace'=>'6')).' '.get_lang('Groups').'</a></li>
<ul >
'.$create_group_item.'
<li class="socialMenuSubLevel"><a href="'.api_get_path(WEB_PATH).'main/social/groups.php">'.Display::return_icon('group.gif',get_lang('MyGroups'),array('hspace'=>'6')).get_lang('MyGroups').'</a></li>
</ul>
<li><a href="'.api_get_path(WEB_PATH).'main/social/search.php">'.Display::return_icon('search.gif',get_lang('Search'),array('hspace'=>'6')).' '.get_lang('Search').'</a></li>
<li><a href="'.api_get_path(WEB_PATH).'main/social/home.php">'.Display::return_icon('home.gif',get_lang('Home'),array('hspace'=>'6')).'<span class="menuTex4" >'.get_lang('Home').'</span></a></li>
<li><a href="'.api_get_path(WEB_PATH).'main/messages/inbox.php?f=social">'.Display::return_icon('inbox.png',get_lang('Messages'),array('hspace'=>'6')).'<span class="menuTex4" >'.get_lang('Messages').'</span></a></li>';
if ($show == 'messages') {
echo '<ul class="social_menu_messages">';
echo '<li class="socialMenuSubLevel"><a href="'.api_get_path(WEB_PATH).'main/messages/inbox.php?f=social">'.Display::return_icon('inbox.png',get_lang('Inbox')).'<span class="menuTex4" >'.get_lang('Inbox').'</span></a></li>';
echo '<li class="socialMenuSubLevel"><a href="'.api_get_path(WEB_PATH).'main/messages/new_message.php?f=social">'.Display::return_icon('message_new.png',get_lang('ComposeMessage')).'<span class="menuTex4" >'.get_lang('ComposeMessage').'</span></a></li>';
echo '<li class="socialMenuSubLevel"><a href="'.api_get_path(WEB_PATH).'main/messages/outbox.php?f=social">'.Display::return_icon('outbox.png',get_lang('Outbox')).'<span class="menuTex4" >'.get_lang('Outbox').'</span></a></li>';
echo '</ul>';
}
echo '<li><a href="'.api_get_path(WEB_PATH).'main/social/profile.php">'.Display::return_icon('shared_profile.png',get_lang('ViewMySharedProfile'),array('hspace'=>'6')).'<span class="menuTex4" >'.get_lang('ViewMySharedProfile').'</span></a></li>
<li><a href="'.api_get_path(WEB_PATH).'main/social/friends.php">'.Display::return_icon('lp_users.png',get_lang('Friends'),array('hspace'=>'6')).'<span class="menuTex4" >'.get_lang('Friends').'</span></a></li>
<li><a href="'.api_get_path(WEB_PATH).'main/social/groups.php">'.Display::return_icon('group.gif',get_lang('Groups'),array('hspace'=>'6')).'<span class="menuTex4" >'.get_lang('Groups').'</span></a></li>';
if ($show == 'groups') {
echo '<ul class="social_menu_groups">';
echo $create_group_item;
echo '<li class="socialMenuSubLevel"><a href="'.api_get_path(WEB_PATH).'main/social/groups.php">'.Display::return_icon('group.gif',get_lang('MyGroups')).'<span class="menuTex4" >'.get_lang('MyGroups').'</span></a></li>';
echo '</ul>';
}
echo '<li><a href="'.api_get_path(WEB_PATH).'main/social/search.php">'.Display::return_icon('search.gif',get_lang('Search'),array('hspace'=>'6')).'<span class="menuTex4" >'.get_lang('Search').'</span></a></li>
</ul>
</div>
</div>';
</div>';
if ($show == 'group_messages' && !empty($group_id)) {
echo GroupPortalManager::show_group_column_information($group_id, api_get_user_id());
}
/*
echo '<div align="center" class="menuTitle"><span class="menuTex1">Nombre del Grupo en que me encuentro</span></div>
<ul>
<li><img src="images/newtopic.png"/> <a href="#"><span>New Topic</span></a></li>
<li><img src="images/messagelist.png"/> <a href="#"><span>Message list</span></a></li>
<li><img src="images/edit.png"/> <a href="#"><span>Edit Group</span></a></li>
<li><img src="images/friends.jpg"/> <a href="#"><span>Members list</span></a></li>
<li><img src="images/groups.jpg"/> <a href="#"><span>Invite Friends</span></a></li>
</ul>';
*/
echo '</div>';
}

50
main/social/groups.php
Unescape View File

@ -138,9 +138,14 @@ $who_is_on_line = get_lang('UsersOnline').' '.count(WhoIsOnline(api_get_setting(
echo '<div class="actions-title-groups">';
//echo get_lang('Groups');
echo '<table width="100%"><tr><td width="150px" bgcolor="#32578b"><center><span class="menuTex1">'.strtoupper(get_lang('Menu')).'</span></center></td>
<td width="15px">&nbsp;</td><td bgcolor="#32578b">'.Display::return_icon('whoisonline.png','',array('hspace'=>'6')).'<a href="#" ><span class="menuTex1">'.$who_is_on_line.'</span></a></td>
</tr></table>';
/*
echo '<div class="menuTitle" align="center"><span class="menuTex1">'.get_lang('Menu').'</span></div>';
echo '<div class="TitleRigth">'.Display::return_icon('whoisonline.png','',array('hspace'=>'6')).'<a href="#" ><span class="menuTex1">'.$who_is_on_line.'</span></a></div>';
*/
echo '</div>';
@ -148,11 +153,17 @@ echo '<div id="socialContent">';
echo '<div id="socialContentLeft">';
//this include the social menu div
SocialManager::show_social_menu('groups');
//this include the social menu div
if ($group_id != 0 ) {
SocialManager::show_social_menu('group_messages',$group_id);
} else {
SocialManager::show_social_menu('groups');
}
echo '</div>';
echo '<div id="socialContentRigth">';
if ($group_id != 0 ) {
@ -184,7 +195,7 @@ if ($group_id != 0 ) {
}
//-- Shows left column
echo GroupPortalManager::show_group_column_information($group_id, api_get_user_id());
//echo GroupPortalManager::show_group_column_information($group_id, api_get_user_id());
//---
//-- Show message groups
@ -214,11 +225,11 @@ if ($group_id != 0 ) {
$url_open = '<a href="groups.php?id='.$id.'">';
$url_close = '</a>';
$name = cut($result['name'],30,true);
$name = strtoupper(cut($result['name'],25,true));
if ($result['relation_type'] == GROUP_USER_PERMISSION_ADMIN) {
$name .= Display::return_icon('admin_star.png', get_lang('Admin'));
$name .= Display::return_icon('admin_star.png', get_lang('Admin'), array('style'=>'vertical-align:middle'));
} elseif ($result['relation_type'] == GROUP_USER_PERMISSION_MODERATOR) {
$name .= Display::return_icon('moderator_star.png', get_lang('Moderator'));
$name .= Display::return_icon('moderator_star.png', get_lang('Moderator'), array('style'=>'vertical-align:middle'));
}
$count_users_group = count(GroupPortalManager::get_all_users_by_group($id));
if ($count_users_group == 1 ) {
@ -230,8 +241,8 @@ if ($group_id != 0 ) {
$result['picture_uri'] = '<img class="imageGroups" src="'.$result['picture_uri'].'" hspace="4" height="50" border="2" align="left" width="50" />';
$grid_item_1 = Display::return_icon('boxmygroups.jpg');
$item_1 = '<div>'.$url_open.$result['picture_uri'].'<p class="groupTex1"><strong>'.$name.'<br />('.$count_users_group.')</strong></p>'.$url_close.Display::return_icon('linegroups.jpg').'</div>';
$item_2 = '<div class="box_description_group_title" ><span class="groupText2">'.get_lang('DescriptionGroup').'</span></div>';
$item_3 = '<div class="box_description_group_content" >'.cut($result['description'],120,true).'</div>';
$item_2 = '<div class="box_description_group_title" ><span class="groupText2">'.strtoupper(get_lang('DescriptionGroup')).'</span></div>';
$item_3 = '<div class="box_description_group_content" >'.cut($result['description'],100,true).'</div>';
$item_4 = '<div class="box_description_group_actions" >'.$url_open.get_lang('SeeMore').$url_close.'</div>';
$grid_item_2 = $item_1.$item_2.$item_3.$item_4;
$grid_my_groups[]= array($grid_item_1,$grid_item_2);
@ -252,12 +263,12 @@ if ($group_id != 0 ) {
$count_users_group = $count_users_group.' '.get_lang('Members');
}
$name = cut($result['name'],30,true);
$name = strtoupper(cut($result['name'],30,true));
$result['picture_uri'] = '<img class="imageGroups" src="'.$result['picture_uri'].'" hspace="4" height="50" border="2" align="left" width="50" />';
$grid_item_1 = Display::return_icon('boxmygroups.jpg');
$item_1 = '<div>'.$url_open.$result['picture_uri'].'<p class="groupTex1"><strong>'.$name.'<br />('.$count_users_group.')</strong></p>'.$url_close.Display::return_icon('linegroups.jpg').'</div>';
$item_2 = '<div class="box_description_group_title" ><span class="groupText2">'.get_lang('DescriptionGroup').'</span></div>';
$item_3 = '<div class="box_description_group_content" >'.cut($result['description'],120,true).'</div>';
$item_2 = '<div class="box_description_group_title" ><span class="groupText2">'.strtoupper(get_lang('DescriptionGroup')).'</span></div>';
$item_3 = '<div class="box_description_group_content" >'.cut($result['description'],100,true).'</div>';
$item_4 = '<div class="box_description_group_actions" >'.$url_open.get_lang('SeeMore').$url_close.'</div>';
$grid_item_2 = $item_1.$item_2.$item_3.$item_4;
@ -278,12 +289,12 @@ if ($group_id != 0 ) {
}
$count_users_group = $result['count'];
$name = cut($result['name'],30,true);
$name = strtoupper(cut($result['name'],30,true));
$result['picture_uri'] = '<img class="imageGroups" src="'.$result['picture_uri'].'" hspace="4" height="50" border="2" align="left" width="50" />';
$grid_item_1 = Display::return_icon('boxmygroups.jpg');
$item_1 = '<div>'.$url_open.$result['picture_uri'].'<p class="groupTex1"><strong>'.$name.'<br />('.$count_users_group.')</strong></p>'.$url_close.Display::return_icon('linegroups.jpg').'</div>';
$item_2 = '<div class="box_description_group_title" ><span class="groupText2">'.get_lang('DescriptionGroup').'</span></div>';
$item_3 = '<div class="box_description_group_content" >'.cut($result['description'],120,true).'</div>';
$item_2 = '<div class="box_description_group_title" ><span class="groupText2">'.strtoupper(get_lang('DescriptionGroup')).'</span></div>';
$item_3 = '<div class="box_description_group_content" >'.cut($result['description'],100,true).'</div>';
$item_4 = '<div class="box_description_group_actions" >'.$url_open.get_lang('SeeMore').$url_close.'</div>';
$grid_item_2 = $item_1.$item_2.$item_3.$item_4;
@ -292,16 +303,16 @@ if ($group_id != 0 ) {
}
echo '<div id="boxmyGroups">';
echo '<h1>'.get_lang('MyGroups').'</h1>';
echo '<div class="groupText3">'.strtoupper(get_lang('MyGroups')).'</div>';
if (count($grid_my_groups) > 0) {
Display::display_sortable_grid('mygroups', array(), $grid_my_groups, array('hide_navigation'=>true, 'per_page' => 2), $query_vars, false, array(true, true, true,false));
}
if (count($grid_newest_groups) > 0) {
echo '<h1>'.get_lang('Newest').'</h1>';
echo '<div class="groupText3">'.strtoupper(get_lang('Newest')).'</div>';
Display::display_sortable_grid('newest', array(), $grid_newest_groups, array('hide_navigation'=>true, 'per_page' => 100), $query_vars, false, array(true, true, true,false));
}
if (count($grid_pop_groups) > 0) {
echo '<h1>'.get_lang('Popular').'</h1>';
echo '<div class="groupText3">'.strtoupper(get_lang('Popular')).'</div>';
Display::display_sortable_grid('popular', array(), $grid_pop_groups, array('hide_navigation'=>true, 'per_page' => 100), $query_vars, false, array(true, true, true,true,true));
}
echo '</div>';
@ -311,4 +322,5 @@ if ($group_id != 0 ) {
echo '</div>';
Display :: display_footer();
?>
?>

Write Preview
Loading…
Cancel
Save