--- trunk/share/web/templates/list	2006/12/05 17:00:46	8
+++ trunk/share/web/templates/list	2006/12/10 19:00:33	34
@@ -1,59 +1,43 @@
 <%args>
-$page => 1
-
-$author => undef;
-
 </%args>
 
 <%init>
 my $filter = Jifty->web->new_action(
 	class => 'Filter',
-	moniker => 'filer_list',
+	moniker => 'filter_list',
 );
 
-my $revisions = SVNBrowser::Model::RevisionCollection->new();
-
-$author ||= $filter->argument_value('author');
-
-if ($author) {
-	$revisions->limit(
-		column => 'author',
-		value => $author,
-	);
-} else {
-	$revisions->unlimit();
-}
-$revisions->order_by({ column => 'commit_date', order => 'desc' });
-$revisions->set_page_info(
-	current_page => $page,
-	per_page => 20,
-);
-$revisions->goto_first_item;
-
-
-my $actions = SVNBrowser::Model::ActionCollection->new();
-
 </%init>
 
-<&| /_elements/wrapper, title => "Statistics" &>
+<&| /_elements/wrapper, title => "SVN Reporitory Browser" &>
 
 <% Jifty->web->form->start %>
-<% $filter->form_field('author', default_value => $author ) %>
-<% $filter->button( label => 'Show just this commiter' ) %>
-<% Jifty->web->form->end %>
+
+<% $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' ) %>
 
 <%perl>
-if (my $nr = $revisions->pager->total_entries) {
-        $m->out("Found $nr revisions");
-} else {
-        $m->out("No revisions found.")         
-}                                                                                
 </%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(
-		url => '/revision/' . $r->revision,
+		url => '/rev/' . $r->revision,
 		label => $r->revision,
 	) %>
 	<span class="author"><% $r->author %></span>
@@ -61,34 +45,50 @@
 	</dt>
 	<dd>
 	<pre class="commit_message"><% $r->message %></pre>
-	<ul class="paths">
-%	$actions->limit( column => 'revision', value => $r->revision );
-%	while (my $a = $actions->next) {
-		<li><tt><% $a->type %> <% $a->branch %> <% $a->rel_path %></tt></li>
+%	if ($filter->argument_value('show_actions')) {
+		<ul class="actions">
+%		$actions->unlimit;
+%		$actions->limit( column => 'revision', value => $r->revision );
+%		while (my $a = $actions->next) {
+%			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>
 %	}
-	</ul>
 
 	</dd>
 % }
 </dl>
 
 % if ($revisions->pager->previous_page) {
- <% Jifty->web->link(
- 	label => "Previous",
-	onclick => { args => { page => $revisions->pager->previous_page } }
+ <% $filter->button(
+ 	label => "&lt;&lt;",
+	escape_label => 0,
+	arguments => {
+		page => $revisions->pager->previous_page,
+	}
  ) %>
 % }
 
 % 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) {
- <% Jifty->web->link(
- 	label => "Next",
-	onclick => { args => { page => $revisions->pager->next_page } }
+ <% $filter->button(
+ 	label => "&gt;&gt;",
+	escape_label => 0,
+	arguments => {
+		page => $revisions->pager->next_page,
+	}
  ) %>
 % }
 
-</&>
+<!-- no $revisions -->
+% }
+
+<% Jifty->web->form->end %>
 
+</&>