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

fix view 1024x768 and box styles

Browse Source
skala
Juan Carlos Raña 15 years ago
parent ba85c86ce8
commit 067c12f610
17 changed files with 99 additions and 24 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. BIN
      main/img/group_add.png
  2. BIN
      main/img/group_join.png
  3. BIN
      main/img/group_leave.png
  4. 2
      main/inc/lib/group_portal_manager.lib.php
  5. 2
      main/inc/lib/message.lib.php
  6. 13
      main/messages/inbox.php
  7. 11
      main/messages/new_message.php
  8. 13
      main/messages/outbox.php
  9. 10
      main/messages/view_message.php
  10. 6
      main/social/group_add.php
  11. 12
      main/social/group_edit.php
  12. 10
      main/social/group_invitation.php
  13. 7
      main/social/group_members.php
  14. 2
      main/social/groups.php
  15. 17
      main/social/invitations.php
  16. 1
      main/social/myfiles.php
  17. 17
      main/social/search.php

BIN
main/img/group_add.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 824 B

After

Width:  |  Height:  |  Size: 807 B

BIN
main/img/group_join.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 807 B

After

Width:  |  Height:  |  Size: 842 B

BIN
main/img/group_leave.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 909 B

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

@ -925,7 +925,7 @@ class GroupPortalManager
$links .= '<li><a href="groups.php?id='.$group_id.'">'. Display::return_icon('message_list.png', get_lang('MessageList'), array('hspace'=>'6')).'<span class="'.($show=='messages_list'?'social-menu-text-active':'social-menu-text4').'" >'.get_lang('MessageList').'</span></a></li>';
$links .= '<li><a href="group_invitation.php?id='.$group_id.'">'. Display::return_icon('invitation_friend.png', get_lang('InviteFriends'), array('hspace'=>'6')).'<span class="'.($show=='invite_friends'?'social-menu-text-active':'social-menu-text4').'" >'.get_lang('InviteFriends').'</span></a></li>';
$links .= '<li><a href="group_members.php?id='.$group_id.'">'. Display::return_icon('member_list.png', get_lang('MemberList'), array('hspace'=>'6')).'<span class="'.($show=='member_list'?'social-menu-text-active':'social-menu-text4').'" >'.get_lang('MemberList').'</span></a></li>';
$links .= '<li><a href="groups.php?id='.$group_id.'&action=leave&u='.api_get_user_id().'">'. Display::return_icon('delete_data.gif', get_lang('LeaveGroup'), array('hspace'=>'6')).'<span class="social-menu-text4" >'.get_lang('LeaveGroup').'</span></a></li>';
$links .= '<li><a href="groups.php?id='.$group_id.'&action=leave&u='.api_get_user_id().'">'. Display::return_icon('group_leave.png', get_lang('LeaveGroup'), array('hspace'=>'6')).'<span class="social-menu-text4" >'.get_lang('LeaveGroup').'</span></a></li>';
break;
case GROUP_USER_PERMISSION_ADMIN:
$relation_group_title = get_lang('IamAnAdmin');

2
main/inc/lib/message.lib.php
Unescape View File

@ -896,7 +896,7 @@ class MessageManager
$name = api_get_person_name($user_sender_info['firstname'], $user_sender_info['lastname']);
$html .= '<div class="social-box-container2" >';
$html .= '<div>'.Display::return_icon('content-post-group1.jpg').'</div>';
$html .= '<div>'.Display::return_icon('content-post-group1.jpg',get_lang('Show')).'</div>';
$html .= '<div class="social-box-content2">';
$html .= '<a href="#" class="head" id="head_'.$topic['id'].'">';
$html .= '<span class="message-group-title-topic">'.(((isset($_GET['anchor_topic']) && $_GET['anchor_topic'] == 'topic_'.$topic['id']) || in_array('items_'.$topic['id'].'_page_nr',$param_names))?Display::return_icon('div_hide.gif',get_lang('Hide'),array('style'=>'vertical-align: middle')):

13
main/messages/inbox.php
Unescape View File

@ -129,7 +129,6 @@ if ($_GET['f']=='social' || api_get_setting('allow_social_tool') == 'true') {
//comes from normal profile
echo '<div class="actions">';
if (api_get_setting('allow_social_tool') == 'true' && api_get_setting('allow_message_tool') == 'true') {
echo '<a href="'.api_get_path(WEB_PATH).'main/social/profile.php">'.Display::return_icon('shared_profile.png', get_lang('ViewSharedProfile')).'&nbsp;'.get_lang('ViewSharedProfile').'</a>';
}
@ -149,8 +148,8 @@ echo '<div id="social-content">';
$id_content_right = 'inbox';
echo '<div id="inbox-menu" class="actions">';
echo '<ul>';
echo '<li><a href="'.api_get_path(WEB_PATH).'main/messages/inbox.php">'.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">'.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/inbox.php">'.Display::return_icon('inbox.png',get_lang('Inbox')).get_lang('Inbox').'</a>'.'</li>';
echo '<li><a href="'.api_get_path(WEB_PATH).'main/messages/outbox.php">'.Display::return_icon('outbox.png',get_lang('Outbox')).get_lang('Outbox').'</a>'.'</li>';
echo '</ul>';
echo '</div>';
@ -164,6 +163,11 @@ echo '<div id="social-content">';
}
echo '<div id="'.$id_content_right.'">';
if (api_get_setting('allow_social_tool') == 'true'){
echo '<div class="social-box-container2">';
echo '<div>'.Display::return_icon('content-post-group1.jpg',get_lang('Inbox')).'</div>';
echo '<div id="div_content_table" class="social-box-content2">';
}
//MAIN CONTENT
if (!isset($_GET['del_msg'])) {
inbox_display();
@ -177,6 +181,11 @@ echo '<div id="social-content">';
}
inbox_display();
}
if (api_get_setting('allow_social_tool') == 'true'){
echo '</div>';
echo '</div>';
}
echo '</div>';
echo '</div>';

