From: Kirrily R. <sk...@us...> - 2001-06-18 18:24:40
|
Update of /cvsroot/formmagick/formmagick/lib/CGI/FormMagick In directory usw-pr-cvs1:/tmp/cvs-serv11421 Modified Files: HTML.pm Log Message: s/self/fm/g -- reads better to think of things taking an "fm" object. Index: HTML.pm =================================================================== RCS file: /cvsroot/formmagick/formmagick/lib/CGI/FormMagick/HTML.pm,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** HTML.pm 2001/06/18 18:10:00 1.2 --- HTML.pm 2001/06/18 18:24:37 1.3 *************** *** 17,20 **** --- 17,34 ---- package CGI::FormMagick::HTML; + require Exporter; + @ISA = qw(Exporter); + @EXPORT = qw( + print_buttons + print_form_header + print_form_footer + print_page_header + print_page_footer + print_field_description + print_field_error + display_fields + build_inputfield + ); + use strict; use Carp; *************** *** 34,38 **** =head1 ROUTINES AVAILBLE ! =head2 print_buttons($self) print the table row containing the form's buttons --- 48,52 ---- =head1 ROUTINES AVAILBLE ! =head2 print_buttons($fm) print the table row containing the form's buttons *************** *** 41,51 **** sub print_buttons { ! my $self = shift; print qq(<tr><td></td><td class="buttons">); print qq(<input type="submit" name="wherenext" value="Previous">) ! unless $self->{page_number} == 1 or $self->{previousbutton} == 0; # check whether it's the last page yet ! if (scalar(@{$self->{xml}[1]} + 1)/4 == $self->{page_number}+1) { print qq(<input type="submit" name="wherenext" value="Finish">\n); } else { --- 55,65 ---- sub print_buttons { ! my $fm = shift; print qq(<tr><td></td><td class="buttons">); print qq(<input type="submit" name="wherenext" value="Previous">) ! unless $fm->{page_number} == 1 or $fm->{previousbutton} == 0; # check whether it's the last page yet ! if (scalar(@{$fm->{xml}[1]} + 1)/4 == $fm->{page_number}+1) { print qq(<input type="submit" name="wherenext" value="Finish">\n); } else { *************** *** 53,57 **** } print qq(<input type="reset" value="Clear this form">) ! if $self->{resetbutton}; print qq(</tr>); } --- 67,71 ---- } print qq(<input type="reset" value="Clear this form">) ! if $fm->{resetbutton}; print qq(</tr>); } *************** *** 59,63 **** =pod ! =head2 print_form_header($self) prints the header template and the form title (heading level 1) --- 73,77 ---- =pod ! =head2 print_form_header($fm) prints the header template and the form title (heading level 1) *************** *** 66,82 **** sub print_form_header { ! my $self = shift; ! my $title = $self->{xml}[1][0]->{TITLE}; # print out the templated headers (based on what's specified in the # HTML) then an h1 containing the FORM element's TITLE attribute ! print parse_template($self->{xml}[1][0]->{HEADER}); ! print "<h1>", $self->localise($title), "</h1>\n"; } =pod ! =head2 print_form_footer($self, $cgi) prints the stuff that goes at the bottom of every page of the form --- 80,96 ---- sub print_form_header { ! my $fm = shift; ! my $title = $fm->{xml}[1][0]->{TITLE}; # print out the templated headers (based on what's specified in the # HTML) then an h1 containing the FORM element's TITLE attribute ! print parse_template($fm->{xml}[1][0]->{HEADER}); ! print "<h1>", $fm->localise($title), "</h1>\n"; } =pod ! =head2 print_form_footer($fm, $cgi) prints the stuff that goes at the bottom of every page of the form *************** *** 85,89 **** sub print_form_footer { ! my $self = shift; my $cgi = shift; --- 99,103 ---- sub print_form_footer { ! my $fm = shift; my $cgi = shift; *************** *** 92,102 **** # here's how we clear our state IDs print qq(<p><a href="$url">Start over again</a></p>) ! if $self->{startoverlink}; # this is for debugging purposes ! $self->debug(qq(<a href="$url?checkl10n=1">Check L10N</a>)); # print the footer template ! print parse_template($self->{xml}[1][0]->{FOOTER}); } --- 106,116 ---- # here's how we clear our state IDs print qq(<p><a href="$url">Start over again</a></p>) ! if $fm->{startoverlink}; # this is for debugging purposes ! $fm->debug(qq(<a href="$url?checkl10n=1">Check L10N</a>)); # print the footer template ! print parse_template($fm->{xml}[1][0]->{FOOTER}); } *************** *** 104,108 **** =pod ! =head2 print_page_header($self) prints the page title (heading level 2) and description --- 118,122 ---- =pod ! =head2 print_page_header($fm) prints the page title (heading level 2) and description *************** *** 112,125 **** sub print_page_header { ! my $self = shift; my $cgi = shift; ! my $title = $self->{page_object}[0]->{TITLE}; ! my $description = $self->{page_object}[0]->{DESCRIPTION}; # the level 2 heading is the PAGE element's TITLE heading ! print "<h2>", $self->localise($title), "</h2>\n"; if ($description) { ! print '<p class="pagedescription">', $self->localise($description), "</p>\n"; } --- 126,139 ---- sub print_page_header { ! my $fm = shift; my $cgi = shift; ! my $title = $fm->{page_object}[0]->{TITLE}; ! my $description = $fm->{page_object}[0]->{DESCRIPTION}; # the level 2 heading is the PAGE element's TITLE heading ! print "<h2>", $fm->localise($title), "</h2>\n"; if ($description) { ! print '<p class="pagedescription">', $fm->localise($description), "</p>\n"; } *************** *** 127,132 **** print qq(<form method="POST" action="$url">\n); ! print qq(<input type="hidden" name="page" value="$self->{page_number}">\n); ! print qq(<input type="hidden" name="page_stack" value="$self->{page_stack}">\n); print $cgi->state_field(), "\n"; # hidden field with state ID --- 141,146 ---- print qq(<form method="POST" action="$url">\n); ! print qq(<input type="hidden" name="page" value="$fm->{page_number}">\n); ! print qq(<input type="hidden" name="page_stack" value="$fm->{page_stack}">\n); print $cgi->state_field(), "\n"; # hidden field with state ID *************** *** 137,141 **** =pod ! =head2 print_page_footer($self, $cgi) prints the stuff that goes at the bottom of a page, mostly just the --- 151,155 ---- =pod ! =head2 print_page_footer($fm, $cgi) prints the stuff that goes at the bottom of a page, mostly just the *************** *** 145,149 **** sub print_page_footer { ! my $self = shift; my $cgi = shift; --- 159,163 ---- sub print_page_footer { ! my $fm = shift; my $cgi = shift; *************** *** 161,167 **** sub print_field_description { ! my $self = shift; my $d = shift; ! $d = $self->localise($d); print qq(<tr><td class="fielddescription" colspan=2>$d</td></tr>); } --- 175,181 ---- sub print_field_description { ! my $fm = shift; my $d = shift; ! $d = $fm->localise($d); print qq(<tr><td class="fielddescription" colspan=2>$d</td></tr>); } *************** *** 183,187 **** =pod ! =head2 display_fields($self, $cgi, %errors) displays the fields for a page by looping through them --- 197,201 ---- =pod ! =head2 display_fields($fm, $cgi, %errors) displays the fields for a page by looping through them *************** *** 190,201 **** sub display_fields { ! my ($self, $cgi, %errors) = @_; ! # $self->{page_object} is a big array. To find info about field N, # access element 4*N . my @fields; ! for (my $i=4; $i <= scalar @{$self->{page_object}}; $i=$i+4) { ! push (@fields, $self->{page_object}[$i][0] ); } --- 204,215 ---- sub display_fields { ! my ($fm, $cgi, %errors) = @_; ! # $fm->{page_object} is a big array. To find info about field N, # access element 4*N . my @fields; ! for (my $i=4; $i <= scalar @{$fm->{page_object}}; $i=$i+4) { ! push (@fields, $fm->{page_object}[$i][0] ); } *************** *** 216,220 **** $value = $cgi->param("$fieldname"); } elsif ($fieldinfo->{VALUE} =~ /()$/) { ! $value = call_defaultvalue_routine($self, $cgi, $fieldinfo->{VALUE}); } else { $value = $fieldinfo->{VALUE} || ""; --- 230,234 ---- $value = $cgi->param("$fieldname"); } elsif ($fieldinfo->{VALUE} =~ /()$/) { ! $value = call_defaultvalue_routine($fm, $cgi, $fieldinfo->{VALUE}); } else { $value = $fieldinfo->{VALUE} || ""; *************** *** 226,230 **** my $size = $fieldinfo->{SIZE}; ! $self->print_field_description($description) if $description; my $inputfield; --- 240,244 ---- my $size = $fieldinfo->{SIZE}; ! $fm->print_field_description($description) if $description; my $inputfield; *************** *** 239,243 **** # DWIM whether the options are in a hash or an array. ! my $lv_hashref = $self->get_option_labels_and_values($cgi, $fieldinfo); @option_labels = @{$lv_hashref->{labels}}; --- 253,257 ---- # DWIM whether the options are in a hash or an array. ! my $lv_hashref = $fm->get_option_labels_and_values($cgi, $fieldinfo); @option_labels = @{$lv_hashref->{labels}}; *************** *** 247,251 **** # make HTML for the form field. ! $inputfield = $self->build_inputfield ({TYPE => $type, FIELDNAME => $fieldname, LABELS => \@option_labels, --- 261,265 ---- # make HTML for the form field. ! $inputfield = $fm->build_inputfield ({TYPE => $type, FIELDNAME => $fieldname, LABELS => \@option_labels, *************** *** 259,263 **** ! print qq(<tr><td class="label">) . $self->localise($label) ; # display errors below the field description. --- 273,277 ---- ! print qq(<tr><td class="label">) . $fm->localise($label) ; # display errors below the field description. *************** *** 273,277 **** =pod ! =head2 build_inputfield ($self, $forminfo) builds HTML for individual form fields. $forminfo is a hashref. --- 287,291 ---- =pod ! =head2 build_inputfield ($fm, $forminfo) builds HTML for individual form fields. $forminfo is a hashref. *************** *** 280,284 **** sub build_inputfield { ! my ($self, $forminfo) = @_; my $type = $forminfo->{TYPE}; --- 294,298 ---- sub build_inputfield { ! my ($fm, $forminfo) = @_; my $type = $forminfo->{TYPE}; |