More UI fixes

skala
Julio Montoya 14 years ago
parent fb3ec5d61b
commit 50065b8b81
  1. 8
      main/admin/course_list.php
  2. 10
      main/admin/user_list.php
  3. 6
      main/course_info/infocours.php
  4. 12
      main/coursecopy/import_backup.php

@ -179,7 +179,7 @@ if (isset ($_GET['search']) && $_GET['search'] == 'advanced') {
//api_display_tool_title($tool_name);
$form = new FormValidator('advanced_course_search', 'get');
$form->addElement('header', '', $tool_name);
$form->addElement('header', $tool_name);
$form->add_textfield('keyword_code', get_lang('CourseCode'), false);
$form->add_textfield('keyword_title', get_lang('Title'), false);
$categories = array();
@ -198,7 +198,7 @@ if (isset ($_GET['search']) && $_GET['search'] == 'advanced') {
$form->addElement('radio', 'keyword_unsubscribe', get_lang('Unsubscription'), get_lang('AllowedToUnsubscribe'), 1);
$form->addElement('radio', 'keyword_unsubscribe', null, get_lang('NotAllowedToUnsubscribe'), 0);
$form->addElement('radio', 'keyword_unsubscribe', null, get_lang('All'), '%');
$form->addElement('style_submit_button', 'submit', get_lang('SearchCourse'),'class="search"');
$form->addElement('style_submit_button', 'submit', get_lang('SearchCourse'),'class="btn"');
$defaults['keyword_language'] = '%';
$defaults['keyword_visibility'] = '%';
$defaults['keyword_subscribe'] = '%';
@ -230,11 +230,11 @@ if (isset ($_GET['search']) && $_GET['search'] == 'advanced') {
}
// Create a search-box
$form = new FormValidator('search_simple', 'get', '', '', 'width=200px', false);
$form = new FormValidator('search_simple', 'get', '', '', array('class'=>'form-search'), false);
$renderer =& $form->defaultRenderer();
$renderer->setElementTemplate('<span>{element}</span> ');
$form->addElement('text', 'keyword', get_lang('keyword'));
$form->addElement('style_submit_button', 'submit', get_lang('SearchCourse'), 'class="search"');
$form->addElement('style_submit_button', 'submit', get_lang('SearchCourse'), 'class="btn"');
$form->addElement('static', 'search_advanced_link', null, '<a href="course_list.php?search=advanced">'.get_lang('AdvancedSearch').'</a>');
$actions .= '<div style="float: right; ">';

@ -723,11 +723,11 @@ if (isset ($_POST['action'])) {
}
// Create a search-box
$form = new FormValidator('search_simple','get','','',null,false);
$form = new FormValidator('search_simple','get','','',array('class' => 'form-search'),false);
$renderer =& $form->defaultRenderer();
$renderer->setElementTemplate('<span>{element}</span> ');
$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="btn"');
$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>');
$actions = '';
@ -802,8 +802,8 @@ $form->addElement('html', '</td></tr>');
$form->addElement('html', '<tr><td>');
$active_group = array();
$active_group[] = $form->createElement('checkbox','keyword_active','',get_lang('Active'), array('style'=>'margin-left:17px'));
$active_group[] = $form->createElement('checkbox','keyword_inactive','',get_lang('Inactive'),array('style'=>'margin-left:17px'));
$active_group[] = $form->createElement('checkbox','keyword_active','', get_lang('Active'));
$active_group[] = $form->createElement('checkbox','keyword_inactive','', get_lang('Inactive'));
$form->addGroup($active_group,'',get_lang('ActiveAccount'),'<br/>',false);
$form->addElement('html', '</td><td>');
@ -832,7 +832,7 @@ if (!empty($extra_data)) {
$form->addElement('html', '</td></tr>');
$form->addElement('html', '<tr><td>');
$form->addElement('style_submit_button', 'submit',get_lang('SearchUsers'),'class="search"');
$form->addElement('style_submit_button', 'submit',get_lang('SearchUsers'),'class="btn"');
$form->addElement('html', '</td></tr>');
$form->addElement('html', '</table>');

@ -135,7 +135,7 @@ if (file_exists($course_path.'/course-pic85x85.png')) {
$form->addElement('html', $image_html);
$form->add_textfield('title', get_lang('Title'), true, array('size' => '60'));
$form->add_textfield('title', get_lang('Title'), true, array('class' => 'span6'));
//$form->applyFilter('title', 'html_filter');
$form->applyFilter('title', 'trim');
@ -155,10 +155,10 @@ $form->applyFilter('visual_code', 'strtoupper');*/
$form->addElement('select', 'category_code', get_lang('Fac'), $categories, array('style'=>'width:350px', 'class'=>'chzn-select', 'id'=>'category_code'));
$form->addElement('select_language', 'course_language', array(get_lang('Ln'), get_lang('TipLang')));
$form->add_textfield('department_name', get_lang('Department'), false, array('size' => '60'));
$form->add_textfield('department_name', get_lang('Department'), false, array('class' => 'span5'));
$form->applyFilter('department_name', 'trim');
$form->add_textfield('department_url', get_lang('DepartmentUrl'), false, array('size' => '60'));
$form->add_textfield('department_url', get_lang('DepartmentUrl'), false, array('class' => 'span5'));
//$form->addRule('tutor_name', get_lang('ThisFieldIsRequired'), 'required');

@ -84,17 +84,17 @@ if ((isset($_POST['action']) && $_POST['action'] == 'course_select_form' ) || (i
$cr->set_file_option($_POST['same_file_name_option']);
$cr->restore();
Display::display_normal_message(get_lang('ImportFinished').
'<a class="bottom-link" href="'.api_get_path(WEB_COURSE_PATH).api_get_course_path().'/index.php">'.get_lang('CourseHomepage').'</a>', false);
'<a class="btn" href="'.api_get_path(WEB_COURSE_PATH).api_get_course_path().'/index.php">'.get_lang('CourseHomepage').'</a>', false);
} else {
if (!$error) {
Display::display_warning_message(get_lang('NoResourcesInBackupFile').
'<a class="bottom-link" href="import_backup.php?'.api_get_cidreq().'">'.get_lang('TryAgain').'</a>', false);
'<a class="btn" href="import_backup.php?'.api_get_cidreq().'">'.get_lang('TryAgain').'</a>', false);
} elseif ($filename === false) {
Display::display_error_message(get_lang('ArchivesDirectoryNotWriteableContactAdmin').
'<a class="bottom-link" href="import_backup.php?'.api_get_cidreq().'">'.get_lang('TryAgain').'</a>', false);
'<a class="btn" href="import_backup.php?'.api_get_cidreq().'">'.get_lang('TryAgain').'</a>', false);
} else {
Display::display_error_message(api_ucfirst(get_lang('UploadError')).
'<a class="bottom-link" href="import_backup.php?'.api_get_cidreq().'">'.get_lang('TryAgain').'</a>', false);
'<a class="btn" href="import_backup.php?'.api_get_cidreq().'">'.get_lang('TryAgain').'</a>', false);
}
}
CourseArchiver::clean_backup_dir();
@ -111,10 +111,10 @@ if ((isset($_POST['action']) && $_POST['action'] == 'course_select_form' ) || (i
CourseSelectForm::display_form($course, array('same_file_name_option' => $_POST['same_file_name_option']));
} elseif ($filename === false) {
Display::display_error_message(get_lang('ArchivesDirectoryNotWriteableContactAdmin').
'<a class="bottom-link" href="import_backup.php?'.api_get_cidreq().'">'.get_lang('TryAgain').'</a>', false);
'<a class="btn" href="import_backup.php?'.api_get_cidreq().'">'.get_lang('TryAgain').'</a>', false);
} else {
Display::display_warning_message(get_lang('NoResourcesInBackupFile').
'<a class="bottom-link" href="import_backup.php?'.api_get_cidreq().'">'.get_lang('TryAgain').'</a>', false);
'<a class="btn" href="import_backup.php?'.api_get_cidreq().'">'.get_lang('TryAgain').'</a>', false);
}
} else {
$user = api_get_user_info();

Loading…
Cancel
Save