pieforms-commit Mailing List for Pieforms

Revision: 143
          http://svn.sourceforge.net/pieforms/?rev=143&view=rev
Author:   oracleshinoda
Date:     2006-12-23 22:29:24 -0800 (Sat, 23 Dec 2006)

Log Message:
-----------
Renumbered response constants to be negative numbers, to allow application developers to use the positive numbers

Modified Paths:
--------------
    pieforms-php5/trunk/src/pieform.php

Modified: pieforms-php5/trunk/src/pieform.php
===================================================================
--- pieforms-php5/trunk/src/pieform.php	2006-12-24 05:12:32 UTC (rev 142)
+++ pieforms-php5/trunk/src/pieform.php	2006-12-24 06:29:24 UTC (rev 143)
@@ -26,6 +26,13 @@
 
 $GLOBALS['_PIEFORM_REGISTRY'] = array();
 
+/** The form was processed successfully */
+define('PIEFORM_OK', 0);
+/** The form failed processing/validating */
+define('PIEFORM_ERR', -1);
+/** A cancel button was pressed */
+define('PIEFORM_CANCEL', -2);
+
 /**
  * Builds, validates and processes a form.
  *
@@ -877,7 +884,7 @@
             }
             else {
                 // Redirect if the form is being cancelled
-                if (data.returnCode == 2) {
+                if (data.returnCode == -2) {
                     window.location = data.message;
                     return;
                 }
@@ -890,7 +897,7 @@
                     }
                 }
 
-                if (data.returnCode == 1) {
+                if (data.returnCode == -1) {
                     // The request failed validation
 
 EOF;
@@ -1330,8 +1337,4 @@
     return array_unique($htmlelements);
 }
 
-define('PIEFORM_OK', 0);
-define('PIEFORM_ERR', 1);
-define('PIEFORM_CANCEL', 2);
-
 ?>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 142
          http://svn.sourceforge.net/pieforms/?rev=142&view=rev
Author:   oracleshinoda
Date:     2006-12-23 21:12:32 -0800 (Sat, 23 Dec 2006)

Log Message:
-----------
Renamed the *_messages_js functions to *_get_js, which is more appropriate

Modified Paths:
--------------
    pieforms-php5/trunk/src/pieform/renderers/div.php
    pieforms-php5/trunk/src/pieform/renderers/multicolumntable.php
    pieforms-php5/trunk/src/pieform/renderers/table.php
    pieforms-php5/trunk/src/pieform.php

Modified: pieforms-php5/trunk/src/pieform/renderers/div.php
===================================================================
--- pieforms-php5/trunk/src/pieform/renderers/div.php	2006-12-24 02:32:29 UTC (rev 141)
+++ pieforms-php5/trunk/src/pieform/renderers/div.php	2006-12-24 05:12:32 UTC (rev 142)
@@ -78,8 +78,7 @@
 }
 
 
-// @todo needs updating again... need to replace remove_error with remove_all_errors
-function pieform_renderer_div_messages_js($id) {
+function pieform_renderer_div_get_js($id) {
     $result = <<<EOF
 // Given a message and form element name, should set an error on the element
 function {$id}_set_error(message, element) {

Modified: pieforms-php5/trunk/src/pieform/renderers/multicolumntable.php
===================================================================
--- pieforms-php5/trunk/src/pieform/renderers/multicolumntable.php	2006-12-24 02:32:29 UTC (rev 141)
+++ pieforms-php5/trunk/src/pieform/renderers/multicolumntable.php	2006-12-24 05:12:32 UTC (rev 142)
@@ -46,8 +46,7 @@
     $formrenderermct->set_form($form);
 }
 
-function pieform_renderer_multicolumntable_messages_js($id) {
-    //return pieform_renderer_table_messages_js($id);
+function pieform_renderer_multicolumntable_get_js($id) {
     return <<<EOF
 function {$id}_set_error (message, element) {
     element = '{$id}_' + element;

Modified: pieforms-php5/trunk/src/pieform/renderers/table.php
===================================================================
--- pieforms-php5/trunk/src/pieform/renderers/table.php	2006-12-24 02:32:29 UTC (rev 141)
+++ pieforms-php5/trunk/src/pieform/renderers/table.php	2006-12-24 05:12:32 UTC (rev 142)
@@ -106,7 +106,7 @@
     return "</tbody></table>\n";
 }
 
-function pieform_renderer_table_messages_js($id) {
+function pieform_renderer_table_get_js($id) {
     $result = <<<EOF
 function {$id}_set_error(message, element) {
     element = $('{$id}_' + element + '_container');

Modified: pieforms-php5/trunk/src/pieform.php
===================================================================
--- pieforms-php5/trunk/src/pieform.php	2006-12-24 02:32:29 UTC (rev 141)
+++ pieforms-php5/trunk/src/pieform.php	2006-12-24 05:12:32 UTC (rev 142)
@@ -928,7 +928,7 @@
 
 EOF;
         $result .= "});\n\n";
-        $function = 'pieform_renderer_' . $this->data['renderer'] . '_messages_js';
+        $function = 'pieform_renderer_' . $this->data['renderer'] . '_get_js';
         if (!function_exists($function)) {
             throw new PieformException('No renderer message function "' . $function . '"');
         }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 141
          http://svn.sourceforge.net/pieforms/?rev=141&view=rev
Author:   oracleshinoda
Date:     2006-12-23 18:32:29 -0800 (Sat, 23 Dec 2006)

Log Message:
-----------
Insert empty table cells in gaps to preserve HTML validation. Disable fieldsets from working, they just make a mess. Fixed up the javascript for inserting errors so it actually works

Modified Paths:
--------------
    pieforms-php5/trunk/src/pieform/renderers/multicolumntable.php

Modified: pieforms-php5/trunk/src/pieform/renderers/multicolumntable.php
===================================================================
--- pieforms-php5/trunk/src/pieform/renderers/multicolumntable.php	2006-12-24 00:25:05 UTC (rev 140)
+++ pieforms-php5/trunk/src/pieform/renderers/multicolumntable.php	2006-12-24 02:32:29 UTC (rev 141)
@@ -42,15 +42,47 @@
  */
 function pieform_renderer_multicolumntable(Pieform $form, $builtelement, $rawelement) {
     global $formrenderermct;
-    // Used by the messages javascript function
-    $form->include_plugin('renderer', 'table');
     $formrenderermct->add_element($builtelement, $rawelement);
     $formrenderermct->set_form($form);
 }
 
 function pieform_renderer_multicolumntable_messages_js($id) {
-    return pieform_renderer_table_messages_js($id);
+    //return pieform_renderer_table_messages_js($id);
+    return <<<EOF
+function {$id}_set_error (message, element) {
+    element = '{$id}_' + element;
+    var parentRow = $(element + '_container').parentNode;
+    var nextRow = parentRow.nextSibling;
+    if (!(nextRow && hasElementClass(nextRow, 'errorRow'))) {
+        var errorRow = TR({'class': 'errorRow'});
+        log(parentRow.cells.length);
+        for (var i = 0; i < parentRow.cells.length; i++) {
+            var attrs = null;
+            if (parentRow.cells[i].id) {
+                attrs = {
+                    'id': parentRow.cells[i].id.replace(/_container$/, '_error'),
+                    'class': 'error'
+                };
+            }
+            appendChildNodes(errorRow, TD(attrs));
+        }
+        insertSiblingNodesAfter($(element + '_container').parentNode, errorRow);
+    }
+
+    appendChildNodes(element + '_error', message);
+    addElementClass(element, 'error');
+    addElementClass( element + '_container', 'error');
 }
+function {$id}_remove_all_errors() {
+    forEach(getElementsByTagAndClassName('TR', 'errorRow', '{$id}'), function(row) {
+        removeElement(row);
+    });
+    forEach(getElementsByTagAndClassName(null, 'error', '{$id}'), function(item) {
+        removeElementClass(item, 'error');
+    });
+}
+EOF;
+}
 
 function pieform_renderer_multicolumntable_header() {
     global $formrenderermct;
@@ -68,6 +100,9 @@
     private $form;
 
     function add_element($builtelement, $rawelement) {
+        if ($rawelement['type'] == 'fieldset') {
+            throw new PieformException('The multicolumntable renderer does not support fieldsets');
+        }
         if (!array_key_exists($rawelement['title'], $this->elements)) {
             $this->elements[$rawelement['title']] = array();
             $this->elements[$rawelement['title']]['rawelements'] = array();
@@ -83,6 +118,11 @@
     }
 
     function build() {
+        // Find out the maximum number of columns
+        $columns = 0;
+        foreach ($this->elements as $data) {
+            $columns = max($columns, count($data['builtelements']));
+        }
         $result = "<table cellspacing=\"0\" border=\"0\"><tbody>\n";
         foreach ($this->elements as $title => $data) {
             $result .= "\t<tr";
@@ -120,6 +160,9 @@
 
                 // @todo description...
             }
+            for ($i = count($data['builtelements']); $i < $columns; $i++) {
+                $result .= "\t<td></td>\n\t";
+            }
             $result .= "</tr>\n";
         }
         $result .= "</tbody></table>\n";


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 140
          http://svn.sourceforge.net/pieforms/?rev=140&view=rev
Author:   oracleshinoda
Date:     2006-12-23 16:25:05 -0800 (Sat, 23 Dec 2006)

Log Message:
-----------
Ignore vim .swp files

Property Changed:
----------------
    pieforms-php5/trunk/src/js/MochiKit/
    pieforms-php5/trunk/src/js/jscalendar/
    pieforms-php5/trunk/src/js/jscalendar/lang/
    pieforms-php5/trunk/src/js/jscalendar/skins/
    pieforms-php5/trunk/src/js/jscalendar/skins/aqua/
    pieforms-php5/trunk/src/pieform/elements/
    pieforms-php5/trunk/src/pieform/renderers/
    pieforms-php5/trunk/src/pieform/rules/


Property changes on: pieforms-php5/trunk/src/js/MochiKit
___________________________________________________________________
Name: svn:ignore
   + *.swp



Property changes on: pieforms-php5/trunk/src/js/jscalendar
___________________________________________________________________
Name: svn:ignore
   + *.swp



Property changes on: pieforms-php5/trunk/src/js/jscalendar/lang
___________________________________________________________________
Name: svn:ignore
   + *.swp



Property changes on: pieforms-php5/trunk/src/js/jscalendar/skins
___________________________________________________________________
Name: svn:ignore
   + *.swp



Property changes on: pieforms-php5/trunk/src/js/jscalendar/skins/aqua
___________________________________________________________________
Name: svn:ignore
   + *.swp



Property changes on: pieforms-php5/trunk/src/pieform/elements
___________________________________________________________________
Name: svn:ignore
   + *.swp



Property changes on: pieforms-php5/trunk/src/pieform/renderers
___________________________________________________________________
Name: svn:ignore
   + *.swp



Property changes on: pieforms-php5/trunk/src/pieform/rules
___________________________________________________________________
Name: svn:ignore
   + *.swp



This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 139
          http://svn.sourceforge.net/pieforms/?rev=139&view=rev
Author:   oracleshinoda
Date:     2006-12-23 16:23:51 -0800 (Sat, 23 Dec 2006)

Log Message:
-----------
Ignore vim .swp files

Property Changed:
----------------
    pieforms-php5/trunk/src/
    pieforms-php5/trunk/src/JSON/
    pieforms-php5/trunk/src/js/
    pieforms-php5/trunk/src/pieform/


Property changes on: pieforms-php5/trunk/src
___________________________________________________________________
Name: svn:ignore
   + *.swp



Property changes on: pieforms-php5/trunk/src/JSON
___________________________________________________________________
Name: svn:ignore
   + *.swp



Property changes on: pieforms-php5/trunk/src/js
___________________________________________________________________
Name: svn:ignore
   + *.swp



Property changes on: pieforms-php5/trunk/src/pieform
___________________________________________________________________
Name: svn:ignore
   + *.swp



This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 138
          http://svn.sourceforge.net/pieforms/?rev=138&view=rev
Author:   oracleshinoda
Date:     2006-12-23 16:20:47 -0800 (Sat, 23 Dec 2006)

Log Message:
-----------
Updated the expiry element to work with the error javascript stuff.

Modified Paths:
--------------
    pieforms-php5/trunk/src/pieform/elements/expiry.php

Modified: pieforms-php5/trunk/src/pieform/elements/expiry.php
===================================================================
--- pieforms-php5/trunk/src/pieform/elements/expiry.php	2006-12-24 00:19:12 UTC (rev 137)
+++ pieforms-php5/trunk/src/pieform/elements/expiry.php	2006-12-24 00:20:47 UTC (rev 138)
@@ -33,6 +33,7 @@
  * @return string          The HTML for the element
  */
 function pieform_element_expiry(Pieform $form, $element) {
+    $formname = $form->get_name();
     $result = '';
     $name = $element['name'];
     if (!isset($element['defaultvalue'])) {
@@ -46,9 +47,9 @@
         $seconds = $element['value'];
         $values = pieform_element_expiry_get_expiry_from_seconds($element['value']);
     }
-    else if (isset($global[$element['name'] . '_number'])
+    else if (isset($global[$element['name']])
              && isset($global[$element['name'] . '_units'])) {
-        $values = array('number' => $global[$element['name'] . '_number'],
+        $values = array('number' => $global[$element['name']],
                         'units'  => $global[$element['name'] . '_units']);
         $seconds = $values['number'] * pieform_element_expiry_seconds_in($values['units']);
     }
@@ -65,11 +66,12 @@
     // Same with the select. And do the events using mochikit signal instead of dom events
     $numberinput = '<input';
     $numberinput .= ($values['units'] == 'noenddate' && empty($element['rules']['required'])) ? ' disabled="disabled"' : '';
-    $numberinput .= ' type="text" size="4" name="' . $name . '_number"';
-    $numberinput .= ' id="' . $name . '_number" value="' . $values['number'] . '" tabindex="' . $element['tabindex'] . "\">\n";
+    $numberinput .= ' type="text" size="4" name="' . $name . '"';
+    $numberinput .= ' id="' . $formname . '_' . $name . '" value="' . $values['number'] . '" tabindex="' . $element['tabindex'] . '"';
+    $numberinput .= (isset($element['error']) ? ' class="error"' : '') . ">\n";
 
     $uselect = '<select onchange="' . $name . '_change()" ';
-    $uselect .= 'name="' . $name . '_units" id="' . $name . '_units"' . ' tabindex="' . $element['tabindex'] . "\">\n";
+    $uselect .= 'name="' . $name . '_units" id="' . $formname . '_' . $name . '_units"' . ' tabindex="' . $element['tabindex'] . "\">\n";
     foreach (pieform_element_expire_get_expiry_units() as $u) {
         // Don't allow 'no end date' if the element is required
         if ($u == 'noenddate' && !empty($element['rules']['required'])) {
@@ -85,11 +87,11 @@
     $script = <<<EOJS
 <script type="text/javascript" language="javascript">
 function {$name}_change() {
-    if ($('{$name}_units').value == 'noenddate') {
-        $('{$name}_number').disabled = true;
+    if ($('{$formname}_{$name}_units').value == 'noenddate') {
+        $('{$formname}_{$name}').disabled = true;
     }
     else {
-        $('{$name}_number').disabled = false;
+        $('{$formname}_{$name}').disabled = false;
     }
 }
 </script>
@@ -113,7 +115,7 @@
         return null;
     }
     $allunits = pieform_element_expire_get_expiry_units();
-    $number = $global[$name . '_number'];
+    $number = $global[$name];
     if (!in_array($unit,$allunits) || $number < 0) {
         return null;
     }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 137
          http://svn.sourceforge.net/pieforms/?rev=137&view=rev
Author:   oracleshinoda
Date:     2006-12-23 16:19:12 -0800 (Sat, 23 Dec 2006)

Log Message:
-----------
Slight improvements to the javascript for the table renderer

Modified Paths:
--------------
    pieforms-php5/trunk/src/pieform/renderers/table.php

Modified: pieforms-php5/trunk/src/pieform/renderers/table.php
===================================================================
--- pieforms-php5/trunk/src/pieform/renderers/table.php	2006-12-24 00:18:11 UTC (rev 136)
+++ pieforms-php5/trunk/src/pieform/renderers/table.php	2006-12-24 00:19:12 UTC (rev 137)
@@ -109,11 +109,11 @@
 function pieform_renderer_table_messages_js($id) {
     $result = <<<EOF
 function {$id}_set_error(message, element) {
-    element = '{$id}_' + element + '_container';
-    var container = getFirstElementByTagAndClassName('TD', null, $(element));
+    element = $('{$id}_' + element + '_container');
+    var container = getFirstElementByTagAndClassName('TD', null, element);
     addElementClass(container, 'error');
     addElementClass(container.firstChild, 'error');
-    insertSiblingNodesAfter($(element), TR({'id': '{$id}_error_' + element}, TD({'colspan': 2, 'class': 'errmsg'}, message)));
+    insertSiblingNodesAfter(element, TR(null, TD({'colspan': 2, 'class': 'errmsg'}, message)));
 }
 function {$id}_remove_all_errors() {
     forEach(getElementsByTagAndClassName('TD', 'errmsg', $('$id')), function(item) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 136
          http://svn.sourceforge.net/pieforms/?rev=136&view=rev
Author:   oracleshinoda
Date:     2006-12-23 16:18:11 -0800 (Sat, 23 Dec 2006)

Log Message:
-----------
Updated the div javascript for the recent changes made

Modified Paths:
--------------
    pieforms-php5/trunk/src/pieform/renderers/div.php

Modified: pieforms-php5/trunk/src/pieform/renderers/div.php
===================================================================
--- pieforms-php5/trunk/src/pieform/renderers/div.php	2006-12-23 13:23:23 UTC (rev 135)
+++ pieforms-php5/trunk/src/pieform/renderers/div.php	2006-12-24 00:18:11 UTC (rev 136)
@@ -81,38 +81,21 @@
 // @todo needs updating again... need to replace remove_error with remove_all_errors
 function pieform_renderer_div_messages_js($id) {
     $result = <<<EOF
-
 // Given a message and form element name, should set an error on the element
 function {$id}_set_error(message, element) {
-    {$id}_remove_error(element);
-    element += '_container';
-    // @todo set error class on input elements...
-   insertSiblingNodesBefore(DIV({'id': '{$id}_error_' + element, 'class': 'errmsg'}, message), $(element));
+    element = '{$id}_' + element;
+    addElementClass(element + '_container', 'error');
+    addElementClass(element, 'error');
+   insertSiblingNodesAfter(element + '_container', DIV({'class': 'errmsg'}, message));
 }
-function {$id}_remove_error(element) {
-    element += '_container';
-    var elem = $('{$id}_error_' + element);
-    if (elem) {
-        removeElement(elem);
-    }
+function {$id}_remove_all_errors() {
+    forEach(getElementsByTagAndClassName('DIV', 'errmsg', '{$id}'), function(div) {
+        removeElement(div);
+    });
+    forEach(getElementsByTagAndClassName(null, 'error', '{$id}'), function(div) {
+        removeElementClass(div, 'error');
+    });
 }
-function {$id}_message(message, type) {
-    var elem = $('{$id}_pieform_message');
-    var msg  = DIV({'id': '{$id}_pieform_message', 'class': type}, message);
-    if (elem) {
-        swapDOM(elem, msg);
-    }
-    else {
-        insertSiblingNodesAfter($('{$id}_' + {$id}_btn + '_container'), msg);
-    }
-}
-function {$id}_remove_message() {
-    var elem = $('{$id}_message');
-    if (elem) {
-        removeElement(elem);
-    }
-}
-    
 EOF;
     return $result;
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.