Changeset 702

Timestamp:

12/15/07 15:28:20 (1 year ago)

Author:

laurentj

Message:

ticket #258: added support of reset tag in jforms. p=Dominique Papin

Files:

• trunk/build/manifests/jelix-lib.mn (modified) (1 diff)
• trunk/build/manifests/jelix-lib.mn (modified) (1 diff)
• trunk/lib/jelix/core-modules/jelix/locales/en_EN/formserr.ISO-8859-1.properties (modified) (2 diffs)
• trunk/lib/jelix/core-modules/jelix/locales/en_EN/formserr.ISO-8859-1.properties (modified) (2 diffs)
• trunk/lib/jelix/core-modules/jelix/locales/en_EN/formserr.UTF-8.properties (modified) (2 diffs)
• trunk/lib/jelix/core-modules/jelix/locales/en_EN/formserr.UTF-8.properties (modified) (2 diffs)
• trunk/lib/jelix/core-modules/jelix/locales/en_US/formserr.ISO-8859-1.properties (modified) (2 diffs)
• trunk/lib/jelix/core-modules/jelix/locales/en_US/formserr.ISO-8859-1.properties (modified) (2 diffs)
• trunk/lib/jelix/core-modules/jelix/locales/en_US/formserr.UTF-8.properties (modified) (2 diffs)
• trunk/lib/jelix/core-modules/jelix/locales/en_US/formserr.UTF-8.properties (modified) (2 diffs)
• trunk/lib/jelix/core-modules/jelix/locales/fr_FR/formserr.ISO-8859-1.properties (modified) (1 diff)
• trunk/lib/jelix/core-modules/jelix/locales/fr_FR/formserr.ISO-8859-1.properties (modified) (1 diff)
• trunk/lib/jelix/core-modules/jelix/locales/fr_FR/formserr.UTF-8.properties (modified) (1 diff)
• trunk/lib/jelix/core-modules/jelix/locales/fr_FR/formserr.UTF-8.properties (modified) (1 diff)
• trunk/lib/jelix/CREDITS (modified) (1 diff)
• trunk/lib/jelix/CREDITS (modified) (1 diff)
• trunk/lib/jelix/docs/ns/jforms.rng (modified) (2 diffs)
• trunk/lib/jelix/docs/ns/jforms.rng (modified) (2 diffs)
• trunk/lib/jelix/forms/jFormsBase.class.php (modified) (13 diffs)
• trunk/lib/jelix/forms/jFormsBase.class.php (modified) (13 diffs)
• trunk/lib/jelix/forms/jFormsBuilderBase.class.php (modified) (6 diffs)
• trunk/lib/jelix/forms/jFormsBuilderBase.class.php (modified) (6 diffs)
• trunk/lib/jelix/forms/jFormsCompiler.class.php (modified) (12 diffs)
• trunk/lib/jelix/forms/jFormsCompiler.class.php (modified) (12 diffs)
• trunk/lib/jelix/forms/jFormsControl.class.php (modified) (3 diffs)
• trunk/lib/jelix/forms/jFormsControl.class.php (modified) (3 diffs)
• trunk/lib/jelix/plugins/tpl/html/block.formcontrols.php (modified) (5 diffs)
• trunk/lib/jelix/plugins/tpl/html/block.formcontrols.php (modified) (5 diffs)
• trunk/lib/jelix/plugins/tpl/html/cfunction.formfull.php (modified) (4 diffs)
• trunk/lib/jelix/plugins/tpl/html/cfunction.formfull.php (modified) (4 diffs)
• trunk/lib/jelix/plugins/tpl/html/function.ctrl_control.php (modified) (2 diffs)
• trunk/lib/jelix/plugins/tpl/html/function.ctrl_control.php (modified) (2 diffs)
• trunk/lib/jelix/plugins/tpl/html/function.ctrl_label.php (modified) (2 diffs)
• trunk/lib/jelix/plugins/tpl/html/function.ctrl_label.php (modified) (2 diffs)
• trunk/lib/jelix/plugins/tpl/html/function.ctrl_value.php (modified) (3 diffs)
• trunk/lib/jelix/plugins/tpl/html/function.ctrl_value.php (modified) (3 diffs)
• trunk/lib/jelix/plugins/tpl/html/function.formdatasfull.php (modified) (2 diffs)
• trunk/lib/jelix/plugins/tpl/html/function.formdatasfull.php (modified) (2 diffs)
• trunk/lib/jelix/plugins/tpl/html/function.formreset.php (added)
• trunk/lib/jelix/plugins/tpl/html/function.formreset.php (added)
• trunk/testapp/modules/jelix_tests/tests/jforms.compiler.html.php (modified) (7 diffs)
• trunk/testapp/modules/jelix_tests/tests/jforms.compiler.html.php (modified) (7 diffs)
• trunk/testapp/modules/jelix_tests/tests/jforms.htmlbuilder.html.php (modified) (6 diffs)
• trunk/testapp/modules/jelix_tests/tests/jforms.htmlbuilder.html.php (modified) (6 diffs)
• trunk/testapp/modules/testapp/forms/sample.form.xml (modified) (1 diff)
• trunk/testapp/modules/testapp/forms/sample.form.xml (modified) (1 diff)
• trunk/testapp/modules/testapp/templates/sampleform.tpl (modified) (1 diff)
• trunk/testapp/modules/testapp/templates/sampleform.tpl (modified) (1 diff)

