Changeset 889

Timestamp:

04/20/08 22:57:50 (8 months ago)

Author:

laurentj

Message:

ticket #460: jforms, html builder, now maxlength attribute is generated on input when maxlength is specified in the xml

Files:

• trunk/lib/jelix/plugins/jforms/html/html.jformsbuilder.php (modified) (2 diffs)
• trunk/lib/jelix/plugins/jforms/html/html.jformsbuilder.php (modified) (2 diffs)
• trunk/lib/jelix/plugins/jforms/html/html.jformsbuilder.php (modified) (2 diffs)
• trunk/lib/jelix/plugins/jforms/html/html.jformsbuilder.php (modified) (2 diffs)
• trunk/testapp/modules/jelix_tests/tests/jforms.htmlbuilder.html_cli.php (modified) (5 diffs)
• trunk/testapp/modules/jelix_tests/tests/jforms.htmlbuilder.html_cli.php (modified) (5 diffs)
• trunk/testapp/modules/jelix_tests/tests/jforms.htmlbuilder.html_cli.php (modified) (5 diffs)
• trunk/testapp/modules/jelix_tests/tests/jforms.htmlbuilder.html_cli.php (modified) (5 diffs)

trunk/lib/jelix/plugins/jforms/html/html.jformsbuilder.php

