Use setCustomElementTemplate() instead of setElementTemplate

To manage templates setup by developers instead of default element
templates.
1.10.x
Julio Montoya 11 years ago
parent 4f4e392074
commit b41e42b48b
  1. 2
      main/admin/class_list.php
  2. 2
      main/admin/configure_homepage.php
  3. 2
      main/admin/configure_inscription.php
  4. 2
      main/admin/course_request_accepted.php
  5. 2
      main/admin/course_request_rejected.php
  6. 2
      main/admin/course_request_review.php
  7. 2
      main/admin/group_list.php
  8. 2
      main/admin/special_exports.php
  9. 2
      main/admin/specific_fields.php
  10. 4
      main/admin/user_fields.php
  11. 2
      main/attendance/attendance_sheet.php
  12. 2
      main/coursecopy/import_backup.php
  13. 2
      main/exercice/exercise_show.php
  14. 2
      main/exercice/feedback.php
  15. 2
      main/gradebook/lib/fe/catform.class.php
  16. 2
      main/gradebook/lib/fe/dataform.class.php
  17. 4
      main/gradebook/lib/fe/evalform.class.php
  18. 2
      main/gradebook/lib/fe/linkform.class.php
  19. 2
      main/gradebook/lib/fe/userform.class.php
  20. 3
      main/group/group_creation.php
  21. 2
      main/inc/introductionSection.inc.php
  22. 31
      main/inc/lib/pear/HTML/QuickForm/Renderer/Default.php
  23. 2
      main/inc/lib/statistics.lib.php
  24. 8
      main/survey/survey_question.php
  25. 2
      main/tracking/courseLog.php
  26. 2
      main/tracking/course_log_resources.php
  27. 2
      main/upload/upload_word.php
  28. 2
      main/user/subscribe_user.php
  29. 4
      plugin/before_login/index.php
  30. 2
      plugin/ticket/src/myticket.php