trunk/build/manifests/jelix-lib.mn

@@ -371 +371 @@
-  function.ctrl_value.php
-  function.formsubmit.php
+  function.formreset.php
-  function.pagelinks.php
-

trunk/build/manifests/jelix-lib.mn

@@ -371 +371 @@
-  function.ctrl_value.php
-  function.formsubmit.php
+  function.formreset.php
-  function.pagelinks.php
-

trunk/lib/jelix/core-modules/jelix/locales/en_EN/formserr.ISO-8859-1.properties

@@ -1 +1 @@
-tag.missing=(800) %1$s is missing (file %2$s)
-
+n
-attribute.missing=(802) attribut %1$s is missing on %2$s (file %3$s)
-attribute.not.allowed=(803) attribut %1$s not allowed on %2$s (file %3$s)
-
+n
-invalid.xml.file=(805) invalid xml syntax in jforms file (file %s)
-selected.attribute.not.allowed=(806)"selected" attribute on <item> is not allowed when using defaultvalue attribute or <defaultvalues> (file %s)
@@ -16 +16 @@
-invalid.upload.control.name = (815) The given control name "%s" is invalid or the corresponding control is not an upload (form=%s)
-content.missing=(816) content of %1$s tag is missing (file %2$s)
+notunique.tag=(817) tag %1$s must be unique (file %2$s)
-
-js.err.invalid= "%s" field is invalid

trunk/lib/jelix/core-modules/jelix/locales/en_EN/formserr.ISO-8859-1.properties

@@ -1 +1 @@
-tag.missing=(800) %1$s is missing (file %2$s)
-
+n
-attribute.missing=(802) attribut %1$s is missing on %2$s (file %3$s)
-attribute.not.allowed=(803) attribut %1$s not allowed on %2$s (file %3$s)
-
+n
-invalid.xml.file=(805) invalid xml syntax in jforms file (file %s)
-selected.attribute.not.allowed=(806)"selected" attribute on <item> is not allowed when using defaultvalue attribute or <defaultvalues> (file %s)
@@ -16 +16 @@
-invalid.upload.control.name = (815) The given control name "%s" is invalid or the corresponding control is not an upload (form=%s)
-content.missing=(816) content of %1$s tag is missing (file %2$s)
+notunique.tag=(817) tag %1$s must be unique (file %2$s)
-
-js.err.invalid= "%s" field is invalid

trunk/lib/jelix/core-modules/jelix/locales/en_EN/formserr.UTF-8.properties

@@ -1 +1 @@
-tag.missing=(800) %1$s is missing (file %2$s)
-
+n
-attribute.missing=(802) attribut %1$s is missing on %2$s (file %3$s)
-attribute.not.allowed=(803) attribut %1$s not allowed on %2$s (file %3$s)
-
+n
-invalid.xml.file=(805) invalid xml syntax in jforms file (file %s)
-selected.attribute.not.allowed=(806)"selected" attribute on <item> is not allowed when using defaultvalue attribute or <defaultvalues> (file %s)
@@ -16 +16 @@
-invalid.upload.control.name = (815) The given control name "%s" is invalid or the corresponding control is not an upload (form=%s)
-content.missing=(816) content of %1$s tag is missing (file %2$s)
+notunique.tag=(817) tag %1$s must be unique (file %2$s)
-
-js.err.invalid= "%s" field is invalid

