Showing 16 changed files with 89 additions and 99 deletions
+11 -11
lib/Gitprep.pm
... ...
@@ -82,35 +82,35 @@ sub startup {
82 82
   $r->get('/')->to('#home');
83 83
 
84 84
   # Repositories
85
-  $r->get('/:user')->to('#repositories');
85
+  $r->get('/:user')->to('#projects');
86 86
   
87 87
   # Repository
88
-  $r->get('/:user/:repository')->to('#repository');
88
+  $r->get('/:user/:project')->to('#project');
89 89
   
90 90
   # Commit
91
-  $r->get('/:user/:repository/commit/:id')->to('#commit');
91
+  $r->get('/:user/:project/commit/:id')->to('#commit');
92 92
   
93 93
   # Commits
94
-  $r->get('/:user/:repository/commits/:id', {id => 'HEAD'})->to('#commits');
95
-  $r->get('/:user/:repository/commits/:id/(*file)')->to('#commits');
94
+  $r->get('/:user/:project/commits/:id', {id => 'HEAD'})->to('#commits');
95
+  $r->get('/:user/:project/commits/:id/(*file)')->to('#commits');
96 96
   
97 97
   # Branches
98
-  $r->get('/:user/:repository/branches')->to('#branches');
98
+  $r->get('/:user/:project/branches')->to('#branches');
99 99
 
100 100
   # Tags
101
-  $r->get('/:user/:repository/tags')->to('#tags');
101
+  $r->get('/:user/:project/tags')->to('#tags');
102 102
 
103 103
   # Downloads
104
-  $r->get('/:user/:repository/downloads')->to('#downloads');
104
+  $r->get('/:user/:project/downloads')->to('#downloads');
105 105
   
106 106
   # Tree
107
-  $r->get('/:user/:repository/tree/(*id_dir)')->to('#tree');
107
+  $r->get('/:user/:project/tree/(*id_dir)')->to('#tree');
108 108
   
109 109
   # Blob
110
-  $r->get('/:user/:repository/blob/(*id_file)')->to('#blob');
110
+  $r->get('/:user/:project/blob/(*id_file)')->to('#blob');
111 111
   
112 112
   # Raw
113
-  $r->get('/:user/:repository/raw/(*id_file)')->to('#raw');
113
+  $r->get('/:user/:project/raw/(*id_file)')->to('#raw');
114 114
   
115 115
   # Projects
116 116
   $r->get('/(*home)/projects')->to('#projects')->name('projects');
+4 -14
lib/Gitprep/Git.pm
... ...
@@ -398,16 +398,6 @@ sub project_description {
398 398
   return $description;
399 399
 }
400 400
 
401
-sub repository_description {
402
-  my ($self, $rep) = @_;
403
-  
404
-  # Description
405
-  my $file = "$rep/description";
406
-  my $description = $self->_slurp($file) || '';
407
-  
408
-  return $description;
409
-}
410
-
411 401
 sub last_activity {
412 402
   my ($self, $project) = @_;
413 403
   
... ...
@@ -489,7 +479,7 @@ sub references {
489 479
   return \%refs;
490 480
 }
491 481
 
492
-sub fill_repositories {
482
+sub fill_projects {
493 483
   my ($self, $home, $ps) = @_;
494 484
   
495 485
   # Fill rep info
... ...
@@ -499,7 +489,7 @@ sub fill_repositories {
499 489
     next unless @activity;
500 490
     ($rep->{age}, $rep->{age_string}) = @activity;
501 491
     if (!defined $rep->{descr}) {
502
-      my $descr = $self->repository_description("$home/$rep->{path}") || '';
492
+      my $descr = $self->project_description("$home/$rep->{path}") || '';
503 493
       $rep->{descr_long} = $descr;
504 494
       $rep->{descr} = $self->_chop_str($descr, 25, 5);
505 495
     }
... ...
@@ -510,7 +500,7 @@ sub fill_repositories {
510 500
   return \@resp;
511 501
 }
512 502
 
513
-sub repositories {
503
+sub projects {
514 504
   my ($self, $dir, %opt) = @_;
515 505
   
516 506
   my $filter = $opt{filter};
... ...
@@ -534,7 +524,7 @@ sub repositories {
534 524
     next unless @activity;
535 525
     ($rep->{age}, $rep->{age_string}) = @activity;
536 526
     if (!defined $rep->{descr}) {
537
-      my $descr = $self->repository_description("$dir/$rep->{path}") || '';
527
+      my $descr = $self->project_description("$dir/$rep->{path}") || '';
538 528
       $rep->{descr_long} = $descr;
539 529
       $rep->{descr} = $self->_chop_str($descr, 25, 5);
540 530
     }
+5 -5
templates/include/code_menu.html.ep
... ...
@@ -48,13 +48,13 @@
48 48
         branch <b>master</b>
49 49
       </div>
50 50
     </li>
51
-    <li class="code_menu_files"><a href="<%= url_for("/$user/$repository") %>">Files</a></li>
52
-    <li class="code_menu_commits"><a href="<%= url_for("/$user/$repository/commits/master") %>">Commits</a></li>
53
-    <li class="code_menu_branches"><a href="<%= url_for("/$user/$repository/branches") %>">Branches</a></li>
51
+    <li class="code_menu_files"><a href="<%= url_for("/$user/$project") %>">Files</a></li>
52
+    <li class="code_menu_commits"><a href="<%= url_for("/$user/$project/commits/master") %>">Commits</a></li>
53
+    <li class="code_menu_branches"><a href="<%= url_for("/$user/$project/branches") %>">Branches</a></li>
54 54
   </ul>
55 55
   <ul class="code_menu_right">
56
-    <li class="code_menu_downloads"><a href="<%= url_for("/$user/$repository/downloads") %>">Downloads</a></li>
57
-    <li class="code_menu_tags"><a href="<%= url_for("/$user/$repository/tags") %>">Tags</a></li>
56
+    <li class="code_menu_downloads"><a href="<%= url_for("/$user/$project/downloads") %>">Downloads</a></li>
57
+    <li class="code_menu_tags"><a href="<%= url_for("/$user/$project/tags") %>">Tags</a></li>
58 58
   </ul>
59 59
   <div class="code_menu_under"></div>
60 60
 </div>
+3 -3
templates/include/page_path.html.ep
... ...
@@ -18,8 +18,8 @@
18 18
 % end
19 19
 
20 20
 <span class="page_path">
21
-  <a href="<%= url_for("/$user/$repository" . ($operation eq 'commits' ? '/commits' : '')) %>">
22
-    <b><%= $repository %></b>
21
+  <a href="<%= url_for("/$user/$project" . ($operation eq 'commits' ? '/commits' : '')) %>">
22
+    <b><%= $project %></b>
23 23
   </a> /
24 24
   % my @parts = split('/', $Path);
25 25
   % my $path;
... ...
@@ -31,7 +31,7 @@
31 31
       <b><%= $part %></b>
32 32
     % } else {
33 33
       <a href=
34
-          "<%= url_for("/$user/$repository/$operation/$id/$path") %>">
34
+          "<%= url_for("/$user/$project/$operation/$id/$path") %>">
35 35
         <%= $part %>
36 36
       </a>
37 37
       % $path .= '/';
+9 -9
templates/include/sub_header.html.ep
... ...
@@ -1,6 +1,6 @@
1 1
 %= stylesheet begin
2 2
 
3
-  /* User and repository name */
3
+  /* User and project name */
4 4
   .user_rep {
5 5
     font-size:140%;
6 6
     margin-top:15px;
... ...
@@ -39,15 +39,15 @@
39 39
 <div class="user_rep">
40 40
   <a href="<%= url_for("/$user") %>"><%= $user %></a>
41 41
   /
42
-  <a href="<%= url_for("/$user/$repository") %>"><b><%= $repository %></b></a>
42
+  <a href="<%= url_for("/$user/$project") %>"><b><%= $project %></b></a>
43 43
 </div>
44 44
 
45 45
 <ul class="main_menu">
46
-  <li><a href="<%= url_for("/$user/$repository") %>">Code</a></li>
47
-  <li><a href="<%= url_for("/$user/$repository/network") %>"><s>Network</s></a></li>
48
-  <li><a href="<%= url_for("/$user/$repository/pulls") %>"><s>Pull Requests 0</s></a></li>
49
-  <li><a href="<%= url_for("/$user/$repository/issues") %>"><s>Issues 1</s></a></li>
50
-  <li><a href="<%= url_for("/$user/$repository/wiki") %>"><s>Wiki</s></a></li>
51
-  <li><a href="<%= url_for("/$user/$repository/graphs") %>"><s>Graphs</s></a></li>
52
-  <li><a href="<%= url_for("/$user/$repository/admin") %>"><s>Admin</s></a></li>
46
+  <li><a href="<%= url_for("/$user/$project") %>">Code</a></li>
47
+  <li><a href="<%= url_for("/$user/$project/network") %>"><s>Network</s></a></li>
48
+  <li><a href="<%= url_for("/$user/$project/pulls") %>"><s>Pull Requests 0</s></a></li>
49
+  <li><a href="<%= url_for("/$user/$project/issues") %>"><s>Issues 1</s></a></li>
50
+  <li><a href="<%= url_for("/$user/$project/wiki") %>"><s>Wiki</s></a></li>
51
+  <li><a href="<%= url_for("/$user/$project/graphs") %>"><s>Graphs</s></a></li>
52
+  <li><a href="<%= url_for("/$user/$project/admin") %>"><s>Admin</s></a></li>
53 53
 </ul>
+4 -4
templates/include/tree.html.ep
... ...
@@ -98,7 +98,7 @@
98 98
       <b><%= $latest_commit_log->{author} %></b> <span class="tree_header2_left_right">authored <%= $latest_commit_log->{author_date} %></span>
99 99
     </div>
100 100
     <div class="tree_header2_right">
101
-      <a href="<%= url_for("/$user/$repository/commit/$commit->{id}") %>">
101
+      <a href="<%= url_for("/$user/$project/commit/$commit->{id}") %>">
102 102
         latest commit <%= substr($commit->{id}, 0, 10) %>
103 103
       </a>
104 104
     </div>
... ...
@@ -117,13 +117,13 @@
117 117
           % my $file = defined $dir && $dir ne '' ? "$dir/$name" : $name;
118 118
           
119 119
           <td class="tree_td_blob">
120
-            <a href="<%= url_for("/$user/$repository/blob/$ref/$file") %>">
120
+            <a href="<%= url_for("/$user/$project/blob/$ref/$file") %>">
121 121
               <%= $name %>
122 122
             </a>
123 123
           </td>
124 124
         % } elsif ($tree) {
125 125
           <td class="tree_td_dir">
126
-            <a href="<%= url_for("/$user/$repository/tree/$ref/$child_dir") %>">
126
+            <a href="<%= url_for("/$user/$project/tree/$ref/$child_dir") %>">
127 127
               <%= $name %>
128 128
             </a>
129 129
           </td>
... ...
@@ -133,7 +133,7 @@
133 133
           <%= $tree->{author_date} %>
134 134
         </td>
135 135
         <td class="tree_td_commit">
136
-          <a href="<%= url_for("/$user/$repository/commit/$tree->{commit}") %>">
136
+          <a href="<%= url_for("/$user/$project/commit/$tree->{commit}") %>">
137 137
             <%= $tree->{comment} %>
138 138
           </a>
139 139
           [<%= $tree->{author} %>]
+7 -7
templates/main/blob.html.ep
... ...
@@ -3,13 +3,13 @@
3 3
   my $api = Gitprep::API->new($self);
4 4
   
5 5
   my $user = param('user');
6
-  my $repository = param('repository');
6
+  my $project = param('project');
7 7
   my $plain = param('plain');
8 8
 
9 9
   my $root_ns = $api->root_ns(config->{root});
10 10
   
11 11
   # Parameters
12
-  my $rep_ns = "$root_ns/$user/$repository.git";
12
+  my $rep_ns = "$root_ns/$user/$project.git";
13 13
   my $rep = "/$rep_ns";
14 14
   my $home_ns = $api->dirname($rep_ns);
15 15
   my $home = "/$home_ns";
... ...
@@ -64,7 +64,7 @@
64 64
   }
65 65
   
66 66
   # Global variable
67
-  stash(id => $id, repository => $repository);
67
+  stash(id => $id, project => $project);
68 68
 %>
69 69
 
70 70
 % layout 'common';
... ...
@@ -178,7 +178,7 @@
178 178
       <div class="top">
179 179
         <b><%= $commit_log->{author} %></b>
180 180
         <span class="author_date"><%= $commit_log->{author_date} %></span>
181
-        <a class="comment" href="<%= url_for("/$user/$repository/commit/$id") %>">
181
+        <a class="comment" href="<%= url_for("/$user/$project/commit/$id") %>">
182 182
           <%= $commit->{title} %>
183 183
         </a>
184 184
       </div>
... ...
@@ -193,9 +193,9 @@
193 193
           file <span style="color:gray">|</span> <%= @$lines %> lines <span style="color:gray">|</span> <%= $blob_size %>kb
194 194
         </div>
195 195
         <div class="sright_header">
196
-          <a class="sraw" href="<%= url_for("/$user/$repository/raw/$id/$file") %>">Raw</a>
197
-          <!-- TODO: <a class="sblame" href="<%= url_for("/$user/$repository/blame/$id/$file") %>">Blame</a> -->
198
-          <a class="shistory" href="<%= url_for("/$user/$repository/commits/$id/$file") %>">History</a>
196
+          <a class="sraw" href="<%= url_for("/$user/$project/raw/$id/$file") %>">Raw</a>
197
+          <!-- TODO: <a class="sblame" href="<%= url_for("/$user/$project/blame/$id/$file") %>">Blame</a> -->
198
+          <a class="shistory" href="<%= url_for("/$user/$project/commits/$id/$file") %>">History</a>
199 199
         </div>
200 200
       </div>
201 201
       <div class="sbody">
+4 -4
templates/main/branches.html.ep
... ...
@@ -5,12 +5,12 @@
5 5
   my $api = Gitprep::API->new($self);
6 6
 
7 7
   my $user = param('user');
8
-  my $repository = param('repository');
8
+  my $project = param('project');
9 9
 
10 10
   my $root_ns = $api->root_ns(config->{root});
11 11
   
12 12
   # Parameters
13
-  my $project_ns = "$root_ns/$user/$repository.git";
13
+  my $project_ns = "$root_ns/$user/$project.git";
14 14
   my $project = "/$project_ns";
15 15
   my $home_ns = $api->dirname($project_ns);
16 16
   my $home = "/$home_ns";
... ...
@@ -135,7 +135,7 @@
135 135
         <tr>
136 136
           <td class="left">
137 137
             <div class="name">
138
-              <a href="<%= url_for("/$user/$repository/tree/$name") %>">
138
+              <a href="<%= url_for("/$user/$project/tree/$name") %>">
139 139
                 <%= $name %>
140 140
               </a>
141 141
             </div>
... ...
@@ -145,7 +145,7 @@
145 145
             
146 146
           </td>
147 147
           <td class="right">
148
-            <a href="<%= url_for("/$user/$repository/compare/$default_branch->{name}...$name") %>">Compare</a>
148
+            <a href="<%= url_for("/$user/$project/compare/$default_branch->{name}...$name") %>">Compare</a>
149 149
           </td>
150 150
         </tr>
151 151
       % }
+2 -2
templates/main/commit.html.ep
... ...
@@ -3,13 +3,13 @@
3 3
   my $api = Gitprep::API->new($self);
4 4
   
5 5
   my $user = param('user');
6
-  my $repository = param('repository');
6
+  my $project = param('project');
7 7
   my $id = param('id');
8 8
 
9 9
   my $root_ns = $api->root_ns(config->{root});
10 10
   
11 11
   # Parameters
12
-  my $project_ns = "$root_ns/$user/$repository.git";
12
+  my $project_ns = "$root_ns/$user/$project.git";
13 13
   my $project = "/$project_ns";
14 14
   my $home_ns = $api->dirname($project_ns);
15 15
   my $home = "/$home_ns";
+10 -10
templates/main/commits.html.ep
... ...
@@ -3,7 +3,7 @@
3 3
   my $api = Gitprep::API->new($self);
4 4
   
5 5
   my $user = param('user');
6
-  my $repository = param('repository');
6
+  my $project = param('project');
7 7
   my $id = param('id');
8 8
   my $file = param('file');
9 9
   my $page = param('page') || 0;
... ...
@@ -11,7 +11,7 @@
11 11
   my $root_ns = $api->root_ns(config->{root});
12 12
   
13 13
   # Parameters
14
-  my $project_ns = "$root_ns/$user/$repository.git";
14
+  my $project_ns = "$root_ns/$user/$project.git";
15 15
   my $project = "/$project_ns";
16 16
   my $home_ns = $api->dirname($project_ns);
17 17
   my $home = "/$home_ns";
... ...
@@ -35,7 +35,7 @@
35 35
   }
36 36
   
37 37
   # Global variable
38
-  stash(user => $user, repository => $repository);
38
+  stash(user => $user, project => $project);
39 39
 %>
40 40
 
41 41
 % layout 'common';
... ...
@@ -158,8 +158,8 @@
158 158
         History for
159 159
         %= include '/include/page_path', type => 'blob', Path => $file, operation => 'commits';
160 160
       % } else {
161
-        <a class="ubar" href="<%= url_for("/$user/$repository") %>">
162
-          <%= $repository %>
161
+        <a class="ubar" href="<%= url_for("/$user/$project") %>">
162
+          <%= $project %>
163 163
         </a>
164 164
         /
165 165
         Commit History
... ...
@@ -175,12 +175,12 @@
175 175
           <div class="commit_content">
176 176
             <div class="commit_first">
177 177
               <div class="commit_first_left">
178
-                <a class="ubar" href="<%= url_for("/$user/$repository/commit/$commit->{id}") %>">
178
+                <a class="ubar" href="<%= url_for("/$user/$project/commit/$commit->{id}") %>">
179 179
                   <%= $commit->{title_short} %>
180 180
                 </a>
181 181
               </div>
182 182
               <div class="commit_first_right a_dec_on a_blue">
183
-                <a class="ubar" href="<%= url_for("/$user/$repository/commit/$commit->{id}") %>">
183
+                <a class="ubar" href="<%= url_for("/$user/$project/commit/$commit->{id}") %>">
184 184
                   <%= substr($commit->{id}, 0, 10) %>
185 185
                 </a>
186 186
               </div>
... ...
@@ -188,7 +188,7 @@
188 188
             <div class="commit_second">
189 189
               <div class="commit_second_left">yuki-kimoto authored 7 days ago</div>
190 190
               <div class="commit_second_right">
191
-                <a class="ubar" href="<%= url_for("/$user/$repository/commit/$commit->{id}") %>">
191
+                <a class="ubar" href="<%= url_for("/$user/$project/commit/$commit->{id}") %>">
192 192
                   Browse code
193 193
                 </a>
194 194
               </div>
... ...
@@ -202,13 +202,13 @@
202 202
         <span class="left disable">&laquo; Newer</span>
203 203
       % } else {
204 204
         % my $newer_page = $page - 1;
205
-        <a class="left" href="<%= url_for("/$user/$repository/commits/$id?page=$newer_page") %>">&laquo; Newer</a>
205
+        <a class="left" href="<%= url_for("/$user/$project/commits/$id?page=$newer_page") %>">&laquo; Newer</a>
206 206
       % }
207 207
       % if ($commits_count < $page_count) {
208 208
         <span class="right disable">Older &raquo;</span>
209 209
       % } else {
210 210
         % my $older_page = $page + 1;
211
-        <a class="right" href="<%= url_for("/$user/$repository/commits/$id?page=$older_page") %>">Older &raquo;</a>
211
+        <a class="right" href="<%= url_for("/$user/$project/commits/$id?page=$older_page") %>">Older &raquo;</a>
212 212
       % }
213 213
     </div>
214 214
   </div>
+3 -3
templates/main/downloads.html.ep
... ...
@@ -1,7 +1,7 @@
1 1
 <%
2 2
 
3 3
   my $user = param('user');
4
-  my $repository = param('repository');
4
+  my $project = param('project');
5 5
 
6 6
   my $default_branch = 'master';
7 7
 %>
... ...
@@ -44,8 +44,8 @@
44 44
       }
45 45
     % end
46 46
     <div class="download">
47
-      <a href="<%= url_for("/$user/$repository/archive/$default_branch.zip") %>">Download as zip</a>
48
-      <a href="<%= url_for("/$user/$repository/archive/$default_branch.tar.gz") %>">Download as tar.gz</a>
47
+      <a href="<%= url_for("/$user/$project/archive/$default_branch.zip") %>">Download as zip</a>
48
+      <a href="<%= url_for("/$user/$project/archive/$default_branch.tar.gz") %>">Download as tar.gz</a>
49 49
     </div>
50 50
   </div>
51 51
   %= include '/include/footer';
+9 -9
templates/main/repository.html.ep → templates/main/project.html.ep
... ...
@@ -5,7 +5,7 @@
5 5
   
6 6
   # Parameters
7 7
   my $user = param('user');
8
-  my $repository = param('repository');
8
+  my $project = param('project');
9 9
   my $id_dir ||= param('id_dir') || 'master/';
10 10
 
11 11
   # API
... ...
@@ -14,7 +14,7 @@
14 14
   # Parameters
15 15
   my $root_ns = $api->root_ns(config->{root});
16 16
   
17
-  my $rep_ns = "$root_ns/$user/$repository.git";
17
+  my $rep_ns = "$root_ns/$user/$project.git";
18 18
   my $rep = "/$rep_ns";
19 19
   my $home_ns = $api->dirname($rep_ns);
20 20
   my $home = "/$home_ns";
... ...
@@ -43,7 +43,7 @@
43 43
   my $trees = $api->trees($rep, $tid, $ref);
44 44
   
45 45
   # Repository description
46
-  my $desc = $git->repository_description($rep);
46
+  my $desc = $git->project_description($rep);
47 47
   
48 48
   # Commits number
49 49
   my $commits_number = $git->commits_number($rep, $ref);
... ...
@@ -54,7 +54,7 @@
54 54
   # Global variable
55 55
   stash(
56 56
     user => $user,
57
-    repository => $repository,
57
+    project => $project,
58 58
     rep_ns => $rep_ns,
59 59
     id => $id,
60 60
     commit => $commit,
... ...
@@ -62,7 +62,7 @@
62 62
     trees => $trees,
63 63
     dir => $dir,
64 64
     ref => $ref,
65
-    title => "$user/$repository"
65
+    title => "$user/$project"
66 66
   );
67 67
 %>
68 68
 
... ...
@@ -74,10 +74,10 @@
74 74
       
75 75
       // Repository URL
76 76
       var rep_url_bak_color = "#F5F5F5";
77
-      var http_rep_url = "<%= url_for("/$user/$repository.git")->to_abs %>";
77
+      var http_rep_url = "<%= url_for("/$user/$project.git")->to_abs %>";
78 78
       var ssh_rep_url
79 79
         = "<%= url_for("/$rep_ns")->to_abs->scheme('ssh')->userinfo($user)->port(config->{ssh_port}) %>";
80
-      var git_rep_url = "<%= url_for("/$user/$repository.git")->to_abs->scheme('git')->port('') %>";
80
+      var git_rep_url = "<%= url_for("/$user/$project.git")->to_abs->scheme('git')->port('') %>";
81 81
       $(".git_url_text").val(http_rep_url);
82 82
       $(".git_url_http").css("background-color", "darkgray");
83 83
       $(".git_url_http").on('click', function () {
... ...
@@ -232,10 +232,10 @@
232 232
         
233 233
     <div class="commit_number">
234 234
       <div class="commit_number_left">
235
-        <a href="<%= url_for %>"><%= $repository %></a>
235
+        <a href="<%= url_for %>"><%= $project %></a>
236 236
       </div>
237 237
       <div class="commit_number_right">
238
-        <a href="<%= url_for("/$user/$repository/commits/master") %>">
238
+        <a href="<%= url_for("/$user/$project/commits/master") %>">
239 239
           <%= $commits_number %> commits
240 240
         </a>
241 241
       </div>
+3 -3
templates/main/repositories.html.ep → templates/main/projects.html.ep
... ...
@@ -3,16 +3,16 @@
3 3
   my $user = param('user');
4 4
   
5 5
   # Repositories
6
-  my $reps = app->git->repositories("/$root/$user");
6
+  my $reps = app->git->projects("/$root/$user");
7 7
 %>
8 8
 
9 9
 % layout 'common';
10
-  %= include '/include/header', title => 'Repositories';
10
+  %= include '/include/header', title => 'Project';
11 11
   <table class="project_list">
12 12
     <a href="<%= url_for '/' %>">home</a> &gt;
13 13
     <%= $user %>
14 14
     <tr>
15
-      <th>Repository</th>
15
+      <th>Project</th>
16 16
       <th>Description</th>
17 17
       <th>Last Change</th>
18 18
       <th></th>
+2 -2
templates/main/raw.html.ep
... ...
@@ -3,11 +3,11 @@
3 3
   my $api = Gitprep::API->new($self);
4 4
   
5 5
   my $user = param('user');
6
-  my $repository = param('repository');
6
+  my $project = param('project');
7 7
   my $root_ns = $api->root_ns(config->{root});
8 8
   
9 9
   # Parameters
10
-  my $rep_ns = "$root_ns/$user/$repository.git";
10
+  my $rep_ns = "$root_ns/$user/$project.git";
11 11
   my $rep = "/$rep_ns";
12 12
   my $home_ns = $api->dirname($rep_ns);
13 13
   my $home = "/$home_ns";
+6 -6
templates/main/tags.html.ep
... ...
@@ -3,12 +3,12 @@
3 3
   my $api = Gitprep::API->new($self);
4 4
 
5 5
   my $user = param('user');
6
-  my $repository = param('repository');
6
+  my $project = param('project');
7 7
 
8 8
   my $root_ns = $api->root_ns(config->{root});
9 9
   
10 10
   # Parameters
11
-  my $project_ns = "$root_ns/$user/$repository.git";
11
+  my $project_ns = "$root_ns/$user/$project.git";
12 12
   my $project = "/$project_ns";
13 13
   my $home_ns = $api->dirname($project_ns);
14 14
   my $home = "/$home_ns";
... ...
@@ -110,7 +110,7 @@
110 110
         % my $name = $tag->{name};
111 111
         <div class="tag">
112 112
           <div class="top">
113
-            <a class="name ubar" href="<%= url_for("/$user/$repository/archive/$name.zip") %>" title ="<%= $name %>">
113
+            <a class="name ubar" href="<%= url_for("/$user/$project/archive/$name.zip") %>" title ="<%= $name %>">
114 114
               <%= "$name.zip" %>
115 115
             </a>
116 116
... ...
@@ -121,11 +121,11 @@
121 121
                 <%= $tag->{commit}{title_short} %>
122 122
               % }
123 123
             <span>
124
-            <a class="archive ubar" href="<%= url_for("/$user/$repository/archive/$name.zip") %>">ZIP</a>
125
-            <a class="archive ubar" href="<%= url_for("/$user/$repository/archive/$name.tar.gz") %>">TAR.GZ</a>
124
+            <a class="archive ubar" href="<%= url_for("/$user/$project/archive/$name.zip") %>">ZIP</a>
125
+            <a class="archive ubar" href="<%= url_for("/$user/$project/archive/$name.tar.gz") %>">TAR.GZ</a>
126 126
           </div>
127 127
           <div class="bottom">
128
-            <a class="commit ubar" href="<%= url_for("/$user/$repository/commit/$tag->{commit}{id}") %>"><%= substr($tag->{commit}{id}, 0, 10) %></a>
128
+            <a class="commit ubar" href="<%= url_for("/$user/$project/commit/$tag->{commit}{id}") %>"><%= substr($tag->{commit}{id}, 0, 10) %></a>
129 129
              · 
130 130
             <span class="uploaded">Uploaded <%= $tag->{commit}{age_string} %></span>
131 131
           </div>
+7 -7
templates/main/tree.html.ep
... ...
@@ -6,10 +6,10 @@
6 6
   
7 7
   # Parameters
8 8
   my $user = param('user');
9
-  my $repository = param('repository');
9
+  my $project = param('project');
10 10
   my $id_dir ||= param('id_dir') || 'master/';
11 11
   my $root_ns = $api->root_ns(config->{root});
12
-  my $rep_ns = "$root_ns/$user/$repository.git";
12
+  my $rep_ns = "$root_ns/$user/$project.git";
13 13
   my $rep = "/$rep_ns";
14 14
   my $home_ns = $api->dirname($rep_ns);
15 15
   my $home = "/$home_ns";
... ...
@@ -38,7 +38,7 @@
38 38
   my $trees = $api->trees($rep, $tid, $id, $dir);
39 39
   
40 40
   # Repository description
41
-  my $desc = $git->repository_description($rep);
41
+  my $desc = $git->project_description($rep);
42 42
   
43 43
   # Commits number
44 44
   my $commits_number = $git->commits_number($rep, $id);
... ...
@@ -49,7 +49,7 @@
49 49
   # Global variable
50 50
   stash(
51 51
     user => $user,
52
-    repository => $repository,
52
+    project => $project,
53 53
     rep_ns => $rep_ns,
54 54
     id => $id,
55 55
     commit => $commit,
... ...
@@ -57,7 +57,7 @@
57 57
     trees => $trees,
58 58
     dir => $dir,
59 59
     ref => $id,
60
-    title => "$repository/$dir at $id - $user/$repository"
60
+    title => "$project/$dir at $id - $user/$project"
61 61
   );
62 62
 %>
63 63
 
... ...
@@ -69,10 +69,10 @@
69 69
       
70 70
       // Repository URL
71 71
       var rep_url_bak_color = "#F5F5F5";
72
-      var http_rep_url = "<%= url_for("/$user/$repository.git")->to_abs %>";
72
+      var http_rep_url = "<%= url_for("/$user/$project.git")->to_abs %>";
73 73
       var ssh_rep_url
74 74
         = "<%= url_for("/$rep_ns")->to_abs->scheme('ssh')->userinfo($user)->port(config->{ssh_port}) %>";
75
-      var git_rep_url = "<%= url_for("/$user/$repository.git")->to_abs->scheme('git')->port('') %>";
75
+      var git_rep_url = "<%= url_for("/$user/$project.git")->to_abs->scheme('git')->port('') %>";
76 76
       $(".git_url_text").val(http_rep_url);
77 77
       $(".git_url_http").css("background-color", "darkgray");
78 78
       $(".git_url_http").on('click', function () {