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

Improving UI

Browse Source
skala
Julio Montoya 14 years ago
parent a4d61fe9bf
commit 283fb9bebb
25 changed files with 129 additions and 283 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. 31
      main/css/base.css
  2. 2
      main/css/chamilo/default.css
  3. BIN
      main/img/icons/32/completed.png
  4. BIN
      main/img/icons/32/compose_message.png
  5. BIN
      main/img/icons/32/incomplete.png
  6. BIN
      main/img/icons/32/outbox.png
  7. 34
      main/inc/lib/message.lib.php
  8. 59
      main/inc/lib/social.lib.php
  9. 27
      main/link/link.php
  10. 22
      main/messages/inbox.php
  11. 46
      main/messages/new_message.php
  12. 25
      main/messages/outbox.php
  13. 4
      main/messages/send_message_to_userfriend.inc.php
  14. 8
      main/messages/view_message.php
  15. 11
      main/social/friends.php
  16. 9
      main/social/group_add.php
  17. 9
      main/social/group_edit.php
  18. 15
      main/social/group_invitation.php
  19. 15
      main/social/group_members.php
  20. 15
      main/social/group_waiting_list.php
  21. 13
      main/social/groups.php
  22. 31
      main/social/invitations.php
  23. 9
      main/social/myfiles.php
  24. 11
      main/social/profile.php
  25. 16
      main/social/search.php

31
main/css/base.css
Unescape View File

@ -5,43 +5,34 @@
* {
outline :none;
}
input, select, textarea {
input {
-moz-border-radius:5px;
-webkit-border-radius:5px;
-border-radius:5px;
border-radius:5px;
-x-system-font:none;
border:1px solid #CCCCCC;
color:#666666;
font-family:Arial,Helvetica,sans-serif;
font-size:120%;
font-size-adjust:none;
font-stretch:normal;
font-style:normal;
font-variant:normal;
font-weight:normal;
font-size:120%;
line-height:normal;
padding:5px;
}
select, textarea {
color : #000;
border: 1px solid #000;
}
input.checkbox {
border-width: 0;
border-radius:5px;
-moz-border-radius:5px;
-webkit-border-radius:5px;
-opera-border-radius:5px;
border:1px solid #E1E1E0;
border:1px solid #CCCCCC;
padding:5px;
-moz-border-radius:5px;
-webkit-border-radius:5px;
border-radius:5px;
color:#666666;
}
select, input[type=checkbox], input[type=radio], input[type=button], input[type=submit] {
cursor: pointer;
font-size: 12px;
-moz-border-radius:5px;
-webkit-border-radius:5px;
border-radius:5px;
-border-radius:5px;
border:1px solid #E1E1E0;
}

2
main/css/chamilo/default.css
Unescape View File

@ -4635,4 +4635,4 @@ padding-top:10px;
.progresstext {
text-align:center;
}
}

BIN
main/img/icons/32/completed.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.7 KiB

BIN
main/img/icons/32/compose_message.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.6 KiB

BIN
main/img/icons/32/incomplete.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 998 B

BIN
main/img/icons/32/outbox.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.6 KiB

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

