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 style fixes

Browse Source
skala
Julio Montoya 14 years ago
parent 0bfb10868d
commit 9c3dd44482
4 changed files with 117 additions and 77 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. 11
      main/css/base.css
  2. 55
      main/messages/send_message_to_userfriend.inc.php
  3. 126
      main/session/index.php
  4. 2
      main/social/group_invitation.php

11
main/css/base.css
Unescape View File

@ -3670,3 +3670,14 @@ form div.error input, form div.error textarea {
height:15px;
}
.tag {
background-color: #D3E6EF;
border-radius: 3px 3px 3px 3px;
display: inline-block;
float: left;
font-size: 12px;
font-weight: 700;
margin: 0 10px 5px 0;
padding: 0.4em 0.6em;
}

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

@ -27,23 +27,47 @@ if (isset($_REQUEST['user_friend']) ) {
}
?>
<div id="id_content_panel_init">
<dl>
<?php
if (api_get_setting('allow_message_tool')=='true') {
if ($panel == 1) {
if ($panel == 1) {
//normal message
$user_info=api_get_user_info($userfriend_id); ?>
<div id="display_response_id" style="height:200px;width:400px">
<?php echo api_xml_http_response_encode(get_lang('To')); ?> :&nbsp;&nbsp;<?php echo api_xml_http_response_encode(api_get_person_name($user_info['firstName'], $user_info['lastName'])); ?>
<br />
<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="5" cols="55"></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>
$user_info=api_get_user_info($userfriend_id); ?>
<div id="display_response_id" style="height:200px;width:400px">
<div class="row">
<div class="label">
<?php echo api_xml_http_response_encode(get_lang('To')); ?>:
</div>
<div class="formw">
<div class="tag">
<?php echo api_xml_http_response_encode(api_get_person_name($user_info['firstName'], $user_info['lastName'])); ?>
</div>
</div>
</div>
<div class="row">
<div class="label">
<span style="color:red"> * </span><?php echo api_xml_http_response_encode(get_lang('Subject')); ?> :
</div>
<div class="formw">
<input id="txt_subject_id" type="text" style="width:400px;">
</div>
</div>
<div class="row">
<div class="label">
<?php echo api_xml_http_response_encode(get_lang('Message')); ?> :
</div>
<div class="formw">
<textarea id="txt_area_invite" rows="5" cols="55"></textarea>
</div>
</div>
<div class="row">
<div class="label">
</div>
<div class="formw">
<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>
</div>
</div>
<?php
} else {
// friend invitation message
@ -56,5 +80,4 @@ if (api_get_setting('allow_message_tool')=='true') {
</div>
<?php }
} ?>
</dl>
</div>
</div>

126
main/session/index.php
Unescape View File

@ -25,8 +25,6 @@ api_block_anonymous_users(); // Only users who are logged in can proceed.
$this_section = SECTION_COURSES;
$htmlHeadXtra[] = api_get_jquery_ui_js(true);
Display::display_header(get_lang('Session'));
if (empty($_GET['session_id'])) {
api_not_allowed();
}
@ -40,6 +38,71 @@ $session_info = SessionManager::fetch($session_id);
$session_list = SessionManager::get_sessions_by_coach(api_get_user_id());
$course_list = SessionManager::get_course_list_by_session_id($session_id);
//Getting all sessions where I'm subscribed
$new_session_list = UserManager::get_personal_session_course_list(api_get_user_id());
$my_session_list = array();
$final_array = array();
if (!empty($new_session_list)) {
foreach($new_session_list as $item) {
$my_session_id = isset($item['id_session']) ? $item['id_session'] : null;
if (isset($my_session_id) && !in_array($my_session_id, $my_session_list) && $session_id == $my_session_id) {
$final_array[$my_session_id]['name'] = $item['session_name'];
//Get all courses by session where I'm subscribed
$my_course_list = UserManager::get_courses_list_by_session(api_get_user_id(), $my_session_id);
foreach ($my_course_list as $my_course) {
$course = array();
$course_info = api_get_course_info($my_course['code']);
//Getting all exercises from the current course
$exercise_list = get_all_exercises($course_info, $my_session_id);
//Exercises we skip
/*if (empty($exercise_list)) {
continue;
} */
//$exercise_course_list = array();
$course['name'] = $course_info['name'];
$course['id'] = $course_info['real_id'];
if (!empty($exercise_list)) {
foreach($exercise_list as $exercise_item) {
//Loading the exercise
$exercise = new Exercise($course_info['real_id']);
$exercise->read($exercise_item['id']);
//$exercise_course_list[$exercise_item['id']] = $exercise;
//Reading all Exercise results by user, exercise_id, code, and session
$user_results = get_exercise_results_by_user(api_get_user_id(), $exercise_item['id'], $my_course['code'], $my_session_id);
$course['exercises'][$exercise_item['id']]['data']['exercise_data'] = $exercise;
$course['exercises'][$exercise_item['id']]['data']['results'] = $user_results;
}
$final_array[$my_session_id]['data'][$my_course['code']] = $course;
}
}
}
$my_session_list[] = $my_session_id;
}
}
//echo '<pre>';print_r($final_array);
//If the requested session does not exist in my list we stop the script
if (!api_is_platform_admin()) {
if (!in_array($session_id, $my_session_list)) {
api_not_allowed();
}
}
//If session is not active we stop de script
if (!api_is_allowed_to_session_edit()) {
api_not_allowed();
}
Display::display_header(get_lang('Session'));
$session_select = array();
foreach ($session_list as $item) {
$session_select[$item['id']] = $item['name'];
@ -69,64 +132,7 @@ if (!empty($course_list)) {
}
}*/
//Getting all sessions where I'm subscribed
$new_session_list = UserManager::get_personal_session_course_list(api_get_user_id());
$my_session_list = array();
$final_array = array();
if (!empty($new_session_list)) {
foreach($new_session_list as $item) {
$my_session_id = isset($item['id_session']) ? $item['id_session'] : null;
if (isset($my_session_id) && !in_array($my_session_id, $my_session_list) && $session_id == $my_session_id) {
$final_array[$my_session_id]['name'] = $item['session_name'];
//Get all courses by session where I'm subscribed
$my_course_list = UserManager::get_courses_list_by_session(api_get_user_id(), $my_session_id);
foreach ($my_course_list as $my_course) {
$course = array();
$course_info = api_get_course_info($my_course['code']);
//Getting all exercises from the current course
$exercise_list = get_all_exercises($course_info, $my_session_id);
//Exercises we skip
/*if (empty($exercise_list)) {
continue;
} */
//$exercise_course_list = array();
$course['name'] = $course_info['name'];
$course['id'] = $course_info['real_id'];
if (!empty($exercise_list)) {
foreach($exercise_list as $exercise_item) {
//Loading the exercise
$exercise = new Exercise($course_info['real_id']);
$exercise->read($exercise_item['id']);
//$exercise_course_list[$exercise_item['id']] = $exercise;
//Reading all Exercise results by user, exercise_id, code, and session
$user_results = get_exercise_results_by_user(api_get_user_id(), $exercise_item['id'], $my_course['code'], $my_session_id);
$course['exercises'][$exercise_item['id']]['data']['exercise_data'] = $exercise;
$course['exercises'][$exercise_item['id']]['data']['results'] = $user_results;
}
$final_array[$my_session_id]['data'][$my_course['code']] = $course;
}
}
}
$my_session_list[] = $my_session_id;
}
}
//echo '<pre>';print_r($final_array);
//If the requested session does not exist in my list we stop the script
if (!api_is_platform_admin()) {
if (!in_array($session_id, $my_session_list)) {
api_not_allowed();
}
}
//If session is not active we stop de script
if (!api_is_allowed_to_session_edit()) {
api_not_allowed();
}
//Final data to be show
$my_real_array = $new_exercises = array();
@ -219,7 +225,7 @@ if (!empty($new_exercises)) {
}
$back_url = '';
if (!empty($course_id)) {
$back_url = Display::url(Display::return_icon('back.png',get_lang('back.png')), api_get_path(WEB_CODE_PATH).'session/?session_id='.$session_id);
//$back_url = Display::url(Display::return_icon('back.png',get_lang('back.png')), api_get_path(WEB_CODE_PATH).'session/?session_id='.$session_id);
}
$start = $end = $start_only = $end_only ='';

2
main/social/group_invitation.php
Unescape View File

@ -319,7 +319,7 @@ if ($add_type == 'multiple') {
echo '</div>';
echo '<div id="social-content-right">';
echo '<h1><a href="groups.php?id='.$group_id.'">'.$group_info['name'].'</a></h1>';
echo '<h2>'.Security::remove_XSS($group_info['name'], STUDENT, true).'</h2>';
if (count($nosessionUsersList) == 0) {
$friends = SocialManager::get_friends(api_get_user_id());

Write Preview
Loading…
Cancel
Save