--- trunk/share/web/templates/list	2006/12/06 23:20:47	19
+++ trunk/share/web/templates/list	2006/12/10 19:00:32	32
@@ -6,74 +6,49 @@
 $from_date => undef;
 $to_date => undef;
 $search => undef;
+$branch => undef;
 </%args>
 
 <%init>
 my $filter = Jifty->web->new_action(
 	class => 'Filter',
 	moniker => 'filer_list',
-#	arguments => {
-#		author => $author,
-#		show_actions => $show_actions,
-#	},
 );
 
-my $revisions = SVNBrowser::Model::RevisionCollection->new();
-
-$author ||= $filter->argument_value('author');
-$show_actions ||= $filter->argument_value('show_actions');
-$page ||= $filter->argument_value('page') || 1;
-$per_page ||= $filter->argument_value('per_page') || 10;
-$from_date ||= $filter->argument_value('from_date');
-$to_date ||= $filter->argument_value('to_date');
-$search ||= $filter->argument_value('search');
-
-$revisions->unlimit();
-
-$revisions->limit( column => 'author', value => $author, entry_aggregator => 'AND' ) if ($author);
-$revisions->limit( column => 'commit_date', operator => '>=', value => $from_date, entry_aggregator => 'AND' ) if ($from_date);
-$revisions->limit( column => 'commit_date', operator => '<=', value => $to_date, entry_aggregator => 'AND' ) if ($to_date);
-
-$revisions->limit( column => 'message', operator => 'LIKE', value => '%' . $search . '%' ) if ($search);
-
-$revisions->order_by({ column => 'commit_date', order => 'desc' });
-$revisions->set_page_info(
-	current_page => $page,
-	per_page => $per_page,
-);
-
-warn $revisions->build_select_query;
-
-$revisions->goto_first_item;
-
-
-my $actions = SVNBrowser::Model::ActionCollection->new();
-
 </%init>
 
 <&| /_elements/wrapper, title => "SVN Reporitory Browser" &>
 
 <% Jifty->web->form->start %>
-<% $filter->form_field('author', default_value => $author ) %>
+
+<% $filter->form_field('author') %>
+<% $filter->form_field('branch') %>
+<% $filter->form_field('search') %>
+
+<div class="inline">
+<% $filter->form_field('from_date') %>
+<% $filter->form_field('to_date') %>
+<% $filter->form_field('per_page') %>
+<% $filter->form_field('show_actions') %>
+</div>
+
+<div style="clear: left">
 <% $filter->button( label => 'Filter commits' ) %>
-<% $filter->form_field('show_actions', default_value => $show_actions ) %>
-<% $filter->form_field('per_page', default_value => $per_page ) %>
-<% $filter->form_field('from_date', default_value => $from_date ) %>
-<% $filter->form_field('to_date', default_value => $to_date ) %>
-<% $filter->form_field('search', default_value => $search ) %>
 
 <%perl>
-if (my $nr = $revisions->pager->total_entries) {
-        $m->out("$nr revisions found");
-} else {
-        $m->out("No revisions found in repository");
-}                                                                                
 </%perl>
+</div>
 
+% my $res = Jifty->web->response->result('filter_list');
+% my $revisions = $res->content('revisions') if ($res);
+% use Data::Dump qw/dump/; warn dump($res, $revisions);
+% if ( $revisions ) {
+
+% my $actions = SVNBrowser::Model::ActionCollection->new();
 <dl>
 % while (my $r = $revisions->next) {
 	<dt><% Jifty->web->tangent(
-		url => '/revision/' . $r->revision,
+		url => '/rev/' . $r->revision,
 		label => $r->revision,
 	) %>
 	<span class="author"><% $r->author %></span>
@@ -83,9 +58,13 @@
 	<pre class="commit_message"><% $r->message %></pre>
 %	if ($show_actions) {
 		<ul class="actions">
+%		$actions->unlimit;
 %		$actions->limit( column => 'revision', value => $r->revision );
 %		while (my $a = $actions->next) {
-			<li><tt class="action-<% $a->type %>"><% $a->type %> <% $a->branch %> <% $a->rel_path %></tt></li>
+%			my $full_path = $a->branch . $a->rel_path ;
+			<li><tt class="action-<% $a->type %>"><% $a->type %> <% $full_path %>
+			<% Jifty->web->tangent( url => '/rev/' . $r->revision . $full_path, label => 'diff' ) %>
+			</tt></li>
 %		}
 		</ul>
 %	}
@@ -118,6 +97,9 @@
  ) %>
 % }
 
+<!-- no $revisions -->
+% }
+
 <% Jifty->web->form->end %>
 
 </&>