@@ -92,11 +92,12 @@ sub startup {

   # Projects

   $r->get('/(*home)/projects')->to('#projects')->name('projects');

-  # Download

-

+  # Archive

+  $r->get('/:user/:project/archive/(:rev).tar.gz')->to('#archive', archive_type => 'tar');

+  $r->get('/:user/:project/archive/(:rev).zip')->to('#archive', archive_type => 'zip');

+  

   # File cache

   $git->search_projects;

-

 }

 1;

@@ -4,7 +4,7 @@ use File::Basename 'dirname';

 use Carp 'croak';

 use Gitprep::API;

-sub snapshot {

+sub archive {

   my $self = shift;

   # API

@@ -12,12 +12,25 @@ sub snapshot {

   # Parameter

   my $user = $self->param('user');

-  my $project_ns = $self->param('project');

-  my $project = "/$project_ns";

+  my $project = $self->param('project');

   my $root_ns = $api->root_ns($self->config->{root});

   my $rep_ns = "$root_ns/$user/$project.git";

   my $rep = "/$rep_ns";

   my $rev = $self->param('rev');

+  my $archive_type = $self->stash('archive_type');

+  my $content_type;

+  my $format;

+  my $ext;

+  if ($archive_type eq 'tar') {

+    $format = 'tar';

+    $ext = 'tar.gz';

+    $content_type = 'application/x-tar';

+  }

+  elsif ($archive_type eq 'zip') {

+    $format = 'zip';

+    $ext = 'zip';

+    $content_type = 'application/zip';

+  }

   # Git

   my $git = $self->app->git;

@@ -27,20 +40,22 @@ sub snapshot {

   if (!$type) { croak 404, 'Object does not exist' }

   elsif ($type eq 'blob') { croak 400, 'Object is not a tree-ish' }

-  my ($name, $prefix) = $git->snapshot_name($rep, $rev);

-  my $file = "$name.tar.gz";

+  my $name = "$project-$rev";

+  my $file = "$name.$ext";

+  

   my $cmd = $self->_quote_command(

-    $git->cmd($rep), 'archive', "--format=tar", "--prefix=$prefix/", $rev

+    $git->cmd($rep), 'archive', "--format=$format", "--prefix=$name/", $rev

   );

-  $cmd .= ' | ' . $self->_quote_command('gzip', '-n');

-

+  if ($archive_type eq 'tar') {

+    $cmd .= ' | ' . $self->_quote_command('gzip', '-n');

+  }

   $file =~ s/(["\\])/\\$1/g;

   open my $fh, '-|', $cmd

     or croak 'Execute git-archive failed';

   # Write chunk

-  $self->res->headers->content_type('application/x-tar');

+  $self->res->headers->content_type($content_type);

   $self->res->headers->content_disposition(qq/attachment; filename="$file"/);

   my $cb;

   $cb = sub {

@@ -50,6 +65,7 @@ sub snapshot {

     unless ($length) {

       close $fh;

       undef $cb;

+      $c->finish;

       return;

     }

     $c->write_chunk($buffer, $cb);

@@ -1,5 +1,7 @@

 <%

-  my $tags_count = stash('tags_count');

+  my $tags_count = stash('tags_count') || 0;

+  my $branches_count = stash('branches_count') || 0;

+  my $display = stash('display') || '';

 %>

 %= stylesheet begin

@@ -10,61 +12,95 @@

     height:30px;

     overflow:hidden;

   }

-  .code_menu_left {

+  .code_menu .cleft {

     width:700px;

     float:left;

     overflow:hidden;

   }

-  .code_menu_current_ref {

+  .code_menu .ccurrent_rev {

     float:left;

     padding:5px 10px 10px 10px;

   }

-  .code_menu_current_ref_button {

+  .code_menu .ccurrent_rev_button {

     border:1px solid #E5E5E5;

   }

-  .code_menu_left li {

+  .code_menu .cleft li {

     float:left;

     padding:5px 10px;

   }

-  .code_menu_right {

+  .code_menu .cright {

     text-align:right;

     overflow:hidden;

     height:27px;

   }

-  .code_menu_right li {

+  .code_menu .cright li {

     float:right;

     padding:5px 10px;

     height:27px;

   }

-  .code_menu_under {

+  .code_menu .cunder {

     border-top:1px solid #E5E5E5;

     margin-top:-1px;

   }

   .code_menu a {

     color:#666;

   }

+  .code_menu .ccount {

+    display:inline-block;

+    font-weight:normal;

+    border:1px solid #CCC;

+    background-color:#EEE;

+    padding:2px;

+    padding-left:5px;

+    padding-right:5px;

+    border-radius:9px;

+    font-size:75%;

+  }

+  

+  % if ($display) {

+    /* Code menu */

+    .code_menu .c<%= $display %> {

+      border:1px solid #E5E5E5;

+      border-bottom:none;

+      background-color:white;

+      font-weight:bold;

+    }

+    .code_menu .c<%= $display %> a {

+      color:#333

+    }

+  % }

+

 % end

 <div class="code_menu">

-  <ul class="code_menu_left">

+  <ul class="cleft">

     % if (defined(my $rev = stash('rev'))) {

-      <li class="code_menu_current_ref">

-        <div class="code_menu_current_ref_button">

+      <li class="ccurrent_rev">

+        <div class="ccurrent_rev_button">

           branch <b><%= $rev %></b>

         </div>

       </li>

     % }

-    <li class="code_menu_files"><a href="<%= url_for("/$user/$project") %>">Files</a></li>

-    <li class="code_menu_commits"><a href="<%= url_for("/$user/$project/commits/master") %>">Commits</a></li>

-    <li class="code_menu_branches"><a href="<%= url_for("/$user/$project/branches") %>">Branches</a></li>

+    <li class="cfiles"><a href="<%= url_for("/$user/$project") %>">Files</a></li>

+    <li class="ccommits"><a href="<%= url_for("/$user/$project/commits/master") %>">Commits</a>

+      </li>

+    <li class="cbranches">

+      <a href="<%= url_for("/$user/$project/branches") %>">Branches</a>

+      % if ($display eq 'branches') {

+        <span class="ccount"><%= $branches_count %></span>

+      % }

+    </li>

   </ul>

-  <ul class="code_menu_right">

-    <li class="code_menu_tags">

+  <ul class="cright">

+    <li class="ctags">

       <a href="<%= url_for("/$user/$project/tags") %>">

-        Tags <span><%= defined $tags_count ? " $tags_count" : '' %></span>

+        Tags

+        % if ($display eq 'tags') {

+          <span class="ccount"><%= $tags_count %></span>

+        % }

       </a>

      </li>

   </ul>

-  <div class="code_menu_under"></div>

+  <div class="cunder"></div>

 </div>

@@ -90,21 +90,7 @@

   <div class="main_panel">

     %= include '/include/sub_header';

-    

-    %= include '/include/code_menu';

-    %= stylesheet begin

-      /* Code menu */

-      .code_menu_branches {

-        border:1px solid #E5E5E5;

-        border-bottom:none;

-        background-color:white;

-        font-weight:bold;

-      }

-      .code_menu_branches a {

-        color:#333

-      }

-      

-    % end

+    %= include '/include/code_menu', display => 'branches', branches_count => scalar @$branches;

     <h2>Branches</h2>

@@ -133,19 +133,7 @@

   <div class="main_panel">

     %= include '/include/sub_header';

-    %= include '/include/code_menu';

-    %= stylesheet begin

-    /* Code menu */

-    .code_menu_commits {

-      border:1px solid #E5E5E5;

-      border-bottom:none;

-      background-color:white;

-      font-weight:bold;

-    }

-    .code_menu_commits a {

-      color:#333

-    }

-    % end

+    %= include '/include/code_menu', display => 'commits';

     <div class="commit_history">

       % if (defined $blob) {

@@ -207,7 +207,7 @@

     <div class="description"><%= $desc %></div>

     <div class="git_url">

-      <div class="git_url_zip"><a href="<%= url_for('/archive/master.zip') %>"><s>ZIP</s></a></div>

+      <div class="git_url_zip"><a href="<%= url_for("/$user/$project/archive/master.zip") %>">ZIP</a></div>

       <div class="git_url_http">HTTP</div>

       <div class="git_url_ssh">SSH</div>

       <!-- <div class="git_url_git">Git Read-Only</div> -->

@@ -215,20 +215,8 @@

       <div class="git_url_access">Read-only access</div>

     </div>

-    %= include '/include/code_menu';

-    %= stylesheet begin

-      /* Code menu */

-      .code_menu_files {

-        border:1px solid #E5E5E5;

-        border-bottom:none;

-        background-color:white;

-        font-weight:bold;

-      }

-      .code_menu_files a {

-        color:#333

-      }

-    % end

-        

+    %= include '/include/code_menu', display => 'files';

+    

     <div class="commit_number">

       <div class="commit_number_left">

         <a href="<%= url_for %>"><%= $project %></a>

@@ -2,24 +2,20 @@

   # API

   my $api = Gitprep::API->new($self);

+  # Parameters

   my $user = param('user');

   my $project = param('project');

-

   my $root_ns = $api->root_ns(config->{root});

-  

-  # Parameters

-  my $project_ns = "$root_ns/$user/$project.git";

-  my $project = "/$project_ns";

-  my $home_ns = $api->dirname($project_ns);

-  my $home = "/$home_ns";

+  my $rep_ns = "$root_ns/$user/$project.git";

+  my $rep = "/$rep_ns";

   # Git

   my $git = $self->app->git;

   # Ref names

-  my $tags  = $git->tags($project);

+  my $tags  = $git->tags($rep);

   for my $tag (@$tags) {

-    $tag->{commit} = $git->parse_commit($project, $tag->{name});

+    $tag->{commit} = $git->parse_commit($rep, $tag->{name});

   }

 %>

@@ -84,21 +80,7 @@

   <div class="main_panel">

     %= include '/include/sub_header';

-    

-    %= include '/include/code_menu', tags_count => scalar @$tags;

-    %= stylesheet begin

-      /* Code menu */

-      .code_menu_tags {

-        border:1px solid #E5E5E5;

-        border-bottom:none;

-        background-color:white;

-        font-weight:bold;

-      }

-      .code_menu_tags a {

-        color:#333

-      }

-      

-    % end

+    %= include '/include/code_menu', display => 'tags', tags_count => scalar @$tags;

     <div class="tags">

       % for (my $i = 0; $i < @$tags; $i++) {