--- trunk/lib/Frey/Action.pm 2009/06/28 14:05:08 1085 +++ trunk/lib/Frey/Action.pm 2009/07/01 12:23:58 1142 @@ -1,8 +1,7 @@ package Frey::Action; use Moose; extends 'Frey::PPI'; -with 'Frey::Web'; -with 'Frey::Config'; +with 'Frey::Web', 'Frey::Config'; use Clone qw/clone/; use Data::Dump qw/dump/; @@ -102,6 +101,86 @@ =cut +sub form_id { + my ($self) = @_; + my $form_id = $self->class; + $form_id =~ s{\W+}{_}g; + return $form_id; +} + +sub select_values { + my ( $self, $name, $attr_type, $values ) = @_; + + $attr_type ||= '?' and warn "$name doesn't have attr_type"; + + my $form_id = $self->form_id; + my $max_value_len = 0; + my @values; + my $display; + my $html = ''; + + foreach ( @$values ) { + my $v = ref($_) eq 'HASH' ? $_->{$name} : $_; + if ( $v =~ s/\t+(.+)$// ) { + $display->{$v} = $1; + } + warn "## value '$v'"; + push @values, $v; + $max_value_len = length($v) if length($v) > $max_value_len; + } + + warn "# max_value_len: $max_value_len"; + #my $render = eval $class . '->render_' . $name; + my $call = 'render_' . $name; + my $render = $self->class->$call if $self->class->can($call); + warn "## render $@"; + + if ( $#values > 3 && $render !~ m{radio} ) { + my $options = join("\n", + map { + my $d = $display->{$_} || $_; + qq||; + } @values + ); + # onchange="alert(this.options[this.selectedIndex].value);" + $html = qq| + + | if $options; + } else { + my $delimiter = $max_value_len > $self->input_step_size ? qq|
| : ''; + my $radio = +# $delimiter . + join("\n", + map { strip(qq| + + + $_ + + $delimiter + |) } @values + ); + if ( $radio ) { + + my $size = int( $max_value_len / $self->input_step_size ) + 1; + $size = 5 if $size > 5; + $size *= $self->input_step_size; + $radio .= qq| + + + + + |; + } + $html = qq|
$radio
|; + } + + return +# qq|| . + $html +} + sub params_form { my ( $self ) = @_; @@ -132,93 +211,35 @@ warn "# $class config = ",dump( $params_config ) if $self->debug; my $form; - my $form_id = $class; - $form_id =~ s{\W+}{_}g; - - sub select_values { - my ( $name, $attr_type, $values ) = @_; - - $attr_type ||= '?' and warn "$name doesn't have attr_type"; - - my $max_value_len = 0; - my @values; - my $display; - my $html = ''; - - foreach ( @$values ) { - my $v = ref($_) eq 'HASH' ? $_->{$name} : $_; - if ( $v =~ s/\t+(.+)$// ) { - $display->{$v} = $1; - } - warn "## value '$v'"; - push @values, $v; - $max_value_len = length($v) if length($v) > $max_value_len; - } - - warn "# max_value_len: $max_value_len"; - my $render = eval $class . '->render_' . $name; - warn "## render $@"; - - if ( $#values > 3 && $render !~ m{radio} ) { - my $options = join("\n", - map { - my $d = $display->{$_} || $_; - qq||; - } @values - ); - # onchange="alert(this.options[this.selectedIndex].value);" - $html = qq| - - | if $options; - } else { - my $delimiter = $max_value_len > $self->input_step_size ? qq|
| : ''; - my $radio = -# $delimiter . - join("\n", - map { strip(qq| - - - $_ - - $delimiter - |) } @values - ); - if ( $radio ) { - - my $size = int( $max_value_len / $self->input_step_size ) + 1; - $size = 5 if $size > 5; - $size *= $self->input_step_size; - $radio .= qq| - - - - - |; - } - $html = qq|
$radio
|; - } - - return -# qq|| . - $html - } - + my $form_id = $self->form_id; my @checkboxes; my $label_width = 1; # minimum - - foreach my $name ( + my @fields = grep { die "$_ doesn't have meta" unless $class->can('meta'); ! $class->meta->get_attribute($_)->is_lazy - && ! defined $default->{$_} +# && ! defined $default->{$_} # XXX show fields with values && ! m{^_} # skip _private - } $self->attributes - ) { + } $self->attributes; + + my $fieldset; + + my $last; + foreach my $name ( @fields ) { + my $set = $name; + $set =~ s{_[^_]+$}{}; + push @{ $fieldset->{$set} }, $name; + } + + delete( $fieldset->{$_} ) + foreach ( grep { $#{ $fieldset->{$_} } == 0 } keys %$fieldset ); + + warn "# fieldset = ",dump( $fieldset ); + + foreach my $name ( @fields ) { my $attr_type = ''; my $type = $name =~ m/^pass/ ? 'password' : 'text'; my $label = $name; @@ -236,16 +257,17 @@ if ( ref($params_config) eq 'HASH' && defined $params_config->{$name} ) { $value = $params_config->{$name}; } elsif ( ref($params_config) eq 'ARRAY' ) { - $value_html = select_values( $name, $attr_type, $params_config ); + $value_html = $self->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 ); + $value_html = $self->select_values( $name, $attr_type, $attr->type_constraint->values ); } elsif ( $class->can( $name . '_available' ) ) { - my $available = eval $class . '->' . $name . '_available'; + my $available = $name . '_available'; + $available = $class->$available; confess $@ if $@; $available =~ s/^\s+//gs; $available =~ s/\s+$//gs; - $value_html = select_values( $name, $attr_type, [ split(/\n/,$available) ]); + $value_html = $self->select_values( $name, $attr_type, [ split(/\n/,$available) ]); } elsif ( $attr_type =~ m{^Bool} ) { my $suffix = ''; $suffix = ' checked=1' if $value; @@ -253,7 +275,7 @@ push @checkboxes, $name; } elsif ( ! defined $value && ! $required->{$name} ) { $value_html = qq|undef|; # FIXME if $self->debug - } elsif ( $attr_type !~ m{^(Str|Int)$} || $value =~ $Frey::Web::re_html || $name =~ m{text} ) { + } elsif ( $attr_type !~ m{^(Str|Int|Email)$} || $value =~ $Frey::Web::re_html || $name =~ m{text} ) { $value_html = qq||; } @@ -266,10 +288,32 @@ # warn "# required $name ", $class->meta->get_attribute( $name )->dump( 2 ); - $label_title .= qq| class="required"| if $required->{$name}; + if ( $required->{$name} ) { + $label_title .= qq| class="required"|; + $value_html =~ s{(<\S+)\s}{$1 class=required }; + } $label =~ s/_/ /g; - $form .= qq|$value_html
|; + my $set = $name; + $set =~ s{_[^_]+$}{}; + + my ( $before, $after ) = ( '', '
' ); + + if ( my $s = $fieldset->{$set} ) { + if ($s->[0] eq $name) { + $before = qq| +
+ $set + |; + } elsif ( $s->[ -1 ] eq $name ) { + $after = qq| +
+ |; + } + $label =~ s{^\Q$set\E\s+}{}; + } + + $form .= qq|$before$value_html $after|; my $ll = length($label); $label_width = $ll if $ll > $label_width; } @@ -301,10 +345,20 @@ label.required { font-weight: bold; } + input.required, + select.required { + border-color: #c00; + } br { clear: left; } + + fieldset { + margin: 0; + padding: 0; + margin-bottom: 0.5em; + } |); my $html; @@ -338,4 +392,7 @@ =cut +__PACKAGE__->meta->make_immutable; +no Moose; + 1;