richter at apache
Apr 3, 2011, 5:06 AM
Post #1 of 1
(380 views)
Permalink
|
|
svn commit: r1088263 - in /perl/embperl/trunk/Embperl: Form.pm Form/Control.pm Form/Control/selectdyn.pm Form/Control/table.pm
|
|
Author: richter
Date: Sun Apr 3 12:06:48 2011
New Revision: 1088263
URL: http://svn.apache.org/viewvc?rev=1088263&view=rev
Log:
Embperl::Form table support
Modified:
perl/embperl/trunk/Embperl/Form.pm
perl/embperl/trunk/Embperl/Form/Control.pm
perl/embperl/trunk/Embperl/Form/Control/selectdyn.pm
perl/embperl/trunk/Embperl/Form/Control/table.pm
Modified: perl/embperl/trunk/Embperl/Form.pm
URL: http://svn.apache.org/viewvc/perl/embperl/trunk/Embperl/Form.pm?rev=1088263&r1=1088262&r2=1088263&view=diff
==============================================================================
--- perl/embperl/trunk/Embperl/Form.pm (original)
+++ perl/embperl/trunk/Embperl/Form.pm Sun Apr 3 12:06:48 2011
@@ -295,7 +295,8 @@ sub new_controls
push @{$self -> {prepare_fdat}}, $control if ($control -> can ('prepare_fdat')) ;
}
-
+ $self -> {controlids}{$control->{id}} = $control ;
+
next if ($control -> is_disabled) ;
push @{$validate_rules}, $control -> get_validate_rules ;
if ($control -> {sublines})
@@ -343,6 +344,7 @@ sub parent_form
return $Embperl::FormData::forms{$self -> {parentptr}} ;
}
+
# ---------------------------------------------------------------------------
Modified: perl/embperl/trunk/Embperl/Form/Control.pm
URL: http://svn.apache.org/viewvc/perl/embperl/trunk/Embperl/Form/Control.pm?rev=1088263&r1=1088262&r2=1088263&view=diff
==============================================================================
--- perl/embperl/trunk/Embperl/Form/Control.pm (original)
+++ perl/embperl/trunk/Embperl/Form/Control.pm Sun Apr 3 12:06:48 2011
@@ -168,6 +168,34 @@ sub form
# ---------------------------------------------------------------------------
#
+# get_control_from_id
+#
+
+sub get_control_from_id
+ {
+ my ($class, $id) = @_ ;
+
+ my ($formptr, $ctlid) = split /#/, $id ;
+ my $form = $Embperl::FormData::forms{$formptr} ;
+ my $ctl = $form -> {controlids}{$ctlid} ;
+
+ return $ctl ;
+ }
+
+# ---------------------------------------------------------------------------
+#
+# get_id_for_control
+#
+
+sub get_id_for_control
+ {
+ my ($self) = @_ ;
+
+ return "$self->{formptr}#$self->{id}" ;
+ }
+
+# ---------------------------------------------------------------------------
+#
# label_text - return text of label
#
Modified: perl/embperl/trunk/Embperl/Form/Control/selectdyn.pm
URL: http://svn.apache.org/viewvc/perl/embperl/trunk/Embperl/Form/Control/selectdyn.pm?rev=1088263&r1=1088262&r2=1088263&view=diff
==============================================================================
--- perl/embperl/trunk/Embperl/Form/Control/selectdyn.pm (original)
+++ perl/embperl/trunk/Embperl/Form/Control/selectdyn.pm Sun Apr 3 12:06:48 2011
@@ -147,7 +147,7 @@ autocomplete_setup($( "#_inp_[.+ $jsname
popupurl: '[.+ do { local $escmode = 0 ; $self -> {popupurl} } +]',
datasrcurl: '[.+ do { local $escmode = 0 ; $self -> {datasrcurl} } +]',
datasrc: '[+ $self->{datasrc} +]',
- show_on_select: '[+ $self->{show_on_select}?'true':'false' +]',
+ show_on_select: [+ $self->{show_on_select}?'true':'false' +],
}) ;
</[$if $noscript $]x-[$endif$]script type="text/javascript">
Modified: perl/embperl/trunk/Embperl/Form/Control/table.pm
URL: http://svn.apache.org/viewvc/perl/embperl/trunk/Embperl/Form/Control/table.pm?rev=1088263&r1=1088262&r2=1088263&view=diff
==============================================================================
--- perl/embperl/trunk/Embperl/Form/Control/table.pm (original)
+++ perl/embperl/trunk/Embperl/Form/Control/table.pm Sun Apr 3 12:06:48 2011
@@ -36,25 +36,17 @@ sub show
1 ;
__EMBPERL__
-
+
+[$ syntax EmbperlBlocks $]
+
+
[# ---------------------------------------------------------------------------
#
-# show_table - output the control
+# show_table_head
#]
-[$ sub show_table ($self, $data)
+[$ sub show_table_head ($self) $]
- my $span = ($self->{width_percent}) ;
- my $showtext = $self -> {showtext} ;
- my $dataprefix = $self -> {dataprefix} || [''] ;
-$]
-<td class="cBase cTabTD" colspan="[+ $span +]">
-[$if $self -> {text} $]
-[# --- heading text --- #]
-<table width="100%"><tr><td class="cLabelBox">
-[.+ $self -> {showtext}?($self->{text} || $self->{name}):$self -> form -> convert_label ($self) +]<br>
-</td></tr></table>
-[$endif$]
<table width="100%">
[# --- heading columns --- #]
@@ -67,10 +59,37 @@ $]
[- $i++ -]
</tr>
[$endforeach$]
+
+[$endsub $]
+
+
+[# ---------------------------------------------------------------------------
+#
+# show_table_foot
+#]
+
+[$ sub show_table_foot ($self) $]
+
+</table>
+
+[$endsub $]
+
+
+
+[# ---------------------------------------------------------------------------
+#
+# show_table_row
+#]
+
+[$ sub show_table_row ($self, $r, $o, $dataprefix) $]
+
+[.-
+use Data::Dumper ;
+print STDERR "show_table_row ", Dumper ($self, $r, $o, $dataprefix) ;
+
+ -]
+
-[# --- data --- #]
-[- $r = 0 -]
-[$foreach $o (@$data) $]
[- $i = 0 -]
[$foreach $line (@{$self->{columns}}) $]
[- $colnum = 0 -]
@@ -148,9 +167,39 @@ $]
<td class="cControlBox" colspan="[+ scalar(@{$self->{columns}})+]">[+ join ('<br>', @$item) +]</td>
</tr>
[$endif$]
+
+
+[$endsub $]
+
+
+[# ---------------------------------------------------------------------------
+#
+# show_table - output the control
+#]
+
+[.$ sub show_table ($self, $data)
+
+ my $span = ($self->{width_percent}) ;
+ my $showtext = $self -> {showtext} ;
+ my $dataprefix = $self -> {dataprefix} || [''] ;
+$]
+<td class="cBase cTabTD" colspan="[+ $span +]">
+[$if $self -> {text} $]
+[# --- heading text --- #]
+<table width="100%"><tr><td class="cLabelBox">
+[.+ $self -> {showtext}?($self->{text} || $self->{name}):$self -> form -> convert_label ($self) +]<br>
+</td></tr></table>
+[$endif$]
+
+[- $self -> show_table_head -]
+
+[# --- data --- #]
+[- $r = 0 -]
+[$foreach $o (@$data) $]
+[- $self -> show_table_row ($r, $o, $dataprefix) -]
[- $r++ -]
[$endforeach$]
-</table>
+[- $self -> show_table_foot -]
</td>
[$endsub$]
---------------------------------------------------------------------
To unsubscribe, e-mail: embperl-cvs-unsubscribe [at] perl
For additional commands, e-mail: embperl-cvs-help [at] perl
|