trunk/lib/jelix/core-modules/jelix/locales/en_EN/formserr.UTF-8.properties

@@ -1 +1 @@
-tag.missing=(800) %1$s is missing (file %2$s)
-
+n
-attribute.missing=(802) attribut %1$s is missing on %2$s (file %3$s)
-attribute.not.allowed=(803) attribut %1$s not allowed on %2$s (file %3$s)
-
+n
-invalid.xml.file=(805) invalid xml syntax in jforms file (file %s)
-selected.attribute.not.allowed=(806)"selected" attribute on <item> is not allowed when using defaultvalue attribute or <defaultvalues> (file %s)
@@ -16 +16 @@
-invalid.upload.control.name = (815) The given control name "%s" is invalid or the corresponding control is not an upload (form=%s)
-content.missing=(816) content of %1$s tag is missing (file %2$s)
+notunique.tag=(817) tag %1$s must be unique (file %2$s)
-
-js.err.invalid= "%s" field is invalid

trunk/lib/jelix/core-modules/jelix/locales/en_US/formserr.ISO-8859-1.properties

@@ -1 +1 @@
-tag.missing=(800) %1$s is missing (file %2$s)
-
+n
-attribute.missing=(802) attribut %1$s is missing on %2$s (file %3$s)
-attribute.not.allowed=(803) attribut %1$s not allowed on %2$s (file %3$s)
-
+n
-invalid.xml.file=(805) invalid xml syntax in jforms file (file %s)
-selected.attribute.not.allowed=(806)"selected" attribute on <item> is not allowed when using defaultvalue attribute or <defaultvalues> (file %s)
@@ -16 +16 @@
-invalid.upload.control.name = (815) The given control name "%s" is invalid or the corresponding control is not an upload (form=%s)
-content.missing=(816) content of %1$s tag is missing (file %2$s)
+notunique.tag=(817) tag %1$s must be unique (file %2$s)
-
-js.err.invalid= "%s" field is invalid

trunk/lib/jelix/core-modules/jelix/locales/en_US/formserr.ISO-8859-1.properties

@@ -1 +1 @@
-tag.missing=(800) %1$s is missing (file %2$s)
-
+n
-attribute.missing=(802) attribut %1$s is missing on %2$s (file %3$s)
-attribute.not.allowed=(803) attribut %1$s not allowed on %2$s (file %3$s)
-
+n
-invalid.xml.file=(805) invalid xml syntax in jforms file (file %s)
-selected.attribute.not.allowed=(806)"selected" attribute on <item> is not allowed when using defaultvalue attribute or <defaultvalues> (file %s)
@@ -16 +16 @@
-invalid.upload.control.name = (815) The given control name "%s" is invalid or the corresponding control is not an upload (form=%s)
-content.missing=(816) content of %1$s tag is missing (file %2$s)
+notunique.tag=(817) tag %1$s must be unique (file %2$s)
-
-js.err.invalid= "%s" field is invalid

trunk/lib/jelix/core-modules/jelix/locales/en_US/formserr.UTF-8.properties

@@ -1 +1 @@
-tag.missing=(800) %1$s is missing (file %2$s)
-
+n
-attribute.missing=(802) attribut %1$s is missing on %2$s (file %3$s)
-attribute.not.allowed=(803) attribut %1$s not allowed on %2$s (file %3$s)
-
+n
-invalid.xml.file=(805) invalid xml syntax in jforms file (file %s)
-selected.attribute.not.allowed=(806)"selected" attribute on <item> is not allowed when using defaultvalue attribute or <defaultvalues> (file %s)
@@ -16 +16 @@
-invalid.upload.control.name = (815) The given control name "%s" is invalid or the corresponding control is not an upload (form=%s)
-content.missing=(816) content of %1$s tag is missing (file %2$s)
+notunique.tag=(817) tag %1$s must be unique (file %2$s)
-
-js.err.invalid= "%s" field is invalid

trunk/lib/jelix/core-modules/jelix/locales/en_US/formserr.UTF-8.properties

