Some further refactoring in form classes.

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

diff --git a/WEB-INF/lib/form/DateField.class.php b/WEB-INF/lib/form/DateField.class.php
index 0ed220d..3906db6 100644 (file)
--- a/WEB-INF/lib/form/DateField.class.php
+++ b/WEB-INF/lib/form/DateField.class.php
@@ -35,7 +35,7 @@ class DateField extends TextField {
   var $lToday      = "Today";
 
   var $mDateObj;
-  var $cClassName  = "DateField";
+  var $class = 'DateField';
 
   var $lCalendarButtons = array('today'=>'Today', 'close'=>'Close');
 
@@ -44,14 +44,13 @@ class DateField extends TextField {
     $this->mDateObj  = new DateAndTime();
 
     if (isset($GLOBALS["I18N"])) {
-      $this->setLocalization($GLOBALS["I18N"]);
+      $this->localize($GLOBALS["I18N"]);
     }
   }
 
-  function setLocalization($i18n)  {
-       global $user;
+  function localize($i18n)  {
+    global $user;
        
-    FormElement::setLocalization($i18n);
     $this->mDateObj->setFormat($user->date_format);
 
     $this->mMonthNames = $i18n->monthNames;
@@ -81,10 +80,9 @@ class DateField extends TextField {
     }
   }
 
-  function toStringControl()  {
-    if (!$this->isRenderable()) return "";
+  function getHtml() {
 
-    if (!$this->isEnable()) {
+    if (!$this->isEnabled()) {
       $html = htmlspecialchars($this->getValue()).
         "<input type=\"hidden\" name=\"$this->name\" value=\"".htmlspecialchars($this->getValue())."\">\n";
     } else {
@@ -398,19 +396,16 @@ class DateField extends TextField {
       if ($this->size!="")
         $html .= " size=\"$this->size\"";
 
-      if ($this->mStyle!="")
-         $html .= " style=\"$this->mStyle\"";
+      if ($this->style!="")
+         $html .= " style=\"$this->style\"";
 
         $html .= " maxlength=\"50\"";
 
       if ($this->on_change!="")
          $html .= " onchange=\"$this->on_change\"";
 
-      if ($this->mOnClick!="")
-         $html .= " onclick=\"$this->mOnClick\"";
-
-      if ($this->mOnFocus!="")
-         $html .= " onfocus=\"$this->mOnFocus\"";
+      if ($this->on_click!="")
+         $html .= " onclick=\"$this->on_click\"";
 
       $html .= " value=\"".htmlspecialchars($this->getValue())."\"";
       $html .= ">";