diff --git a/main/admin/settings.lib.php b/main/admin/settings.lib.php index ebad60a7d3..28578db481 100644 --- a/main/admin/settings.lib.php +++ b/main/admin/settings.lib.php @@ -876,8 +876,8 @@ function add_edit_template() { $form->addElement('style_submit_button' , 'submit', get_lang('Ok') ,'class="save"'); // Setting the rules: the required fields. - $form->addRule('title', '
'.get_lang('ThisFieldIsRequired'), 'required'); - $form->addRule('template_text', '
'.get_lang('ThisFieldIsRequired'), 'required'); + $form->addRule('title', get_lang('ThisFieldIsRequired'), 'required'); + $form->addRule('template_text', get_lang('ThisFieldIsRequired'), 'required'); // if the form validates (complies to all rules) we save the information, else we display the form again (with error message if needed) if ($form->validate()) { diff --git a/main/admin/usergroups.php b/main/admin/usergroups.php index 22139346ff..7e0e3f189b 100755 --- a/main/admin/usergroups.php +++ b/main/admin/usergroups.php @@ -107,7 +107,7 @@ if (isset($_GET['action']) && $_GET['action'] == 'add') { $form->addElement('style_submit_button', 'submit', get_lang('Add'), 'class="add"'); // Setting the rules - $form->addRule('name', '
'.get_lang('ThisFieldIsRequired'), 'required'); + $form->addRule('name', get_lang('ThisFieldIsRequired'), 'required'); // The validation or display if ($form->validate()) { @@ -146,7 +146,7 @@ elseif (isset($_GET['action']) && $_GET['action'] == 'edit' && is_numeric($_GET[ $form->setDefaults($defaults); // Setting the rules - $form->addRule('name', '
'.get_lang('ThisFieldIsRequired'), 'required'); + $form->addRule('name', get_lang('ThisFieldIsRequired'), 'required'); // The validation or display if ($form->validate()) { diff --git a/main/exercice/question_create.php b/main/exercice/question_create.php index 91a4913c75..8c54edec64 100644 --- a/main/exercice/question_create.php +++ b/main/exercice/question_create.php @@ -62,8 +62,8 @@ $form->addElement('style_submit_button', 'SubmitCreateQuestion', get_lang('Creat // setting the rules // $form->addRule('question_type', '
'.get_lang('ThisFieldIsRequired'), 'required'); -$form->addRule('exercice', ''.get_lang('ThisFieldIsRequired').'', 'required'); -$form->addRule('exercice', ''.get_lang('YouHaveToSelectATest').'', 'numeric'); +$form->addRule('exercice', get_lang('ThisFieldIsRequired'), 'required'); +$form->addRule('exercice', get_lang('YouHaveToSelectATest'), 'numeric'); $form->registerRule('validquestiontype', 'callback', 'check_question_type'); $form->addRule('question_type_hidden', get_lang('InvalidQuestionType'), 'validquestiontype'); diff --git a/main/exercice/tests_category.php b/main/exercice/tests_category.php index 15fe4e5fc2..29462f54de 100644 --- a/main/exercice/tests_category.php +++ b/main/exercice/tests_category.php @@ -86,7 +86,7 @@ function edit_category_form($in_action) { // -------------------- // setting the rules // -------------------- - $form->addRule('category_name', '
'.get_lang('ThisFieldIsRequired'), 'required'); + $form->addRule('category_name', get_lang('ThisFieldIsRequired'), 'required'); // -------------------- // The validation or display // -------------------- @@ -158,7 +158,7 @@ function add_category_form($in_action) { $form->addElement('html_editor', 'category_description', get_lang('CategoryDescription'), null, array('ToolbarSet' => 'test_category', 'Width' => '90%', 'Height' => '200')); $form->addElement('style_submit_button', 'SubmitNote', get_lang('AddTestCategory'), 'class="add"'); // setting the rules - $form->addRule('category_name', '
'.get_lang('ThisFieldIsRequired'), 'required'); + $form->addRule('category_name', get_lang('ThisFieldIsRequired'), 'required'); // The validation or display if ($form->validate()) { diff --git a/main/forum/forumfunction.inc.php b/main/forum/forumfunction.inc.php index 62f38cd498..416eaff400 100644 --- a/main/forum/forumfunction.inc.php +++ b/main/forum/forumfunction.inc.php @@ -2133,9 +2133,9 @@ function show_add_post_form($action = '', $id = '', $form_values = '') { $form->setDefaults(isset($defaults) ? $defaults : null); // The course admin can make a thread sticky (=appears with special icon and always on top). - $form->addRule('post_title', '
'.get_lang('ThisFieldIsRequired'), 'required'); + $form->addRule('post_title', get_lang('ThisFieldIsRequired'), 'required'); if ($current_forum['allow_anonymous'] == 1 && !isset($_user['user_id'])) { - $form->addRule('poster_name', '
'.get_lang('ThisFieldIsRequired'), 'required'); + $form->addRule('poster_name', get_lang('ThisFieldIsRequired'), 'required'); } // Validation or display @@ -2570,7 +2570,7 @@ function show_edit_post_form($current_post, $current_thread, $current_forum, $fo // The course admin can make a thread sticky (=appears with special icon and always on top). - $form->addRule('post_title', '
'.get_lang('ThisFieldIsRequired'), 'required'); + $form->addRule('post_title', get_lang('ThisFieldIsRequired'), 'required'); // Validation or display if ($form->validate()) { diff --git a/main/glossary/index.php b/main/glossary/index.php index c7c05db623..8b573461ac 100644 --- a/main/glossary/index.php +++ b/main/glossary/index.php @@ -160,7 +160,7 @@ if (api_is_allowed_to_edit(null, true)) { $form->setDefaults($glossary_data); // setting the rules - $form->addRule('glossary_title', '
'.get_lang('ThisFieldIsRequired'), 'required'); + $form->addRule('glossary_title', get_lang('ThisFieldIsRequired'), 'required'); // The validation or display if ($form->validate()) { diff --git a/main/inc/lib/career.lib.php b/main/inc/lib/career.lib.php index e13a68847c..01a9726791 100644 --- a/main/inc/lib/career.lib.php +++ b/main/inc/lib/career.lib.php @@ -118,7 +118,7 @@ class Career extends Model { $form->setDefaults($defaults); // Setting the rules - $form->addRule('name', '
'.get_lang('ThisFieldIsRequired'), 'required'); + $form->addRule('name', get_lang('ThisFieldIsRequired'), 'required'); return $form; } diff --git a/main/inc/lib/grade_model.lib.php b/main/inc/lib/grade_model.lib.php index a786e70634..799d8c3727 100644 --- a/main/inc/lib/grade_model.lib.php +++ b/main/inc/lib/grade_model.lib.php @@ -59,6 +59,7 @@ class GradeModel extends Model { $oFCKeditor->CreateHtml(); $form = new FormValidator('grades', 'post', $url); + // Settting the form elements $header = get_lang('Add'); @@ -74,7 +75,7 @@ class GradeModel extends Model { $form->add_html_editor('description', get_lang('Description'), false, false, array('ToolbarSet' => 'careers','Width' => '100%', 'Height' => '250')); $form->addElement('label', get_lang('Components')); - + //Get components $nr_items = 2; $max = 10; @@ -93,7 +94,7 @@ class GradeModel extends Model { $renderer = & $form->defaultRenderer(); - for ($i = 0; $i <= $max; $i++) { + for ($i = 0; $i <= $max; $i++) { $counter = $i; $form->addElement('text', 'components['.$i.'][percentage]', null, array('class' => 'span1')); $form->addElement('text', 'components['.$i.'][acronym]', null, array('class' => 'span1')); @@ -102,28 +103,50 @@ class GradeModel extends Model { $template_percentage = '
-

* - -

{error}
{element} % = '; - - $template_acronym = ' - * - {error} {element} {label}'; + +

+ +

+ + + * + + {element} + % = '; + + $template_acronym = ' + * + {element} {label}'; - $template_title = - '{error}
 {element} - - '.get_lang('Add').' - - - '.get_lang('Delete').' - -

'; + $template_title = + ' {element} + + '.get_lang('Add').' + + + '.get_lang('Delete').' + +
+

+
'; $renderer->setElementTemplate($template_title, 'components['.$i.'][title]'); $renderer->setElementTemplate($template_percentage , 'components['.$i.'][percentage]'); - $renderer->setElementTemplate($template_acronym , 'components['.$i.'][acronym]'); + $renderer->setElementTemplate($template_acronym , 'components['.$i.'][acronym]'); + + if ($i == 0) { + //$form->addRule('components['.$i.'][percentage]', '
'.get_lang('ThisFieldIsRequired'), 'required'); + //$form->addRule('components['.$i.'][title]', '
'.get_lang('ThisFieldIsRequired'), 'required'); + //$form->addRule('components['.$i.'][acronym]', '
'.get_lang('ThisFieldIsRequired'), 'required'); + + } } + //Required field + + + + //$this->addRule('score', get_lang('OnlyNumbers'), 'numeric',null,'client'); + $form->addElement('advanced_settings', get_lang('AllMustWeight100')); if ($action == 'edit') { @@ -145,7 +168,7 @@ class GradeModel extends Model { $form->setDefaults($defaults); // Setting the rules - $form->addRule('name', '
'.get_lang('ThisFieldIsRequired'), 'required'); + $form->addRule('name', get_lang('ThisFieldIsRequired'), 'required'); return $form; } diff --git a/main/inc/lib/promotion.lib.php b/main/inc/lib/promotion.lib.php index 4366c77f2a..17b163e527 100644 --- a/main/inc/lib/promotion.lib.php +++ b/main/inc/lib/promotion.lib.php @@ -192,7 +192,7 @@ class Promotion extends Model { $form->setDefaults($defaults); // Setting the rules - $form->addRule('name', '
'.get_lang('ThisFieldIsRequired'), 'required'); + $form->addRule('name', get_lang('ThisFieldIsRequired'), 'required'); return $form; } diff --git a/main/inc/lib/timeline.lib.php b/main/inc/lib/timeline.lib.php index 575e464bcc..b19759304b 100644 --- a/main/inc/lib/timeline.lib.php +++ b/main/inc/lib/timeline.lib.php @@ -86,7 +86,7 @@ class Timeline extends Model { $form->addElement('style_submit_button', 'submit', get_lang('Add'), 'class="save"'); } - $form->addRule('headline', '
'.get_lang('ThisFieldIsRequired'), 'required'); + $form->addRule('headline', get_lang('ThisFieldIsRequired'), 'required'); // Setting the defaults $defaults = $this->get($id); @@ -100,7 +100,7 @@ class Timeline extends Model { $form->setDefaults($defaults); // Setting the rules - $form->addRule('headline', '
'.get_lang('ThisFieldIsRequired'), 'required'); + $form->addRule('headline', get_lang('ThisFieldIsRequired'), 'required'); return $form; } @@ -128,8 +128,8 @@ class Timeline extends Model { $form->addElement('text', 'media_credit', get_lang('media_credit'), array('size' => '70')); $form->addElement('text', 'title_slide', get_lang('title_slide'), array('size' => '70')); - $form->addRule('headline', '
'.get_lang('ThisFieldIsRequired'), 'required'); - $form->addRule('start_date', '
'.get_lang('ThisFieldIsRequired'), 'required'); + $form->addRule('headline', get_lang('ThisFieldIsRequired'), 'required'); + $form->addRule('start_date', get_lang('ThisFieldIsRequired'), 'required'); //$form->add_html_editor('description', get_lang('Description'), false, false, array('ToolbarSet' => 'careers','Width' => '100%', 'Height' => '250')); @@ -151,7 +151,7 @@ class Timeline extends Model { $form->setDefaults($defaults); // Setting the rules - $form->addRule('headline', '
'.get_lang('ThisFieldIsRequired'), 'required'); + $form->addRule('headline', get_lang('ThisFieldIsRequired'), 'required'); return $form; } diff --git a/main/newscorm/learnpath.class.php b/main/newscorm/learnpath.class.php index c6f649cea6..82a0352ec3 100644 --- a/main/newscorm/learnpath.class.php +++ b/main/newscorm/learnpath.class.php @@ -6468,7 +6468,7 @@ class learnpath { if ($action != 'move') { $form->addElement('text', 'title', get_lang('Title'), 'id="idTitle" class="learnpath_chapter_form" size="40%"'); $form->applyFilter('title', 'html_filter'); - $form->addRule('title', '
' . get_lang('ThisFieldIsRequired'), 'required'); + $form->addRule('title', get_lang('ThisFieldIsRequired'), 'required'); //$form->addElement('textarea', 'description', get_lang('Description').' :', 'id="idDescription"'); } else { $form->addElement('hidden', 'title'); diff --git a/main/notebook/index.php b/main/notebook/index.php index 34be76264c..add05c9e66 100644 --- a/main/notebook/index.php +++ b/main/notebook/index.php @@ -83,7 +83,7 @@ if (isset($_GET['action']) && $_GET['action'] == 'addnote') { $form->addElement('style_submit_button', 'SubmitNote', get_lang('AddNote'), 'class="add"'); // Setting the rules - $form->addRule('note_title', '
'.get_lang('ThisFieldIsRequired'), 'required'); + $form->addRule('note_title', get_lang('ThisFieldIsRequired'), 'required'); // The validation or display if ($form->validate()) { @@ -134,7 +134,7 @@ elseif (isset($_GET['action']) && $_GET['action'] == 'editnote' && is_numeric($_ $form->setDefaults($defaults); // Setting the rules - $form->addRule('note_title', '
'.get_lang('ThisFieldIsRequired'), 'required'); + $form->addRule('note_title', get_lang('ThisFieldIsRequired'), 'required'); // The validation or display if ($form->validate()) { diff --git a/main/survey/create_new_survey.php b/main/survey/create_new_survey.php index 2df123fd9b..2d06dbf9c6 100644 --- a/main/survey/create_new_survey.php +++ b/main/survey/create_new_survey.php @@ -253,10 +253,10 @@ $form->addElement('style_submit_button', 'submit_survey', $text, 'class="'.$clas // Setting the rules if ($_GET['action'] == 'add') { - $form->addRule('survey_code', '
'.get_lang('ThisFieldIsRequired'), 'required'); + $form->addRule('survey_code', get_lang('ThisFieldIsRequired'), 'required'); $form->addRule('survey_code', '', 'maxlength', 20); } -$form->addRule('survey_title', '
'.get_lang('ThisFieldIsRequired'), 'required'); +$form->addRule('survey_title', get_lang('ThisFieldIsRequired'), 'required'); $form->addRule('start_date', get_lang('InvalidDate'), 'date'); $form->addRule('end_date', get_lang('InvalidDate'), 'date'); $form->addRule(array('start_date', 'end_date'), get_lang('StartDateShouldBeBeforeEndDate'), 'date_compare', 'lte'); diff --git a/main/upload/form.scorm.php b/main/upload/form.scorm.php index 9fcbc9a49a..63df597965 100644 --- a/main/upload/form.scorm.php +++ b/main/upload/form.scorm.php @@ -53,7 +53,7 @@ $form->addElement('hidden', 'tool', $my_tool); $form->addElement('file','user_file',get_lang('FileToUpload')); $form->add_real_progress_bar('uploadScorm','user_file'); -$form->addRule('user_file', '
'.get_lang('ThisFieldIsRequired'), 'required'); +$form->addRule('user_file', get_lang('ThisFieldIsRequired'), 'required'); /*$select_content_marker = &$form->addElement('select','content_maker',get_lang('ContentMaker')); foreach($content_origins as $index => $origin){ diff --git a/main/wiki/index.php b/main/wiki/index.php index 160484d0d0..3ecb168f56 100644 --- a/main/wiki/index.php +++ b/main/wiki/index.php @@ -1483,7 +1483,7 @@ if ($_GET['action']=='searchpages') { $form->addElement('style_submit_button', 'SubmitWikiSearch', get_lang('Search'), 'class="search"'); // setting the rules - $form->addRule('search_term', ''.get_lang('ThisFieldIsRequired').'', 'required'); + $form->addRule('search_term', get_lang('ThisFieldIsRequired'), 'required'); $form->addRule('search_term', get_lang('TooShort'),'minlength',3); //TODO: before fixing the pagination rules worked, not now if ($form->validate()) { $form->display();