pieforms-commit Mailing List for Pieforms

Revision: 305
          http://pieforms.svn.sourceforge.net/pieforms/?rev=305&view=rev
Author:   oracleshinoda
Date:     2009-04-27 08:05:10 +0000 (Mon, 27 Apr 2009)

Log Message:
-----------
Allow radio buttons to each have a 'description' - text in a div that sits next to them that isn't the label

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

Modified: pieforms-php5/trunk/src/pieform/elements/radio.php
===================================================================
--- pieforms-php5/trunk/src/pieform/elements/radio.php	2009-04-14 00:22:36 UTC (rev 304)
+++ pieforms-php5/trunk/src/pieform/elements/radio.php	2009-04-27 08:05:10 UTC (rev 305)
@@ -45,14 +45,24 @@
         $separator = $element['separator'] . $separator;
     }
 
-    foreach ($element['options'] as $value => $text) {
+    foreach ($element['options'] as $value => $data) {
         $uid = $id . substr(md5(microtime()), 0, 4);
         $element['id'] = $uid;
+        if (is_array($data)) {
+            $text = $data['text'];
+            $description = (isset($data['description'])) ? $data['description'] : '';
+        }
+        else {
+            $text = $data;
+            $description = '';
+        }
         $result .= '<input type="radio"'
             . $form->element_attributes($element)
             . ' value="' . Pieform::hsc($value) . '"'
             . (($form_value == $value) ? ' checked="checked"' : '')
-            . '> <label for="' . $form->get_name() . '_' . $uid . '">' . Pieform::hsc($text) . "</label>$separator";
+            . '> <label for="' . $form->get_name() . '_' . $uid . '">' . Pieform::hsc($text) . "</label>"
+            . ($description != '' ? '<div class="radio-description">' . $description . '</div>' : '')
+            . $separator;
     }
     $result = substr($result, 0, -strlen($separator));
     


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

Revision: 304
          http://pieforms.svn.sourceforge.net/pieforms/?rev=304&view=rev
Author:   oracleshinoda
Date:     2009-04-14 00:22:36 +0000 (Tue, 14 Apr 2009)

Log Message:
-----------
Remove reloadformonreply setting (richardm)

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

Modified: pieforms-php5/trunk/src/pieform.php
===================================================================
--- pieforms-php5/trunk/src/pieform.php	2009-02-27 04:27:47 UTC (rev 303)
+++ pieforms-php5/trunk/src/pieform.php	2009-04-14 00:22:36 UTC (rev 304)
@@ -692,7 +692,6 @@
                 'globalJsErrorCallback' => $this->data['globaljserrorcallback'],
                 'postSubmitCallback'    => $this->data['postsubmitcallback'],
                 'newIframeOnSubmit'     => $this->data['newiframeonsubmit'],
-                'reloadFormOnReply'     => $this->data['reloadformonreply'],
             ));
             $result .= "<script type=\"text/javascript\">new Pieform($data);</script>\n";
         }
@@ -1344,11 +1343,6 @@
             // submitted.
             'newiframeonsubmit' => false,
 
-            // Whether the contents of the form should be reloaded on the page when
-            // a reply is received from the server.  If false, error messages will
-            // not automatically be displayed inside the form.
-            'reloadformonreply' => true,
-
             // The URL where pieforms.js and other related pieforms javascript 
             // files can be accessed. Best specified as an absolute path in 
             // pieform_configure()

Modified: pieforms-php5/trunk/src/static/core/pieforms.js
===================================================================
--- pieforms-php5/trunk/src/static/core/pieforms.js	2009-02-27 04:27:47 UTC (rev 303)
+++ pieforms-php5/trunk/src/static/core/pieforms.js	2009-04-14 00:22:36 UTC (rev 304)
@@ -168,9 +168,9 @@
                 return;
             }
 
-            PieformManager.signal('onreply', self.data.name);
+            if (typeof(data.replaceHTML) == 'string') {
+                PieformManager.signal('onreply', self.data.name);
 
-            if (self.data.reloadFormOnReply) {
                 var tmp = DIV();
                 tmp.innerHTML = data.replaceHTML;
 
@@ -189,6 +189,7 @@
                 replaceChildNodes($(self.data.name), tmp.childNodes[0].childNodes);
 
                 self.connectSubmitButtons();
+                self.clickedButton = null;
                 PieformManager.signal('onload', self.data.name);
             }
 


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