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

[svn r21554] style changes - improvements in profile and message tool - (partial FS#4350)

Browse Source
skala
Isaac Flores 17 years ago
parent c7ba37fd45
commit 82f54d182f
3 changed files with 14 additions and 15 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. 21
      main/auth/profile.php
  2. 6
      main/messages/new_message.php
  3. 2
      main/social/profile.php

21
main/auth/profile.php
Unescape View File

@ -1,4 +1,4 @@
<?php // $Id: profile.php 21534 2009-06-20 17:08:24Z iflorespaz $
<?php // $Id: profile.php 21554 2009-06-21 20:58:47Z iflorespaz $
/* For licensing terms, see /dokeos_license.txt */
/**
==============================================================================
@ -16,14 +16,14 @@
// name of the language file that needs to be included
$language_file = array('registration','messages','userInfo');
$cidReset = true;
require ('../inc/global.inc.php');
require_once '../inc/global.inc.php';
if (!isset($_GET['show'])) {
if (api_get_setting('allow_social_tool')=='true' || api_get_setting('allow_message_tool')=='true') {
header('Location:../social/index.php');
exit;
}
}
require_once (api_get_path(LIBRARY_PATH).'formvalidator/FormValidator.class.php');
require_once api_get_path(LIBRARY_PATH).'formvalidator/FormValidator.class.php';
$this_section = SECTION_MYPROFILE;
$_SESSION['this_section']=$this_section;
api_block_anonymous_users();
@ -93,18 +93,18 @@ if(!empty($_GET['cp'])) {
Configuration file
-----------------------------------------------------------
*/
require_once (api_get_path(CONFIGURATION_PATH).'profile.conf.php');
require_once api_get_path(CONFIGURATION_PATH).'profile.conf.php';
/*
-----------------------------------------------------------
Libraries
-----------------------------------------------------------
*/
require_once (api_get_path(LIBRARY_PATH).'fileManage.lib.php');
require_once (api_get_path(LIBRARY_PATH).'fileUpload.lib.php');
require_once (api_get_path(LIBRARY_PATH).'image.lib.php');
require_once (api_get_path(LIBRARY_PATH).'usermanager.lib.php');
require_once (api_get_path(LIBRARY_PATH).'social.lib.php');
require_once api_get_path(LIBRARY_PATH).'fileManage.lib.php';
require_once api_get_path(LIBRARY_PATH).'fileUpload.lib.php';
require_once api_get_path(LIBRARY_PATH).'image.lib.php';
require_once api_get_path(LIBRARY_PATH).'usermanager.lib.php';
require_once api_get_path(LIBRARY_PATH).'social.lib.php';
if (is_profile_editable())
$tool_name = get_lang('ModifProfile');
@ -246,7 +246,6 @@ $form->addElement('select_language', 'language', get_lang('Language'));
if (api_get_setting('profile', 'language') !== 'true')
$form->freeze('language');
// EXTENDED PROFILE this make the page very slow!
if (api_get_setting('extended_profile') == 'true') {
if ($_GET['type']=='extended') {
@ -812,7 +811,7 @@ $big_image_width= $big_image_size[0];
$big_image_height= $big_image_size[1];
$url_big_image = $big_image.'?rnd='.time();
echo '<div id="image-message-container" style="float:right;display:inline;position:absolute;padding:5px;width:250px;" >';
echo '<div id="image-message-container" style="float:right;display:inline;position:absolute;padding:3px;width:250px;" >';
if ($image=='unknown.jpg') {
echo '<img '.$img_attributes.' />';
} else {

6
main/messages/new_message.php
Unescape View File

@ -1,11 +1,11 @@
<?php // $Id: new_message.php 20962 2009-05-25 03:15:53Z iflorespaz $
<?php // $Id: new_message.php 21554 2009-06-21 20:58:47Z iflorespaz $
/*
==============================================================================
Dokeos - elearning and course management software
Copyright (c) 2009 Dokeos SPRL
Copyright (c) 2009 Julio Montoya Armas <gugli100@gmail.com>
Copyright (c) Facultad de Matematicas, UADY (M<EFBFBD>xico)
Copyright (c) Facultad de Matematicas, UADY (México)
Copyright (c) Evie, Free University of Brussels (Belgium)
Copyright (c) 2009 Isaac Flores Paz <isaac.flores.paz@gmail.com>
For a full list of contributors, see "credits.txt".
@ -101,7 +101,7 @@ $(document).ready(function (){
</script>';
$nameTools = api_xml_http_response_encode(get_lang('ComposeMessage'));
$fck_attribute['Height'] = "150";
$fck_attribute['Height'] = "250";
$fck_attribute['Width'] = "95%";
$fck_attribute['ToolbarSet'] = "Profil";
$fck_attribute['Config']['ToolbarStartExpanded']='false';

2
main/social/profile.php
Unescape View File

@ -483,7 +483,7 @@ echo '<div id="social-profile-wrapper">';
else
$friend_html.= '<div style="float:left;">'.$friends_count.' '.get_lang('Friends').'</div>';
if (api_get_user_id() == $user_id)
$friend_html.= '<div style="float:right; padding-left:280px;"><a href="index.php?#remote-tab-6">'.get_lang('SeeAll').'</a></div>';
$friend_html.= '<div style="float:right;"><a href="index.php?#remote-tab-6">'.get_lang('SeeAll').'</a></div>';
$friend_html.= '</div>'; // close div friend-header
for ($k=0;$k<$loop_friends;$k++) {

Write Preview
Loading…
Cancel
Save