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

Adding smarty support to some admin page

Browse Source
skala
Julio Montoya 14 years ago
parent c827128367
commit a3085fabe8
7 changed files with 90 additions and 74 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. 16
      main/admin/course_add.php
  2. 38
      main/admin/course_list.php
  3. 17
      main/admin/user_add.php
  4. 20
      main/admin/user_edit.php
  5. 60
      main/admin/user_list.php
  6. 9
      main/css/base.css
  7. 4
      main/css/base_chamilo.css

16
main/admin/course_add.php
Unescape View File

@ -167,12 +167,12 @@ if ($form->validate()) {
} }
} }
// The header.
Display::display_header($tool_name);
// Display the form. // Display the form.
$form->display(); $content = $form->return_form();
/* FOOTER */ $tpl = new Template($tool_name);
$tpl->assign('actions', $actions);
Display :: display_footer(); $tpl->assign('message', $message);
$tpl->assign('content', $content);
$template = $tpl->get_template('layout/layout_1_col.tpl');
$tpl->display($template);

38
main/admin/course_list.php
Unescape View File

@ -167,6 +167,9 @@ if (isset ($_POST['action'])) {
break; break;
} }
} }
$content = '';
$message = '';
$actions = '';
if (isset ($_GET['search']) && $_GET['search'] == 'advanced') { if (isset ($_GET['search']) && $_GET['search'] == 'advanced') {
// Get all course categories // 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' => 'index.php', 'name' => get_lang('PlatformAdmin'));
$interbreadcrumb[] = array('url' => 'course_list.php', 'name' => get_lang('CourseList')); $interbreadcrumb[] = array('url' => 'course_list.php', 'name' => get_lang('CourseList'));
$tool_name = get_lang('SearchACourse'); $tool_name = get_lang('SearchACourse');
Display :: display_header($tool_name);
//api_display_tool_title($tool_name); //api_display_tool_title($tool_name);
$form = new FormValidator('advanced_course_search', 'get'); $form = new FormValidator('advanced_course_search', 'get');
$form->addElement('header', '', $tool_name); $form->addElement('header', '', $tool_name);
@ -202,19 +205,19 @@ if (isset ($_GET['search']) && $_GET['search'] == 'advanced') {
$defaults['keyword_subscribe'] = '%'; $defaults['keyword_subscribe'] = '%';
$defaults['keyword_unsubscribe'] = '%'; $defaults['keyword_unsubscribe'] = '%';
$form->setDefaults($defaults); $form->setDefaults($defaults);
$form->display(); $content .= $form->return_form();
} else { } else {
$interbreadcrumb[] = array ('url' => 'index.php', "name" => get_lang('PlatformAdmin')); $interbreadcrumb[] = array ('url' => 'index.php', "name" => get_lang('PlatformAdmin'));
$tool_name = get_lang('CourseList'); $tool_name = get_lang('CourseList');
Display :: display_header($tool_name);
if (isset($_GET['action'])) { if (isset($_GET['action'])) {
switch ($_GET['action']) { switch ($_GET['action']) {
case 'show_msg': case 'show_msg':
if (!empty($_GET['warn'])) { if (!empty($_GET['warn'])) {
Display::display_warning_message(urldecode($_GET['warn'])); $message = Display::return_message(urldecode($_GET['warn']), 'warning');
} }
if (!empty($_GET['msg'])) { if (!empty($_GET['msg'])) {
Display::display_normal_message(urldecode($_GET['msg'])); $message = Display::return_message(urldecode($_GET['msg']));
} }
break; break;
default: 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('style_submit_button', 'submit', get_lang('SearchCourse'), 'class="search"');
$form->addElement('static', 'search_advanced_link', null, '<a href="course_list.php?search=advanced">'.get_lang('AdvancedSearch').'</a>'); $form->addElement('static', 'search_advanced_link', null, '<a href="course_list.php?search=advanced">'.get_lang('AdvancedSearch').'</a>');
echo '<div style="float: right; margin-top: 5px; margin-right: 5px;">'; $actions .= '<div style="float: right; margin-top: 5px; margin-right: 5px;">';
echo '<a href="course_add.php">'.Display::return_icon('new_course.png', get_lang('AddCourse'),'','32').'</a> '; $actions .= '<a href="course_add.php">'.Display::return_icon('new_course.png', get_lang('AddCourse'),'','32').'</a> ';
if (api_get_setting('course_validation') == 'true') { if (api_get_setting('course_validation') == 'true') {
echo '<a href="course_request_review.php">'.Display::return_icon('course_request_pending.png', get_lang('ReviewCourseRequests'),'','32').'</a>'; $actions .= '<a href="course_request_review.php">'.Display::return_icon('course_request_pending.png', get_lang('ReviewCourseRequests'),'','32').'</a>';
} }
echo '</div>'; $actions .= '</div>';
$actions .= $form->return_form();
echo '<div class="actions">';
$form->display();
echo '</div>';
// Create a sortable table with the course data // Create a sortable table with the course data
$table = new SortableTable('courses', 'get_number_of_courses', 'get_course_data', 2); $table = new SortableTable('courses', 'get_number_of_courses', 'get_course_data', 2);
$parameters=array(); $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_header(8, get_lang('Action'), false, 'width="150px"');
$table->set_column_filter(8, 'modify_filter'); $table->set_column_filter(8, 'modify_filter');
$table->set_form_actions(array('delete_courses' => get_lang('DeleteCourse')), 'course'); $table->set_form_actions(array('delete_courses' => get_lang('DeleteCourse')), 'course');
$table->display(); $content .= $table->return_table();
} }
/* FOOTER */ $tpl = new Template($tool_name);
$tpl->assign('actions', $actions);
Display :: display_footer(); $tpl->assign('message', $message);
$tpl->assign('content', $content);
$template = $tpl->get_template('layout/layout_1_col.tpl');
$tpl->display($template);

17
main/admin/user_add.php
Unescape View File

@ -409,13 +409,14 @@ if( $form->validate()) {
$form->setConstants(array('sec_token' => $token)); $form->setConstants(array('sec_token' => $token));
} }
// Display form
Display::display_header($tool_name);
//api_display_tool_title($tool_name);
if(!empty($message)){ if(!empty($message)){
Display::display_normal_message(stripslashes($message)); $message = Display::return_message(stripslashes($message));
} }
$form->display(); $content .= $form->return_form();
// Footer $tpl = new Template($tool_name);
Display::display_footer(); $tpl->assign('actions', $actions);
$tpl->assign('message', $message);
$tpl->assign('content', $content);
$template = $tpl->get_template('layout/layout_1_col.tpl');
$tpl->display($template);

20
main/admin/user_edit.php
Unescape View File

@ -424,11 +424,9 @@ if ( $form->validate()) {
} }
} }
Display::display_header($tool_name);
if ($error_drh) { if ($error_drh) {
$err_msg = get_lang('StatusCanNotBeChangedToHumanResourcesManager'); $err_msg = get_lang('StatusCanNotBeChangedToHumanResourcesManager');
Display::display_error_message($err_msg); $message = Display::return_message($err_msg, 'error');
} }
// USER PICTURE // USER PICTURE
@ -454,13 +452,17 @@ $big_image_height = $big_image_size['height'];
$url_big_image = $big_image.'?rnd='.time(); $url_big_image = $big_image.'?rnd='.time();
if ($image == '') { if ($image == '') {
echo '<img '.$img_attributes.' />'; $content .= '<img '.$img_attributes.' />';
} else { } else {
echo '<input type="image" '.$img_attributes.' onclick="javascript: return show_image(\''.$url_big_image.'\',\''.$big_image_width.'\',\''.$big_image_height.'\');"/>'; $content .= '<input type="image" '.$img_attributes.' onclick="javascript: return show_image(\''.$url_big_image.'\',\''.$big_image_width.'\',\''.$big_image_height.'\');"/>';
} }
// Display form // Display form
$form->display(); $content .= $form->return_form();
// Footer $tpl = new Template($tool_name);
Display::display_footer(); $tpl->assign('actions', $actions);
$tpl->assign('message', $message);
$tpl->assign('content', $content);
$template = $tpl->get_template('layout/layout_1_col.tpl');
$tpl->display($template);

60
main/admin/user_list.php
Unescape View File

@ -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); //api_display_tool_title($tool_name);
if (isset ($_GET['action'])) { if (isset ($_GET['action'])) {
@ -780,32 +782,32 @@ if (isset ($_GET['action'])) {
if ($_GET['warn'] == 'session_message'){ if ($_GET['warn'] == 'session_message'){
$_GET['warn'] = $_SESSION['session_message_import_users']; $_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'])) { if (!empty($_GET['message'])) {
Display :: display_confirmation_message(stripslashes($_GET['message'])); $message = Display :: return_message(stripslashes($_GET['message']), 'confirmation');
} }
break; break;
case 'delete_user' : case 'delete_user' :
if (api_is_platform_admin()) { if (api_is_platform_admin()) {
if ($delete_user_available) { if ($delete_user_available) {
if ($user_id != $_user['user_id'] && UserManager :: delete_user($_GET['user_id'])) { 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 { } else {
Display :: display_error_message(get_lang('CannotDeleteUserBecauseOwnsCourse')); $message = Display :: return_message(get_lang('CannotDeleteUserBecauseOwnsCourse'), 'error');
} }
} else { } else {
Display :: display_error_message(get_lang('CannotDeleteUser')); $message = Display :: return_message(get_lang('CannotDeleteUser'),'error');
} }
} }
break; break;
case 'lock' : case 'lock' :
$message=lock_unlock_user('lock',$_GET['user_id']); $message=lock_unlock_user('lock',$_GET['user_id']);
Display :: display_normal_message($message); $message =Display :: return_message($message);
break; break;
case 'unlock'; case 'unlock';
$message=lock_unlock_user('unlock',$_GET['user_id']); $message=lock_unlock_user('unlock',$_GET['user_id']);
Display :: display_normal_message($message); $message =Display :: return_message($message);
break; break;
} }
@ -822,23 +824,17 @@ if (isset ($_POST['action'])) {
$number_of_selected_users = count($_POST['id']); $number_of_selected_users = count($_POST['id']);
$number_of_deleted_users = 0; $number_of_deleted_users = 0;
if (is_array($_POST['id'])) { if (is_array($_POST['id'])) {
foreach ($_POST['id'] as $index => $user_id) foreach ($_POST['id'] as $index => $user_id) {
{ if($user_id != $_user['user_id']) {
if($user_id != $_user['user_id']) if(UserManager :: delete_user($user_id)) {
{
if(UserManager :: delete_user($user_id))
{
$number_of_deleted_users++; $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')); Display :: display_confirmation_message(get_lang('SelectedUsersDeleted'));
} } else {
else
{
Display :: display_error_message(get_lang('SomeUsersNotDeleted')); Display :: display_error_message(get_lang('SomeUsersNotDeleted'));
} }
} }
@ -854,18 +850,17 @@ $renderer =& $form->defaultRenderer();
$renderer->setElementTemplate('<span>{element}</span> '); $renderer->setElementTemplate('<span>{element}</span> ');
$form->addElement('text','keyword',get_lang('keyword'), 'size="25"'); $form->addElement('text','keyword',get_lang('keyword'), 'size="25"');
$form->addElement('style_submit_button', 'submit',get_lang('Search'),'class="search"'); $form->addElement('style_submit_button', 'submit',get_lang('Search'),'class="search"');
//$form->addElement('static','search_advanced_link',null,'<a href="user_list.php?search=advanced">'.get_lang('AdvancedSearch').'</a>'); $form->addElement('static','search_advanced_link',null,'<a href="javascript://" class = "advanced_parameters" onclick="display_advanced_search_form();"><span id="img_plus_and_minus">&nbsp;'.Display::return_icon('div_show.gif',get_lang('Show'),array('style'=>'vertical-align:middle')).' '.get_lang('AdvancedSearch').'</span></a>');
$form->addElement('static','search_advanced_link',null,'<a href="javascript://" class = "advanced_parameters" onclick="display_advanced_search_form();"><span id="img_plus_and_minus">&nbsp;'.Display::return_icon('div_show.gif',get_lang('Show'),array('style'=>'vertical-align:middle')).' '.get_lang('AdvancedSearch').'</span></a>');
echo '<div class="actions" style="width:100%;">'; $actions = '';
if (api_is_platform_admin()) { if (api_is_platform_admin()) {
echo '<span style="float:right;">'. $actions .= '<span style="float:right;">'.
'<a href="'.api_get_path(WEB_CODE_PATH).'admin/user_add.php">'.Display::return_icon('new_user.png',get_lang('AddUsers'),'','32').'</a>'. '<a href="'.api_get_path(WEB_CODE_PATH).'admin/user_add.php">'.Display::return_icon('new_user.png',get_lang('AddUsers'),'','32').'</a>'.
'</span>'; '</span>';
} }
$form->display(); $actions .=$form->return_form();
echo '</div>';
if (isset ($_GET['keyword'])) { if (isset ($_GET['keyword'])) {
$parameters = array ('keyword' => Security::remove_XSS($_GET['keyword'])); $parameters = array ('keyword' => Security::remove_XSS($_GET['keyword']));
} elseif (isset ($_GET['keyword_firstname'])) { } elseif (isset ($_GET['keyword_firstname'])) {
@ -970,7 +965,7 @@ $defaults['keyword_inactive'] = 1;
$form->setDefaults($defaults); $form->setDefaults($defaults);
$form->addElement('html','</div>'); $form->addElement('html','</div>');
$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 = 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); $table->set_additional_parameters($parameters);
@ -1000,6 +995,13 @@ $table->set_column_filter(9, 'modify_filter');
if (api_is_platform_admin()) if (api_is_platform_admin())
$table->set_form_actions(array ('delete' => get_lang('DeleteFromPlatform'))); $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);

9
main/css/base.css
Unescape View File

@ -3787,4 +3787,13 @@ form div.error input, form div.error textarea {
} }
.label_tag.notice { .label_tag.notice {
background-color: #62cffc; background-color: #62cffc;
}
.invisible {
color: #999;
}
.invisible h2 {
color: #999;
} }

4
main/css/base_chamilo.css
Unescape View File

@ -216,9 +216,7 @@ ul#navigation .student-connect a {
min-height: 300px; min-height: 300px;
background-color: #fff; background-color: #fff;
} }
.invisible {
color: #999;
}
.courseadminview table td a, .Authoringview table td a { .courseadminview table td a, .Authoringview table td a {
font-weight: bold; font-weight: bold;
font-size:13px; font-size:13px;

Write Preview
Loading…
Cancel
Save