diff --git a/main/admin/calendar_view.php b/main/admin/calendar_view.php index 05d4c4a7e0..b2e7b6863d 100644 --- a/main/admin/calendar_view.php +++ b/main/admin/calendar_view.php @@ -28,9 +28,7 @@ $MonthsLong = api_get_months_long(); Calendar diff --git a/main/admin/group_edit.php b/main/admin/group_edit.php index f3ab2b5a58..3fbb7245ab 100644 --- a/main/admin/group_edit.php +++ b/main/admin/group_edit.php @@ -138,7 +138,7 @@ Display::display_header($tool_name); $image_path = GroupPortalManager::get_group_picture_path_by_id($group_id, 'web'); $image_dir = $image_path['dir']; $image = $image_path['file']; -$image_file = ($image != '' ? $image_dir.$image : api_get_path(WEB_CODE_PATH).'img/unknown_group.jpg'); +$image_file = ($image != '' ? $image_dir.$image : api_get_path(WEB_IMG_PATH).'unknown_group.jpg'); $image_size = api_getimagesize($image_file); $img_attributes = 'src="'.$image_file.'?rand='.time().'" ' diff --git a/main/admin/languages.php b/main/admin/languages.php index a3a514e46d..322b2f20c9 100644 --- a/main/admin/languages.php +++ b/main/admin/languages.php @@ -81,9 +81,6 @@ $htmlHeadXtra[] = ' > diff --git a/main/cron/img/list_used_img.php b/main/cron/img/list_used_img.php index 33d0413a31..5c9c508f9b 100644 --- a/main/cron/img/list_used_img.php +++ b/main/cron/img/list_used_img.php @@ -8,7 +8,7 @@ */ if (PHP_SAPI!='cli') { die('Run this script through the command line or comment this line in the code'); } require_once '../../inc/global.inc.php'; -$path = api_get_path(SYS_CODE_PATH).'img/'; +$path = api_get_path(SYS_IMG_PATH); ini_set('memory_limit','128M'); ini_set('max_execution_time','240'); /** @@ -93,7 +93,7 @@ function get_all_php_files($base_path) { if (in_array($ext,array('.php','html','.htm','.css'))) { $files[] = $base_path.$item; } - } + } } $list = null; return $files; diff --git a/main/document/document.inc.php b/main/document/document.inc.php index dd893ca58f..159189c63d 100644 --- a/main/document/document.inc.php +++ b/main/document/document.inc.php @@ -895,7 +895,9 @@ function build_edit_icons($document_data, $id, $is_template, $is_read_only = 0, $modify_icons .= ' '; + ).'&set_certificate='.$id.$req_gid.'&'.$sort_params.'"> + '.Display::return_icon($visibility_icon_certificate.'.png', $certificate).' + '; if ($is_preview) { $modify_icons .= ' '. diff --git a/main/document/slideshow.php b/main/document/slideshow.php index ade29c0e9c..846367ea02 100644 --- a/main/document/slideshow.php +++ b/main/document/slideshow.php @@ -498,7 +498,7 @@ if ($slide_id != 'all') { echo ''; echo ''; echo ' - '.get_lang('Modify').'
'; + '.Display::return_icon('edit.gif', get_lang('Modify')).'
'; $aux = explode('.', htmlspecialchars($image_files_only[$slide])); $ext = $aux[count($aux) - 1]; echo $image_files_only[$slide].'
'; diff --git a/main/dropbox/dropbox_init.inc.php b/main/dropbox/dropbox_init.inc.php index e868aa8ec6..fd9733e3c4 100644 --- a/main/dropbox/dropbox_init.inc.php +++ b/main/dropbox/dropbox_init.inc.php @@ -361,7 +361,7 @@ if ($view == 'sent' OR empty($view)) { if (isset($origin) && $origin == 'learnpath') { // if we come from the learning path we have to include the stylesheet and the required javascripts manually. - echo ''; + //echo ''; echo $javascript; } else { Display::display_header($nameTools, 'Dropbox'); diff --git a/main/exercice/exercice.php b/main/exercice/exercice.php index 66808b3fcf..9787354146 100644 --- a/main/exercice/exercice.php +++ b/main/exercice/exercice.php @@ -940,7 +940,8 @@ if (isset($attribute['path']) && is_array($attribute['path'])) { if ($is_allowedToEdit) { $item = Display::tag( 'td', - 'HotPotatoes '.$title.' ' ); $item .= Display::tag('td', '-'); diff --git a/main/exercice/exercise.lib.php b/main/exercice/exercise.lib.php index 880d671ed3..2b25c5f799 100644 --- a/main/exercice/exercise.lib.php +++ b/main/exercice/exercise.lib.php @@ -472,8 +472,8 @@ function get_exam_results_data($from, $number_of_items, $column, $direction, $ex //Admin can always delete the attempt if ($locked == false || api_is_platform_admin()) { $ip = TrackingUserLog::get_ip_from_user_event($results[$i]['exe_user_id'], $results[$i]['exe_date'], false); - $actions .= ''; - + $actions .= ' + '.Display::return_icon('info.png', $ip).''; $delete_link = ''.Display :: return_icon('delete.png', get_lang('Delete')).''; $delete_link = utf8_encode($delete_link); diff --git a/main/exercice/export/scorm/scorm_export.php b/main/exercice/export/scorm/scorm_export.php index c4133753b9..7e13496b7a 100644 --- a/main/exercice/export/scorm/scorm_export.php +++ b/main/exercice/export/scorm/scorm_export.php @@ -36,7 +36,7 @@ class ScormAssessmentItem $this->question = $question; //$this->answer = new Answer($question->id); $this->question->setAnswer(); - + $this->questionIdent = "QST_" . $question->id ; $this->standalone = $standalone; //echo "
".print_r($this,1)."
"; @@ -68,7 +68,7 @@ class ScormAssessmentItem if($this->standalone){return '';} return ''; } - + /** * Start document header */ @@ -76,7 +76,7 @@ class ScormAssessmentItem if($this->standalone){return ''. "\n";} return ''; } - + /** * Print CSS inclusion */ @@ -85,14 +85,12 @@ class ScormAssessmentItem if ($this->standalone) { $css = ''."\n"; $css .= ''."\n"; + $css .= ''."\n"; } return $css; } @@ -281,21 +279,21 @@ class ScormSection function end_page() { return ''; } - + /** * Start document header */ function start_header() { return ''. "\n"; } - + /** * Print CSS inclusion */ function css() { $css = ''."\n"; $css .= ''; - $print .= '' . get_lang('Print') . ' ' . get_lang('Print') . ''; + $print .= ' + '.Display::return_icon('printmgr.gif', get_lang('Print')).''; } //add header diff --git a/main/inc/lib/glossary.lib.php b/main/inc/lib/glossary.lib.php index eba47103e7..4689b92263 100644 --- a/main/inc/lib/glossary.lib.php +++ b/main/inc/lib/glossary.lib.php @@ -695,13 +695,7 @@ class GlossaryManager $html .= ''; $course_code = api_get_course_id(); $pdf = new PDF(); - //$pdf->set_custom_header($title); - /*$css_file = api_get_path(SYS_CODE_PATH).'css/print.css'; - if (file_exists($css_file)) { - $css = @file_get_contents($css_file); - } else { - $css = ''; - }*/ + $css = null; $pdf->content_to_pdf($html, $css, get_lang('Glossary').'_'.$course_code, $course_code); } } diff --git a/main/metadata/playscormmdset.inc.php b/main/metadata/playscormmdset.inc.php index 497e6e8841..b422e53baa 100644 --- a/main/metadata/playscormmdset.inc.php +++ b/main/metadata/playscormmdset.inc.php @@ -1,5 +1,5 @@ -Scorm package -