From 556d19743e0ac77b204ca51de20b4b797cab8797 Mon Sep 17 00:00:00 2001 From: Julio Montoya Date: Thu, 24 May 2012 15:21:13 +0200 Subject: [PATCH] Some corrections in order to add the buttons fixed in the bottom of the page (if wanted) --- main/admin/course_list.php | 6 ++-- main/admin/settings.lib.php | 26 ++++++++-------- main/admin/settings.php | 4 +-- main/admin/user_add.php | 2 +- main/create_course/add_course.php | 2 +- main/css/base.css | 13 ++++---- .../formvalidator/Element/select_language.php | 3 +- .../formvalidator/Element/style_button.php | 1 + .../lib/formvalidator/FormValidator.class.php | 31 ++++++++++++++++--- 9 files changed, 54 insertions(+), 34 deletions(-) diff --git a/main/admin/course_list.php b/main/admin/course_list.php index e1e44c344c..fc3e5dc086 100644 --- a/main/admin/course_list.php +++ b/main/admin/course_list.php @@ -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('{element} '); - $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, ''.get_lang('AdvancedSearch').''); diff --git a/main/admin/settings.lib.php b/main/admin/settings.lib.php index c6c2087a32..320a04c5b6 100644 --- a/main/admin/settings.lib.php +++ b/main/admin/settings.lib.php @@ -76,8 +76,7 @@ function handle_regions() { } echo ''; echo '
'; - echo ''; - echo '
'; + echo ''; } function handle_extensions() { @@ -108,7 +107,7 @@ function handle_plugins() { //Plugins NOT installed echo Display::page_subheader(get_lang('Plugins')); - echo '
'; + echo ''; echo ''; echo ''; echo '
'; @@ -164,8 +163,12 @@ function handle_plugins() { } } echo '
'; - echo '
'; - echo '
'; + + echo '
'; + echo ''; + echo '
'; + echo ''; + } /** @@ -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('
{header}
'."\n"); //$renderer->setElementTemplate('
{label}
'."\n".'
{element}
'."\n"); - $renderer->setElementTemplate('
{label}
{element}{label_2}
'); + //$renderer->setElementTemplate('
{label}
{element}{label_2}
'); $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', '
'); - $form->addElement('style_submit_button', null, get_lang('SaveSettings'), 'class="save"'); - $form->addElement('html', '
'); + } + $form->addElement('button', 'submit_fixed_in_bottom', get_lang('SaveSettings'), 'class="save"'); return $form; } diff --git a/main/admin/settings.php b/main/admin/settings.php index 07ab7eafbc..de2533414d 100644 --- a/main/admin/settings.php +++ b/main/admin/settings.php @@ -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': diff --git a/main/admin/user_add.php b/main/admin/user_add.php index 46fc89dd5f..16f29e5527 100644 --- a/main/admin/user_add.php +++ b/main/admin/user_add.php @@ -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); diff --git a/main/create_course/add_course.php b/main/create_course/add_course.php index 16fd0dc952..95a84db089 100644 --- a/main/create_course/add_course.php +++ b/main/create_course/add_course.php @@ -170,7 +170,7 @@ $obj->fill_grade_model_select_in_form($form); $form->addElement('html',''); // 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(); diff --git a/main/css/base.css b/main/css/base.css index c9cf629d6b..92f7dc7605 100644 --- a/main/css/base.css +++ b/main/css/base.css @@ -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; } \ No newline at end of file diff --git a/main/inc/lib/formvalidator/Element/select_language.php b/main/inc/lib/formvalidator/Element/select_language.php index 8aa734baea..ec2762143f 100644 --- a/main/inc/lib/formvalidator/Element/select_language.php +++ b/main/inc/lib/formvalidator/Element/select_language.php @@ -27,5 +27,4 @@ class HTML_QuickForm_Select_Language extends HTML_QuickForm_select } } } -} -?> \ No newline at end of file +} \ No newline at end of file diff --git a/main/inc/lib/formvalidator/Element/style_button.php b/main/inc/lib/formvalidator/Element/style_button.php index f9bbad289a..3c5ae74ca8 100644 --- a/main/inc/lib/formvalidator/Element/style_button.php +++ b/main/inc/lib/formvalidator/Element/style_button.php @@ -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().''; } } //end func toHtml diff --git a/main/inc/lib/formvalidator/FormValidator.class.php b/main/inc/lib/formvalidator/FormValidator.class.php index 051dd0fd10..63144bec22 100644 --- a/main/inc/lib/formvalidator/FormValidator.class.php +++ b/main/inc/lib/formvalidator/FormValidator.class.php @@ -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 = '
@@ -183,9 +185,30 @@ class FormValidator extends HTML_QuickForm
'; + $renderer->setElementTemplate($element_template); + + //Display a gray div in the buttons + $button_element_template = '
{label} {element}
'; + $renderer->setElementTemplate($button_element_template, 'submit_in_actions'); + + //Display a gray div in the buttons + makes the button available when scrolling + $button_element_template = '
{label} {element}
'; + $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('{header}');