11
main/messages/new_message.php
Unescape View File

@ -306,8 +306,8 @@ echo '<div id="social-content" >';
$id_content_right = 'inbox';
echo '<div id="inbox-menu" class="actions">';
echo '<ul>';
echo '<li><a href="'.api_get_path(WEB_PATH).'main/messages/inbox.php">'.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">'.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/inbox.php">'.Display::return_icon('inbox.png',get_lang('Inbox')).get_lang('Inbox').'</a>'.'</li>';
echo '<li><a href="'.api_get_path(WEB_PATH).'main/messages/outbox.php">'.Display::return_icon('outbox.png',get_lang('Outbox')).get_lang('Outbox').'</a>'.'</li>';
echo '</ul>';
echo '</div>';
@ -323,6 +323,11 @@ echo '<div id="social-content" >';
echo '<div id="'.$id_content_right.'">';
//MAIN CONTENT
if (api_get_setting('allow_social_tool') == 'true'){
echo '<div class="social-box-container2">';
echo '<div>'.Display::return_icon('content-post-group1.jpg',get_lang('ComposeMessage')).'</div>';
echo '<div id="div_content_table" class="social-box-content2">';
}
if (!isset($_POST['compose'])) {
if(isset($_GET['re_id'])) {
show_compose_reply_to_message($_GET['re_id'], api_get_user_id());
@ -365,6 +370,10 @@ echo '<div id="social-content" >';
}
}
}
if (api_get_setting('allow_social_tool') == 'true'){
echo '</div>';
echo '</div>';
}
echo '</div>';
echo '</div>';

13
main/messages/outbox.php
Unescape View File

@ -122,8 +122,8 @@ echo '<div id="social-content">';
$id_content_right = 'outbox';
echo '<div id="inbox-menu" class="actions">';
echo '<ul>';
echo '<li><a href="'.api_get_path(WEB_PATH).'main/messages/inbox.php">'.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">'.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/new_message.php">'.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/inbox.php">'.Display::return_icon('inbox.png',get_lang('Inbox')).get_lang('Inbox').'</a>'.'</li>';
echo '<li><a href="'.api_get_path(WEB_PATH).'main/messages/outbox.php">'.Display::return_icon('outbox.png',get_lang('Outbox')).get_lang('Outbox').'</a>'.'</li>';
echo '</ul>';
echo '</div>';
@ -137,6 +137,11 @@ echo '<div id="social-content">';
}
echo '<div id="'.$id_content_right.'">';
if (api_get_setting('allow_social_tool') == 'true'){
echo '<div class="social-box-container2">';
echo '<div>'.Display::return_icon('content-post-group1.jpg',get_lang('Outbox')).'</div>';
echo '<div id="div_content_table" class="social-box-content2">';
}
//MAIN CONTENT
if ($_REQUEST['action']=='delete') {
$delete_list_id=array();
@ -163,6 +168,10 @@ echo '<div id="social-content">';
}else {
outbox_display();
}
if (api_get_setting('allow_social_tool') == 'true'){
echo '</div>';
echo '</div>';
}
echo '</div>';
echo '</div>';

10
main/messages/view_message.php
Unescape View File

@ -84,6 +84,11 @@ echo '<div id="social-content">';
}
echo '<div id="'.$id_content_right.'">';
if (api_get_setting('allow_social_tool') == 'true'){
echo '<div class="social-box-container2">';
echo '<div>'.Display::return_icon('content-post-group1.jpg',get_lang('View')).'</div>';
echo '<div id="div_content_table" class="social-box-content2">';
}
//MAIN CONTENT
$message = MessageManager::show_message_box($id_message,$source);
@ -92,7 +97,10 @@ echo '<div id="social-content">';
} else {
api_not_allowed();
}
if (api_get_setting('allow_social_tool') == 'true'){
echo '</div>';
echo '</div>';
}
echo '</div>';
echo '</div>';

