Allowing the $attribute array for static and label elements.

1.10.x
Julio Montoya 11 years ago
parent 33042b7782
commit 9a4fca4e5f
  1. 25
      main/inc/lib/pear/HTML/QuickForm/element.php
  2. 11
      main/inc/lib/pear/HTML/QuickForm/label.php
  3. 102
      main/inc/lib/pear/HTML/QuickForm/static.php

@ -42,8 +42,6 @@ require_once 'HTML/Common.php';
*/
class HTML_QuickForm_element extends HTML_Common
{
// {{{ properties
/**
* Label of the field
* @var string
@ -76,9 +74,6 @@ class HTML_QuickForm_element extends HTML_Common
*/
var $_persistantFreeze = false;
// }}}
// {{{ constructor
/**
* Class constructor
*
@ -89,7 +84,7 @@ class HTML_QuickForm_element extends HTML_Common
* @access public
* @return void
*/
function HTML_QuickForm_element($elementName=null, $elementLabel=null, $attributes=null)
function HTML_QuickForm_element($elementName = null, $elementLabel = null, $attributes = null)
{
$array = array(
'text',
@ -427,8 +422,6 @@ class HTML_QuickForm_element extends HTML_Common
return true;
} // end func onQuickFormEvent
// }}}
// {{{ accept()
/**
* Accepts a renderer
@ -442,10 +435,7 @@ class HTML_QuickForm_element extends HTML_Common
function accept(&$renderer, $required=false, $error=null)
{
$renderer->renderElement($this, $required, $error);
} // end func accept
// }}}
// {{{ _generateId()
}
/**
* Automatically generates and assigns an 'id' attribute for the element.
@ -463,10 +453,7 @@ class HTML_QuickForm_element extends HTML_Common
if (!$this->getAttribute('id')) {
$this->updateAttributes(array('id' => 'qf_' . substr(md5(microtime() . $idx++), 0, 6)));
}
} // end func _generateId
// }}}
// {{{ exportValue()
}
/**
* Returns a 'safe' element's value
@ -485,8 +472,6 @@ class HTML_QuickForm_element extends HTML_Common
return $this->_prepareValue($value, $assoc);
}
// }}}
// {{{ _prepareValue()
/**
* Used by exportValue() to prepare the value for returning
@ -517,6 +502,4 @@ class HTML_QuickForm_element extends HTML_Common
}
}
}
// }}}
} // end class HTML_QuickForm_element
}

@ -29,9 +29,9 @@ class HTML_QuickForm_label extends HTML_QuickForm_static
* @access public
* @return void
*/
function HTML_QuickForm_label($label = null, $text = null)
function HTML_QuickForm_label($label = null, $text = null, $attributes = null)
{
$this->HTML_QuickForm_static(null, $label, $text);
$this->HTML_QuickForm_static(null, $label, $text, $attributes);
$this->_type = 'html';
}
@ -52,7 +52,12 @@ class HTML_QuickForm_label extends HTML_QuickForm_static
function toHtml()
{
return '<div class="form-group">
$id = $this->getAttribute('id');
$idCondition = null;
if (!empty($id)) {
$idCondition = 'id="'.$id.'"';
}
return '<div class="form-group" '.$idCondition.' >
<label class="col-sm-2 control-label">'.$this->getLabel().'</label>
<div class="col-sm-10">
'.HTML_QuickForm_static::toHtml().'

@ -1,43 +1,42 @@
<?php
/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
/**
* HTML class for static data
*
* PHP versions 4 and 5
*
* LICENSE: This source file is subject to version 3.01 of the PHP license
* that is available through the world-wide-web at the following URI:
* http://www.php.net/license/3_01.txt If you did not receive a copy of
* the PHP License and are unable to obtain it through the web, please
* send a note to license@php.net so we can mail you a copy immediately.
*
* @category HTML
* @package HTML_QuickForm
* @author Wojciech Gdela <eltehaem@poczta.onet.pl>
* @copyright 2001-2009 The PHP Group
* @license http://www.php.net/license/3_01.txt PHP License 3.01
* @version CVS: $Id: static.php,v 1.8 2009/04/04 21:34:04 avb Exp $
* @link http://pear.php.net/package/HTML_QuickForm
*/
/**
* HTML class for static data
*
* PHP versions 4 and 5
*
* LICENSE: This source file is subject to version 3.01 of the PHP license
* that is available through the world-wide-web at the following URI:
* http://www.php.net/license/3_01.txt If you did not receive a copy of
* the PHP License and are unable to obtain it through the web, please
* send a note to license@php.net so we can mail you a copy immediately.
*
* @category HTML
* @package HTML_QuickForm
* @author Wojciech Gdela <eltehaem@poczta.onet.pl>
* @copyright 2001-2009 The PHP Group
* @license http://www.php.net/license/3_01.txt PHP License 3.01
* @version CVS: $Id: static.php,v 1.8 2009/04/04 21:34:04 avb Exp $
* @link http://pear.php.net/package/HTML_QuickForm
*/
/**
* Base class for form elements
*/
require_once 'HTML/QuickForm/element.php';
/**
* Base class for form elements
*/
require_once 'HTML/QuickForm/element.php';
/**
* HTML class for static data
*
* @category HTML
* @package HTML_QuickForm
* @author Wojciech Gdela <eltehaem@poczta.onet.pl>
* @version Release: 3.2.11
* @since 2.7
* @category HTML
* @package HTML_QuickForm
* @author Wojciech Gdela <eltehaem@poczta.onet.pl>
* @version Release: 3.2.11
* @since 2.7
*/
class HTML_QuickForm_static extends HTML_QuickForm_element {
// {{{ properties
class HTML_QuickForm_static extends HTML_QuickForm_element
{
/**
* Display text
@ -46,9 +45,6 @@ class HTML_QuickForm_static extends HTML_QuickForm_element {
*/
var $_text = null;
// }}}
// {{{ constructor
/**
* Class constructor
*
@ -57,17 +53,14 @@ class HTML_QuickForm_static extends HTML_QuickForm_element {
* @access public
* @return void
*/
function HTML_QuickForm_static($elementName=null, $elementLabel=null, $text=null)
function HTML_QuickForm_static($elementName = null, $elementLabel = null, $text = null, $attributes = null)
{
HTML_QuickForm_element::HTML_QuickForm_element($elementName, $elementLabel);
HTML_QuickForm_element::HTML_QuickForm_element($elementName, $elementLabel, $attributes);
$this->_persistantFreeze = false;
$this->_type = 'static';
$this->_text = $text;
} //end constructor
// }}}
// {{{ setName()
/**
* Sets the element name
*
@ -80,9 +73,6 @@ class HTML_QuickForm_static extends HTML_QuickForm_element {
$this->updateAttributes(array('name'=>$name));
} //end func setName
// }}}
// {{{ getName()
/**
* Returns the element name
*
@ -94,8 +84,6 @@ class HTML_QuickForm_static extends HTML_QuickForm_element {
return $this->getAttribute('name');
} //end func getName
// }}}
// {{{ setText()
/**
* Sets the text
@ -109,9 +97,6 @@ class HTML_QuickForm_static extends HTML_QuickForm_element {
$this->_text = $text;
} // end func setText
// }}}
// {{{ setValue()
/**
* Sets the text (uses the standard setValue call to emulate a form element.
*
@ -124,9 +109,6 @@ class HTML_QuickForm_static extends HTML_QuickForm_element {
$this->setText($text);
} // end func setValue
// }}}
// {{{ toHtml()
/**
* Returns the static text element in HTML
*
@ -138,9 +120,6 @@ class HTML_QuickForm_static extends HTML_QuickForm_element {
return $this->_getTabs() . $this->_text;
} //end func toHtml
// }}}
// {{{ getFrozenHtml()
/**
* Returns the value of field without HTML tags
*
@ -152,15 +131,12 @@ class HTML_QuickForm_static extends HTML_QuickForm_element {
return $this->toHtml();
} //end func getFrozenHtml
// }}}
// {{{ onQuickFormEvent()
/**
* Called by HTML_QuickForm whenever form event is made on this element
*
* @param string $event Name of event
* @param mixed $arg event arguments
* @param object &$caller calling object
* @param object &$caller calling object
* @since 1.0
* @access public
* @return void
@ -183,10 +159,7 @@ class HTML_QuickForm_static extends HTML_QuickForm_element {
parent::onQuickFormEvent($event, $arg, $caller);
}
return true;
} // end func onQuickFormEvent
// }}}
// {{{ exportValue()
}
/**
* We override this here because we don't want any values from static elements
@ -195,7 +168,4 @@ class HTML_QuickForm_static extends HTML_QuickForm_element {
{
return null;
}
// }}}
} //end class HTML_QuickForm_static
?>
}
Loading…
Cancel
Save