diff --git a/main/admin/configure_plugin.php b/main/admin/configure_plugin.php index 9c035bbc44..1018550d2d 100644 --- a/main/admin/configure_plugin.php +++ b/main/admin/configure_plugin.php @@ -39,7 +39,7 @@ if (isset($plugin_info['settings_form'])) { //We override the form attributes $attributes = array('action'=>api_get_self().'?name='.$plugin_name, 'method'=>'POST'); $form->updateAttributes($attributes); - $content = Display::page_subheader($plugin_info['title']); + $content = Display::page_header($plugin_info['title']); $content .= $form->toHtml(); } } else { diff --git a/main/admin/resume_session.php b/main/admin/resume_session.php index a85c016b5b..1495302479 100644 --- a/main/admin/resume_session.php +++ b/main/admin/resume_session.php @@ -122,7 +122,7 @@ if (!empty($message)) { echo $message; } -echo Display::page_subheader(Display::return_icon('session.png', get_lang('Session')).' '.$session['name']); +echo Display::page_header(Display::return_icon('session.png', get_lang('Session')).' '.$session['name']); ?> diff --git a/main/course_info/delete_course.php b/main/course_info/delete_course.php old mode 100755 new mode 100644 index d5540c6172..a1ef0d8e67 --- a/main/course_info/delete_course.php +++ b/main/course_info/delete_course.php @@ -15,7 +15,6 @@ $language_file = array('admin', 'course_info'); require_once '../inc/global.inc.php'; -require_once api_get_path(LIBRARY_PATH).'course.lib.php'; require_once '../gradebook/lib/be/gradebookitem.class.php'; require_once '../gradebook/lib/be/category.class.php'; $this_section = SECTION_COURSES; @@ -29,9 +28,7 @@ if (!api_is_allowed_to_edit()) { $tool_name = get_lang('DelCourse'); if (isset($_GET['delete']) && $_GET['delete'] == 'yes') { - CourseManager :: delete_course($_course['sysCode']); - $obj_cat = new Category(); $obj_cat->update_category_delete($_course['sysCode']); @@ -39,15 +36,17 @@ if (isset($_GET['delete']) && $_GET['delete'] == 'yes') { unset($_course); unset($_cid); $noPHP_SELF = true; - $message = get_lang('Course').' "'.$current_course_name.'" ('.$current_course_code.') '.get_lang('HasDel'); + $message = '

'.get_lang('Course').' : '.$current_course_name.' ('.$current_course_code.')

'; + $message .=get_lang('HasDel'); $message .= '

'.get_lang('BackHome').' '.api_get_setting('siteName').''; -} else { - $message = '"'.$current_course_name.'" ('.$current_course_code.')

'.get_lang('ByDel').'

'.get_lang('No').'  |  '.get_lang('Yes').'

'; +} else { + $message = '

'.get_lang('Course').' : '.$current_course_name.' ('.$current_course_code.')

'; + $message .= '

'.get_lang('ByDel').'

'.get_lang('No').' '.get_lang('Yes').'

'; $interbreadcrumb[] = array('url' => 'maintenance.php', 'name' => get_lang('Maintenance')); } Display :: display_header($tool_name, 'Settings'); -api_display_tool_title($tool_name); +echo Display::page_header($tool_name); Display::display_warning_message($message, false); /* FOOTER */ diff --git a/main/course_info/maintenance.php b/main/course_info/maintenance.php old mode 100755 new mode 100644 index 77c6b1cb98..c1379d4c1c --- a/main/course_info/maintenance.php +++ b/main/course_info/maintenance.php @@ -16,7 +16,7 @@ $this_section = SECTION_COURSES; $nameTools = get_lang('Maintenance'); api_block_anonymous_users(); Display :: display_header($nameTools); -api_display_tool_title($nameTools); +echo Display::page_header($nameTools); ?> diff --git a/main/coursecopy/create_backup.php b/main/coursecopy/create_backup.php old mode 100755 new mode 100644 index 733926144e..b54abae94e --- a/main/coursecopy/create_backup.php +++ b/main/coursecopy/create_backup.php @@ -44,7 +44,7 @@ require_once 'classes/CourseRestorer.class.php'; require_once 'classes/CourseSelectForm.class.php'; // Display the tool title -api_display_tool_title($nameTools); +echo Display::page_header($nameTools); /* MAIN CODE */ @@ -57,38 +57,25 @@ if ((isset($_POST['action']) && $_POST['action'] == 'course_select_form') || (is } $zip_file = CourseArchiver :: write_course($course); Display::display_confirmation_message(get_lang('BackupCreated')); - echo '
'.get_lang('Download').''; - -?> - -'.get_lang('Download').''; } elseif (isset($_POST['backup_option']) && $_POST['backup_option'] == 'select_items') { $cb = new CourseBuilder('partial'); - $course = $cb->build(); - + $course = $cb->build(); CourseSelectForm :: display_form($course); } else { $cb = new CourseBuilder(); $course = $cb->build(); if (!$course->has_resources()) { echo get_lang('NoResourcesToBackup'); - } else { - echo ''.get_lang('SelectOptionForBackup').'

'; - - require_once api_get_path(LIBRARY_PATH).'formvalidator/FormValidator.class.php'; + } else { + $form = new FormValidator('create_backup_form', 'post'); - $renderer = $form->defaultRenderer(); - $renderer->setElementTemplate('
{element}
'); + $form->addElement('header',get_lang('SelectOptionForBackup')); + $form->addElement('radio', 'backup_option', '', get_lang('CreateFullBackup'), 'full_backup'); $form->addElement('radio', 'backup_option', '', get_lang('LetMeSelectItems'), 'select_items'); - $form->addElement('html', '
'); + $form->addElement('style_submit_button', null, get_lang('CreateBackup'), 'class="save"'); $form->add_progress_bar(); diff --git a/main/coursecopy/recycle_course.php b/main/coursecopy/recycle_course.php old mode 100755 new mode 100644 index 45864c5b64..2a81f2da72 --- a/main/coursecopy/recycle_course.php +++ b/main/coursecopy/recycle_course.php @@ -37,7 +37,7 @@ require_once 'classes/CourseRecycler.class.php'; require_once 'classes/CourseSelectForm.class.php'; // Display the tool title -api_display_tool_title($nameTools); +echo Display::page_header($nameTools); /* MAIN CODE */ @@ -62,18 +62,17 @@ if ((isset($_POST['action']) && $_POST['action'] == 'course_select_form') || (is echo get_lang('NoResourcesToRecycle'); } else { Display::display_warning_message(get_lang('RecycleWarning'), false); -?> - - - -
- - -
-
- - -addElement('header',get_lang('SelectOptionForBackup')); + + $form->addElement('radio', 'recycle_option', null, get_lang('FullRecycle'), 'full_backup'); + $form->addElement('radio', 'recycle_option', null, get_lang('LetMeSelectItems'), 'select_items'); + + $form->addElement('style_submit_button', 'submit', get_lang('RecycleCourse'), 'class="save"'); + $form->setDefaults(array('recycle_option' => 'select_items')); + $form->display(); } } diff --git a/main/gradebook/gradebook_showlog_eval.php b/main/gradebook/gradebook_showlog_eval.php index 0886a7546b..5a61fafab0 100644 --- a/main/gradebook/gradebook_showlog_eval.php +++ b/main/gradebook/gradebook_showlog_eval.php @@ -32,8 +32,7 @@ $interbreadcrumb[] = array ( $this_section = SECTION_COURSES; Display :: display_header(''); -echo Display::page_subheader(get_lang('GradebookQualifyLog')); - +echo Display::page_header(get_lang('GradebookQualifyLog')); $t_linkeval_log = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_LINKEVAL_LOG); $t_user= Database :: get_main_table(TABLE_MAIN_USER); diff --git a/main/mySpace/course.php b/main/mySpace/course.php index 0fd9d18214..d0689fb748 100644 --- a/main/mySpace/course.php +++ b/main/mySpace/course.php @@ -97,7 +97,7 @@ if (api_is_drh() || api_is_session_admin() || api_is_platform_admin()) { echo ''; } echo ''; - echo Display::page_subheader($title); + echo Display::page_header($title); } // Database Table Definitions diff --git a/main/mySpace/lp_tracking.php b/main/mySpace/lp_tracking.php index dc6b84325f..6b6daf181f 100644 --- a/main/mySpace/lp_tracking.php +++ b/main/mySpace/lp_tracking.php @@ -83,7 +83,7 @@ $session_name = api_get_session_name($session_id); $table_title = ($session_name? Display::return_icon('session.png', get_lang('Session'), array(), ICON_SIZE_SMALL).' '.$session_name.' ':' '). Display::return_icon('course.png', get_lang('Course'), array(), ICON_SIZE_SMALL).' '.$course_info['name'].' '. Display::return_icon('user.png', get_lang('User'), array(), ICON_SIZE_SMALL).' '.$name; -echo Display::page_subheader($table_title); +echo Display::page_header($table_title); echo Display::page_subheader('

'.Display::return_icon('learnpath.png', get_lang('ToolLearnpath'), array(), ICON_SIZE_SMALL).' '.$lp_title.'

'); $list = learnpath :: get_flat_ordered_items_list($lp_id, 0, $course_info['real_id']); diff --git a/main/mySpace/session.php b/main/mySpace/session.php index 37aa17c28b..f34f4e247d 100644 --- a/main/mySpace/session.php +++ b/main/mySpace/session.php @@ -89,7 +89,7 @@ if (api_is_drh() || api_is_session_admin() || api_is_platform_admin()) { } echo ''; - echo Display::page_subheader(get_lang('YourSessionsList')); + echo Display::page_header(get_lang('YourSessionsList')); } else { /*if (api_is_platform_admin()) {