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

Some corrections in order to add the buttons fixed in the bottom of the page (if wanted)

Browse Source
skala
Julio Montoya 14 years ago
parent 438afd6c2b
commit 556d19743e
9 changed files with 54 additions and 34 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. 6
      main/admin/course_list.php
  2. 26
      main/admin/settings.lib.php
  3. 4
      main/admin/settings.php
  4. 2
      main/admin/user_add.php
  5. 2
      main/create_course/add_course.php
  6. 13
      main/css/base.css
  7. 3
      main/inc/lib/formvalidator/Element/select_language.php
  8. 1
      main/inc/lib/formvalidator/Element/style_button.php
  9. 31
      main/inc/lib/formvalidator/FormValidator.class.php

6
main/admin/course_list.php
Unescape View File

@ -230,10 +230,8 @@ if (isset ($_GET['search']) && $_GET['search'] == 'advanced') {
}
// Create a search-box
$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 = new FormValidator('search_simple', 'get', '', '', array('class'=>'form-search'), false);
$form->addElement('text', 'keyword', null);
$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>');

26
main/admin/settings.lib.php
Unescape View File

@ -76,8 +76,7 @@ function handle_regions() {
}
echo '</table>';
echo '<br />';
echo '<button class="save" type="submit" name="submit_plugins">'.get_lang('EnablePlugins').'</button></form>';
echo '<br />';
echo '<button class="save" type="submit" name="submit_plugins">'.get_lang('EnablePlugins').'</button></form>';
}
function handle_extensions() {
@ -108,7 +107,7 @@ function handle_plugins() {
//Plugins NOT installed
echo Display::page_subheader(get_lang('Plugins'));
echo '<form name="plugins" method="post" action="'.api_get_self().'?category='.Security::remove_XSS($_GET['category']).'">';
echo '<form class="form-horizontal" name="plugins" method="post" action="'.api_get_self().'?category='.Security::remove_XSS($_GET['category']).'">';
echo '<table class="data_table">';
echo '<tr>';
echo '<th width="20px">';
@ -164,8 +163,12 @@ function handle_plugins() {
}
}
echo '</table>';
echo '<br />';
echo '<button class="save" type="submit" name="submit_plugins">'.get_lang('EnablePlugins').'</button></form>';
echo '<div class="form-actions bottom_actions">';
echo '<button class="save" type="submit" name="submit_plugins">'.get_lang('EnablePlugins').'</button>';
echo '</div>';
echo '</form>';
}
/**
@ -508,10 +511,10 @@ function handle_search() {
$form = new FormValidator('search-options', 'post', api_get_self().'?category=Search');
$renderer = & $form->defaultRenderer();
//$renderer = & $form->defaultRenderer();
//$renderer->setHeaderTemplate('<div class="sectiontitle">{header}</div>'."\n");
//$renderer->setElementTemplate('<div class="sectioncomment">{label}</div>'."\n".'<div class="sectionvalue">{element}</div>'."\n");
$renderer->setElementTemplate('<div class="row"><div class="label">{label}</div><div class="formw">{element}<!-- BEGIN label_2 --><span class="help-block">{label_2}</span><!-- END label_2 --></div></div>');
//$renderer->setElementTemplate('<div class="row"><div class="label">{label}</div><div class="formw">{element}<!-- BEGIN label_2 --><span class="help-block">{label_2}</span><!-- END label_2 --></div></div>');
$values = api_get_settings_options('search_enabled');
$form->addElement('header', null, get_lang('SearchEnabledTitle'));
@ -1048,7 +1051,7 @@ function generate_settings_form($settings, $settings_by_access_list) {
$table_settings_current = Database :: get_main_table(TABLE_MAIN_SETTINGS_CURRENT);
global $_configuration, $settings_to_avoid, $convert_byte_to_mega_list;
$form = new FormValidator('settings', 'post', 'settings.php?category='.Security::remove_XSS($_GET['category']), null, array('sss'));
$form = new FormValidator('settings', 'post', 'settings.php?category='.Security::remove_XSS($_GET['category']));
$form->addElement('hidden', 'search_field', Security::remove_XSS($_GET['search_field']));
$default_values = array();
@ -1256,11 +1259,8 @@ function generate_settings_form($settings, $settings_by_access_list) {
if (!empty($settings)) {
$form->setDefaults($default_values);
}
$form->addElement('html', '<div class="bottom_actions">');
$form->addElement('style_submit_button', null, get_lang('SaveSettings'), 'class="save"');
$form->addElement('html', '</div>');
}
$form->addElement('button', 'submit_fixed_in_bottom', get_lang('SaveSettings'), 'class="save"');
return $form;
}

4
main/admin/settings.php
Unescape View File

@ -128,7 +128,8 @@ if (!empty($_GET['category']) && !in_array($_GET['category'], array('Plugins', '
}
}
$form = generate_settings_form($settings, $settings_by_access_list);
$form = generate_settings_form($settings, $settings_by_access_list);
$message = array();
if ($form->validate()) {
@ -377,7 +378,6 @@ if (isset($form) && $form->validate()) {
}
}
if (!empty($_GET['category'])) {
switch ($_GET['category']) {
case 'Regions':

2
main/admin/user_add.php
Unescape View File

@ -330,7 +330,7 @@ $defaults = array_merge($defaults, $extra_data);
$form->setDefaults($defaults);
// Submit button
$select_level = array ();
$select_level = array();
$html_results_enabled[] = FormValidator :: createElement ('style_submit_button', 'submit_plus', get_lang('Add').'+', 'class="add"');
$html_results_enabled[] = FormValidator :: createElement ('style_submit_button', 'submit', get_lang('Add'), 'class="add"');
$form->addGroup($html_results_enabled);

2
main/create_course/add_course.php
Unescape View File

@ -170,7 +170,7 @@ $obj->fill_grade_model_select_in_form($form);
$form->addElement('html','</div>');
// Submit button.
$form->addElement('style_submit_button', null, $course_validation_feature ? get_lang('CreateThisCourseRequest') : get_lang('CreateCourseArea'), 'class="add"');
$form->addElement('button', 'submit', $course_validation_feature ? get_lang('CreateThisCourseRequest') : get_lang('CreateCourseArea'), 'class="add"');
// The progress bar of this form.
$form->add_progress_bar();

13
main/css/base.css
Unescape View File

@ -3834,15 +3834,13 @@ footer {
.bottom_actions {
background:#efefef;
/*background:#efefef;
border:1px solid #ccc;
padding:10px;
padding:10px;
vertical-align:middle;
display: block;
width: 100%;
*/
display: block;
width: 100%;
}
.bottom_actions_fixed {
@ -3850,4 +3848,5 @@ footer {
z-index: 9001;
bottom: 0;
left: 0px;
margin-bottom: 0px;
}

3
main/inc/lib/formvalidator/Element/select_language.php
Unescape View File

@ -27,5 +27,4 @@ class HTML_QuickForm_Select_Language extends HTML_QuickForm_select
}
}
}
}
?>
}