@@ -1 +1 @@
-tag.missing=(800) %1$s is missing (file %2$s)
-
+n
-attribute.missing=(802) attribut %1$s is missing on %2$s (file %3$s)
-attribute.not.allowed=(803) attribut %1$s not allowed on %2$s (file %3$s)
-
+n
-invalid.xml.file=(805) invalid xml syntax in jforms file (file %s)
-selected.attribute.not.allowed=(806)"selected" attribute on <item> is not allowed when using defaultvalue attribute or <defaultvalues> (file %s)
@@ -16 +16 @@
-invalid.upload.control.name = (815) The given control name "%s" is invalid or the corresponding control is not an upload (form=%s)
-content.missing=(816) content of %1$s tag is missing (file %2$s)
+notunique.tag=(817) tag %1$s must be unique (file %2$s)
-
-js.err.invalid= "%s" field is invalid

trunk/lib/jelix/core-modules/jelix/locales/fr_FR/formserr.ISO-8859-1.properties

@@ -16 +16 @@
-invalid.upload.control.name = (815) Le nom de controle indiqu�%s" est invalide ou le control n'est pas un upload (form=%s)
-content.missing=(816) le contenu de %1$s est manquant (fichier %2$s)
+notunique.tag=(817) La balise %1$s doit �e unique (fichier %2$s)
-
-js.err.invalid=La saisie de "%s" est invalide

trunk/lib/jelix/core-modules/jelix/locales/fr_FR/formserr.ISO-8859-1.properties

@@ -16 +16 @@
-invalid.upload.control.name = (815) Le nom de controle indiqu�%s" est invalide ou le control n'est pas un upload (form=%s)
-content.missing=(816) le contenu de %1$s est manquant (fichier %2$s)
+notunique.tag=(817) La balise %1$s doit �e unique (fichier %2$s)
-
-js.err.invalid=La saisie de "%s" est invalide

trunk/lib/jelix/core-modules/jelix/locales/fr_FR/formserr.UTF-8.properties

@@ -16 +16 @@
-invalid.upload.control.name = (815) Le nom de controle indiqué "%s" est invalide ou le control n'est pas un upload (form=%s)
-content.missing=(816) le contenu de %1$s est manquant (fichier %2$s)
+notunique.tag=(817) La balise %1$s doit être unique (fichier %2$s)
-
-js.err.invalid=La saisie de "%s" est invalide

trunk/lib/jelix/core-modules/jelix/locales/fr_FR/formserr.UTF-8.properties

@@ -16 +16 @@
-invalid.upload.control.name = (815) Le nom de controle indiqué "%s" est invalide ou le control n'est pas un upload (form=%s)
-content.missing=(816) le contenu de %1$s est manquant (fichier %2$s)
+notunique.tag=(817) La balise %1$s doit être unique (fichier %2$s)
-
-js.err.invalid=La saisie de "%s" est invalide

trunk/lib/jelix/CREDITS

