Changeset 5928

Timestamp:

01/11/12 23:18:45 (4 months ago)

Author:

vain

Message:

• added form classes to the autoloader
• removed direct loading of form elements from datagrid column fields

Location:

trunk/core

Files:

• autoload/autoloader.core.php (modified) (1 diff)
• viewhelper/datagrid/datagridcols/checkbox.column.php (modified) (1 diff)
• viewhelper/datagrid/datagridcols/editbutton.column.php (modified) (1 diff)
• viewhelper/form/elements/input.form.php (modified) (1 diff)

trunk/core/autoload/autoloader.core.php

@@ -245 +245 @@
         'Clansuite_Datagrid_Column'           => 'viewhelper/datagrid/datagridcol.core.php',
         # /viewhelper/form
-        'Clansuite_Form'                      => 'viewhelper/form/form.core.php',
-        'Clansuite_Formelement'               => 'viewhelper/form/formelement.core.php',
-        'Clansuite_Formelement_Input'         => 'viewhelper/form/formelements/input.form.php',
-        'Clansuite_Form_Decorator'            => 'viewhelper/form/formdecorator.core.php',
-        'Clansuite_Formelement_Decorator'     => 'viewhelper/form/formdecorator.core.php',
-        'Clansuite_Array_Formgenerator'       => 'viewhelper/form/formgenerators/array.formgenerator.php',
-        'Clansuite_Doctrine_Formgenerator'    => 'viewhelper/form/formgenerators/doctrine.formgenerator.php',
-        'Clansuite_Xml_Formgenerator'         => 'viewhelper/form/formgenerators/xml.formgenerator.php',
+        'Clansuite_Form'                      => 'viewhelper/form/form.php',
+        'Clansuite_Formelement'               => 'viewhelper/form/formelement.php',
+        'Clansuite_Form_Decorator'            => 'viewhelper/form/formdecorator.php',
+        'Clansuite_Formelement_Decorator'     => 'viewhelper/form/formelementdecorator.php',
+        'Clansuite_Formelement_Validator'     => 'viewhelper/form/formelementvalidator.php',
+        'Clansuite_Formelement_Input'         => 'viewhelper/form/elements/input.php',
+        'Clansuite_Formelement_Imagebutton'   => 'viewhelper/form/elements/imagebutton.php',
+        'Clansuite_Formelement_Checkbox'      => 'viewhelper/form/elements/checkbox.form.php',
+        'Clansuite_Array_Formgenerator'       => 'viewhelper/form/generators/array.php',
+        'Clansuite_Doctrine_Formgenerator'    => 'viewhelper/form/generators/doctrine.php',
+        'Clansuite_Xml_Formgenerator'         => 'viewhelper/form/generators/xml.php',
         );
 

trunk/core/viewhelper/datagrid/datagridcols/checkbox.column.php

@@ -37 +37 @@
 }
 
-if(false === class_exists('Clansuite_Formelement_Checkbox', false))
-{
-    include ROOT_CORE . 'viewhelper/form/formelements/checkbox.form.php';
-}
-
 /**
 * Clansuite Datagrid Column Renderer Checkbox

trunk/core/viewhelper/datagrid/datagridcols/editbutton.column.php

@@ -37 +37 @@
 }
 
-if (false === class_exists('Clansuite_Formelement_Imagebutton', false))
-{ 
-    include ROOT_CORE . 'viewhelper/formelements/imagebutton.form.php';
-}
-
 /**
  * Clansuite Datagrid Col Renderer for EditButton Cells

trunk/core/viewhelper/form/elements/input.form.php

@@ -35 +35 @@
 {
     die('Clansuite not loaded. Direct Access forbidden.');
-}
-
-# conditional include of the parent class
-if (false == class_exists('Clansuite_Formelement',false))
-{
-    include dirname(__DIR__) . '/formelement.core.php';
 }