BUG 9905 Dynaforms accessibility SOLVED
- Added tag label for the control labels in the mater dynaform
This commit is contained in:
@@ -33,6 +33,7 @@ class XmlForm_Field {
|
|||||||
var $name = '';
|
var $name = '';
|
||||||
var $type = 'field';
|
var $type = 'field';
|
||||||
var $label = '';
|
var $label = '';
|
||||||
|
var $pmLabel = '';
|
||||||
var $owner;
|
var $owner;
|
||||||
var $language;
|
var $language;
|
||||||
var $group = 0;
|
var $group = 0;
|
||||||
@@ -101,7 +102,7 @@ class XmlForm_Field {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@$this->label = $data->value;
|
@$this->label = $this->pmLabel = $data->value;
|
||||||
|
|
||||||
|
|
||||||
/*Loads the field attributes*/
|
/*Loads the field attributes*/
|
||||||
@@ -731,11 +732,11 @@ class XmlForm_Field {
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
function NSGridLabel($show = false){
|
function NSGridLabel($show = false){
|
||||||
$idv = 'pm:label="'.$this->label.'"';
|
$idv = 'pm:label="'.$this->pmLabel.'"';
|
||||||
if ($show){
|
if ($show){
|
||||||
return $idv;
|
return $idv;
|
||||||
}else{
|
}else{
|
||||||
return ($this->label != '')? $idv : '';
|
return ($this->pmLabel != '')? $idv : '';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -4787,6 +4788,9 @@ class xmlformTemplate extends Smarty
|
|||||||
//if (isset($form->fields[$k]->sql)) $form->fields[$k]->executeSQL( $form );
|
//if (isset($form->fields[$k]->sql)) $form->fields[$k]->executeSQL( $form );
|
||||||
$value = (isset ( $form->values [$k] )) ? $form->values [$k] : NULL;
|
$value = (isset ( $form->values [$k] )) ? $form->values [$k] : NULL;
|
||||||
$result [$k] = G::replaceDataField ( $form->fields [$k]->label, $form->values );
|
$result [$k] = G::replaceDataField ( $form->fields [$k]->label, $form->values );
|
||||||
|
if ($form->type == 'xmlform') {
|
||||||
|
$result[$k] = '<label for="form[' . $k . ']">' . $result[$k] . '</label>';
|
||||||
|
}
|
||||||
if (! is_array ( $value )) {
|
if (! is_array ( $value )) {
|
||||||
if ($form->type == 'grid') {
|
if ($form->type == 'grid') {
|
||||||
$aAux = array();
|
$aAux = array();
|
||||||
|
|||||||
Reference in New Issue
Block a user