richter at apache
Nov 17, 2007, 12:11 PM
Post #1 of 1
(244 views)
Permalink
|
|
svn commit: r595997 - in /perl/embperl/trunk/Embperl/Form: Control.pm Control/grid.pm Control/mult.pm Control/selectdyn.pm ControlMultValue.pm
|
|
Author: richter
Date: Sat Nov 17 12:11:19 2007
New Revision: 595997
URL: http://svn.apache.org/viewvc?rev=595997&view=rev
Log:
Embperl::Form, support fuer targets und zusaetzliche Controls durch datasource
Modified:
perl/embperl/trunk/Embperl/Form/Control.pm
perl/embperl/trunk/Embperl/Form/Control/grid.pm
perl/embperl/trunk/Embperl/Form/Control/mult.pm
perl/embperl/trunk/Embperl/Form/Control/selectdyn.pm
perl/embperl/trunk/Embperl/Form/ControlMultValue.pm
Modified: perl/embperl/trunk/Embperl/Form/Control.pm
URL: http://svn.apache.org/viewvc/perl/embperl/trunk/Embperl/Form/Control.pm?rev=595997&r1=595996&r2=595997&view=diff
==============================================================================
--- perl/embperl/trunk/Embperl/Form/Control.pm (original)
+++ perl/embperl/trunk/Embperl/Form/Control.pm Sat Nov 17 12:11:19 2007
@@ -244,6 +244,13 @@
[$ sub show_control_readonly ($self, $req) $][+ $self -> {value} || $fdat{$self -> {name}} +][$endsub$]
+[.# ---------------------------------------------------------------------------
+#
+# show_control_addons - output additional things after the control
+#]
+
+[$ sub show_control_addons ($self, $req) $][$endsub$]
+
[# ---------------------------------------------------------------------------
#
@@ -255,7 +262,10 @@
my $span = $self->{width_percent} - $x ;
$]
<td class="cControlBox" colspan="[+ $span +]">
- [.* my @ret = $self -> is_readonly?$self -> show_control_readonly($req):$self -> show_control ($req); *]
+ [.*
+ my @ret = $self -> is_readonly?$self -> show_control_readonly($req):$self -> show_control ($req);
+ $self -> show_control_addons ($req) ;
+ *]
</td>
[* return @ret ; *]
[$endsub$]
@@ -342,6 +352,14 @@
=head2 show_control
Output the control itself
+
+=head2 show_control_readonly
+
+Output the control itself as readonly
+
+=head2 show_control_addons
+
+output additional things after the control
=head2 show_control_cell
Modified: perl/embperl/trunk/Embperl/Form/Control/grid.pm
URL: http://svn.apache.org/viewvc/perl/embperl/trunk/Embperl/Form/Control/grid.pm?rev=595997&r1=595996&r2=595997&view=diff
==============================================================================
--- perl/embperl/trunk/Embperl/Form/Control/grid.pm (original)
+++ perl/embperl/trunk/Embperl/Form/Control/grid.pm Sat Nov 17 12:11:19 2007
@@ -182,8 +182,8 @@
<tr class="cTableRow">
<td class="cBase cGridLabelBox">[+ $self->{text} +]</td>
<td class="cBase cGridControlBox">
- <img src="/images/button_neu.gif" id="cmdAdd" name="-add" title="Zeile Hinzufügen" onclick="[+ $jsname +].addRow()">
- <img src="/images/button_loeschen.gif" id="cmdDelete" name="-delete" title="Markierte Zeile Löschen" onclick="[+ $jsname +].delRow()">
+ <img src="/images/button_neu.gif" id="cmdAdd" name="-add" title="Zeile Hinzufügen Alt-NUM+" onclick="[+ $jsname +].addRow()">
+ <img src="/images/button_loeschen.gif" id="cmdDelete" name="-delete" title="Markierte Zeile Löschen Alt-NUM-" onclick="[+ $jsname +].delRow()">
</td>
</tr>
</table>
Modified: perl/embperl/trunk/Embperl/Form/Control/mult.pm
URL: http://svn.apache.org/viewvc/perl/embperl/trunk/Embperl/Form/Control/mult.pm?rev=595997&r1=595996&r2=595997&view=diff
==============================================================================
--- perl/embperl/trunk/Embperl/Form/Control/mult.pm (original)
+++ perl/embperl/trunk/Embperl/Form/Control/mult.pm Sat Nov 17 12:11:19 2007
@@ -72,14 +72,11 @@
my $ldap = $req->{ldap};
my $name = $self->{name} ;
my @entries = split("\t",$fdat{$name});
-use Data::Dumper ;
-print STDERR 'init_data', Dumper (\%fdat, $name, \@entries) ;
my $i = 0 ;
foreach my $entry (@entries)
{
- $fdat{"$name--$i"} = $entry ;
-warn "init_data mult field=$name--$i fd=" . $fdat{"$name--$i"} ;
+ $fdat{"$name--$i"} = $entry ;
$i++ ;
}
@@ -97,20 +94,15 @@
my $ldap = $req->{ldap};
my $name = $self->{name} ;
my $max = $fdat{"$name-max"} || 1 ;
-warn "prepare_dat mult name =$name, max=$max" ;
-use Data::Dumper ;
-print STDERR Dumper (\%fdat) ;
my @rows;
my $val ;
for (my $i = 0; $i < $max; $i++)
{
-warn "prepare_dat mult field=$name--$i fd=" . $fdat{"$name--$i"} ;
$val = $fdat{"$name--$i"} ;
push @rows, $val if ($val ne '') ;
}
$fdat{$name} = \@rows ;
-print STDERR Dumper (\%fdat, \@rows) ;
}
sub show { Embperl::Form::Control::show (@_) }
Modified: perl/embperl/trunk/Embperl/Form/Control/selectdyn.pm
URL: http://svn.apache.org/viewvc/perl/embperl/trunk/Embperl/Form/Control/selectdyn.pm?rev=595997&r1=595996&r2=595997&view=diff
==============================================================================
--- perl/embperl/trunk/Embperl/Form/Control/selectdyn.pm (original)
+++ perl/embperl/trunk/Embperl/Form/Control/selectdyn.pm Sat Nov 17 12:11:19 2007
@@ -77,7 +77,8 @@
}
$i++ ;
}
-
+ $target = '' ;
+ $target = "parent.frames.$self->{link_target}." if ($self -> {link_target}) ;
$]
<div class="cAutoCompDiv">
@@ -88,7 +89,7 @@
border: 2px grey outset; background: white; text-align: center;"
>
-<a href="#" onClick="location.href='ldapTreeData.epl?-id=' + encodeURIComponent([+ $jsname +]Popup.idval)">Anzeigen</a>
+<a href="#" onClick="[+ $target +]location.href='ldapTreeData.epl?-id=' + encodeURIComponent([+ $jsname +]Popup.idval)">Anzeigen</a>
[#
<a href="#" onClick="alert('ldapTreeData.epl?-id=' + [+ $jsname +]Popup.idval)">Durchsuchen</a>
<a href="ldapTreeData?-id=">Neu</a>
@@ -105,6 +106,7 @@
<input class="cBase cControl cAutoCompInput" id="_inp_[+ $jsname +]" type="text"
[$if $self -> {size} $]size="[+ $self->{size} +]"[$endif$]
value="[+ $initval +]"
+onDblClick="u='ldapTreeData.epl?-id=' + encodeURIComponent(document.getElementById('[+ $name +]').value);[+ $target +]location.href=u;"
>
<div class="cAutoCompArrow" onclick="[+ $jsname +]Popup.showPopup()"
> </div>
Modified: perl/embperl/trunk/Embperl/Form/ControlMultValue.pm
URL: http://svn.apache.org/viewvc/perl/embperl/trunk/Embperl/Form/ControlMultValue.pm?rev=595997&r1=595996&r2=595997&view=diff
==============================================================================
--- perl/embperl/trunk/Embperl/Form/ControlMultValue.pm (original)
+++ perl/embperl/trunk/Embperl/Form/ControlMultValue.pm Sat Nov 17 12:11:19 2007
@@ -59,6 +59,21 @@
return ($self -> {values}, $self -> {options}) ;
}
+# ---------------------------------------------------------------------------
+#
+# get_datasource_controls - returns additional controls provided by the
+# datasource object e.g. a browse button
+#
+
+sub get_datasource_controls
+
+ {
+ my ($self, $req) = @_ ;
+
+ return $self -> {datasrcobj} -> get_datasource_controls ($req, $self) if ($self -> {datasrcobj}) ;
+ return ;
+ }
+
# ---------------------------------------------------------------------------
#
@@ -95,6 +110,24 @@
# damit %fdat etc definiert ist
__EMBPERL__
+
+[.# ---------------------------------------------------------------------------
+#
+# show_control_addons - output additional things after the control
+#]
+
+[.$ sub show_control_addons ($self, $req)
+
+ my $datasrc_ctrls = $self -> get_datasource_controls ($req) ;
+ return if (!$datasrc_ctrls) ;
+
+$]
+[$foreach my $ctrl (@$datasrc_ctrl) $]
+<a href="[+ $ctrl->{href} +]" onClick="[+ $ctrl->{onclick} +]">[$if $ctrl -> {icon} $]<img src="[+ $ctrl -> {icon} +]" title="[+ $ctrl -> {text} +]">[$else$][+ $ctrl -> {text} +][$endif$]
+[$endforeach$]
+[$endsub$]
+
+
__END__
=pod
@@ -122,6 +155,11 @@
=head2 get_values
returns the values and options
+
+=haed2 get_datasource_controls
+
+returns additional controls provided by the
+datasource object e.g. a browse button
=head2 get_active_id
---------------------------------------------------------------------
To unsubscribe, e-mail: embperl-cvs-unsubscribe[at]perl.apache.org
For additional commands, e-mail: embperl-cvs-help[at]perl.apache.org
|