@@ -90 +90 @@
- - added support of 'else' keyword for block plugin in jtpl (#349)
- - fixed bug in firebug support (#362)
+ - added support of <reset> in jforms (#258)
-
-Thibault Piront (aka nuks)

trunk/lib/jelix/CREDITS

@@ -90 +90 @@
- - added support of 'else' keyword for block plugin in jtpl (#349)
- - fixed bug in firebug support (#362)
+ - added support of <reset> in jforms (#258)
-
-Thibault Piront (aka nuks)

trunk/lib/jelix/docs/ns/jforms.rng

@@ -34 +34 @@
-        </choice>
-      </oneOrMore>
+      <optional>
+        <ref name="reset" />
+      </optional>
-  </define>
-
@@ -320 +323 @@
--->
-
+  <define name="reset">
+     <element name="reset">
+       <ref name="control.common" />
+     </element>
+  </define>
-  
-  <!--

trunk/lib/jelix/docs/ns/jforms.rng

@@ -34 +34 @@
-        </choice>
-      </oneOrMore>
+      <optional>
+        <ref name="reset" />
+      </optional>
-  </define>
-
@@ -320 +323 @@
--->
-
+  <define name="reset">
+     <element name="reset">
+       <ref name="control.common" />
+     </element>
+  </define>
-  
-  <!--

trunk/lib/jelix/forms/jFormsBase.class.php

@@ -4 +4 @@
-* @subpackage  forms
-* @author      Laurent Jouanneau
-
-
+ Dominique Papin
+, 2007 Dominique Papin
-* @link        http://www.jelix.org
-* @licence     http://www.gnu.org/licenses/lgpl.html GNU Lesser General Public Licence, see LICENCE file
@@ -48 +48 @@
-     */
-    protected $_submits = array();
+
+    /**
+     * Reset button
+     * @var jFormsControl
+     * @see jFormsControl
+     * @since 1.0
+     */
+    protected $_reset = null;
-
-    /**
@@ -116 +124 @@
-                }
-            }elseif($ctrl->type=='submit' && $value) {
- 
+
-                // "value" attribute, we should verify it and get the real value
-                $datas = $ctrl->datasource->getDatas();
@@ -189 +197 @@
-                    }else {
-                        $this->_container->datas[$name] = $ctrl->valueOnUncheck;
- 
+
-                }else{
-                    $this->_container->datas[$name] = $daorec->$name;
@@ -239 +247 @@
-                // if no value and if the property is not required, we set null to it
-                $daorec->$name = null;
- 
+
-                    && in_array($prop[$name]['datatype'],
-                                array('int','integer','double','float'))) {
@@ -272 +280 @@
-    /**
-     * set datas from a DAO, in a control
- 
+
-     * The control must be a container like checkboxes or listbox with multiple attribute.
-     * The form should contain a formId
-     *
-     * The Dao should map to an "association table" : its primary key should be composed by
- 
+
-     * the values of the control. If this order is not the same as defined into the dao,
-     * you should provide the list of property names which corresponds to the primary key
- 
+
-     * the value.
-     * @param string $controlName  the name of the control
@@ -332 +340 @@
-     * The control must be a container like checkboxes or listbox with multiple attribute.
-     * If the form contain a new record (no formId), you should call saveToDao before
- 
+
-     * by an other way. then you must pass this primary key in the third argument.
-     * If the form have already a formId, then it will be used as a primary key, unless
@@ -338 +346 @@
-     *
-     * The Dao should map to an "association table" : its primary key should be
- 
+
-     * the values of the control. If this order is not the same as defined into the dao,
-     * you should provide the list of property names which corresponds to the primary key
- 
+
-     * the value.
-     * All existing records which have the formid in their keys are deleted
@@ -411 +419 @@
-     * set an error message on a specific field
-     * @param string $field the field name
- 
+
-     */
-    public function setErrorOn($field, $mesg){
@@ -460 +468 @@
-    /**
-     * @param string $name the control name you want to get
- 
+
-     * @since jelix 1.0
-     */
@@ -469 +477 @@
-     */
-    public function getSubmits(){ return $this->_submits; }
+ 
+    /**
+     * @return array of jFormsControl objects
+     */
+    public function getReset(){ return $this->_reset; }
-
-    /**
@@ -498 +511 @@
-
-    /**
- 
+
-     * an upload control of course.
-     * @param string $controlName the name of the upload control
@@ -568 +581 @@
-        if($control->type =='submit')
-            $this->_submits [$control->ref] = $control;
-
+
+
+
-            $this->_uploads [$control->ref] = $control;
-
+
-        if(!isset($this->_container->datas[$control->ref])){
-            if ( $control->datatype instanceof jDatatypeDateTime && $control->defaultValue == 'now') {

trunk/lib/jelix/forms/jFormsBase.class.php

@@ -4 +4 @@
-* @subpackage  forms
-* @author      Laurent Jouanneau
-
-
+ Dominique Papin
+, 2007 Dominique Papin
-* @link        http://www.jelix.org
-* @licence     http://www.gnu.org/licenses/lgpl.html GNU Lesser General Public Licence, see LICENCE file
@@ -48 +48 @@
-     */
-    protected $_submits = array();
+
+    /**
+     * Reset button
+     * @var jFormsControl
+     * @see jFormsControl
+     * @since 1.0
+     */
+    protected $_reset = null;
-
-    /**
@@ -116 +124 @@
-                }
-            }elseif($ctrl->type=='submit' && $value) {
- 
+
-                // "value" attribute, we should verify it and get the real value
-                $datas = $ctrl->datasource->getDatas();
@@ -189 +197 @@
-                    }else {
-                        $this->_container->datas[$name] = $ctrl->valueOnUncheck;
- 
+
-                }else{
-                    $this->_container->datas[$name] = $daorec->$name;
@@ -239 +247 @@
-                // if no value and if the property is not required, we set null to it
-                $daorec->$name = null;
- 
+
-                    && in_array($prop[$name]['datatype'],
-                                array('int','integer','double','float'))) {
@@ -272 +280 @@
-    /**
-     * set datas from a DAO, in a control
- 
+
-     * The control must be a container like checkboxes or listbox with multiple attribute.
-     * The form should contain a formId
-     *
-     * The Dao should map to an "association table" : its primary key should be composed by
- 
+
-     * the values of the control. If this order is not the same as defined into the dao,
-     * you should provide the list of property names which corresponds to the primary key
- 
+
-     * the value.
-     * @param string $controlName  the name of the control
@@ -332 +340 @@
-     * The control must be a container like checkboxes or listbox with multiple attribute.
-     * If the form contain a new record (no formId), you should call saveToDao before
- 
+
-     * by an other way. then you must pass this primary key in the third argument.
-     * If the form have already a formId, then it will be used as a primary key, unless
@@ -338 +346 @@
-     *
-     * The Dao should map to an "association table" : its primary key should be
- 
+
-     * the values of the control. If this order is not the same as defined into the dao,
-     * you should provide the list of property names which corresponds to the primary key
- 
+
-     * the value.
-     * All existing records which have the formid in their keys are deleted
@@ -411 +419 @@
-     * set an error message on a specific field
-     * @param string $field the field name
- 
+
-     */
-    public function setErrorOn($field, $mesg){
@@ -460 +468 @@
-    /**
-     * @param string $name the control name you want to get
- 
+
-     * @since jelix 1.0
-     */
@@ -469 +477 @@
-     */
-    public function getSubmits(){ return $this->_submits; }
+ 
+    /**
+     * @return array of jFormsControl objects
+     */
+    public function getReset(){ return $this->_reset; }
-
-    /**
@@ -498 +511 @@
-
-    /**
- 
+
-     * an upload control of course.
-     * @param string $controlName the name of the upload control
@@ -568 +581 @@
-        if($control->type =='submit')
-            $this->_submits [$control->ref] = $control;
-
+
+
+
-            $this->_uploads [$control->ref] = $control;
-
+
-        if(!isset($this->_container->datas[$control->ref])){
-            if ( $control->datatype instanceof jDatatypeDateTime && $control->defaultValue == 'now') {

trunk/lib/jelix/forms/jFormsBuilderBase.class.php

@@ -4 +4 @@
-* @subpackage  forms
-* @author      Laurent Jouanneau
-
-
+, Dominique Papin
+, 2007 Dominique Papin
-* @copyright   2007 Loic Mathaud
-* @link        http://www.jelix.org
@@ -123 +123 @@
-            echo '</div>';
-        }
- 
+
-//<![CDATA[
-', $this->getJavascriptCheck($params[0],$params[1]),'
@@ -165 +165 @@
-        if($ctrl->type == 'output' || $ctrl->type == 'checkboxes' || $ctrl->type == 'radiobuttons'){
-            echo '<span class="jforms-label',$required,$inError,'"',$hint,'>',htmlspecialchars($ctrl->label),'</span>';
-
+ && $ctrl->type != 'reset'
-            $id = $this->_name.'_'.$ctrl->ref;
-            echo '<label class="jforms-label',$required,$inError,'" for="'.$id.'"',$hint,'>'.htmlspecialchars($ctrl->label).'</label>';
@@ -204 +204 @@
-                foreach($ctrl->datasource->getDatas() as $v=>$label){
-                    echo '<input type="checkbox"',$attrs,$i,'" value="',htmlspecialchars($v),'"';
- 
+
-                        echo ' checked="checked"';
-                    echo $readonly,$class,$this->_endt,'<label for="',$id,$i,'">',htmlspecialchars($label),'</label>';
@@ -212 +212 @@
-                foreach($ctrl->datasource->getDatas() as $v=>$label){
-                    echo '<input type="checkbox"',$attrs,$i,'" value="',htmlspecialchars($v),'"';
- 
+
-                        echo ' checked="checked"';
-                    echo $readonly,$class,$this->_endt,'<label for="',$id,$i,'">',htmlspecialchars($label),'</label>';
@@ -318 +318 @@
-            }
-            break;
+        case 'reset':
+            echo '<button type="reset"',$id,$hint,'>',htmlspecialchars($ctrl->label),'</button>';
+            break;
-        }
-

trunk/lib/jelix/forms/jFormsBuilderBase.class.php

@@ -4 +4 @@
-* @subpackage  forms
-* @author      Laurent Jouanneau
-
-
+, Dominique Papin
+, 2007 Dominique Papin
-* @copyright   2007 Loic Mathaud
-* @link        http://www.jelix.org
@@ -123 +123 @@
-            echo '</div>';
-        }
- 
+
-//<![CDATA[
-', $this->getJavascriptCheck($params[0],$params[1]),'
@@ -165 +165 @@
-        if($ctrl->type == 'output' || $ctrl->type == 'checkboxes' || $ctrl->type == 'radiobuttons'){
-            echo '<span class="jforms-label',$required,$inError,'"',$hint,'>',htmlspecialchars($ctrl->label),'</span>';
-
+ && $ctrl->type != 'reset'
-            $id = $this->_name.'_'.$ctrl->ref;
-            echo '<label class="jforms-label',$required,$inError,'" for="'.$id.'"',$hint,'>'.htmlspecialchars($ctrl->label).'</label>';
@@ -204 +204 @@
-                foreach($ctrl->datasource->getDatas() as $v=>$label){
-                    echo '<input type="checkbox"',$attrs,$i,'" value="',htmlspecialchars($v),'"';
- 
+
-                        echo ' checked="checked"';
-                    echo $readonly,$class,$this->_endt,'<label for="',$id,$i,'">',htmlspecialchars($label),'</label>';
@@ -212 +212 @@
-                foreach($ctrl->datasource->getDatas() as $v=>$label){
-                    echo '<input type="checkbox"',$attrs,$i,'" value="',htmlspecialchars($v),'"';
- 
+
-                        echo ' checked="checked"';
-                    echo $readonly,$class,$this->_endt,'<label for="',$id,$i,'">',htmlspecialchars($label),'</label>';
@@ -318 +318 @@
-            }
-            break;
+        case 'reset':
+            echo '<button type="reset"',$id,$hint,'>',htmlspecialchars($ctrl->label),'</button>';
+            break;
-        }
-

trunk/lib/jelix/forms/jFormsCompiler.class.php

@@ -4 +4 @@
-* @subpackage forms
-* @author     Laurent Jouanneau
-
+, Dominique Papin
-* @contributor Uriel Corfa Emotic SARL
-* @copyright   2006-2007 Laurent Jouanneau
-
+, 2007 Dominique Papin
-* @copyright   2007 Emotic SARL
-* @link        http://www.jelix.org
@@ -37 +37 @@
-            throw new jException('jelix~formserr.invalid.xml.file',array($this->sourceFile));
-        }
-
-        if($doc->documentElement->namespaceURI != JELIX_NAMESPACE_BASE.'forms/1.0'){
-            throw new jException('jelix~formserr.namespace.wrong',array($this->sourceFile));
-        }
-
-        $xml = simplexml_import_dom($doc);
-
-        $source=array();
@@ -64 +58 @@
-        $srcjs[]='$js.="jForms.tForm.setHelpDecorator(new ".$helpDecoratorName."());\n";';
-
-
-
-
-
+
+
-        $source[]="  }\n} ?>";
-
@@ -82 +74 @@
-    }
-
+    protected function generatePHPContent($doc, &$source, &$srcjs){
+
+        if($doc->documentElement->namespaceURI != JELIX_NAMESPACE_BASE.'forms/1.0'){
+           throw new jException('jelix~formserr.namespace.wrong',array($this->sourceFile));
+        }
+
+        $xml = simplexml_import_dom($doc);
+
+        if (count($xml->reset) > 1 )
+            throw new jException('jelix~formserr.notunique.tag',array('reset',$this->sourceFile));
+
+
+        foreach($xml->children() as $controltype=>$control){
+            $source[] = $this->generatePHPControl($controltype, $control);
+            $srcjs[] =  $this->generateJsControl($controltype, $control);
+        }
+    }
-
-    protected function generatePHPControl($controltype, $control){
@@ -106 +115 @@
-            $dt = (string)$control['type'];
-            if(!in_array(strtolower($dt), array('string','boolean','decimal','integer','hexadecimal',
- 
+
-                                                'url','email','ipv4','ipv6'))){
-               throw new jException('jelix~formserr.datatype.unknow',array($dt,$controltype,$this->sourceFile));
@@ -118 +127 @@
-        // readonly support
-        if(isset($control['readonly'])){
-
+ || $controltype == 'reset'
-                throw new jException('jelix~formserr.attribute.not.allowed',array('readonly',$controltype,$this->sourceFile));
-            }
@@ -126 +135 @@
-        // required support
-        if(isset($control['required'])){
-
+ || $controltype == 'reset'
-                throw new jException('jelix~formserr.attribute.not.allowed',array('required',$controltype,$this->sourceFile));
-            }