--- trunk/lib/Frey/Action.pm	2009/01/06 13:18:43	940
+++ trunk/lib/Frey/Action.pm	2009/01/09 21:50:21	976
@@ -43,11 +43,12 @@
 
   my @required_attributes = $self->required;
   my $required_attributes = $self->required;
+  my $required_hash       = $self->required('as_hash');
 
 =cut
 
 sub required {
-	my ( $self ) = @_;
+	my ($self,$param) = @_;
 	$self->load_class( $self->class );
 
 	my @required = 
@@ -61,7 +62,14 @@
 			blessed $attr && $attr->is_required && $attr;
 		} $self->class->meta->get_attribute_list;
 
-	warn "## required = ",dump( map { $_->name } @required ), " for ", $self->class if @required && $self->debug;
+	@required = map { $_->name } @required;
+	warn "## required = ",dump( @required ), " for ", $self->class if @required && $self->debug;
+
+	if ( $param eq 'as_hash' ) {
+		my $hash;
+		map { $hash->{$_}++ } @required;
+		return $hash;
+	}
 	return @required if wantarray;
 	return \@required;
 }
@@ -81,7 +89,7 @@
 	my $a;
 	my @attrs = @{ $self->attribute_order };
 	@attrs = map {  $a->{$_}++; $_ } @attrs;
-	push @attrs, $_ foreach grep { ! $a->{$_} } map { $_->name } @{ $self->required };
+	push @attrs, $_ foreach grep { ! $a->{$_} } @{ $self->required };
 	warn "# attributes = ",dump( @attrs ) if $self->debug;
 	return @attrs if wantarray;
 	return \@attrs;
@@ -96,13 +104,13 @@
 
 sub params_form {
 	my ( $self ) = @_;
-	my @required = $self->required;
-	if ( ! @required ) {
+	my $required = $self->required('as_hash');
+	if ( $required ) {
+		warn $self->class, " required params ", dump( keys %$required ) if $self->debug;
+	} else {
 		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 ", map { $_->dump(2) } @required if $self->debug;
 	}
 
 	my $class = $self->class;
@@ -116,10 +124,14 @@
 	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 $html = '';
@@ -160,6 +172,18 @@
 						$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|
+					<span>
+					<input type="radio" name="$name" value=" " onclick="document.getElementById('new-$name').focus();" >
+					<input type="text" name="new-$name" id="new-$name" onchange="clear_radio('$form_id','$name'); this.disable = false;" onblur="this.disable = true;" title="enter new value" size="$size">
+					</span>
+				|;
+			}
 			$html = qq|<div style="display: block;">$radio</div>|;
 		}
 
@@ -168,6 +192,7 @@
 			$html
 	}
 
+
 	foreach my $checkbox ( split(/\s+/, $default->{'frey-checkboxes'} ) ) {
 		next if defined $default->{ $checkbox };
 
@@ -212,7 +237,7 @@
 		} elsif ( $attr_type =~ m{^Bool} ) {
 			my $suffix = '';
 			$suffix = ' checked' if $value;
-			$value_html = qq|<input type="checkbox" name="$name" title="$attr_type" value="$value"$suffix>|;
+			$value_html = qq|<input type="checkbox" name="$name" title="$attr_type" value="1"$suffix>|;
 			push @checkboxes, $name;
 		} elsif ( ! defined $value ) {
 			$value_html = qq|<tt id="$name">undef</tt><!-- $name = undef -->|; # FIXME if $self->debug
@@ -228,12 +253,20 @@
 		$value_html = qq|<input type="$type" name="$name" title="$attr_type" value="$value" size="$size">| unless $value_html;
 
 #		warn "# required $name ", $class->meta->get_attribute( $name )->dump( 2 );
+
+		$label_title .= qq| class="required"| if $required->{$name};
+		$label =~ s/_/ /g;
+
 		$form .= qq|<label for="$name"$label_title>$label</label>$value_html<br>|;
 		my $ll = length($label);
 		$label_width = $ll if $ll > $label_width;
 	}
 	$form .= qq|<input type="hidden" name="frey-checkboxes" value="| . join(' ', @checkboxes) . qq|">| if @checkboxes;
 
+	$label_width += 2; # XXX padding left+right em
+
+	$self->add_js('static/Frey/Action.js');
+
 	$self->add_css(qq|
 		label,input {
 			display: block;
@@ -241,10 +274,20 @@
 			margin-bottom: 10px;
 		}
 
+		input:focus {
+			border-color: #cc0;
+			background: #ffc;
+		}
+
 		label {
 			text-align: right;
 			width: ${label_width}ex;
-			padding-right: 20px;
+			padding-right: 1ex;
+			white-space: nowrap;
+		}
+
+		label.required {
+			font-weight: bold;
 		}
 
 		br {
@@ -259,7 +302,7 @@
 
 	$html = qq|
 		<h1>$class params</h1>
-		<form method="post">
+		<form name="$form_id" id="$form_id" method="post">
 		$form
 		<input type="submit" value="Run $class">
 		</form>