1
main/inc/lib/formvalidator/Element/style_button.php
Unescape View File

@ -169,6 +169,7 @@ class HTML_QuickForm_stylebutton extends HTML_QuickForm_element
if (isset($this->_attributes['class'])) {
$this->_attributes['class'] = 'btn '.$this->_attributes['class'];
}
//var_dump($this->getName());
return $this->_getTabs().'<button ' . $this->_getAttrString($this->_attributes) . ' >'.$this->getValue() .'</button>';
}
} //end func toHtml

31
main/inc/lib/formvalidator/FormValidator.class.php
Unescape View File

@ -19,7 +19,6 @@ define('TEACHER_HTML_FULLPAGE', 5);
*/
class FormValidator extends HTML_QuickForm
{
/**
* Create a form validator based on an array of form data:
*
@ -98,7 +97,6 @@ class FormValidator extends HTML_QuickForm
}
}
$result->setDefaults($defaults);
return $result;
}
@ -158,8 +156,12 @@ class FormValidator extends HTML_QuickForm
$renderer->setFormTemplate($form_template);
//Element template
if (isset($attributes['class']) && $attributes['class'] == 'well form-inline') {
if (isset($attributes['class']) && $attributes['class'] == 'well form-inline') {
$element_template = ' {label} {element} ';
$renderer->setElementTemplate($element_template);
} elseif (isset($attributes['class']) && $attributes['class'] == 'form-search') {
$element_template = ' {label} {element} ';
$renderer->setElementTemplate($element_template);
} else {
$element_template = '
<div class="control-group {error_class}">
@ -183,9 +185,30 @@ class FormValidator extends HTML_QuickForm
<!-- END error -->
</div>
</div>';
$renderer->setElementTemplate($element_template);
//Display a gray div in the buttons
$button_element_template = '<div class="form-actions">{label} {element}</div>';
$renderer->setElementTemplate($button_element_template, 'submit_in_actions');
//Display a gray div in the buttons + makes the button available when scrolling
$button_element_template = '<div class="form-actions bottom_actions">{label} {element}</div>';
$renderer->setElementTemplate($button_element_template, 'submit_fixed_in_bottom');
/*
$renderer->setElementTemplate($button_element_template, 'submit_button');
$renderer->setElementTemplate($button_element_template, 'submit');
$renderer->setElementTemplate($button_element_template, 'button');
*
*/
}
$renderer->setElementTemplate($element_template);
//Set Header template
$renderer->setHeaderTemplate('<legend>{header}</legend>');

Write Preview
Loading…
Cancel
Save