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

Removing unclosed div in some form validators

Browse Source
skala
Julio Montoya 14 years ago
parent 9c962b3354
commit e38cb2eb6e
15 changed files with 69 additions and 46 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. 4
      main/admin/settings.lib.php
  2. 4
      main/admin/usergroups.php
  3. 4
      main/exercice/question_create.php
  4. 4
      main/exercice/tests_category.php
  5. 6
      main/forum/forumfunction.inc.php
  6. 2
      main/glossary/index.php
  7. 2
      main/inc/lib/career.lib.php
  8. 63
      main/inc/lib/grade_model.lib.php
  9. 2
      main/inc/lib/promotion.lib.php
  10. 10
      main/inc/lib/timeline.lib.php
  11. 2
      main/newscorm/learnpath.class.php
  12. 4
      main/notebook/index.php
  13. 4
      main/survey/create_new_survey.php
  14. 2
      main/upload/form.scorm.php
  15. 2
      main/wiki/index.php

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

@ -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', '<div class="required">'.get_lang('ThisFieldIsRequired'), 'required');
$form->addRule('template_text', '<div class="required">'.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()) {

4
main/admin/usergroups.php
Unescape View File

@ -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', '<div class="required">'.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', '<div class="required">'.get_lang('ThisFieldIsRequired'), 'required');
$form->addRule('name', get_lang('ThisFieldIsRequired'), 'required');
// The validation or display
if ($form->validate()) {

4
main/exercice/question_create.php
Unescape View File

@ -62,8 +62,8 @@ $form->addElement('style_submit_button', 'SubmitCreateQuestion', get_lang('Creat
// setting the rules
// $form->addRule('question_type', '<div class="required">'.get_lang('ThisFieldIsRequired'), 'required');
$form->addRule('exercice', '<span class="required">'.get_lang('ThisFieldIsRequired').'</span>', 'required');
$form->addRule('exercice', '<span class="required">'.get_lang('YouHaveToSelectATest').'</span>', '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');

4
main/exercice/tests_category.php
Unescape View File

@ -86,7 +86,7 @@ function edit_category_form($in_action) {
// --------------------
// setting the rules
// --------------------
$form->addRule('category_name', '<div class="required">'.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', '<div class="required">'.get_lang('ThisFieldIsRequired'), 'required');
$form->addRule('category_name', get_lang('ThisFieldIsRequired'), 'required');
// The validation or display
if ($form->validate())
{

6
main/forum/forumfunction.inc.php
Unescape View File

@ -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', '<div class="required">'.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', '<div class="required">'.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', '<div class="required">'.get_lang('ThisFieldIsRequired'), 'required');
$form->addRule('post_title', get_lang('ThisFieldIsRequired'), 'required');
// Validation or display
if ($form->validate()) {

2
main/glossary/index.php
Unescape View File

@ -160,7 +160,7 @@ if (api_is_allowed_to_edit(null, true)) {
$form->setDefaults($glossary_data);
// setting the rules
$form->addRule('glossary_title', '<div class="required">'.get_lang('ThisFieldIsRequired'), 'required');
$form->addRule('glossary_title', get_lang('ThisFieldIsRequired'), 'required');
// The validation or display
if ($form->validate()) {

2
main/inc/lib/career.lib.php
Unescape View File

@ -118,7 +118,7 @@ class Career extends Model {
$form->setDefaults($defaults);
// Setting the rules
$form->addRule('name', '<div class="required">'.get_lang('ThisFieldIsRequired'), 'required');
$form->addRule('name', get_lang('ThisFieldIsRequired'), 'required');
return $form;
}

63
main/inc/lib/grade_model.lib.php
Unescape View File

@ -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 =
'<div id=' . $i . ' style="display: '.(($i<=$nr_items)?'inline':'none').';" class="control-group">
<p><!-- BEGIN required --><span class="form_required">*</span> <!-- END required -->
<label class="control-label">{label}</label>
<div class="controls"><!-- BEGIN error --><span class="form_error">{error}</span><br /><!-- END error -->{element} % = ';
$template_acronym = '
<!-- BEGIN required --><span class="form_required">*</span> <!-- END required -->
<!-- BEGIN error --><span class="form_error">{error}</span> <!-- END error -->{element} {label}';
<p>
<label class="control-label">{label}</label>
<div class="controls">
<!-- BEGIN required -->
<span class="form_required">*</span>
<!-- END required -->
{element}
% = ';
$template_acronym = '
<!-- BEGIN required --><span class="form_required">*</span> <!-- END required -->
{element} {label}';
$template_title =
'<!-- BEGIN error --><span class="form_error">{error}</span><br /><!-- END error -->&nbsp{element}
<a href="javascript:plusItem(' . ($counter+1) . ')">
<img style="display: '.(($counter>=$nr_items)?'inline':'none').';" id="plus-' . ($counter+1) . '" src="../img/icons/22/add.png" alt="'.get_lang('Add').'" title="'.get_lang('Add').'"></img>
</a>
<a href="javascript:minItem(' . ($counter) . ')">
<img style="display: '.(($counter>=$nr_items)?'inline':'none').';" id="min-' . $counter . '" src="../img/delete.png" alt="'.get_lang('Delete').'" title="'.get_lang('Delete').'"></img>
</a>
</div></p></div>';
$template_title =
'&nbsp{element}
<a href="javascript:plusItem(' . ($counter+1) . ')">
<img style="display: '.(($counter>=$nr_items)?'inline':'none').';" id="plus-' . ($counter+1) . '" src="../img/icons/22/add.png" alt="'.get_lang('Add').'" title="'.get_lang('Add').'"></img>
</a>
<a href="javascript:minItem(' . ($counter) . ')">
<img style="display: '.(($counter>=$nr_items)?'inline':'none').';" id="min-' . $counter . '" src="../img/delete.png" alt="'.get_lang('Delete').'" title="'.get_lang('Delete').'"></img>
</a>
</div>
</p>
</div>';
$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]', '<div class="required">'.get_lang('ThisFieldIsRequired'), 'required');
//$form->addRule('components['.$i.'][title]', '<div class="required">'.get_lang('ThisFieldIsRequired'), 'required');
//$form->addRule('components['.$i.'][acronym]', '<div class="required">'.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', '<div class="required">'.get_lang('ThisFieldIsRequired'), 'required');
$form->addRule('name', get_lang('ThisFieldIsRequired'), 'required');
return $form;
}

2
main/inc/lib/promotion.lib.php
Unescape View File

@ -192,7 +192,7 @@ class Promotion extends Model {
$form->setDefaults($defaults);
// Setting the rules
$form->addRule('name', '<div class="required">'.get_lang('ThisFieldIsRequired'), 'required');
$form->addRule('name', get_lang('ThisFieldIsRequired'), 'required');
return $form;
}

10
main/inc/lib/timeline.lib.php
Unescape View File

@ -86,7 +86,7 @@ class Timeline extends Model {
$form->addElement('style_submit_button', 'submit', get_lang('Add'), 'class="save"');
}
$form->addRule('headline', '<div class="required">'.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', '<div class="required">'.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', '<div class="required">'.get_lang('ThisFieldIsRequired'), 'required');
$form->addRule('start_date', '<div class="required">'.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', '<div class="required">'.get_lang('ThisFieldIsRequired'), 'required');
$form->addRule('headline', get_lang('ThisFieldIsRequired'), 'required');
return $form;
}

2
main/newscorm/learnpath.class.php
Unescape View File

@ -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', '<div class="required">' . 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');

4
main/notebook/index.php
Unescape View File

@ -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', '<div class="required">'.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', '<div class="required">'.get_lang('ThisFieldIsRequired'), 'required');
$form->addRule('note_title', get_lang('ThisFieldIsRequired'), 'required');
// The validation or display
if ($form->validate()) {

4
main/survey/create_new_survey.php
Unescape View File

@ -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', '<div class="required">'.get_lang('ThisFieldIsRequired'), 'required');
$form->addRule('survey_code', get_lang('ThisFieldIsRequired'), 'required');
$form->addRule('survey_code', '', 'maxlength', 20);
}
$form->addRule('survey_title', '<div class="required">'.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');

2
main/upload/form.scorm.php
Unescape View File

@ -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', '<div class="required">'.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){

2
main/wiki/index.php
Unescape View File

@ -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', '<span class="required">'.get_lang('ThisFieldIsRequired').'</span>', '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();

Write Preview
Loading…
Cancel
Save