Some renaming.

[timetracker.git] / WEB-INF / lib / form / FormElement.class.php

diff --git a/WEB-INF/lib/form/FormElement.class.php b/WEB-INF/lib/form/FormElement.class.php
index f2d0c92..bd8cd6d 100644 (file)
--- a/WEB-INF/lib/form/FormElement.class.php
+++ b/WEB-INF/lib/form/FormElement.class.php
@@ -33,24 +33,21 @@ class FormElement {
   var $form_name = '';  // Form name the control is in.
   var $value = '';      // Value of the control.
   var $size = '';       // Control size.
-  var $max_length = ''; // Max lenght of text in control.
+  var $max_length = ''; // Max length of text in control.
   var $on_change = '';  // What happens when value of control changes.
   var $on_click = '';   // What happens when the control is clicked.
+  var $label = '';      // Optional label for control.
+  var $style = '';      // Control style.
+  var $enabled = true;  // Whether the control is enabled.
+  var $class = 'FormElement'; // Class name for the element.
 
   // TODO: refactoring ongoing down from here.
-       var $mOnKeyPress        = ""; // This is only used in TextArea, consider moving out of the base class.
-       var $mOnFocus           = "";
-       var $mLabel         = "";
-       var $mStyle         = "";
-       var $mRenderable    = true;
-       var $mEnabled           = true;
-       var $cClassName         = "FormElement";
        var $mI18n                      = null;
 
        function __construct() {
        }
 
-       function getClass()     { return $this->cClassName; }
+       function getClass() { return $this->class; }
        
        function setName($name) { $this->name = $name; }
        function getName()      { return $this->name; }
@@ -58,7 +55,7 @@ class FormElement {
        function setFormName($name) { $this->form_name = $name; }
        function getFormName()  { return $this->form_name; }
        
-       function setValue($value) { $this->value = $value;}
+       function setValue($value) { $this->value = $value; }
        function getValue() { return $this->value; }
        
        function setValueSafe($value) { $this->value = $value;}
@@ -70,20 +67,17 @@ class FormElement {
        function setSize($value) { $this->size = $value; }
        function getSize() { return $this->size; }
 
-       function setLabel($label)       { $this->mLabel = $label; }
-       function getLabel() { return $this->mLabel; }
+       function setLabel($label) { $this->label = $label; }
+       function getLabel() { return $this->label; }
        
        function setMaxLength($value) { $this->max_length = $value; }
        function getMaxLength() { return $this->max_length; }
 
-       function setStyle($value)       { $this->mStyle = $value; }
-       function getStyle() { return $this->mStyle; }
-       
-       function setRenderable($flag)   { $this->mRenderable = $flag;   }
-       function isRenderable() { return $this->mRenderable; }
-       
-       function setEnable($flag)       { $this->mEnabled = $flag;      }
-       function isEnable()     { return $this->mEnabled; }
+       function setStyle($value) { $this->style = $value; }
+       function getStyle() { return $this->style; }
+
+       function setEnabled($flag) { $this->enabled = $flag; }
+       function isEnabled() { return $this->enabled; }
        
        function setOnChange($str) { $this->on_change = $str; }
        function setOnClick($str) { $this->on_click = $str; }
@@ -95,9 +89,9 @@ class FormElement {
        function toStringControl()      {
                return "";
        }
-       
+
        function toStringLabel() {
-           return "<label for=\"" . $this->id . "\">" . $this->mLabel . "</label>";
+           return "<label for=\"" . $this->id . "\">" . $this->label . "</label>";
        }
        
        function toArray() {