--- trunk/lib/Frey/Action.pm 2008/11/17 14:37:48 369 +++ branches/no-pager/lib/Frey/Action.pm 2008/12/06 15:29:10 738 @@ -4,6 +4,7 @@ with 'Frey::Web'; with 'Frey::Config'; +use Clone qw/clone/; use Data::Dump qw/dump/; =head1 DESCRIPTION @@ -35,16 +36,19 @@ sub required { my ( $self ) = @_; $self->load_class( $self->class ); + my @required = grep { - defined $_ && $_->can('name') && !defined( $self->params->{ $_->name } ) + defined $_ && $_->can('name') && + ! defined( $self->params->{ $_->name } ) && + ! $_->is_lazy } map { my $attr = $self->class->meta->get_attribute($_); - $attr->is_required && $attr; + blessed $attr && $attr->is_required && $attr; } $self->class->meta->get_attribute_list; - warn "## required = ",dump( map { $_->name } @required ), " for ", $self->class; + warn "## required = ",dump( map { $_->name } @required ), " for ", $self->class if @required && $self->debug; return @required if wantarray; return \@required; } @@ -65,14 +69,15 @@ my @attrs = @{ $self->attribute_order }; @attrs = map { $a->{$_}++; $_ } @attrs; push @attrs, $_ foreach grep { ! $a->{$_} } map { $_->name } @{ $self->required }; - warn "# attributes = ",dump( @attrs ); + warn "# attributes = ",dump( @attrs ) if $self->debug; return @attrs if wantarray; return \@attrs; } =head2 params_form - my $html = $self->params_form; + my $html = $self->params_form; + my ($html,$default_params) = $self->params_form; =cut @@ -80,53 +85,165 @@ my ( $self ) = @_; my @required = $self->required; if ( ! @required ) { - warn "all params available ", dump( $self->params ), " not creating form"; + warn "all params available ", dump( $self->params ), " not creating form" if $self->debug; + return (undef,$self->params) if wantarray; return; } else { - warn $self->class, " required params ", dump( @required ); + warn $self->class, " required params ", map { $_->dump(2) } @required if $self->debug; } my $class = $self->class; $self->load_class( $class ); - my $params = {}; - $params = $self->config($class); - warn "# $class config = ",dump( $params ) if $self->debug; + my $default = clone $self->params; # XXX we really don't want to modify params! - my $html = qq|

$class params

|; + my $params_config = {}; + $params_config = $self->config($class); + warn "# $class config = ",dump( $params_config ) if $self->debug; - foreach my $name ( grep { ! $class->meta->get_attribute($_)->is_lazy } $self->attributes ) { - my $type = $name =~ m/^pass/ ? 'password' : 'text'; - my $value = ''; - my $value_html = ''; - if ( ref($params) eq 'HASH' ) { - $value = $params->{$name}; - } elsif ( ref($params) eq 'ARRAY' ) { - $value_html = qq||; - } elsif ( my $attr = $class->meta->get_attribute( $name ) ) { - if ( $attr->has_type_constraint && $attr->type_constraint->can('values') ) { - $value_html = qq||; - } elsif ( $attr->has_default ) { - $value = $attr->default( $name ); - } + my $v = ref($_) eq 'HASH' ? $_->{$name} : $_; + qq|| if $v; + } @$values + ); + qq|| if $options; } else { - warn "wired attribute $name"; + my $radio = join("\n", + map { + my $v = ref($_) eq 'HASH' ? $_->{$name} : $_; + qq|$v|; + } @$values + ); + qq|
$radio
|; + } + } + + foreach my $checkbox ( split(/\s+/, $default->{'frey-checkboxes'} ) ) { + next if defined $default->{ $checkbox }; + + $default->{ $checkbox } = 0; + $self->params->{ $checkbox } = 0; + warn "# checkbox $checkbox not ticked"; + } + + my @checkboxes; + + my $skip_prefix; + if ( $self->class->can('action') ) { + my $action = eval $self->class . '->action'; + $skip_prefix->{$_}++ foreach eval $self->class .'->action_order'; + warn "# skip_prefix = ", $self->dump( $skip_prefix ); + } + + my $label_width = 1; # minimum + + foreach my $name ( + grep { + ! $class->meta->get_attribute($_)->is_lazy + && ! defined $default->{$_} + && ! m{^_} # skip _private + } $self->attributes + ) { + my $attr_type = ''; + my $type = $name =~ m/^pass/ ? 'password' : 'text'; + my $label = $name; + my $label_title = ''; + my $value_html = ''; + + my $attr = $class->meta->get_attribute( $name ); + $attr_type = $attr->type_constraint->name if $attr->has_type_constraint; + + my $value = + defined $default->{$name} ? $default->{$name} : + $attr->has_default ? $attr->default( $name ) : + ''; + + if ( ref($params_config) eq 'HASH' ) { + $value = $params_config->{$name}; + } elsif ( ref($params_config) eq 'ARRAY' ) { + $value_html = select_values( $name, $attr_type, $params_config ); + $default->{$name} = $params_config->[0]->{$name}; + } elsif ( $attr->has_type_constraint && $attr->type_constraint->can('values') ) { + $value_html = select_values( $name, $attr_type, $attr->type_constraint->values ); + } elsif ( $attr_type =~ m{^Bool} ) { + my $suffix = ''; + $suffix = ' checked' if $value; + $value_html = qq||; + push @checkboxes, $name; + } elsif ( ! defined $value ) { + $value_html = qq|undef|; # FIXME if $self->debug + } elsif ( $attr_type !~ m{^(Str|Int)$} || $value =~ $Frey::Web::re_html ) { + $value_html = qq||; } - $value_html = qq|| unless $value_html; + + $label_title = qq| title="| . $attr->documentation . qq|"| if $attr->has_documentation; + + $default->{$name} = $value unless defined $default->{$name}; + + $value_html = qq|| unless $value_html; + # warn "# required $name ", $class->meta->get_attribute( $name )->dump( 2 ); - $html .= qq|| . $value_html; + $form .= qq|$value_html
|; + my $ll = length($label); + $label_width = $ll if $ll > $label_width; } - $html .= qq|
|; + $form .= qq|| if @checkboxes; + + $self->add_css(qq| + label,input { + display: block; + float: left; + margin-bottom: 10px; + } + + label { + text-align: right; + width: ${label_width}ex; + padding-right: 20px; + } + br { + clear: left; + } + |); + + my $html; + + # http://www.quirksmode.org/oddsandends/forms.html +# $form =~ s{<([^>]+)(name=")([^"]+)(")([^>]*)>}{<$1$2$3$4 id="$3" $5}gs; + + $html = qq| +

$class params

+
+ $form + +
+ | if $form; + + $self->add_status({ + $self->class => { + params => $self->params, + params_config => $params_config, + default => $default, + }, + }); + + return ($html,$default) if wantarray; return $html; } +=head1 SEE ALSO + +L for info on CSS2 forms + +=cut + 1;