X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=WEB-INF%2Flib%2Fform%2FFormElement.class.php;h=799abf7b16dadd67e75804692592c407380a3866;hb=785d404c84c153bda7d45d3aedfefa81985703b3;hp=f3d26a4d27db4530d307263ac9adb3da2b171526;hpb=a4d1c5627c3958245ea7e2e573267e34f5872471;p=timetracker.git

diff --git a/WEB-INF/lib/form/FormElement.class.php b/WEB-INF/lib/form/FormElement.class.php
index f3d26a4d..799abf7b 100644
--- a/WEB-INF/lib/form/FormElement.class.php
+++ b/WEB-INF/lib/form/FormElement.class.php
@@ -84,30 +84,15 @@ class FormElement {
   function localize($i18n) {} // Localization occurs in derived classes and is dependent on control type.
                               // For example, in calendar control we need to localize day and month names.
 
-  // TODO: refactoring ongoing down from here.
+  // getHtml returns HTML for the element.
+  function getHtml() { return ''; }
 
+  // getLabelHtml returns HTML code for element label.
+  function getLabelHtml() { return '<label for="'.$this->id.'">'.$this->label.'</label>'; }
 
-
-
-
-	
-
-
-
-	
-	function toStringControl()	{
-		return "";
-	}
-
-	function toStringLabel() {
-	    return "<label for=\"" . $this->id . "\">" . $this->label . "</label>";
-	}
-	
-	function toArray() {
-	    return array(
-	             "label"=>$this->toStringLabel(),
-	             "control"=>$this->toStringControl()
-	           );
-	}
-
+  function toArray() {
+    return array(
+      'label'=>$this->getLabelHtml(),
+      'control'=>$this->getHtml());
+  }
 }