Using formvalidator instead of HTML, using the new function page_header and page_subheader

skala
Julio Montoya 14 years ago
parent 98d3424974
commit 14fa80654a
  1. 2
      main/admin/configure_plugin.php
  2. 2
      main/admin/resume_session.php
  3. 13
      main/course_info/delete_course.php
  4. 2
      main/course_info/maintenance.php
  5. 29
      main/coursecopy/create_backup.php
  6. 25
      main/coursecopy/recycle_course.php
  7. 3
      main/gradebook/gradebook_showlog_eval.php
  8. 2
      main/mySpace/course.php
  9. 2
      main/mySpace/lp_tracking.php
  10. 2
      main/mySpace/session.php

@ -39,7 +39,7 @@ if (isset($plugin_info['settings_form'])) {
//We override the form attributes //We override the form attributes
$attributes = array('action'=>api_get_self().'?name='.$plugin_name, 'method'=>'POST'); $attributes = array('action'=>api_get_self().'?name='.$plugin_name, 'method'=>'POST');
$form->updateAttributes($attributes); $form->updateAttributes($attributes);
$content = Display::page_subheader($plugin_info['title']); $content = Display::page_header($plugin_info['title']);
$content .= $form->toHtml(); $content .= $form->toHtml();
} }
} else { } else {

@ -122,7 +122,7 @@ if (!empty($message)) {
echo $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']);
?> ?>
<!-- General properties --> <!-- General properties -->
<table class="data_table" width="100%"> <table class="data_table" width="100%">

@ -15,7 +15,6 @@
$language_file = array('admin', 'course_info'); $language_file = array('admin', 'course_info');
require_once '../inc/global.inc.php'; 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/gradebookitem.class.php';
require_once '../gradebook/lib/be/category.class.php'; require_once '../gradebook/lib/be/category.class.php';
$this_section = SECTION_COURSES; $this_section = SECTION_COURSES;
@ -29,9 +28,7 @@ if (!api_is_allowed_to_edit()) {
$tool_name = get_lang('DelCourse'); $tool_name = get_lang('DelCourse');
if (isset($_GET['delete']) && $_GET['delete'] == 'yes') { if (isset($_GET['delete']) && $_GET['delete'] == 'yes') {
CourseManager :: delete_course($_course['sysCode']); CourseManager :: delete_course($_course['sysCode']);
$obj_cat = new Category(); $obj_cat = new Category();
$obj_cat->update_category_delete($_course['sysCode']); $obj_cat->update_category_delete($_course['sysCode']);
@ -39,15 +36,17 @@ if (isset($_GET['delete']) && $_GET['delete'] == 'yes') {
unset($_course); unset($_course);
unset($_cid); unset($_cid);
$noPHP_SELF = true; $noPHP_SELF = true;
$message = get_lang('Course').' &quot;'.$current_course_name.'&quot; ('.$current_course_code.') '.get_lang('HasDel'); $message = '<h2>'.get_lang('Course').' : '.$current_course_name.' ('.$current_course_code.') </h2>';
$message .=get_lang('HasDel');
$message .= '<br /><br /><a href="../../index.php">'.get_lang('BackHome').' '.api_get_setting('siteName').'</a>'; $message .= '<br /><br /><a href="../../index.php">'.get_lang('BackHome').' '.api_get_setting('siteName').'</a>';
} else { } else {
$message = '&quot;'.$current_course_name.'&quot; ('.$current_course_code.') <p>'.get_lang('ByDel').'</p><p><a href="maintenance.php">'.get_lang('No').'</a>&nbsp;&nbsp;|&nbsp;&nbsp;<a href="'.api_get_self().'?delete=yes">'.get_lang('Yes').'</a></p>'; $message = '<h3>'.get_lang('Course').' : '.$current_course_name.' ('.$current_course_code.') </h3>';
$message .= '<p>'.get_lang('ByDel').'</p><p><a class="btn btn-primary" href="maintenance.php">'.get_lang('No').'</a>&nbsp;<a class="btn" href="'.api_get_self().'?delete=yes">'.get_lang('Yes').'</a></p>';
$interbreadcrumb[] = array('url' => 'maintenance.php', 'name' => get_lang('Maintenance')); $interbreadcrumb[] = array('url' => 'maintenance.php', 'name' => get_lang('Maintenance'));
} }
Display :: display_header($tool_name, 'Settings'); Display :: display_header($tool_name, 'Settings');
api_display_tool_title($tool_name); echo Display::page_header($tool_name);
Display::display_warning_message($message, false); Display::display_warning_message($message, false);
/* FOOTER */ /* FOOTER */

@ -16,7 +16,7 @@ $this_section = SECTION_COURSES;
$nameTools = get_lang('Maintenance'); $nameTools = get_lang('Maintenance');
api_block_anonymous_users(); api_block_anonymous_users();
Display :: display_header($nameTools); Display :: display_header($nameTools);
api_display_tool_title($nameTools); echo Display::page_header($nameTools);
?> ?>

@ -44,7 +44,7 @@ require_once 'classes/CourseRestorer.class.php';
require_once 'classes/CourseSelectForm.class.php'; require_once 'classes/CourseSelectForm.class.php';
// Display the tool title // Display the tool title
api_display_tool_title($nameTools); echo Display::page_header($nameTools);
/* MAIN CODE */ /* MAIN CODE */
@ -57,38 +57,25 @@ if ((isset($_POST['action']) && $_POST['action'] == 'course_select_form') || (is
} }
$zip_file = CourseArchiver :: write_course($course); $zip_file = CourseArchiver :: write_course($course);
Display::display_confirmation_message(get_lang('BackupCreated')); Display::display_confirmation_message(get_lang('BackupCreated'));
echo '<br /><a class="a_button orange medium" href="../course_info/download.php?archive='.$zip_file.'">'.get_lang('Download').'</a>'; echo '<br /><a class="btn btn-primary btn-large" href="../course_info/download.php?archive='.$zip_file.'">'.get_lang('Download').'</a>';
?>
<!-- Manual download <script language="JavaScript">
setTimeout('download_backup()',2000);
function download_backup()
{
window.location="../course_info/download.php?archive=<?php echo $zip_file; ?>";
}
</script> //-->
<?php
} elseif (isset($_POST['backup_option']) && $_POST['backup_option'] == 'select_items') { } elseif (isset($_POST['backup_option']) && $_POST['backup_option'] == 'select_items') {
$cb = new CourseBuilder('partial'); $cb = new CourseBuilder('partial');
$course = $cb->build(); $course = $cb->build();
CourseSelectForm :: display_form($course); CourseSelectForm :: display_form($course);
} else { } else {
$cb = new CourseBuilder(); $cb = new CourseBuilder();
$course = $cb->build(); $course = $cb->build();
if (!$course->has_resources()) { if (!$course->has_resources()) {
echo get_lang('NoResourcesToBackup'); echo get_lang('NoResourcesToBackup');
} else { } else {
echo '<span id="page_title">'.get_lang('SelectOptionForBackup').'</span><br /><br />';
require_once api_get_path(LIBRARY_PATH).'formvalidator/FormValidator.class.php';
$form = new FormValidator('create_backup_form', 'post'); $form = new FormValidator('create_backup_form', 'post');
$renderer = $form->defaultRenderer(); $form->addElement('header',get_lang('SelectOptionForBackup'));
$renderer->setElementTemplate('<div>{element}</div> ');
$form->addElement('radio', 'backup_option', '', get_lang('CreateFullBackup'), 'full_backup'); $form->addElement('radio', 'backup_option', '', get_lang('CreateFullBackup'), 'full_backup');
$form->addElement('radio', 'backup_option', '', get_lang('LetMeSelectItems'), 'select_items'); $form->addElement('radio', 'backup_option', '', get_lang('LetMeSelectItems'), 'select_items');
$form->addElement('html', '<br />');
$form->addElement('style_submit_button', null, get_lang('CreateBackup'), 'class="save"'); $form->addElement('style_submit_button', null, get_lang('CreateBackup'), 'class="save"');
$form->add_progress_bar(); $form->add_progress_bar();

@ -37,7 +37,7 @@ require_once 'classes/CourseRecycler.class.php';
require_once 'classes/CourseSelectForm.class.php'; require_once 'classes/CourseSelectForm.class.php';
// Display the tool title // Display the tool title
api_display_tool_title($nameTools); echo Display::page_header($nameTools);
/* MAIN CODE */ /* MAIN CODE */
@ -62,18 +62,17 @@ if ((isset($_POST['action']) && $_POST['action'] == 'course_select_form') || (is
echo get_lang('NoResourcesToRecycle'); echo get_lang('NoResourcesToRecycle');
} else { } else {
Display::display_warning_message(get_lang('RecycleWarning'), false); Display::display_warning_message(get_lang('RecycleWarning'), false);
?>
<form method="post" action="recycle_course.php">
<input type="radio" class="checkbox" id="recycle_option_1" name="recycle_option" value="full_backup" checked="checked"/> $form = new FormValidator('recycle_course', 'post', 'recycle_course.php');
<label for="recycle_option_1"><?php echo get_lang('FullRecycle'); ?></label> $form->addElement('header',get_lang('SelectOptionForBackup'));
<br/>
<input type="radio" class="checkbox" id="recycle_option_2" name="recycle_option" value="select_items"/> $form->addElement('radio', 'recycle_option', null, get_lang('FullRecycle'), 'full_backup');
<label for="recycle_option_2"><?php echo get_lang('LetMeSelectItems'); ?></label> $form->addElement('radio', 'recycle_option', null, get_lang('LetMeSelectItems'), 'select_items');
<br/>
<br/> $form->addElement('style_submit_button', 'submit', get_lang('RecycleCourse'), 'class="save"');
<button class="save" type="submit"><?php echo get_lang('RecycleCourse'); ?></button> $form->setDefaults(array('recycle_option' => 'select_items'));
</form> $form->display();
<?php
} }
} }

@ -32,8 +32,7 @@ $interbreadcrumb[] = array (
$this_section = SECTION_COURSES; $this_section = SECTION_COURSES;
Display :: display_header(''); 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_linkeval_log = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_LINKEVAL_LOG);
$t_user= Database :: get_main_table(TABLE_MAIN_USER); $t_user= Database :: get_main_table(TABLE_MAIN_USER);

@ -97,7 +97,7 @@ if (api_is_drh() || api_is_session_admin() || api_is_platform_admin()) {
echo '</span>'; echo '</span>';
} }
echo '</div>'; echo '</div>';
echo Display::page_subheader($title); echo Display::page_header($title);
} }
// Database Table Definitions // Database Table Definitions

@ -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.' ':' '). $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('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; 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('<h3>'.Display::return_icon('learnpath.png', get_lang('ToolLearnpath'), array(), ICON_SIZE_SMALL).' '.$lp_title.'</h3>'); echo Display::page_subheader('<h3>'.Display::return_icon('learnpath.png', get_lang('ToolLearnpath'), array(), ICON_SIZE_SMALL).' '.$lp_title.'</h3>');
$list = learnpath :: get_flat_ordered_items_list($lp_id, 0, $course_info['real_id']); $list = learnpath :: get_flat_ordered_items_list($lp_id, 0, $course_info['real_id']);

@ -89,7 +89,7 @@ if (api_is_drh() || api_is_session_admin() || api_is_platform_admin()) {
} }
echo '</div>'; echo '</div>';
echo Display::page_subheader(get_lang('YourSessionsList')); echo Display::page_header(get_lang('YourSessionsList'));
} else { } else {
/*if (api_is_platform_admin()) { /*if (api_is_platform_admin()) {

Loading…
Cancel
Save