@@ -136 +136 @@
-    public function outputControlLabel($ctrl){
-        if($ctrl->type == 'hidden') return;
-
+|| $ctrl->readonly
-        $inError = (isset($this->_form->getContainer()->errors[$ctrl->ref]) ?' jforms-error':'');
-        $hint = ($ctrl->hint == ''?'':' title="'.htmlspecialchars($ctrl->hint).'"');
@@ -149 +149 @@
-    public function outputControl($ctrl){
-        $id = ' name="'.$ctrl->ref.'" id="'.$this->_name.'_'.$ctrl->ref.'"';
+        $class = ($ctrl->required == ''|| $ctrl->readonly?'':' jforms-required');
+        $class.= (isset($this->_form->getContainer()->errors[$ctrl->ref]) ?' jforms-error':'');
+        if($class !='') $class = ' class="'.$class.'"';
-        $readonly = ($ctrl->readonly?' readonly="readonly"':'');
-        $hint = ($ctrl->hint == ''?'':' title="'.htmlspecialchars($ctrl->hint).'"');
-        $class = (isset($this->_form->getContainer()->errors[$ctrl->ref]) ?' class="jforms-error"':'');
-        switch($ctrl->type){
-        case 'input':
-            $value = $this->_form->getData($ctrl->ref);
-            $size = ($ctrl->size == 0?'' : ' size="'.$ctrl->size.'"');
-
+
+
+
+
+
+
-            break;
-        case 'checkbox':

trunk/lib/jelix/plugins/jforms/html/html.jformsbuilder.php

@@ -136 +136 @@
-    public function outputControlLabel($ctrl){
-        if($ctrl->type == 'hidden') return;
-
+|| $ctrl->readonly
-        $inError = (isset($this->_form->getContainer()->errors[$ctrl->ref]) ?' jforms-error':'');
-        $hint = ($ctrl->hint == ''?'':' title="'.htmlspecialchars($ctrl->hint).'"');
@@ -149 +149 @@
-    public function outputControl($ctrl){
-        $id = ' name="'.$ctrl->ref.'" id="'.$this->_name.'_'.$ctrl->ref.'"';
+        $class = ($ctrl->required == ''|| $ctrl->readonly?'':' jforms-required');
+        $class.= (isset($this->_form->getContainer()->errors[$ctrl->ref]) ?' jforms-error':'');
+        if($class !='') $class = ' class="'.$class.'"';
-        $readonly = ($ctrl->readonly?' readonly="readonly"':'');
-        $hint = ($ctrl->hint == ''?'':' title="'.htmlspecialchars($ctrl->hint).'"');
-        $class = (isset($this->_form->getContainer()->errors[$ctrl->ref]) ?' class="jforms-error"':'');
-        switch($ctrl->type){
-        case 'input':
-            $value = $this->_form->getData($ctrl->ref);
-            $size = ($ctrl->size == 0?'' : ' size="'.$ctrl->size.'"');
-
+
+
+
+
+
+
-            break;
-        case 'checkbox':

trunk/lib/jelix/plugins/jforms/html/html.jformsbuilder.php

@@ -136 +136 @@
-    public function outputControlLabel($ctrl){
-        if($ctrl->type == 'hidden') return;
-
+|| $ctrl->readonly
-        $inError = (isset($this->_form->getContainer()->errors[$ctrl->ref]) ?' jforms-error':'');
-        $hint = ($ctrl->hint == ''?'':' title="'.htmlspecialchars($ctrl->hint).'"');
@@ -149 +149 @@
-    public function outputControl($ctrl){
-        $id = ' name="'.$ctrl->ref.'" id="'.$this->_name.'_'.$ctrl->ref.'"';
+        $class = ($ctrl->required == ''|| $ctrl->readonly?'':' jforms-required');
+        $class.= (isset($this->_form->getContainer()->errors[$ctrl->ref]) ?' jforms-error':'');
+        if($class !='') $class = ' class="'.$class.'"';
-        $readonly = ($ctrl->readonly?' readonly="readonly"':'');
-        $hint = ($ctrl->hint == ''?'':' title="'.htmlspecialchars($ctrl->hint).'"');
-        $class = (isset($this->_form->getContainer()->errors[$ctrl->ref]) ?' class="jforms-error"':'');
-        switch($ctrl->type){
-        case 'input':
-            $value = $this->_form->getData($ctrl->ref);
-            $size = ($ctrl->size == 0?'' : ' size="'.$ctrl->size.'"');
-
+
+
+
+
+
+
-            break;
-        case 'checkbox':

trunk/lib/jelix/plugins/jforms/html/html.jformsbuilder.php

@@ -136 +136 @@
-    public function outputControlLabel($ctrl){
-        if($ctrl->type == 'hidden') return;
-
+|| $ctrl->readonly
-        $inError = (isset($this->_form->getContainer()->errors[$ctrl->ref]) ?' jforms-error':'');
-        $hint = ($ctrl->hint == ''?'':' title="'.htmlspecialchars($ctrl->hint).'"');
@@ -149 +149 @@
-    public function outputControl($ctrl){
-        $id = ' name="'.$ctrl->ref.'" id="'.$this->_name.'_'.$ctrl->ref.'"';
+        $class = ($ctrl->required == ''|| $ctrl->readonly?'':' jforms-required');
+        $class.= (isset($this->_form->getContainer()->errors[$ctrl->ref]) ?' jforms-error':'');
+        if($class !='') $class = ' class="'.$class.'"';
-        $readonly = ($ctrl->readonly?' readonly="readonly"':'');
-        $hint = ($ctrl->hint == ''?'':' title="'.htmlspecialchars($ctrl->hint).'"');
-        $class = (isset($this->_form->getContainer()->errors[$ctrl->ref]) ?' class="jforms-error"':'');
-        switch($ctrl->type){
-        case 'input':
-            $value = $this->_form->getData($ctrl->ref);
-            $size = ($ctrl->size == 0?'' : ' size="'.$ctrl->size.'"');
-
+
+
+
+
+
+
-            break;
-        case 'checkbox':

trunk/testapp/modules/jelix_tests/tests/jforms.htmlbuilder.html_cli.php

@@ -155 +155 @@
-        $this->assertEqualOrDiff('<input type="text" name="nom" id="'.$this->formname.'_nom" value="laurent"/>', $out);
-
+        $ctrl->required=true;
+        ob_start();$this->builder->outputControl($ctrl);$out = ob_get_clean();
+        $this->assertEqualOrDiff('<input type="text" name="nom" id="'.$this->formname.'_nom" class=" jforms-required" value="laurent"/>', $out);
+
-        $ctrl->readonly=true;
+        $ctrl->required=false;
-        ob_start();$this->builder->outputControl($ctrl);$out = ob_get_clean();
-        $this->assertEqualOrDiff('<input type="text" name="nom" id="'.$this->formname.'_nom" readonly="readonly" value="laurent"/>', $out);
@@ -171 +176 @@
-        $this->assertEqualOrDiff('<input type="text" name="nom" id="'.$this->formname.'_nom" title="ceci est un tooltip" value="laurent"/><span class="jforms-help"><a href="javascript:jForms.showHelp(\''. $this->formname.'\',\'nom\')">?</a></span>', $out);
-
+        $ctrl->hasHelp=false;
+        $ctrl->hint='';
+        $ctrl->datatype->addFacet('maxLength',5);
+        ob_start();$this->builder->outputControl($ctrl);$out = ob_get_clean();
+        $this->assertEqualOrDiff('<input type="text" name="nom" id="'.$this->formname.'_nom" maxlength="5" value="laurent"/>', $out);
-    }
-    function testOutputCheckbox(){
@@ -717 +727 @@
-
-        ob_start();$this->builder->outputControl($ctrl);$out = ob_get_clean();
-
+class=" jforms-required" 
-
-        $this->form->addControl($ctrl);
-        $this->form->setData('cap','toto');
-        ob_start();$this->builder->outputControl($ctrl);$out = ob_get_clean();
-
+class=" jforms-required" 
-
-        $ctrl->readonly=true;
@@ -731 +741 @@
-        $ctrl->hasHelp=true;
-        ob_start();$this->builder->outputControl($ctrl);$out = ob_get_clean();
-
+class=" jforms-required" 
-
-        $ctrl->hint='ceci est un tooltip';
@@ -738 +748 @@
-
-        ob_start();$this->builder->outputControl($ctrl);$out = ob_get_clean();
-
+class=" jforms-required" 
-    }
-

trunk/testapp/modules/jelix_tests/tests/jforms.htmlbuilder.html_cli.php

@@ -155 +155 @@
-        $this->assertEqualOrDiff('<input type="text" name="nom" id="'.$this->formname.'_nom" value="laurent"/>', $out);
-
+        $ctrl->required=true;
+        ob_start();$this->builder->outputControl($ctrl);$out = ob_get_clean();
+        $this->assertEqualOrDiff('<input type="text" name="nom" id="'.$this->formname.'_nom" class=" jforms-required" value="laurent"/>', $out);
+
-        $ctrl->readonly=true;
+        $ctrl->required=false;
-        ob_start();$this->builder->outputControl($ctrl);$out = ob_get_clean();
-        $this->assertEqualOrDiff('<input type="text" name="nom" id="'.$this->formname.'_nom" readonly="readonly" value="laurent"/>', $out);
@@ -171 +176 @@
-        $this->assertEqualOrDiff('<input type="text" name="nom" id="'.$this->formname.'_nom" title="ceci est un tooltip" value="laurent"/><span class="jforms-help"><a href="javascript:jForms.showHelp(\''. $this->formname.'\',\'nom\')">?</a></span>', $out);
-
+        $ctrl->hasHelp=false;
+        $ctrl->hint='';
+        $ctrl->datatype->addFacet('maxLength',5);
+        ob_start();$this->builder->outputControl($ctrl);$out = ob_get_clean();
+        $this->assertEqualOrDiff('<input type="text" name="nom" id="'.$this->formname.'_nom" maxlength="5" value="laurent"/>', $out);
-    }
-    function testOutputCheckbox(){
@@ -717 +727 @@
-
-        ob_start();$this->builder->outputControl($ctrl);$out = ob_get_clean();
-
+class=" jforms-required" 
-
-        $this->form->addControl($ctrl);
-        $this->form->setData('cap','toto');
-        ob_start();$this->builder->outputControl($ctrl);$out = ob_get_clean();
-
+class=" jforms-required" 
-
-        $ctrl->readonly=true;
@@ -731 +741 @@
-        $ctrl->hasHelp=true;
-        ob_start();$this->builder->outputControl($ctrl);$out = ob_get_clean();
-
+class=" jforms-required" 
-
-        $ctrl->hint='ceci est un tooltip';
@@ -738 +748 @@
-
-        ob_start();$this->builder->outputControl($ctrl);$out = ob_get_clean();
-
+class=" jforms-required" 
-    }
-

trunk/testapp/modules/jelix_tests/tests/jforms.htmlbuilder.html_cli.php

@@ -155 +155 @@
-        $this->assertEqualOrDiff('<input type="text" name="nom" id="'.$this->formname.'_nom" value="laurent"/>', $out);
-
+        $ctrl->required=true;
+        ob_start();$this->builder->outputControl($ctrl);$out = ob_get_clean();
+        $this->assertEqualOrDiff('<input type="text" name="nom" id="'.$this->formname.'_nom" class=" jforms-required" value="laurent"/>', $out);
+
-        $ctrl->readonly=true;
+        $ctrl->required=false;
-        ob_start();$this->builder->outputControl($ctrl);$out = ob_get_clean();
-        $this->assertEqualOrDiff('<input type="text" name="nom" id="'.$this->formname.'_nom" readonly="readonly" value="laurent"/>', $out);
@@ -171 +176 @@
-        $this->assertEqualOrDiff('<input type="text" name="nom" id="'.$this->formname.'_nom" title="ceci est un tooltip" value="laurent"/><span class="jforms-help"><a href="javascript:jForms.showHelp(\''. $this->formname.'\',\'nom\')">?</a></span>', $out);
-
+        $ctrl->hasHelp=false;
+        $ctrl->hint='';
+        $ctrl->datatype->addFacet('maxLength',5);
+        ob_start();$this->builder->outputControl($ctrl);$out = ob_get_clean();
+        $this->assertEqualOrDiff('<input type="text" name="nom" id="'.$this->formname.'_nom" maxlength="5" value="laurent"/>', $out);
-    }
-    function testOutputCheckbox(){
@@ -717 +727 @@
-
-        ob_start();$this->builder->outputControl($ctrl);$out = ob_get_clean();
-
+class=" jforms-required" 
-
-        $this->form->addControl($ctrl);
-        $this->form->setData('cap','toto');
-        ob_start();$this->builder->outputControl($ctrl);$out = ob_get_clean();
-
+class=" jforms-required" 
-
-        $ctrl->readonly=true;
@@ -731 +741 @@
-        $ctrl->hasHelp=true;
-        ob_start();$this->builder->outputControl($ctrl);$out = ob_get_clean();
-
+class=" jforms-required" 
-
-        $ctrl->hint='ceci est un tooltip';
@@ -738 +748 @@
-
-        ob_start();$this->builder->outputControl($ctrl);$out = ob_get_clean();
-
+class=" jforms-required" 
-    }
-

trunk/testapp/modules/jelix_tests/tests/jforms.htmlbuilder.html_cli.php

@@ -155 +155 @@
-        $this->assertEqualOrDiff('<input type="text" name="nom" id="'.$this->formname.'_nom" value="laurent"/>', $out);
-
+        $ctrl->required=true;
+        ob_start();$this->builder->outputControl($ctrl);$out = ob_get_clean();
+        $this->assertEqualOrDiff('<input type="text" name="nom" id="'.$this->formname.'_nom" class=" jforms-required" value="laurent"/>', $out);
+
-        $ctrl->readonly=true;
+        $ctrl->required=false;
-        ob_start();$this->builder->outputControl($ctrl);$out = ob_get_clean();
-        $this->assertEqualOrDiff('<input type="text" name="nom" id="'.$this->formname.'_nom" readonly="readonly" value="laurent"/>', $out);
@@ -171 +176 @@
-        $this->assertEqualOrDiff('<input type="text" name="nom" id="'.$this->formname.'_nom" title="ceci est un tooltip" value="laurent"/><span class="jforms-help"><a href="javascript:jForms.showHelp(\''. $this->formname.'\',\'nom\')">?</a></span>', $out);
-
+        $ctrl->hasHelp=false;
+        $ctrl->hint='';
+        $ctrl->datatype->addFacet('maxLength',5);
+        ob_start();$this->builder->outputControl($ctrl);$out = ob_get_clean();
+        $this->assertEqualOrDiff('<input type="text" name="nom" id="'.$this->formname.'_nom" maxlength="5" value="laurent"/>', $out);
-    }
-    function testOutputCheckbox(){
@@ -717 +727 @@
-
-        ob_start();$this->builder->outputControl($ctrl);$out = ob_get_clean();
-
+class=" jforms-required" 
-
-        $this->form->addControl($ctrl);
-        $this->form->setData('cap','toto');
-        ob_start();$this->builder->outputControl($ctrl);$out = ob_get_clean();
-
+class=" jforms-required" 
-
-        $ctrl->readonly=true;
@@ -731 +741 @@
-        $ctrl->hasHelp=true;
-        ob_start();$this->builder->outputControl($ctrl);$out = ob_get_clean();
-
+class=" jforms-required" 
-
-        $ctrl->hint='ceci est un tooltip';
@@ -738 +748 @@
-
-        ob_start();$this->builder->outputControl($ctrl);$out = ob_get_clean();
-
+class=" jforms-required" 
-    }
-