@ -150,7 +150,7 @@ class MessageManager
$sql_result = Database::query($sql_query);
$i = 0;
$message_list = array ();
while ($result = Database::fetch_row($sql_result)) {
while ($result = Database::fetch_row($sql_result)) {
if ($request===true) {
$message[0] = '<input type="checkbox" value='.$result[0].' name="id[]">';
} else {
@ -171,8 +171,8 @@ class MessageManager
$message[2] = '<a onclick="get_action_url_and_show_messages(1,'.$result[0].')" href="javascript:void(0)">'.str_replace("\\","",$result[3]).'</a>';
$message[3] = '<a onclick="reply_to_messages(\'show\','.$result[0].',\'\')" href="javascript:void(0)">'.Display::return_icon('message_reply.png',get_lang('ReplyToMessage')).'</a>'.
'&nbsp;&nbsp;<a onclick="delete_one_message('.$result[0].')" href="javascript:void(0)" >'.Display::return_icon('delete.png',get_lang('DeleteMessage')).'</a>';
} else {
if($result[3]==1) {
} else {
if($result[4]==1) {
$class = 'class = "unread"';
} else {
$class = 'class = "read"';
@ -745,8 +745,8 @@ class MessageManager
<td valign=top class="view-message-content">'.str_replace("\\","",$row[6]).'</td>
</tr>
</table>
<div id="message-attach">'.(!empty($files_attachments)?implode('&nbsp;|&nbsp;',$files_attachments):'').'</div>
<div style="padding-bottom: 5px">';
<div id="message-attach">'.(!empty($files_attachments)?implode('<br />',$files_attachments):'').'</div>
<div style="padding: 15px 0px 5px 0px">';
$social_link = '';
if ($_GET['f'] == 'social') {
$social_link = 'f=social';
@ -1269,19 +1269,19 @@ function outbox_display() {
if (isset ($_REQUEST['action'])) {
switch ($_REQUEST['action']) {
case 'delete' :
$number_of_selected_messages = count($_POST['id']);
if ($number_of_selected_messages!=0) {
foreach ($_POST['id'] as $index => $message_id) {
MessageManager::delete_message_by_user_receiver(api_get_user_id(), $message_id);
}
}
Display::display_normal_message(api_xml_http_response_encode($success),false);
break;
$number_of_selected_messages = count($_POST['id']);
if ($number_of_selected_messages!=0) {
foreach ($_POST['id'] as $index => $message_id) {
MessageManager::delete_message_by_user_receiver(api_get_user_id(), $message_id);
}
}
Display::display_normal_message(api_xml_http_response_encode($success),false);
break;
case 'deleteone' :
MessageManager::delete_message_by_user_receiver(api_get_user_id(), $_GET['id']);
Display::display_confirmation_message(api_xml_http_response_encode($success),false);
echo '<br/>';
break;
MessageManager::delete_message_by_user_receiver(api_get_user_id(), $_GET['id']);
Display::display_confirmation_message(api_xml_http_response_encode($success),false);
echo '<br/>';
break;
}
}

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

@ -570,20 +570,33 @@ class SocialManager extends UserManager {
}*/
echo '<div class="social-menu">';
echo '<script type="text/javascript">
function show_icon_edit(element_html) {
ident="#edit_image";
$(ident).show();
}
function hide_icon_edit(element_html) {
ident="#edit_image";
$(ident).hide();
}
</script>';
if (in_array($show, $show_groups) && !empty($group_id)) {
//--- Group image
$group_info = GroupPortalManager::get_group_data($group_id);
$big = GroupPortalManager::get_picture_group($group_id, $group_info['picture_uri'],160,GROUP_IMAGE_SIZE_BIG);
$original = GroupPortalManager::get_picture_group($group_id, $group_info['picture_uri'],'',GROUP_IMAGE_SIZE_ORIGINAL);
echo '<div class="social-content-image">';
echo '<div class="social-content-image">';
echo '<div class="social-background-content" onmouseout="hide_icon_edit()" onmouseover="show_icon_edit()"><center>';
echo Display::url('<img src='.$big['file'].' class="social-groups-image" /> </a><br /><br />', api_get_path(WEB_PATH).'main/social/groups.php?id='.$group_id);
if (GroupPortalManager::is_group_admin($group_id, api_get_user_id())) {
echo '<div id="edit_image" class="hidden_message" style="display:none"><a href="'.api_get_path(WEB_PATH).'main/social/group_edit.php?id='.$group_id.'">'.get_lang('EditGroup').'</a></div>';
}
echo '</center></div>';
echo '</div>';
} else {
@ -609,20 +622,22 @@ class SocialManager extends UserManager {
}
if (!in_array($show, array('shared_profile', 'groups', 'group_edit', 'member_list','waiting_list','invite_friends'))) {
echo '<div align="center" class="social-menu-title" ><span class="social-menu-text1">'.get_lang('Menu').'</span></div>';
echo '<div>
<ul>
<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>
<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>';
if (in_array($show, $show_messages)) {
echo '<li><ul>';
echo '<li class="social-menu-sub-level"><a href="'.api_get_path(WEB_PATH).'main/messages/new_message.php?f=social">'.Display::return_icon('compose_message.png', get_lang('ComposeMessage'), array('hspace'=>'6','style'=>'float:left')).'<span class="'.($show=='messages_compose'?'social-menu-text-active':'social-menu-text4').'" >'.get_lang('ComposeMessage').'</span></a></li>';
echo '<li class="social-menu-sub-level"><a href="'.api_get_path(WEB_PATH).'main/messages/inbox.php?f=social">'.Display::return_icon('inbox.png', get_lang('Inbox'), array('hspace'=>'6')).'<span class="'.($show=='messages_inbox'?'social-menu-text-active':'social-menu-text4').'" >'.get_lang('Inbox').'</span></a></li>';
echo '<li class="social-menu-sub-level" style="background:none;padding:0px"><a href="'.api_get_path(WEB_PATH).'main/messages/outbox.php?f=social">'.Display::return_icon('outbox.png', get_lang('Outbox'), array('hspace'=>'6')).'<span class="'.($show=='messages_outbox'?'social-menu-text-active':'social-menu-text4').'" >'.get_lang('Outbox').'</span></a></li>';
echo '</ul></li>';
}
echo '<div align="center" class="social-menu-title">';
echo '<span class="social-menu-text1">'.get_lang('Menu').'</span>';
echo '</div>';
echo '<div><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>';
if (in_array($show, $show_messages)) {
/*echo '<li><ul>';
echo '<li class="social-menu-sub-level"><a href="'.api_get_path(WEB_PATH).'main/messages/new_message.php?f=social">'.Display::return_icon('compose_message.png', get_lang('ComposeMessage'), array('hspace'=>'6','style'=>'float:left')).'<span class="'.($show=='messages_compose'?'social-menu-text-active':'social-menu-text4').'" >'.get_lang('ComposeMessage').'</span></a></li>';
echo '<li class="social-menu-sub-level"><a href="'.api_get_path(WEB_PATH).'main/messages/inbox.php?f=social">'.Display::return_icon('inbox.png', get_lang('Inbox'), array('hspace'=>'6')).'<span class="'.($show=='messages_inbox'?'social-menu-text-active':'social-menu-text4').'" >'.get_lang('Inbox').'</span></a></li>';
echo '<li class="social-menu-sub-level" style="background:none;padding:0px"><a href="'.api_get_path(WEB_PATH).'main/messages/outbox.php?f=social">'.Display::return_icon('outbox.png', get_lang('Outbox'), array('hspace'=>'6')).'<span class="'.($show=='messages_outbox'?'social-menu-text-active':'social-menu-text4').'" >'.get_lang('Outbox').'</span></a></li>';
echo '</ul></li>';*/
}
//Invitations
echo '<li><a href="'.api_get_path(WEB_PATH).'main/social/invitations.php">'.Display::return_icon('invitation.png',get_lang('Invitations'),array('hspace'=>'6')).'<span class="'.($show=='invitations'?'social-menu-text-active':'social-menu-text4').'" >'.get_lang('Invitations').$total_invitations.'</span></a></li>';
@ -688,7 +703,7 @@ class SocialManager extends UserManager {
$html_actions = '';
if ($user_id != api_get_user_id()) {
echo '<li><a href="'.api_get_path(WEB_PATH).'main/messages/send_message_to_userfriend.inc.php?height=300&width=610&user_friend='.$user_id.'&view=profile&view_panel=1" class="thickbox" title="'.get_lang('SendMessage').'">';
echo '<li><a href="'.api_get_path(WEB_PATH).'main/messages/send_message_to_userfriend.inc.php?height=300&width=550&user_friend='.$user_id.'&view=profile&view_panel=1" class="thickbox" title="'.get_lang('SendMessage').'">';
echo Display::return_icon('compose_message.png',get_lang('SendMessage')).'&nbsp;&nbsp;'.get_lang('SendMessage').'</a></li>';
}
@ -699,12 +714,11 @@ class SocialManager extends UserManager {
echo '<li><a href="'.api_get_path(WEB_PATH).'main/social/invitations.php">'.Display::return_icon('invitation.png',get_lang('YouAlreadySentAnInvitation')).'&nbsp;&nbsp;'.get_lang('YouAlreadySentAnInvitation').'</a></li>';
} else {
if (!$show_full_profile) {
echo '<li><a href="'.api_get_path(WEB_PATH).'main/messages/send_message_to_userfriend.inc.php?view_panel=2&height=260&width=610&user_friend='.$user_id.'" class="thickbox" title="'.get_lang('SendInvitation').'">'.Display :: return_icon('invitation.png', get_lang('SocialInvitationToFriends')).'&nbsp;'.get_lang('SendInvitation').'</a></li>';
echo '<li><a href="'.api_get_path(WEB_PATH).'main/messages/send_message_to_userfriend.inc.php?view_panel=2&height=260&width=550&user_friend='.$user_id.'" class="thickbox" title="'.get_lang('SendInvitation').'">'.Display :: return_icon('invitation.png', get_lang('SocialInvitationToFriends')).'&nbsp;'.get_lang('SendInvitation').'</a></li>';
}
}
echo '</ul></div>';
/*
// ---- My Agenda Items
$my_agenda_items = show_simple_personal_agenda($user_id);
@ -762,11 +776,8 @@ class SocialManager extends UserManager {
}
}
echo '</div>';
}
/**
* Displays a sortable table with the list of online users.
* @param array $user_list
@ -1002,4 +1013,4 @@ class SocialManager extends UserManager {
}
return $content;
}
}
}

27
main/link/link.php
Unescape View File

@ -15,7 +15,7 @@
* @author Patrick Cool, main author, completely rewritten
* @author René Haentjens, added CSV file import (October 2004)
* @package chamilo.link
* @todo improve organisation, tables should come from database library
* @todo improve organisation, tables should come from database library, use formvalidator
* @todo Needs serious rewriting here. This doesn't make sense
*/
@ -162,11 +162,7 @@ if (api_is_allowed_to_edit(null, true) && isset($_GET['action'])) {
echo '<div class="actions">';
echo '<a href="link.php?cidReq='.Security::remove_XSS($_GET['cidReq']).'&amp;urlview='.Security::remove_XSS($_GET['urlview']).'">'.Display::return_icon('back.png', get_lang('BackToLinksOverview'),'','32').'</a>';
echo '</div>';
if (api_get_setting('search_enabled') == 'true') {
if (!extension_loaded('xapian')) {
Display::display_error_message(get_lang('SearchXapianModuleNotInstalled'));
}
}
// Displaying the correct title and the form for adding a category or link. This is only shown when nothing
// has been submitted yet, hence !isset($submit_link)
if (($_GET['action'] == 'addlink' || $_GET['action'] == 'editlink') && empty($_POST['submitLink'])) {
@ -255,7 +251,7 @@ if (api_is_allowed_to_edit(null, true) && isset($_GET['action'])) {
<div class="label">
'.get_lang('AddTargetOfLinkOnHomepage').'
</div>
<div class="formw" >
<div class="formw">
<select name="target_link" id="target_link">';
$targets = array('_self'=>get_lang('LinkOpenSelf'),'_blank'=>get_lang('LinkOpenBlank'),'_parent'=>get_lang('LinkOpenParent'),'_top'=>get_lang('LinkOpenTop'));
foreach ($targets as $target_id => $target) {
@ -268,11 +264,11 @@ if (api_is_allowed_to_edit(null, true) && isset($_GET['action'])) {
echo ' </select>
</div>
</div>';
if (api_get_setting('search_enabled') == 'true') {
require_once api_get_path(LIBRARY_PATH).'specific_fields_manager.lib.php';
$specific_fields = get_specific_field_list();
echo ' <div class="row">
<div class="label">
'.get_lang('SearchFeatureDoIndexLink').'?
@ -282,8 +278,6 @@ if (api_is_allowed_to_edit(null, true) && isset($_GET['action'])) {
</div>';
foreach ($specific_fields as $specific_field) {
// Author : <input name="A" type="text" />
$default_values = '';
if ($_GET['action'] == 'editlink') {
$filter = array('course_code'=> "'". api_get_course_id() ."'", 'field_id' => $specific_field['id'], 'ref_id' => Security::remove_XSS($_GET['id']), 'tool_id' => '\''. TOOL_LINK .'\'');
@ -304,11 +298,10 @@ if (api_is_allowed_to_edit(null, true) && isset($_GET['action'])) {
<input name="%s" type="text" value="%s"/>
</div>
</div>';
echo sprintf($sf_textbox, $specific_field['name'], $specific_field['code'], $default_values);
}
}
}
echo ' <div class="row">
<div class="label">
</div>
@ -316,8 +309,9 @@ if (api_is_allowed_to_edit(null, true) && isset($_GET['action'])) {
<button class="save" type="Submit" name="submitLink" value="OK">'.get_lang('SaveLink').'</button>
</div>
</div>';
echo '</div>';
echo '</form>';
} elseif(($_GET['action'] == 'addcategory' || $_GET['action'] == 'editcategory') && !$submit_category) {
echo '<div class="row">';
if ($_GET['action'] == 'addcategory') {
@ -327,7 +321,7 @@ if (api_is_allowed_to_edit(null, true) && isset($_GET['action'])) {
echo '<div class="form_header">'.get_lang('CategoryMod').'</div>';
$my_cat_title = get_lang('CategoryMod');
}
echo "</div>\n\n";
echo "</div>";
echo '<form method="post" action="'.api_get_self().'?action='.Security::remove_XSS($_GET['action']).'&amp;urlview='.Security::remove_XSS($urlview).'">';
if ($_GET['action'] == 'editcategory') {
echo '<input type="hidden" name="id" value="'.$id.'" />';
@ -358,7 +352,6 @@ if (api_is_allowed_to_edit(null, true) && isset($_GET['action'])) {
<button class="save" type="submit" name="submitCategory">'.$my_cat_title.' </button>
</div>
</div>';
echo "</form>";
}
}

22
main/messages/inbox.php
Unescape View File

@ -122,10 +122,10 @@ Display::display_header('');
$social_parameter = '';
if ($_GET['f']=='social' || api_get_setting('allow_social_tool') == 'true') {
$social_parameter = '?f=social';
$social_parameter = '?f=social';
} else {
//comes from normal profile
//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>';
@ -156,13 +156,20 @@ echo '<div id="social-content">';
$id_content_right = 'social-content-right';
echo '<div id="social-content-left">';
//this include the social menu div
SocialManager::show_social_menu('messages_inbox');
SocialManager::show_social_menu('messages');
echo '</div>';
}
echo '<div id="'.$id_content_right.'">';
if (api_get_setting('allow_social_tool') == 'true'){
if (api_get_setting('allow_social_tool') == 'true') {
echo '<div class="social-box-container2">';
echo '<div class="actions">';
echo '<a href="'.api_get_path(WEB_PATH).'main/messages/new_message.php?f=social">'.Display::return_icon('compose_message.png', get_lang('ComposeMessage'), array(), 32).'</a>';
echo '<a href="'.api_get_path(WEB_PATH).'main/messages/outbox.php?f=social">'.Display::return_icon('outbox.png', get_lang('Outbox'), array(), 32).'</a>';
echo '</div>';
//echo '<div>'.Display::return_icon('content-post-group1.jpg',get_lang('Inbox')).'</div>';
//echo '<div id="div_content_table" class="social-box-content2">';
}
@ -180,10 +187,9 @@ echo '<div id="social-content">';
inbox_display();
}
if (api_get_setting('allow_social_tool') == 'true'){
echo '</div>';
//echo '</div>';
//echo '</div>';
}
}
echo '</div>';
echo '</div>';

46
main/messages/new_message.php
Unescape View File

@ -34,17 +34,15 @@ $nameTools = api_xml_http_response_encode(get_lang('Messages'));
$htmlHeadXtra[]='
<script language="javascript">
function validate(form,list) {
if(list.selectedIndex<0)
{
if(list.selectedIndex<0) {
alert("Please select someone to send the message to.")
return false
}
else
} else {
return true
}
}
</script>';
//jquery thickbox already called from main/inc/header.inc.php
$htmlHeadXtra[] = '<script src="'.api_get_path(WEB_LIBRARY_PATH).'javascript/tag/jquery.fcbkcomplete.js" type="text/javascript" language="javascript"></script>';
$htmlHeadXtra[] = '<link href="'.api_get_path(WEB_LIBRARY_PATH).'javascript/tag/style.css" rel="stylesheet" type="text/css" />';
@ -87,7 +85,7 @@ function add_image_form() {
id_elem1 = "filepath_"+counter_image;
id_elem1 = "\'"+id_elem1+"\'";
//document.getElementById("filepath_"+counter_image).innerHTML = "<input type=\"file\" name=\"attach_"+counter_image+"\" size=\"20\" />&nbsp;<a href=\"javascript:remove_image_form("+id_elem1+")\"><img src=\"'.api_get_path(WEB_CODE_PATH).'img/delete.gif\"></a>";
document.getElementById("filepath_"+counter_image).innerHTML = "<input type=\"file\" name=\"attach_"+counter_image+"\" size=\"28\" />&nbsp;<input type=\"text\" name=\"legend[]\" size=\"28\" /></a>";
document.getElementById("filepath_"+counter_image).innerHTML = "<input type=\"file\" name=\"attach_"+counter_image+"\" size=\"20\" />&nbsp;<input type=\"text\" name=\"legend[]\" size=\"20\" />";
if (filepaths.childNodes.length == 6) {
var link_attach = document.getElementById("link-more-attach");
if (link_attach) {
@ -108,9 +106,7 @@ div.row div.formw {
$nameTools = get_lang('ComposeMessage');
/*
FUNCTIONS
*/
/* FUNCTIONS */
/**
* Shows the compose area + a list of users to select from.
@ -211,8 +207,8 @@ function manage_form ($default, $select_from_user_list = null) {
$form->addElement('html','<div class="row"><div class="label">'.get_lang('FilesAttachment').'</div><div class="formw">
<span id="filepaths">
<div id="filepath_1">
<input type="file" name="attach_1" size="28" />
<input type="text" name="legend[]" size="28" />
<input type="file" name="attach_1" size="20" />
<input type="text" name="legend[]" size="20" />
</div></span></div></div>');
$form->addElement('html','<div class="row"><div class="formw"><span id="link-more-attach"><a href="javascript://" onclick="return add_image_form()">'.get_lang('AddOneMoreFile').'</a></span>&nbsp;('.sprintf(get_lang('MaximunFileSizeX'),format_file_size(api_get_setting('message_max_upload_filesize'))).')</div></div>');
}
@ -276,10 +272,8 @@ if ($_GET['f']=='social') {
Display::display_header('');
$group_id = intval($_REQUEST['group_id']);
if ($group_id != 0) {
echo '<div class=actions>';
echo '<a href="'.api_get_path(WEB_PATH).'main/social/groups.php?id='.$group_id.'">'.Display::return_icon('back.png',api_xml_http_response_encode(get_lang('ComposeMessage'))).api_xml_http_response_encode(get_lang('BackToGroup')).'</a>';
@ -287,7 +281,7 @@ if ($group_id != 0) {
echo '</div>';
} else {
if ($_GET['f']=='social') {
} else {
echo '<div class=actions>';
@ -298,13 +292,11 @@ if ($group_id != 0) {
echo '<a href="'.api_get_path(WEB_PATH).'main/messages/inbox.php">'.Display::return_icon('inbox.png').' '.get_lang('Messages').'</a>';
}
echo '<a href="'.api_get_path(WEB_PATH).'main/auth/profile.php?type=reduced">'.Display::return_icon('edit.gif', get_lang('EditNormalProfile')).'&nbsp;'.get_lang('EditNormalProfile').'</a>';
echo '</div>';
}
}
echo '<div id="social-content" >';
echo '<div id="social-content">';
$id_content_right = '';
//LEFT COLUMN
if (api_get_setting('allow_social_tool') != 'true') {
@ -319,17 +311,20 @@ echo '<div id="social-content" >';
} else {
require_once api_get_path(LIBRARY_PATH).'social.lib.php';
echo '<div id="social-content-left">';
//this include the social menu div
SocialManager::show_social_menu('messages_compose');
//this include the social menu div
SocialManager::show_social_menu('messages');
echo '</div>';
$id_content_right = 'social-content-right';
}
echo '<div id="'.$id_content_right.'">';
//MAIN CONTENT
if (api_get_setting('allow_social_tool') == 'true'){
echo '<div class="social-box-container2">';
echo '<div class="social-box-container2">';
echo '<div class="actions">';
echo '<a href="'.api_get_path(WEB_PATH).'main/messages/inbox.php?f=social">'.Display::return_icon('back.png', get_lang('Back'), array(), 32).'</a>';
echo '</div>';
//echo '<div>'.Display::return_icon('content-post-group1.jpg',get_lang('ComposeMessage')).'</div>';
//echo '<div id="div_content_table" class="social-box-content2">';
}
@ -376,12 +371,7 @@ echo '<div id="social-content" >';
}
}
echo '</div>';
echo '</div>';
/*
FOOTER
*/
Display::display_footer();
?>
/* FOOTER */
Display::display_footer();

25
main/messages/outbox.php
Unescape View File

@ -130,15 +130,16 @@ echo '<div id="social-content">';
$id_content_right = 'social-content-right';
echo '<div id="social-content-left">';
//this include the social menu div
SocialManager::show_social_menu('messages_outbox');
SocialManager::show_social_menu('messages');
echo '</div>';
}
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">';
if (api_get_setting('allow_social_tool') == 'true') {
echo '<div class="social-box-container2">';
echo '<div class="actions">';
echo '<a href="'.api_get_path(WEB_PATH).'main/messages/inbox.php?f=social">'.Display::return_icon('back.png', get_lang('Back'), array(), 32).'</a>';
echo '</div>';
}
//MAIN CONTENT
if ($_REQUEST['action']=='delete') {
@ -165,17 +166,11 @@ echo '<div id="social-content">';
outbox_display();
}
if (api_get_setting('allow_social_tool') == 'true'){
//echo '</div>';
echo '</div>';
//echo '</div>';
}
echo '</div>';
echo '</div>';
echo '</div>';
/*
FOOTER
*/
Display::display_footer();
?>
/* FOOTER */
Display::display_footer();

4
main/messages/send_message_to_userfriend.inc.php
Unescape View File

@ -39,8 +39,8 @@ if (isset($_REQUEST['user_friend']) ) {
<br /><span style="color:red">*</span><?php echo api_xml_http_response_encode(get_lang('Subject')); ?> :<br />
<input id="txt_subject_id" type="text" style="width:400px;"><br/>
<br /><?php echo api_xml_http_response_encode(get_lang('Message')); ?> :<br />
<textarea id="txt_area_invite" rows="3" cols="60"></textarea>
<div><span style="color:red">*</span><?php echo get_lang('FieldRequired') ?></div>
<textarea id="txt_area_invite" rows="3" cols="60"></textarea>
<br />
<br />
<button class="save" type="button" value="<?php echo api_xml_http_response_encode(get_lang('SendMessage')); ?>" onclick="action_database_panel('5','<?php echo $userfriend_id;?>')"><?php echo api_xml_http_response_encode(get_lang('SendMessage')) ?></button>
</div>

8
main/messages/view_message.php
Unescape View File

@ -8,7 +8,7 @@ $language_file = array('registration','messages','userInfo');
$cidReset= true;
require_once '../inc/global.inc.php';
api_block_anonymous_users();
if (api_get_setting('allow_message_tool')!='true'){
if (api_get_setting('allow_message_tool')!='true') {
api_not_allowed();
}
require_once api_get_path(LIBRARY_PATH).'message.lib.php';
@ -70,8 +70,7 @@ echo '<div id="social-content">';
require_once api_get_path(LIBRARY_PATH).'social.lib.php';
$id_content_right = 'social-content-right';
echo '<div id="social-content-left">';
//this include the social menu div
//this include the social menu div
SocialManager::show_social_menu($show_menu);
echo '</div>';
}
@ -91,11 +90,10 @@ echo '<div id="social-content">';
api_not_allowed();
}
if (api_get_setting('allow_social_tool') == 'true'){
//echo '</div>';
echo '</div>';
//echo '</div>';
}
echo '</div>';
echo '</div>';
/* FOOTER */

11
main/social/friends.php
Unescape View File

@ -79,17 +79,6 @@ function clear_form () {
$("div#div_info_user").html("");
}
function show_icon_edit(element_html) {
ident="#edit_image";
$(ident).show();
}
function hide_icon_edit(element_html) {
ident="#edit_image";
$(ident).hide();
}
</script>';
$interbreadcrumb[]= array ('url' =>'profile.php','name' => get_lang('Social'));

9
main/social/group_add.php
Unescape View File

@ -32,15 +32,6 @@ function text_longitud(){
textarea = document.forms[0].description.value;
}
}
function show_icon_edit(element_html) {
ident="#edit_image";
$(ident).show();
}
function hide_icon_edit(element_html) {
ident="#edit_image";
$(ident).hide();
}
</script>
<style>

9
main/social/group_edit.php
Unescape View File

@ -32,15 +32,6 @@ function textarea_maxlength(){
textarea = document.forms[0].description.value;
}
}
function show_icon_edit(element_html) {
ident="#edit_image";
$(ident).show();
}
function hide_icon_edit(element_html) {
ident="#edit_image";
$(ident).hide();
}
</script>
<style>

15
main/social/group_invitation.php
Unescape View File

@ -17,21 +17,6 @@ require_once '../inc/lib/xajax/xajax.inc.php';
api_block_anonymous_users();
//jquery thickbox already called from main/inc/header.inc.php
$htmlHeadXtra[] = '<script type="text/javascript">
function show_icon_edit(element_html) {
ident="#edit_image";
$(ident).show();
}
function hide_icon_edit(element_html) {
ident="#edit_image";
$(ident).hide();
}
</script>';
$xajax = new xajax();
//$xajax->debugOn();
$xajax -> registerFunction ('search_users');

15
main/social/group_members.php
Unescape View File

@ -12,21 +12,6 @@ require_once api_get_path(LIBRARY_PATH).'group_portal_manager.lib.php';
require_once api_get_path(LIBRARY_PATH).'usermanager.lib.php';
require_once api_get_path(LIBRARY_PATH).'social.lib.php';
//jquery thickbox already called from main/inc/header.inc.php
$htmlHeadXtra[] = '<script type="text/javascript">
function show_icon_edit(element_html) {
ident="#edit_image";
$(ident).show();
}
function hide_icon_edit(element_html) {
ident="#edit_image";
$(ident).hide();
}
</script>';
$this_section = SECTION_SOCIAL;
$interbreadcrumb[]= array ('url' =>'home.php','name' => get_lang('Social'));
$interbreadcrumb[] = array('url' => 'groups.php','name' => get_lang('Groups'));

15
main/social/group_waiting_list.php
Unescape View File

@ -11,21 +11,6 @@ require_once api_get_path(LIBRARY_PATH).'group_portal_manager.lib.php';
require_once api_get_path(LIBRARY_PATH).'usermanager.lib.php';
require_once api_get_path(LIBRARY_PATH).'social.lib.php';
//jquery thickbox already called from main/inc/header.inc.php
$htmlHeadXtra[] = '<script type="text/javascript">
function show_icon_edit(element_html) {
ident="#edit_image";
$(ident).show();
}
function hide_icon_edit(element_html) {
ident="#edit_image";
$(ident).hide();
}
</script>';
$this_section = SECTION_SOCIAL;
$interbreadcrumb[]= array ('url' =>'home.php','name' => get_lang('Social'));
$interbreadcrumb[]= array ('url' =>'groups.php','name' => get_lang('Groups'));

13
main/social/groups.php
Unescape View File

@ -117,21 +117,8 @@ jQuery(document).ready(function() {
}
});
function show_icon_edit(element_html) {
ident="#edit_image";
$(ident).show();
}
function hide_icon_edit(element_html) {
ident="#edit_image";
$(ident).hide();
}
</script>';
$allowed_views = array('mygroups','newest','pop');
$interbreadcrumb[]= array ('url' =>'home.php','name' => get_lang('Social'));

31
main/social/invitations.php
Unescape View File

@ -59,22 +59,10 @@ function register_friend(element_input) {
});
}
}
function show_icon_edit(element_html) {
ident="#edit_image";
$(ident).show();
}
function hide_icon_edit(element_html) {
ident="#edit_image";
$(ident).hide();
}
</script>';
api_block_anonymous_users();
api_block_anonymous_users();
Display :: display_header($tool_name, 'Groups');
// easy links
@ -112,14 +100,12 @@ echo '<div id="social-content">';
echo '</div>';
echo '<div id="social-content-right">';
if (!empty($show_message)) {
Display :: display_normal_message($show_message);
}
echo '<div id="id_response" align="center">&nbsp;</div>';
echo '<div id="id_response" align="center"></div>';
$list_get_invitation=array();
$user_id = api_get_user_id();
@ -137,7 +123,7 @@ echo '<div id="social-content">';
if ($number_loop != 0) {
echo '<h2>'.get_lang('InvitationReceived').'</h2>';
foreach ($list_get_invitation as $invitation) {
foreach ($list_get_invitation as $invitation) {
$sender_user_id = $invitation['user_sender_id']
?>
<div id="<?php echo 'id_'.$sender_user_id ?>" class="invitation_confirm">
@ -177,13 +163,12 @@ echo '<div id="social-content">';
</div>
<?php
}
}
echo '<div class="clear"></div>';
}
if (count($list_get_invitation_sent) > 0 ) {
echo '<h2>'.get_lang('InvitationSent').'</h2>';
foreach ($list_get_invitation_sent as $invitation) {
foreach ($list_get_invitation_sent as $invitation) {
$sender_user_id = $invitation['user_receiver_id'];?>
<div id="<?php echo 'id_'.$sender_user_id ?>" class="invitation_confirm">
<?php
@ -237,7 +222,7 @@ 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>';
echo '</div>';
echo '</div>';
Display::display_footer();

9
main/social/myfiles.php
Unescape View File

@ -58,16 +58,7 @@ function register_friend(element_input) {
});
}
}
function show_icon_edit(element_html) {
ident="#edit_image";
$(ident).show();
}
function hide_icon_edit(element_html) {
ident="#edit_image";
$(ident).hide();
}
</script>';
api_block_anonymous_users();

11
main/social/profile.php
Unescape View File

@ -176,17 +176,6 @@ function register_friend(element_input) {
}
}
function show_icon_edit(element_html) {
ident="#edit_image";
$(ident).show();
}
function hide_icon_edit(element_html) {
ident="#edit_image";
$(ident).hide();
}
</script>';
$nametool = get_lang('Social');
if (isset($_GET['shared'])) {

16
main/social/search.php
Unescape View File

@ -19,22 +19,6 @@ $this_section = SECTION_SOCIAL;
$tool_name = get_lang('Search');
$interbreadcrumb[]= array ('url' =>'profile.php','name' => get_lang('Social'));
//jquery thickbox already called from main/inc/header.inc.php
$htmlHeadXtra[] = '<script type="text/javascript">
function show_icon_edit(element_html) {
ident="#edit_image";
$(ident).show();
}
function hide_icon_edit(element_html) {
ident="#edit_image";
$(ident).hide();
}
</script>';
Display :: display_header($tool_name);
echo '<div id="social-content">';

Write Preview
Loading…
Cancel
Save