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 corrections

Browse Source
skala
Julio Montoya 14 years ago
parent a941d7caa9
commit 656e69dd90
6 changed files with 18 additions and 49 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. 8
      main/calendar/agenda.lib.php
  2. 1
      main/exercice/admin.php
  3. 2
      main/exercice/exercise_submit.php
  4. 35
      main/inc/lib/group_portal_manager.lib.php
  5. 18
      main/inc/lib/social.lib.php
  6. 3
      main/social/home.php

8
main/calendar/agenda.lib.php
Unescape View File

@ -8,7 +8,7 @@ class Agenda {
$this->events = array();
$this->event_platform_color = 'red';//red
$this->event_course_color = '#6B8E23'; //green
$this->event_course_color = '#458B00'; //green
$this->event_group_color = '#A0522D'; //siena
$this->event_session_color = '#000080'; // blue
$this->event_personal_color = 'steel blue'; //steel blue
@ -33,8 +33,7 @@ class Agenda {
$my_course_list = CourseManager::get_courses_list_by_user_id(api_get_user_id(), true);
foreach($my_course_list as $course_item) {
$this->get_course_events($start, $end, $course_item);
}
}
if (!empty($this->events)) {
return json_encode($this->events);
@ -50,8 +49,7 @@ class Agenda {
//$table_agenda = Database::get_course_table ( TABLE_AGENDA );
switch($type) {
case 'personal':
$personal_event = $this->get_personal_event($id);
$personal_event = $this->get_personal_event($id);
if (!empty($personal_event)) {
$sql = "UPDATE $this->tbl_personal_agenda SET date = DATE_ADD(date,INTERVAL $delta MINUTE), enddate = DATE_ADD(enddate,INTERVAL $delta MINUTE)
WHERE id=".intval($id);

1
main/exercice/admin.php
Unescape View File

@ -195,7 +195,6 @@ if ($editQuestion || $newQuestion || $modifyQuestion || $modifyAnswers) {
if ($editQuestion) {
// question not found
if (!$objQuestion = Question::read($editQuestion)) {
//die(get_lang('QuestionNotFound'));
api_not_allowed();
}
// saves the object into the session

2
main/exercice/exercise_submit.php
Unescape View File

@ -521,7 +521,7 @@ if ($question_count != 0) {
}
}
} else {
$error = get_lang('QuestionNotFound');
$error = get_lang('ThereAreNoQuestionsForThisExercise');
}
if (!empty ($_GET['gradebook']) && $_GET['gradebook'] == 'view') {

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

@ -957,40 +957,11 @@ class GroupPortalManager {
}
if (!empty($links)) {
echo '<div align="center" class="social-menu-title"><span class="social-menu-text1">'.cut($group_info['name'], GROUP_TITLE_LENGTH, true).'</span></div>';
//echo '<div align="center" class="social-menu-title"><span class="social-menu-text1">'.cut($group_info['name'], GROUP_TITLE_LENGTH, true).'</span></div>';
//echo Display::div(get_lang('Actions') ,array('class' => 'social_menu_option'));
echo '<ul class="social-menu-groups">';
echo $links;
echo '</ul>';
}
/*
// my other groups
if (count($groups_by_user) > 1) {
echo '<div align="center" class="social-menu-title"><span class="social-menu-text1">'.get_lang('MyOtherGroups').'</span></div>';
echo '<div align="center">';
$min_count_groups = 4;
$i = 1;
$more_link = false;
foreach($groups_by_user as $group) {
if ($group['id'] == $group_id) continue;
if ($i > $min_count_groups) {
$more_link = true;
break;
}
$picture = GroupPortalManager::get_picture_group($group['id'], $group['picture_uri'],80);
echo '<a href="groups.php?id='.$group['id'].'">';
echo '<img height="44" border="2" align="middle" width="44" vspace="10" class="social-groups-image" src="'.$picture['file'].'"/>';
echo '<div>'.cut($group['name'],50,true).'</div></a>';
$i++;
}
if ($more_link) {
//More link
echo '<div class="mygroups_more" style="margin-top:20px;"><a href="groups.php?view=mygroups">'.get_lang('SeeMore').'</a></div>';
}
echo '</div>';
}
*/
}
}
?>
}

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

@ -628,11 +628,12 @@ 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">';
echo '<span class="social-menu-text1">'.get_lang('Menu').'</span>';
echo '</div>';
//echo Display::div(get_lang('Actions') ,array('class' => 'social_menu_option'));
/*echo '<div align="center" class="social-menu-title">';
echo '<span>'.get_lang('Optoi').'</span>';
echo '</div>';*/
echo '<div><ul>';
echo '<div class="social_menu_items"><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>';
@ -659,9 +660,8 @@ class SocialManager extends UserManager {
}
if ($show == 'shared_profile') {
echo '<div align="center" class="social-menu-title" ><span class="social-menu-text1">'.get_lang('Menu').'</span></div>';
echo '<div>
//echo '<div align="center" class="social-menu-title" ><span class="social-menu-text1">'.get_lang('Menu').'</span></div>';
echo '<div class="social_menu_items">
<ul>';
// My own profile
@ -745,8 +745,8 @@ class SocialManager extends UserManager {
}
}
if (!empty($announcements)) {
echo '<div align="center" class="social-menu-title" ><span class="social-menu-text1">'.get_lang('ToolAnnouncement').'</span></div>';
echo '<div>';
//echo '<div align="center" class="social-menu-title" ><span class="social-menu-text1">'.get_lang('ToolAnnouncement').'</span></div>';
echo '<div class="social_menu_items">';
echo '<ul>';
foreach ($announcements as $announcement) {
echo $announcement;

3
main/social/home.php
Unescape View File

@ -79,7 +79,8 @@ echo '<div id="social-content">';
echo '</div>';
echo '<div id="social-content-right">';
echo '<div class="social-box-main1">';
echo '<div class="rounded_div" style="width:280px">';
echo '<div class="social_user_information" style="width:280px">';
echo '<div class="social-groups-home-title">'.get_lang('ContactInformation').'</div>';
// information current user
echo '<div><p><strong>'.get_lang('Name').'</strong><br /><span class="social-groups-text4">'.api_get_person_name($user_info['firstname'], $user_info['lastname']).'</span></p></div>

Write Preview
Loading…
Cancel
Save