6
main/social/group_add.php
Unescape View File

@ -115,8 +115,14 @@ echo '<div id="social-content">';
SocialManager::show_social_menu('group_add');
echo '</div>';
echo '<div id="social-content-right">';
echo '<div class="social-box-container2">';
echo '<div>'.Display::return_icon('content-post-group1.jpg',get_lang('Groups')).'</div>';
echo '<div id="div_content_table" class="social-box-content2">';
$form->display();
echo '</div>';
echo '</div>';
echo '</div>';
echo '</div>';
Display :: display_footer();

12
main/social/group_edit.php
Unescape View File

@ -174,8 +174,16 @@ echo '<div id="social-content">';
SocialManager::show_social_menu('group_edit',$group_id);
echo '</div>';
echo '<div id="social-content-right">';
// Display form
$form->display();
echo '<div class="social-box-container2">';
echo '<div>'.Display::return_icon('content-post-group1.jpg',get_lang('GroupEdit')).'</div>';
echo '<div id="div_content_table" class="social-box-content2">';
echo '<table><tr><td>';
// Display form
$form->display();
echo '</td></tr></table>';
echo '</div>';
echo '</div>';
echo '</div>';
echo '</div>';

10
main/social/group_invitation.php
Unescape View File

@ -400,6 +400,9 @@ if ($add_type=='multiple') {
if(!empty($errorMsg)) {
Display::display_normal_message($errorMsg); //main API
}
echo '<div class="social-box-container2">';
echo '<div>'.Display::return_icon('content-post-group1.jpg',get_lang('SubscribeUsersToGroup')).'</div>';
echo '<div id="div_content_table" class="social-box-content2">';
?>
<table border="0" cellpadding="5" cellspacing="0" width="100%">
@ -440,7 +443,7 @@ if(!empty($errorMsg)) {
} else {
?>
<div id="ajax_list_users_multiple">
<select id="origin_users" name="nosessionUsersList[]" multiple="multiple" size="15" style="width:320px;">
<select id="origin_users" name="nosessionUsersList[]" multiple="multiple" size="15" style="width:290px;">
<?php
foreach($nosessionUsersList as $enreg) {
?>
@ -474,7 +477,7 @@ if(!empty($errorMsg)) {
<br /><br /><br /><br /><br />
</td>
<td align="center">
<select id="destination_users" name="sessionUsersList[]" multiple="multiple" size="15" style="width:320px;">
<select id="destination_users" name="sessionUsersList[]" multiple="multiple" size="15" style="width:290px;">
<?php
foreach($sessionUsersList as $enreg) {
@ -513,7 +516,8 @@ if (is_array($members) && count($members)>0) {
echo '<span class="social-groups-text1"><strong>'.get_lang('UsersAlreadyInvited').'</strong></span>';
Display::display_sortable_grid('invitation_profile', array(), $members, array('hide_navigation'=>true, 'per_page' => 100), $query_vars, false, array(true, false, true,true));
}
echo '</div>';//end class social-box-content2
echo '</div>';// end class social-box-container2
echo '</div>'; // end layout right
echo '</div>'; //

7
main/social/group_members.php
Unescape View File

@ -109,6 +109,9 @@ echo '<div id="social-content">';
SocialManager::show_social_menu('member_list',$group_id);
echo '</div>';
echo '<div id="social-content-right">';
echo '<div class="social-box-container2">';
echo '<div>'.Display::return_icon('content-post-group1.jpg',get_lang('MemberList')).'</div>';
echo '<div id="div_content_table" class="social-box-content2">';
if (! empty($show_message)){
Display :: display_normal_message($show_message);
}
@ -143,7 +146,9 @@ echo '<div id="social-content">';
}
if (count($new_member_list) > 0) {
Display::display_sortable_grid('list_members', array(), $new_member_list, array('hide_navigation'=>true, 'per_page' => 100), $query_vars, false, array(true, false, true,true,false,true,true));
}
}
echo '</div>';
echo '</div>';
echo '</div>';
echo '</div>';

2
main/social/groups.php
Unescape View File

@ -433,7 +433,7 @@ if ($group_id != 0 ) {
// display groups (newest, mygroups, pop)
echo '<div class="social-box-main1">';
echo '<div class="social-box-container2">';
if (isset($_GET['view']) && in_array($_GET['view'],$allowed_views)) {
$view_group = $_GET['view'];

17
main/social/invitations.php
Unescape View File

@ -114,12 +114,16 @@ echo '<div id="social-content">';
echo '</div>';
echo '<div id="social-content-right">';
///////////////////
echo '<div class="social-box-container2">';
/////////////
if (! empty($show_message)){
Display :: display_normal_message($show_message);
}
echo '<div id="id_response" align="center"></div>';
echo '<div>'.Display::return_icon('content-post-group1.jpg',get_lang('Invitations')).'</div>';
echo '<div id="div_content_table" class="social-box-content2">';
echo '<div id="id_response" align="center">&nbsp;</div>';
$list_get_invitation=array();
$user_id = api_get_user_id();
@ -240,6 +244,13 @@ echo '<div id="social-content">';
Display::display_sortable_grid('waiting_user', array(), $new_invitation, array('hide_navigation'=>true, 'per_page' => 100), $query_vars, false, array(true, true, true,false,false,true,true,true,true));
}
echo '</div>';
///////////7
echo '</div>';
echo '</div>';
////////////7
echo '</div>';
Display::display_footer();

1
main/social/myfiles.php
Unescape View File

@ -114,6 +114,7 @@ echo '<div id="social-content">';
echo '<div id="social-content-right>';
echo '<a href=""></a>';//TODO: hack and delete this line
echo '</br>';
echo '<div class="social-box-container2">';
echo '<div>'.Display::return_icon('content-post-group1.jpg',get_lang('MyFiles')).'</div>';
echo '<div id="div_content_table" class="social-box-content2">';

17
main/social/search.php
Unescape View File

@ -75,8 +75,8 @@ echo '<div id="social-content">';
$results[] = array($img, $user['firstname'],$user['lastname'], $user['tag']);
}
echo '<div class="social-box-container2">';
echo '<div>'.Display::return_icon('content-post-group1.jpg').'</div>';
echo '<div id="div_content_table" class="social-box-content2">';
echo '<div>'.Display::return_icon('content-post-group1.jpg',get_lang('Users')).'</div>';
echo '<div id="div_content_table" class="social-box-content2">';
Display::display_sortable_grid('search_user', array(), $results, array('hide_navigation'=>true, 'per_page' => 5), $query_vars, false ,true);
echo '</div>';
echo '</div>';
@ -106,7 +106,7 @@ echo '<div id="social-content">';
$picture = GroupPortalManager::get_picture_group($result['id'], $result['picture_uri'],80);
$result['picture_uri'] = '<img class="social-groups-image" src="'.$picture['file'].'" hspace="4" height="50" border="2" align="left" width="50" />';
$grid_item_1 = Display::return_icon('boxmygroups.jpg');
$grid_item_1 = Display::return_icon('boxmygroups.jpg');
$item_1 = '<div>'.$url_open.$result['picture_uri'].'<p class="social-groups-text1"><strong>'.$name.'<br />('.$count_users_group.')</strong></p>'.$url_close.Display::return_icon('linegroups.jpg').'</div>';
if ($result['description'] != '') {
@ -141,7 +141,7 @@ echo '<div id="social-content">';
$picture = GroupPortalManager::get_picture_group($group['id'], $group['picture_uri'],80);
$tags = GroupPortalManager::get_group_tags($group['id']);
$group['picture_uri'] = '<img class="social-groups-image" src="'.$picture['file'].'" hspace="4" height="50" border="2" align="left" width="50" />';
$grid_item_1 = Display::return_icon('boxmygroups.jpg');
$grid_item_1 = Display::return_icon('boxmygroups.jpg',get_lang('Groups'));
$item_1 = '<div>'.$url_open.$group['picture_uri'].'<p class="social-groups-text1"><strong>'.$name.'<br />('.$count_users_group.')</strong></p>'.$url_close.Display::return_icon('linegroups.jpg').'</div>';
if ($group['description'] != '') {
$item_2 = '<div class="box_description_group_title" ><span class="social-groups-text2">'.get_lang('Description').'</span></div>';
@ -156,8 +156,13 @@ echo '<div id="social-content">';
$grid_groups[]= array($grid_item_1,$grid_item_2);
}
}
Display::display_sortable_grid('search_group', array(), $grid_groups, array('hide_navigation'=>true, 'per_page' => 5), $query_vars, false, array(true,true,true,true,true));
}
echo '<div class="social-box-container2">';
echo '<div>'.Display::return_icon('content-post-group1.jpg',get_lang('Groups')).'</div>';
echo '<div id="div_content_table" class="social-box-content2">';
Display::display_sortable_grid('search_group', array(), $grid_groups, array('hide_navigation'=>true, 'per_page' => 5), $query_vars, false, array(true,true,true,true,true));
echo '</div>';
echo '</div>';
}
} else {
//we should show something

Write Preview
Loading…
Cancel
Save