@ -102,7 +102,7 @@ if (isset($_GET['action'])) {
// Create a search-box
$form = new FormValidator('search_simple', 'get', '', '', null, false);
$renderer =& $form->defaultRenderer();
$renderer->setElementTemplate('<span>{element}</span> ');
$renderer->setCustomElementTemplate('<span>{element}</span> ');
$form->addElement('text', 'keyword', get_lang('keyword'));
$form->addElement('button', 'submit', get_lang('Search'));
$content .= $form->return_form();

@ -923,7 +923,7 @@ switch ($action) {
$renderer =& $form->defaultRenderer();
$renderer->setHeaderTemplate('');
$renderer->setFormTemplate('<form{attributes}><table border="0" cellpadding="5" cellspacing="0" width="100%">{content}</table></form>');
$renderer->setElementTemplate('<tr><td>{element}</td></tr>');
$renderer->setCustomElementTemplate('<tr><td>{element}</td></tr>');
$renderer->setRequiredNoteTemplate('');
$form->addElement('hidden', 'formSent', '1');

@ -353,7 +353,7 @@ switch ($action){
$renderer =& $form->defaultRenderer();
$renderer->setHeaderTemplate('');
$renderer->setFormTemplate('<form{attributes}><table border="0" cellpadding="5" cellspacing="0" width="100%">{content}</table></form>');
$renderer->setElementTemplate('<tr><td>{element}</td></tr>');
$renderer->setCustomElementTemplate('<tr><td>{element}</td></tr>');
$renderer->setRequiredNoteTemplate('');
$form->addElement('hidden', 'formSent', '1');
$default[$name] = str_replace('{rel_path}', api_get_path(REL_PATH), $open);

@ -146,7 +146,7 @@ if (!$course_validation_feature) {
// Create a simple search-box.
$form = new FormValidator('search_simple', 'get', '', '', 'width=200px', false);
$renderer = $form->defaultRenderer();
$renderer->setElementTemplate('<span>{element}</span> ');
$renderer->setCustomElementTemplate('<span>{element}</span> ');
$form->addElement('text', 'keyword', get_lang('keyword'));
$form->addButtonSearch(get_lang('Search'));

@ -179,7 +179,7 @@ if (!$course_validation_feature) {
// Create a simple search-box.
$form = new FormValidator('search_simple', 'get', '', '', 'width=200px', false);
$renderer = $form->defaultRenderer();
$renderer->setElementTemplate('<span>{element}</span> ');
$renderer->setCustomElementTemplate('<span>{element}</span> ');
$form->addElement('text', 'keyword', get_lang('keyword'));
$form->addButtonSearch(get_lang('Search'));

@ -227,7 +227,7 @@ if (!$course_validation_feature) {
// Create a simple search-box.
$form = new FormValidator('search_simple', 'get', '', '', 'width=200px', false);
$renderer = $form->defaultRenderer();
$renderer->setElementTemplate('<span>{element}</span> ');
$renderer->setCustomElementTemplate('<span>{element}</span> ');
$form->addElement('text', 'keyword', get_lang('keyword'));
$form->addButtonSearch(get_lang('Search'));

@ -377,7 +377,7 @@ if (isset($_GET['search']) && $_GET['search'] == 'advanced') {
// Create a search-box
$form = new FormValidator('search_simple', 'get', '', '', null, false);
$renderer = & $form->defaultRenderer();
$renderer->setElementTemplate('<span>{element}</span> ');
$renderer->setCustomElementTemplate('<span>{element}</span> ');
$form->addElement('text', 'keyword', get_lang('keyword'));
$form->addButtonSearch(get_lang('Search'));
echo '<div class="actions" style="width:100%;">';

@ -151,7 +151,7 @@ Display::display_footer();
function form_special_export() {
$form = new FormValidator('special_exports','post');
$renderer = $form->defaultRenderer();
$renderer->setElementTemplate('<div>{element}</div> ');
$renderer->setCustomElementTemplate('<div>{element}</div> ');
$form->addElement('radio', 'backup_option', '', get_lang('SpecialCreateFullBackup'), 'full_backup');
$form->addElement('radio', 'backup_option', '', get_lang('SpecialLetMeSelectItems'), 'select_items');
$form->addElement('html','<br />');

@ -27,7 +27,7 @@ include_once $libpath.'specific_fields_manager.lib.php';
// Create an add-field box
$form = new FormValidator('add_field','post','','',null,false);
$renderer =& $form->defaultRenderer();
$renderer->setElementTemplate('<span>{element}</span> ');
$renderer->setCustomElementTemplate('<span>{element}</span> ');
$form->addElement('static','search_advanced_link',null,'<a href="specific_fields_add.php">'.Display::return_icon('fieldadd.gif').get_lang('AddSpecificSearchField').'</a>');
// Create a sortable table with specific fields data

@ -127,7 +127,7 @@ if(1)
// Create an add-field box
$form = new FormValidator('add_field','post','','',null,false);
$renderer =& $form->defaultRenderer();
$renderer->setElementTemplate('<span>{element}</span> ');
$renderer->setCustomElementTemplate('<span>{element}</span> ');
//$form->addElement('text','label',get_lang('FieldLabel'));
//$form->addElement('text','type',get_lang('FieldType'));
//$form->addElement('text','title',get_lang('FieldTitle'));
@ -384,4 +384,4 @@ function delete_user_fields($field_id)
// the field was not deleted so we return false
return false;
}
}
}

@ -96,7 +96,7 @@ if (api_is_allowed_to_edit(null, true) ||
}
$renderer = $form->defaultRenderer();
$renderer->setElementTemplate('{label} {element} ');
$renderer->setCustomElementTemplate('{label} {element} ');
$form->setDefaults(
array(

@ -161,7 +161,7 @@ if (Security::check_token('post') && (
);
$form->addElement('header', get_lang('SelectBackupFile'));
$renderer = $form->defaultRenderer();
$renderer->setElementTemplate('<div>{element}</div> ');
$renderer->setCustomElementTemplate('<div>{element}</div> ');
$form->addElement('hidden', 'action', 'restore_backup');

@ -542,7 +542,7 @@ foreach ($questionList as $questionId) {
$feedback_form->addElement('html','<br>');
$renderer =& $feedback_form->defaultRenderer();
$renderer->setFormTemplate('<form{attributes}><div align="left">{content}</div></form>');
$renderer->setElementTemplate('<div align="left">{element}</div>');
$renderer->setCustomElementTemplate('<div align="left">{element}</div>');
$comnt = Event::get_comments($id, $questionId);
$default = array('comments_'.$questionId => $comnt);

@ -52,7 +52,7 @@ Display::display_header($nameTools,"Exercise");
$form = new FormValidator('feedbackform','post',api_get_self()."?".api_get_cidreq()."&modifyQuestion=".$modifyQuestion."&newQuestion=".$newQuestion);
$obj_registration_form = new HTML_QuickForm('frmRegistration', 'POST');
$renderer =& $obj_registration_form->defaultRenderer();
$renderer->setElementTemplate(
$renderer->setCustomElementTemplate(
'<tr>
<td align="left" style="" valign="top" width=30%>{label}
<!-- BEGIN required --><span style="color: #ff0000">*</span><!-- END required -->

@ -53,7 +53,7 @@ class CatForm extends FormValidator
protected function build_move_form()
{
$renderer =& $this->defaultRenderer();
$renderer->setElementTemplate('<span>{element}</span> ');
$renderer->setCustomElementTemplate('<span>{element}</span> ');
$this->addElement(
'static',
null,

@ -42,7 +42,7 @@ class DataForm extends FormValidator
protected function build_pdf_export_form()
{
$renderer =& $this->defaultRenderer();
$renderer->setElementTemplate('<span>{element}</span>');
$renderer->setCustomElementTemplate('<span>{element}</span>');
$this->addElement('header', get_lang('ChooseOrientation'));
$this->addElement('radio', 'orientation', null, get_lang('Portrait'), 'portrait');
$this->addElement('radio', 'orientation', null, get_lang('Landscape'), 'landscape');

@ -214,7 +214,7 @@ class EvalForm extends FormValidator
protected function build_move_form()
{
$renderer = & $this->defaultRenderer();
$renderer->setElementTemplate('<span>{element}</span> ');
$renderer->setCustomElementTemplate('<span>{element}</span> ');
$this->addElement('static', null, null, '"' . $this->evaluation_object->get_name() . '" ');
$this->addElement('static', null, null, get_lang('MoveTo') . ' : ');
$select = $this->addElement('select', 'move_cat', null, null);
@ -332,7 +332,7 @@ class EvalForm extends FormValidator
));
$userinfo = api_get_user_info($this->result_object->get_user_id());
$renderer = & $this->defaultRenderer();
$renderer->setElementTemplate('<span>{element}</span> ');
$renderer->setCustomElementTemplate('<span>{element}</span> ');
$this->addElement('label', get_lang('User'), $userinfo['complete_name']);
$this->addText('score', array(get_lang('Score'), null, '/ ' . $this->evaluation_object->get_max()), false, array(

@ -57,7 +57,7 @@ class LinkForm extends FormValidator
protected function build_move()
{
$renderer =& $this->defaultRenderer();
$renderer->setElementTemplate('<span>{element}</span> ');
$renderer->setCustomElementTemplate('<span>{element}</span> ');
$this->addElement('static',null,null,'"'.$this->link_object->get_name().'" ');
$this->addElement('static',null,null,get_lang('MoveTo').' : ');
$select = $this->addElement('select','move_cat',null,null);

@ -46,7 +46,7 @@ class UserForm extends FormValidator
));
}
$renderer =& $this->defaultRenderer();
$renderer->setElementTemplate('<span>{element}</span> ');
$renderer->setCustomElementTemplate('<span>{element}</span> ');
$this->addElement('text','keyword','');
$this->addElement('style_submit_button','submit',get_lang('Search'),'class="search"');
}

@ -155,7 +155,7 @@ elseif (isset($_POST['number_of_groups'])) {
</tr>
EOT;
$renderer->setElementTemplate($element_template);
$renderer->setCustomElementTemplate($element_template);
$form->addElement('header', $nameTools);
$form->addElement('hidden', 'action');
$form->addElement('hidden', 'number_of_groups');
@ -163,6 +163,7 @@ EOT;
// Table heading
$group_el = array ();
$group_el[] = $form->createElement('static', null, null, '<b>'.get_lang('GroupName').'</b>');
if (api_get_setting('allow_group_categories') == 'true') {
$group_el[] = $form->createElement('static', null, null, '<b>'.get_lang('GroupCategory').'</b>');
}

@ -50,7 +50,7 @@ if (!empty($courseId)) {
}
$renderer =& $form->defaultRenderer();
$renderer->setElementTemplate('<div style="width: 80%; margin: 0px auto; padding-bottom: 10px; ">{element}</div>');
$renderer->setCustomElementTemplate('<div style="width: 80%; margin: 0px auto; padding-bottom: 10px; ">{element}</div>');
$toolbar_set = 'IntroductionTool';
$width = '100%';

@ -37,6 +37,24 @@
class HTML_QuickForm_Renderer_Default extends HTML_QuickForm_Renderer
{
private $form;
private $customElementTemplate;
/**
* @return mixed
*/
public function getCustomElementTemplate()
{
return $this->customElementTemplate;
}
/**
* This template will be taken instead of the default templates by element
* @param string $customElementTemplate
*/
public function setCustomElementTemplate($customElementTemplate)
{
$this->customElementTemplate = $customElementTemplate;
}
/**
* The HTML of the form
@ -277,10 +295,17 @@ class HTML_QuickForm_Renderer_Default extends HTML_QuickForm_Renderer
// Custom template
$html = str_replace('{label}', $nameLabel, $this->_templates[$name]);
} else {
if (method_exists($element, 'getTemplate')) {
$template = $element->getTemplate($this->getForm()->getLayout());
$customElementTemplate = $this->getCustomElementTemplate();
if (empty($customElementTemplate)) {
if (method_exists($element, 'getTemplate')) {
$template = $element->getTemplate(
$this->getForm()->getLayout()
);
} else {
$template = $this->getForm()->getDefaultElementTemplate();
}
} else {
$template = $this->getForm()->getDefaultElementTemplate();
$template = $customElementTemplate;
}
$html = str_replace('{label}', $nameLabel, $template);
}

@ -566,7 +566,7 @@ class Statistics
// Create a search-box
$form = new FormValidator('search_simple','get',api_get_path(WEB_CODE_PATH).'admin/statistics/index.php','','width=200px',false);
$renderer =& $form->defaultRenderer();
$renderer->setElementTemplate('<span>{element}</span> ');
$renderer->setCustomElementTemplate('<span>{element}</span> ');
$form->addElement('hidden','report','activities');
$form->addElement('hidden','activities_direction','DESC');
$form->addElement('hidden','activities_column','4');

@ -116,15 +116,11 @@ class survey_question
public function renderForm()
{
if (isset($_GET['question_id']) and !empty($_GET['question_id'])) {
$icon = 'pencil';
$text = get_lang('ModifyQuestionSurvey');
$this->buttonList[] = $this->getForm()->addButtonUpdate(get_lang('ModifyQuestionSurvey'), 'save', true);
} else {
$icon = 'check';
$text = get_lang('CreateQuestionSurvey');
$this->buttonList[] = $this->getForm()->addButtonSave(get_lang('CreateQuestionSurvey'), 'save', true);
}
$this->buttonList[] = $this->getForm()->createElement('button', 'save', $text, $icon);
$this->getForm()->addGroup($this->buttonList, 'buttons');
}

@ -263,7 +263,7 @@ $form_search = new FormValidator(
FormValidator::LAYOUT_INLINE
);
$renderer = $form_search->defaultRenderer();
$renderer->setElementTemplate('<span>{element}</span>');
$renderer->setCustomElementTemplate('<span>{element}</span>');
$form_search->addElement('hidden', 'from', Security::remove_XSS($from));
$form_search->addElement('hidden', 'session_id', $sessionId);
$form_search->addElement('hidden', 'id_session', $sessionId);

@ -106,7 +106,7 @@ $form = new FormValidator(
false
);
$renderer = $form->defaultRenderer();
$renderer->setElementTemplate('<span>{element}</span>');
$renderer->setCustomElementTemplate('<span>{element}</span>');
$form->addElement('text', 'keyword', get_lang('keyword'));
$form->addElement('hidden', 'cidReq', api_get_course_id());
$form->addElement('hidden', 'id_session', $session_id);

@ -153,7 +153,7 @@ $user_file_template =
<!-- BEGIN error --><br /><span class="form_error">{error}</span><!-- END error -->
</div>
EOT;
$renderer->setElementTemplate($user_file_template);
$renderer->setCustomElementTemplate($user_file_template);
$form -> addElement ('file', 'user_file','<img src="../img/word_big.gif" align="absbottom" />');
if (api_get_setting('search_enabled')=='true') {

@ -61,7 +61,7 @@ if (api_get_setting('ProfilingFilterAddingUsers') == 'true') {
// Build search-form
$form = new FormValidator('search_user', 'get', '', '', null, false);
$renderer = $form->defaultRenderer();
$renderer->setElementTemplate('<span>{element}</span> ');
$renderer->setCustomElementTemplate('<span>{element}</span> ');
$form->addText('keyword', '', false);
$form->addElement('hidden', 'type', $type);
$form->addButtonSearch(get_lang('Search'));

@ -36,7 +36,7 @@ if (api_is_anonymous()) {
$renderer =& $form->defaultRenderer();
$renderer->setFormTemplate('<form{attributes}><table border="0" cellpadding="5" cellspacing="0" width="100%">{content}</table></form>');
$renderer->setElementTemplate('<tr><td>{element}</td></tr>');
$renderersetCustomElementTemplate->setCustomElementTemplate('<tr><td>{element}</td></tr>');
$form->addElement('html', $option1);
$form->addElement('checkbox', 'left', null, get_lang('Yes'));
@ -57,7 +57,7 @@ if (api_is_anonymous()) {
$renderer =& $form2->defaultRenderer();
$renderer->setHeaderTemplate('');
$renderer->setFormTemplate('<form{attributes}><table border="0" cellpadding="5" cellspacing="0" width="100%">{content}</table></form>');
$renderer->setElementTemplate('<tr><td>{element}</td></tr>');
$renderer->setCustomElementTemplate('<tr><td>{element}</td></tr>');
$form2->addElement('html', $option2);
$form2->addElement('checkbox', 'right', null, get_lang('Yes'));

@ -252,7 +252,7 @@ if ($isAdmin) {
// Create a search-box
$form = new FormValidator('search_simple', 'get', '', '', null, false);
$renderer = & $form->defaultRenderer();
$renderer->setElementTemplate('<span>{element}</span> ');
$renderer->setCustomElementTemplate('<span>{element}</span> ');
$form->addElement('text', 'keyword', get_lang('keyword'), 'size="25"');
$form->addElement('style_submit_button', 'submit_simple', get_lang('Search'), 'class="search"');
$form->addElement('static', 'search_advanced_link', null,

Loading…
Cancel
Save