diff --git a/main/admin/course_add.php b/main/admin/course_add.php
index c5732ce961..53df031b0e 100644
--- a/main/admin/course_add.php
+++ b/main/admin/course_add.php
@@ -167,12 +167,12 @@ if ($form->validate()) {
}
}
-// The header.
-Display::display_header($tool_name);
-
// Display the form.
-$form->display();
-
-/* FOOTER */
-
-Display :: display_footer();
+$content = $form->return_form();
+
+$tpl = new Template($tool_name);
+$tpl->assign('actions', $actions);
+$tpl->assign('message', $message);
+$tpl->assign('content', $content);
+$template = $tpl->get_template('layout/layout_1_col.tpl');
+$tpl->display($template);
diff --git a/main/admin/course_list.php b/main/admin/course_list.php
old mode 100755
new mode 100644
index c82c297369..61a004ad9f
--- a/main/admin/course_list.php
+++ b/main/admin/course_list.php
@@ -167,6 +167,9 @@ if (isset ($_POST['action'])) {
break;
}
}
+$content = '';
+$message = '';
+$actions = '';
if (isset ($_GET['search']) && $_GET['search'] == 'advanced') {
// Get all course categories
@@ -174,7 +177,7 @@ if (isset ($_GET['search']) && $_GET['search'] == 'advanced') {
$interbreadcrumb[] = array('url' => 'index.php', 'name' => get_lang('PlatformAdmin'));
$interbreadcrumb[] = array('url' => 'course_list.php', 'name' => get_lang('CourseList'));
$tool_name = get_lang('SearchACourse');
- Display :: display_header($tool_name);
+
//api_display_tool_title($tool_name);
$form = new FormValidator('advanced_course_search', 'get');
$form->addElement('header', '', $tool_name);
@@ -202,19 +205,19 @@ if (isset ($_GET['search']) && $_GET['search'] == 'advanced') {
$defaults['keyword_subscribe'] = '%';
$defaults['keyword_unsubscribe'] = '%';
$form->setDefaults($defaults);
- $form->display();
+ $content .= $form->return_form();
} else {
$interbreadcrumb[] = array ('url' => 'index.php', "name" => get_lang('PlatformAdmin'));
$tool_name = get_lang('CourseList');
- Display :: display_header($tool_name);
+
if (isset($_GET['action'])) {
switch ($_GET['action']) {
case 'show_msg':
if (!empty($_GET['warn'])) {
- Display::display_warning_message(urldecode($_GET['warn']));
+ $message = Display::return_message(urldecode($_GET['warn']), 'warning');
}
if (!empty($_GET['msg'])) {
- Display::display_normal_message(urldecode($_GET['msg']));
+ $message = Display::return_message(urldecode($_GET['msg']));
}
break;
default:
@@ -235,17 +238,15 @@ if (isset ($_GET['search']) && $_GET['search'] == 'advanced') {
$form->addElement('style_submit_button', 'submit', get_lang('SearchCourse'), 'class="search"');
$form->addElement('static', 'search_advanced_link', null, ''.get_lang('AdvancedSearch').'');
- echo '';
+ $actions .= $form->return_form();
+
// Create a sortable table with the course data
$table = new SortableTable('courses', 'get_number_of_courses', 'get_course_data', 2);
$parameters=array();
@@ -276,9 +277,12 @@ if (isset ($_GET['search']) && $_GET['search'] == 'advanced') {
$table->set_header(8, get_lang('Action'), false, 'width="150px"');
$table->set_column_filter(8, 'modify_filter');
$table->set_form_actions(array('delete_courses' => get_lang('DeleteCourse')), 'course');
- $table->display();
+ $content .= $table->return_table();
}
-/* FOOTER */
-
-Display :: display_footer();
+$tpl = new Template($tool_name);
+$tpl->assign('actions', $actions);
+$tpl->assign('message', $message);
+$tpl->assign('content', $content);
+$template = $tpl->get_template('layout/layout_1_col.tpl');
+$tpl->display($template);
\ No newline at end of file
diff --git a/main/admin/user_add.php b/main/admin/user_add.php
old mode 100755
new mode 100644
index ec83aafc94..7d8ad6da07
--- a/main/admin/user_add.php
+++ b/main/admin/user_add.php
@@ -409,13 +409,14 @@ if( $form->validate()) {
$form->setConstants(array('sec_token' => $token));
}
-// Display form
-Display::display_header($tool_name);
-//api_display_tool_title($tool_name);
if(!empty($message)){
- Display::display_normal_message(stripslashes($message));
+ $message = Display::return_message(stripslashes($message));
}
-$form->display();
-
-// Footer
-Display::display_footer();
\ No newline at end of file
+$content .= $form->return_form();
+
+$tpl = new Template($tool_name);
+$tpl->assign('actions', $actions);
+$tpl->assign('message', $message);
+$tpl->assign('content', $content);
+$template = $tpl->get_template('layout/layout_1_col.tpl');
+$tpl->display($template);
diff --git a/main/admin/user_edit.php b/main/admin/user_edit.php
old mode 100755
new mode 100644
index d7cfca327f..8d95b5c0b4
--- a/main/admin/user_edit.php
+++ b/main/admin/user_edit.php
@@ -424,11 +424,9 @@ if ( $form->validate()) {
}
}
-Display::display_header($tool_name);
-
if ($error_drh) {
$err_msg = get_lang('StatusCanNotBeChangedToHumanResourcesManager');
- Display::display_error_message($err_msg);
+ $message = Display::return_message($err_msg, 'error');
}
// USER PICTURE
@@ -454,13 +452,17 @@ $big_image_height = $big_image_size['height'];
$url_big_image = $big_image.'?rnd='.time();
if ($image == '') {
- echo '![]()
';
+ $content .= '![]()
';
} else {
- echo '';
+ $content .= '';
}
// Display form
-$form->display();
-
-// Footer
-Display::display_footer();
+$content .= $form->return_form();
+
+$tpl = new Template($tool_name);
+$tpl->assign('actions', $actions);
+$tpl->assign('message', $message);
+$tpl->assign('content', $content);
+$template = $tpl->get_template('layout/layout_1_col.tpl');
+$tpl->display($template);
diff --git a/main/admin/user_list.php b/main/admin/user_list.php
old mode 100755
new mode 100644
index 1686149df7..4902bbb273
--- a/main/admin/user_list.php
+++ b/main/admin/user_list.php
@@ -767,7 +767,9 @@ if (isset($_GET['keyword']) || isset($_GET['keyword_firstname'])) {
}
-Display :: display_header($tool_name, "");
+//Display :: display_header($tool_name, "");
+
+$message = '';
//api_display_tool_title($tool_name);
if (isset ($_GET['action'])) {
@@ -780,32 +782,32 @@ if (isset ($_GET['action'])) {
if ($_GET['warn'] == 'session_message'){
$_GET['warn'] = $_SESSION['session_message_import_users'];
}
- Display::display_warning_message(urldecode($_GET['warn']),false);
+ $message = Display::return_message(urldecode($_GET['warn']),'warning', false);
}
if (!empty($_GET['message'])) {
- Display :: display_confirmation_message(stripslashes($_GET['message']));
+ $message = Display :: return_message(stripslashes($_GET['message']), 'confirmation');
}
break;
case 'delete_user' :
if (api_is_platform_admin()) {
if ($delete_user_available) {
if ($user_id != $_user['user_id'] && UserManager :: delete_user($_GET['user_id'])) {
- Display :: display_confirmation_message(get_lang('UserDeleted'));
+ $message = Display :: return_message(get_lang('UserDeleted'), 'confirmation');
} else {
- Display :: display_error_message(get_lang('CannotDeleteUserBecauseOwnsCourse'));
+ $message = Display :: return_message(get_lang('CannotDeleteUserBecauseOwnsCourse'), 'error');
}
} else {
- Display :: display_error_message(get_lang('CannotDeleteUser'));
+ $message = Display :: return_message(get_lang('CannotDeleteUser'),'error');
}
}
break;
case 'lock' :
$message=lock_unlock_user('lock',$_GET['user_id']);
- Display :: display_normal_message($message);
+ $message =Display :: return_message($message);
break;
case 'unlock';
$message=lock_unlock_user('unlock',$_GET['user_id']);
- Display :: display_normal_message($message);
+ $message =Display :: return_message($message);
break;
}
@@ -822,23 +824,17 @@ if (isset ($_POST['action'])) {
$number_of_selected_users = count($_POST['id']);
$number_of_deleted_users = 0;
if (is_array($_POST['id'])) {
- foreach ($_POST['id'] as $index => $user_id)
- {
- if($user_id != $_user['user_id'])
- {
- if(UserManager :: delete_user($user_id))
- {
+ foreach ($_POST['id'] as $index => $user_id) {
+ if($user_id != $_user['user_id']) {
+ if(UserManager :: delete_user($user_id)) {
$number_of_deleted_users++;
}
}
}
}
- if($number_of_selected_users == $number_of_deleted_users)
- {
+ if($number_of_selected_users == $number_of_deleted_users) {
Display :: display_confirmation_message(get_lang('SelectedUsersDeleted'));
- }
- else
- {
+ } else {
Display :: display_error_message(get_lang('SomeUsersNotDeleted'));
}
}
@@ -854,18 +850,17 @@ $renderer =& $form->defaultRenderer();
$renderer->setElementTemplate('{element} ');
$form->addElement('text','keyword',get_lang('keyword'), 'size="25"');
$form->addElement('style_submit_button', 'submit',get_lang('Search'),'class="search"');
-//$form->addElement('static','search_advanced_link',null,''.get_lang('AdvancedSearch').'');
-
- $form->addElement('static','search_advanced_link',null,' '.Display::return_icon('div_show.gif',get_lang('Show'),array('style'=>'vertical-align:middle')).' '.get_lang('AdvancedSearch').'');
+$form->addElement('static','search_advanced_link',null,' '.Display::return_icon('div_show.gif',get_lang('Show'),array('style'=>'vertical-align:middle')).' '.get_lang('AdvancedSearch').'');
-echo '';
+$actions .=$form->return_form();
+
+
if (isset ($_GET['keyword'])) {
$parameters = array ('keyword' => Security::remove_XSS($_GET['keyword']));
} elseif (isset ($_GET['keyword_firstname'])) {
@@ -970,7 +965,7 @@ $defaults['keyword_inactive'] = 1;
$form->setDefaults($defaults);
$form->addElement('html','');
-$form->display();
+$form = $form->return_form();
$table = new SortableTable('users', 'get_number_of_users', 'get_user_data', (api_is_western_name_order() xor api_sort_by_first_name()) ? 3 : 2);
$table->set_additional_parameters($parameters);
@@ -1000,6 +995,13 @@ $table->set_column_filter(9, 'modify_filter');
if (api_is_platform_admin())
$table->set_form_actions(array ('delete' => get_lang('DeleteFromPlatform')));
-$table->display();
+$table = $table->return_table();
+
+
+$tpl = new Template($tool_name);
-Display :: display_footer();
+$tpl->assign('actions', $actions);
+$tpl->assign('message', $message);
+$tpl->assign('content', $form.$table);
+$template = $tpl->get_template('layout/layout_1_col.tpl');
+$tpl->display($template);
diff --git a/main/css/base.css b/main/css/base.css
index b83ff48a81..6380af86ee 100644
--- a/main/css/base.css
+++ b/main/css/base.css
@@ -3787,4 +3787,13 @@ form div.error input, form div.error textarea {
}
.label_tag.notice {
background-color: #62cffc;
+}
+
+
+.invisible {
+ color: #999;
+}
+
+.invisible h2 {
+ color: #999;
}
\ No newline at end of file
diff --git a/main/css/base_chamilo.css b/main/css/base_chamilo.css
index 1dc581cb74..13602755da 100644
--- a/main/css/base_chamilo.css
+++ b/main/css/base_chamilo.css
@@ -216,9 +216,7 @@ ul#navigation .student-connect a {
min-height: 300px;
background-color: #fff;
}
-.invisible {
- color: #999;
-}
+
.courseadminview table td a, .Authoringview table td a {
font-weight: bold;
font-size:13px;