--- trunk/share/web/templates/list	2006/12/09 14:24:06	25
+++ trunk/share/web/templates/list	2006/12/10 19:00:33	34
@@ -1,75 +1,39 @@
 <%args>
-$page => undef;
-$author => undef;
-$show_actions => undef;
-$per_page => undef;
-$from_date => undef;
-$to_date => undef;
-$search => undef;
 </%args>
 
 <%init>
 my $filter = Jifty->web->new_action(
 	class => 'Filter',
-	moniker => 'filer_list',
-#	arguments => {
-#		author => $author,
-#		show_actions => $show_actions,
-#	},
+	moniker => 'filter_list',
 );
 
-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>
 
+% if ( $filter->result and my $revisions = $filter->result->content('revisions') ) {
+
+% my $actions = SVNBrowser::Model::ActionCollection->new();
 <dl>
 % while (my $r = $revisions->next) {
 	<dt><% Jifty->web->tangent(
@@ -81,7 +45,7 @@
 	</dt>
 	<dd>
 	<pre class="commit_message"><% $r->message %></pre>
-%	if ($show_actions) {
+%	if ($filter->argument_value('show_actions')) {
 		<ul class="actions">
 %		$actions->unlimit;
 %		$actions->limit( column => 'revision', value => $r->revision );
@@ -109,7 +73,7 @@
 % }
 
 % if ($revisions->pager->last_page > 1) {
-page <% $page %> of <% $revisions->pager->last_page %>
+page <% $revisions->pager->current_page %> of <% $revisions->pager->last_page %>
 % }
 
 % if ($revisions->pager->next_page) {
@@ -122,6 +86,9 @@
  ) %>
 % }
 
+<!-- no $revisions -->
+% }
+
 <% Jifty->web->form->end %>
 
 </&>