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

Merge

Browse Source
skala
Juan Carlos Raña 14 years ago
parent e2e6283edc 8988c879e2
commit b887b1d51a
7 changed files with 39 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. 8
      main/calendar/agenda.inc.php
  2. 11
      main/calendar/myagenda.inc.php
  3. 24
      main/coursecopy/classes/CourseSelectForm.class.php
  4. 5
      main/coursecopy/copy_course.php
  5. 2
      main/coursecopy/create_backup.php
  6. 9
      main/css/base.css
  7. 4
      main/install/install.lib.php

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

@ -282,7 +282,7 @@ function get_calendar_items($select_month, $select_year, $select_day = false) {
if (!empty($row['start_date']) && $row['start_date'] != '0000-00-00 00:00:00')
$row['start_date_tms'] = api_strtotime($row['start_date']);
if (!empty($row['end_date']) && $row['end_date'] != '0000-00-00 00:00:00')
$row['end_date_tms'] = api_strtotime($row['end_date']);
$row['end_date_tms'] = api_strtotime($row['end_date']);
$my_events[] = $row;
$avoid_doubles[] = $row['id'];
}
@ -514,8 +514,8 @@ function display_monthcalendar($month, $year, $agenda_items) {
$subtitle = Display::return_icon('view_remove.png', get_lang('GlobalEvent'), array(), 22);
break;
case 'course':
$bg_color = '#CAFFAA';
$subtitle = Display::return_icon('course.png', get_lang('Course'), array(), 22);
$bg_color = '#CAFFAA';
$subtitle = Display::url(Display::return_icon('course.png', $value['course_name'].' '.get_lang('Course'), array(), 22), $value['url']);
break;
default:
//$time = '<i>'.$start_time.'</i>&nbsp;-&nbsp;<i>'.$end_time.'&nbsp;</i>';
@ -525,7 +525,7 @@ function display_monthcalendar($month, $year, $agenda_items) {
$dayheader.= '<div class="rounded_div_agenda" style="background-color:'.$bg_color.';">';
$value['title'] = Display::tag('strong', $value['title']);
$dayheader .= $time.' '.$subtitle.' '.$value['title'];
$dayheader .= $time.' '.Display::div($subtitle,array('style'=>'float:right')).' '.Display::div($value['title']);
$dayheader .= '</div>';
}

11
main/calendar/myagenda.inc.php
Unescape View File

@ -107,9 +107,10 @@ function get_myagendaitems($courses_dbs, $month, $year) {
$agendaday = date("j",strtotime($item['start_date']));
$url = api_get_path(WEB_CODE_PATH)."calendar/agenda.php?cidReq=".urlencode($array_course_info["code"])."&day=$agendaday&month=$month&year=$year#$agendaday";
$url = Display::url($array_course_info["title"], $url);
//$url = Display::url($array_course_info["title"], $url);
$item['url'] = $url;
$item['url'] = $url;
$item['course_name'] = $array_course_info['title'];
$item['calendar_type'] = 'course';
$my_list[$agendaday][] = $item;
/*
@ -226,8 +227,8 @@ function display_mymonthcalendar($agendaitems, $month, $year, $weekdaynames=arra
$subtitle = Display::return_icon('view_remove.png', get_lang('GlobalEvent'), array(), 22);
break;
case 'course':
$bg_color = '#CAFFAA';
$subtitle = Display::return_icon('course.png', get_lang('Course'), array(), 22).' '.$value['url'];
$bg_color = '#CAFFAA';
$subtitle = Display::url(Display::return_icon('course.png', $value['course_name'].' '.get_lang('Course'), array(), 22), $value['url']);
break;
default:
//$time = '<i>'.$start_time.'</i>&nbsp;-&nbsp;<i>'.$end_time.'&nbsp;</i>';
@ -236,7 +237,7 @@ function display_mymonthcalendar($agendaitems, $month, $year, $weekdaynames=arra
$result = '<div class="rounded_div_agenda" style="background-color:'.$bg_color.';">';
$value['title'] = Display::tag('strong', $value['title']);
$result .= $time.' '.$subtitle.' '.$value['title'];
$result .= $time.' '.Display::div($subtitle,array('style'=>'float:right')).' '.Display::div($value['title']);
$result .= '</div>';
echo $result;
}

24
main/coursecopy/classes/CourseSelectForm.class.php
Unescape View File

@ -98,9 +98,8 @@ class CourseSelectForm
echo '<input type="hidden" name="destination_session" value="'.$hidden_fields['destination_session'].'"/>';
echo '<input type="hidden" name="origin_session" value="'.$hidden_fields['origin_session'].'"/>';
}
foreach ($course->resources as $type => $resources) {
if (count($resources) > 0) {
if (count($resources) > 0) {
switch ($type) {
case RESOURCE_LINKCATEGORY :
case RESOURCE_FORUMCATEGORY :
@ -109,16 +108,25 @@ class CourseSelectForm
case RESOURCE_QUIZQUESTION:
case RESOURCE_SURVEYQUESTION:
case RESOURCE_SURVEYINVITATION:
case RESOURCE_SCORM:
break;
default :
echo '<img id="img_'.$type.'" src="../img/1.gif" onclick="javascript: exp('."'$type'".');" />';
echo '<b onclick="javascript:exp('."'$type'".');" >'.$resource_titles[$type].'</b><br />';
case RESOURCE_SCORM:
break;
default :
echo '<img id="img_'.$type.'" src="../img/1.gif" onclick="javascript:exp('."'$type'".');" />&nbsp;';
echo '<b onclick="javascript:exp('."'$type'".');" >'.$resource_titles[$type].'</b><br />';
echo '<div id="div_'.$type.'">';
if ($type == RESOURCE_LEARNPATH) {
Display::display_warning_message(get_lang('ToExportLearnpathWithQuizYouHaveToSelectQuiz'));
Display::display_warning_message(get_lang('IfYourLPsHaveAudioFilesIncludedYouShouldSelectThemFromTheDocuments'));
}
if ($type == RESOURCE_DOCUMENT) {
if (api_get_setting('show_glossary_in_documents') != 'none') {
Display::display_warning_message(get_lang('ToExportDocumentsWithGlossaryYouHaveToSelectGlossary'));
}
}
echo '<blockquote>';
echo "[<a href=\"javascript: void(0);\" onclick=\"javascript: setCheckbox('$type',true);\" >".get_lang('All')."</a> | <a href=\"javascript: void(0);\" onclick=\"javascript:setCheckbox('$type',false);\" >".get_lang('None')."</a>]";
echo '<br />';
foreach ($resources as $id => $resource) {
echo '<input type="checkbox" name="resource['.$type.']['.$id.']" id="resource['.$type.']['.$id.']" />';
echo ' <label for="resource['.$type.']['.$id.']">';

5
main/coursecopy/copy_course.php
Unescape View File

@ -49,11 +49,6 @@ if ((isset($_POST['action']) && $_POST['action'] == 'course_select_form') || (is
$cr->restore($_POST['destination_course']);
Display::display_normal_message(get_lang('CopyFinished'));
} elseif (isset ($_POST['copy_option']) && $_POST['copy_option'] == 'select_items') {
// Else, if a CourseSelectForm is requested, show it
Display::display_normal_message(get_lang('ToExportLearnpathWithQuizYouHaveToSelectQuiz'));
if (api_get_setting('show_glossary_in_documents') != 'none') {
Display::display_normal_message(get_lang('ToExportDocumentsWithGlossaryYouHaveToSelectGlossary'));
}
$cb = new CourseBuilder();
$course = $cb->build();
//echo get_lang('SelectItemsToCopy');

2
main/coursecopy/create_backup.php
Unescape View File

@ -70,7 +70,7 @@ if ((isset($_POST['action']) && $_POST['action'] == 'course_select_form') || (is
} elseif (isset($_POST['backup_option']) && $_POST['backup_option'] == 'select_items') {
$cb = new CourseBuilder('partial');
$course = $cb->build();
Display::display_normal_message(get_lang('ToExportLearnpathWithQuizYouHaveToSelectQuiz'));
CourseSelectForm :: display_form($course);
} else {
$cb = new CourseBuilder();

9
main/css/base.css
Unescape View File

@ -354,6 +354,8 @@ button:hover {
padding: 6px 0px 6px 5px ;
}
/* New LP add item */
div.lp_resource {
/*background:#FAFAFA;
border:1px solid #ccc; */
@ -386,7 +388,6 @@ div.lp_resource {
margin:5px;
}
div.lp_tree {
height: 100%;
overflow: auto;
@ -401,3 +402,9 @@ table.lp_build td.tree {
#resource_tab {
min-height:380px;
}
/* Calendar */
#agenda_list .days_week {
height: 100px;
}

4
main/install/install.lib.php
Unescape View File

@ -1020,6 +1020,10 @@ function display_requirements($installType, $badUpdatePath, $updatePath = '', $u
echo '<strong>'.get_lang('ReadThoroughly').'</strong><br />';
echo get_lang('MoreDetails').' <a href="../../documentation/installation_guide.html" target="_blank">'.get_lang('ReadTheInstallGuide').'</a>.<br />'."\n";
if ($installType == 'update') {
echo get_lang('IfYouPlanToUpgradeFromOlderVersionYouMightWantToHaveAlookAtTheChangelog').'<br />'."\n";
}
// SERVER REQUIREMENTS
echo '<div class="RequirementHeading"><h1>'.get_lang('ServerRequirements').'</h1>';

Write Preview
Loading…
Cancel
Save