Changeset 73 in text-formbuilder for trunk

Timestamp:

03/16/05 13:55:22 (19 years ago)

Author:

peichman

Message:

updated Changes file
can have a hint comment on group fields (displayed after all the subfields)
'#' comments can appear at the end of lines in group field lines

Location:

trunk

Files:

• Changes (modified) (1 diff)
• lib/Text/FormBuilder.pm (modified) (6 diffs)
• lib/Text/FormBuilder/grammar (modified) (1 diff)

trunk/Changes

@@ -4 +4 @@
     * added support for fields with 'other' (requires FB 3.02)
     * added support for limited growth 'growable' fields
-    * allow end of field line comments
+    * allow end of field line comments in the formspec
     * addded an external_css option to include external stylesheets
+    * using <fieldset> tags instead of <h2> to mark form sections
+    * group fields can have comments
     
 0.09 - 10 Mar 2005

trunk/lib/Text/FormBuilder.pm

@@ -177 +177 @@
                         $$field{name} = "$$_[1]{name}_$$field{name}";                
                     }
-                    $_ = [ 'group', { label => $$_[1]{label} || ucfirst(join(' ',split('_',$$_[1]{name}))), group => \@fields } ];
+                    $_ = [
+                        'group',
+                        {
+                            label => $$_[1]{label} || ucfirst(join(' ',split('_',$$_[1]{name}))),
+                            comment => $$_[1]{comment},
+                            group => \@fields,
+                        },
+                    ];
                 }
             }
@@ -526 +533 @@
                 # mark invalid fields
                 if ($$_{invalid}) {
-                    $OUT .= "<td>$$_{field} $$_{comment} ] . $msg_invalid . q[</td>";
+                    $OUT .= qq[<td>$$_{field} <span class="comment">$$_{comment}</span> ] . $msg_invalid . q[</td>];
                 } else {
-                    $OUT .= qq[<td>$$_{field} $$_{comment}</td>];
+                    $OUT .= qq[<td>$$_{field} <span class="comment">$$_{comment}</span></td>];
                 }
                 
@@ -546 +553 @@
                 $OUT .= " ] . $msg_invalid . q[" if grep { $$_{invalid} } @group_fields;
                 
-                $OUT .= qq[    </span></td>\n];
+                $OUT .= qq[ <span class="comment">$$line[1]{comment}</span></span></td>\n];
                 $OUT .= qq[  </tr>\n];
             }   
@@ -1180 +1187 @@
 
 You can also use groups in normal field lines:
-    
+
     birthday|Your birthday:DATE
 
 The only (currently) supported pieces of a fieldspec that may be used with a
-group in this notation are name and label.
+group in this notation are name, label, and hint.
 
 =head2 Comments
@@ -1190 +1197 @@
     # comment ...
 
-Any line beginning with a C<#> is considered a comment.
+Any line beginning with a C<#> is considered a comment. Comments can also appear
+after any field line. They I<cannot> appear between items in a C<!list>, or on
+the same line as any of the directives.
 
 =head1 TODO
@@ -1207 +1216 @@
 reset button
 
-Allow comments on group fields (rendered after the all the fields)
+Set FB constructor options directly in the formspec (via a C<!fb> or similar
+directive). The major issue here would be what format to use to allow for
+array/hash refs.
 
 Pieces that wouldn't make sense in a group field: size, row/col, options,

trunk/lib/Text/FormBuilder/grammar

@@ -152 +152 @@
 group_name: /%[A-Z_]+/
 
-field_group: name label(?) group_type
-    { 
+field_group: name label(?) hint(?) group_type comment(?)
+    {
+        warn "[$thisline] comment = $item{'hint(?)'}[0]\n" if $item{'hint(?)'}[0];
         #warn "[$thisline] field $item{name} is $item{group_type}\n";
-        push @lines, [ 'group', { name => $item{name}, label => $item{'label(?)'}[0], group => $item{group_type} } ];
+        push @lines, [ 'group', {
+            name    => $item{name},
+            label   => $item{'label(?)'}[0],
+            comment => $item{'hint(?)'}[0],
+            group   => $item{group_type},
+        } ];
     }