allow radio buttons without label

This commit is contained in:
Roland Gruber 2012-02-24 19:41:20 +00:00
parent 8c4cec8df1
commit cbcff51b98
1 changed files with 9 additions and 7 deletions

View File

@ -1130,7 +1130,7 @@ class htmlRadio extends htmlElement {
* *
* @param String $name element name * @param String $name element name
* @param array $elements list of elements array(label => value) * @param array $elements list of elements array(label => value)
* @param array $selectedElement value of selected element (optional, default none) * @param String $selectedElement value of selected element (optional, default none)
*/ */
function __construct($name, $elements, $selectedElement = null) { function __construct($name, $elements, $selectedElement = null) {
$this->name = htmlspecialchars($name); $this->name = htmlspecialchars($name);
@ -1206,7 +1206,7 @@ class htmlTableExtendedRadio extends htmlRadio {
* @param String $label descriptive label * @param String $label descriptive label
* @param String $name element name * @param String $name element name
* @param array $elements list of elements array(label => value) * @param array $elements list of elements array(label => value)
* @param array $selectedElement value of selected element (optional, default none) * @param String $selectedElement value of selected element (optional, default none)
* @param String $helpID help ID * @param String $helpID help ID
*/ */
function __construct($label, $name, $elements, $selectedElement = null, $helpID = null) { function __construct($label, $name, $elements, $selectedElement = null, $helpID = null) {
@ -1227,14 +1227,16 @@ class htmlTableExtendedRadio extends htmlRadio {
* @return array List of input field names and their type (name => type) * @return array List of input field names and their type (name => type)
*/ */
function generateHTML($module, $input, $values, $restricted, &$tabindex, $scope) { function generateHTML($module, $input, $values, $restricted, &$tabindex, $scope) {
if ($this->label != null) {
echo '<div class="nowrap">'; echo '<div class="nowrap">';
echo $this->label; echo $this->label;
echo '</div>'; echo '</div>';
echo "\n</td>\n<td>\n"; echo "\n</td>\n<td>\n";
}
$return = parent::generateHTML($module, $input, $values, $restricted, $tabindex, $scope); $return = parent::generateHTML($module, $input, $values, $restricted, $tabindex, $scope);
// print help link // print help link
if ($this->helpID != null) { if ($this->helpID != null) {
echo "\n</td>\n<td>\n"; echo "\n</td>\n<td valign=\"top\">\n";
$helpLink = new htmlHelpLink($this->helpID); $helpLink = new htmlHelpLink($this->helpID);
$helpLink->generateHTML($module, $input, $values, $restricted, $tabindex, $scope); $helpLink->generateHTML($module, $input, $values, $restricted, $tabindex, $scope);
} }