--- trunk/lib/Frey/ObjectBrowser.pm 2008/07/11 10:29:31 95
+++ trunk/lib/Frey/ObjectBrowser.pm 2008/07/11 19:19:42 100
@@ -3,6 +3,7 @@
use MooseX::Method;
extends 'Frey';
+with 'Frey::Web';
my @callbacks;
@@ -26,6 +27,8 @@
use Data::Dump qw/dump/;
use Data::Structure::Util qw(unbless);
+use Frey::Web::Row;
+use Strix::User;
#method 'html' => positional(
# isa => 'Continuity::RequestHolder',
@@ -37,18 +40,13 @@
my $f = { $req->params };
my $layout = delete( $f->{layout} ) || 'div';
- use Strix::User;
- use Strix::View::User;
-
my $s = Strix::User->rows();
#warn "# s = ",dump( $s );
my @w;
while ( my $u = $s->next ) {
- my $w = Strix::View::User->new( %{ $u } );
- $w->_fey( $u );
- $w->_layout( $layout );
+ my $w = Frey::Web::Row->new( fey => $u, layout => $layout );
warn "# w = ",dump( $w ) if $self->debug;
push @w, $w;
}
@@ -68,14 +66,13 @@
$rows_delimiter = '
' if $layout eq 'div';
my $form = join($rows_delimiter, map {
- $_->_layout( $layout );
+ $_->layout( $layout ); # FIXME do we need this still?
$_->process($f) || ''
} @w );
- if ( $w[ $#w ]->_fey ) {
+ if ( $w[ $#w ]->fey ) {
warn "+++ added new item widget\n";
- my $w = Strix::View::User->new( render_as => 'edit' );
- $w->_layout( $layout );
+ my $w = Frey::Web::Row->new( render_as => 'edit', layout => $layout );
$form .= $rows_delimiter . $w->process;
push @w, $w;
}
@@ -104,7 +101,7 @@
qq||,
);
- my $doc = Continuity::Widget::DomNode->create(
+ my $html = dom2html(
html => [
head => [
link => { rel=>"stylesheet", href=>"/static/form.css", type=>"text/css" }
@@ -117,11 +114,11 @@
],
],
]
- )->to_string;
+ );
- warn ">>> $layout ",length( $doc ),"\n";
+ warn ">>> $layout ",length( $html ),"\n";
- $req->print( $doc );
+ $req->print( $html );
$req->next;
$f = { $req->params };