Change everything round to be /ref/ instead of /commit/ as this makes more sense

diff --git a/lib/Gitalist/Controller/Fragment/Commit.pm b/lib/Gitalist/Controller/Fragment/Ref.pm
similarity index 96%
rename from lib/Gitalist/Controller/Fragment/Commit.pm
rename to lib/Gitalist/Controller/Fragment/Ref.pm
index ae1d3b2..310c12c 100644 (file)
--- a/lib/Gitalist/Controller/Fragment/Commit.pm
+++ b/lib/Gitalist/Controller/Fragment/Ref.pm
@@ -1,9 +1,9 @@
-package Gitalist::Controller::Fragment::Commit;
+package Gitalist::Controller::Fragment::Ref;
 use Moose;
 use namespace::autoclean;
 
 BEGIN { extends 'Gitalist::Controller' }
-with 'Gitalist::URIStructure::Commit';
+with 'Gitalist::URIStructure::Ref';
 
 sub base : Chained('/fragment/repository/find') PathPart('') CaptureArgs(0) {}
 

diff --git a/lib/Gitalist/Controller/Commit.pm b/lib/Gitalist/Controller/Ref.pm
similarity index 95%
rename from lib/Gitalist/Controller/Commit.pm
rename to lib/Gitalist/Controller/Ref.pm
index 1165bea..3abbf55 100644 (file)
--- a/lib/Gitalist/Controller/Commit.pm
+++ b/lib/Gitalist/Controller/Ref.pm
@@ -1,10 +1,10 @@
-package Gitalist::Controller::Commit;
+package Gitalist::Controller::Ref;
 
 use Moose;
 use namespace::autoclean;
 
 BEGIN { extends 'Gitalist::Controller' }
-with 'Gitalist::URIStructure::Commit';
+with 'Gitalist::URIStructure::Ref';
 
 sub base : Chained('/repository/find') PathPart('') CaptureArgs(0) {}
 

diff --git a/lib/Gitalist/URIStructure/Commit.pm b/lib/Gitalist/URIStructure/Ref.pm
similarity index 97%
rename from lib/Gitalist/URIStructure/Commit.pm
rename to lib/Gitalist/URIStructure/Ref.pm
index bf2d5ea..dae28c4 100644 (file)
--- a/lib/Gitalist/URIStructure/Commit.pm
+++ b/lib/Gitalist/URIStructure/Ref.pm
@@ -1,4 +1,4 @@
-package Gitalist::URIStructure::Commit;
+package Gitalist::URIStructure::Ref;
 use MooseX::MethodAttributes::Role;
 use Moose::Autobox;
 use namespace::autoclean;

diff --git a/root/_diff.tt2 b/root/_diff.tt2
index 34618bf..f67dcb6 100644 (file)
--- a/root/_diff.tt2
+++ b/root/_diff.tt2
@@ -2,8 +2,8 @@
 [% FOREACH item IN diff %]
 <div class='diff-head'>
  diff --git [%# FIXME %]
- <a href='[% c.uri_for_action("/commit/blob", [Repository.name, Commit.sha1], item.file) %]'>[% item.a %][% item %]</a>
- <a href='[% c.uri_for_action("/commit/blob", [Repository.name, Commit.sha1], item.file) %]'>[% item.b %]</a>
+ <a href='[% c.uri_for_action("//ref/blob", [Repository.name, Commit.sha1], item.file) %]'>[% item.a %][% item %]</a>
+ <a href='[% c.uri_for_action("//ref/blob", [Repository.name, Commit.sha1], item.file) %]'>[% item.b %]</a>
 </div>
 <div class='diff-index'>
  [% item.index %]

diff --git a/root/_diff_tree.tt2 b/root/_diff_tree.tt2
index afcc1db..0b1d8af 100644 (file)
--- a/root/_diff_tree.tt2
+++ b/root/_diff_tree.tt2
@@ -32,9 +32,9 @@
     %]
    </td>
    <td class='action-list'>
-     [% IF !line.is_new %]<a href="[% c.uri_for_action("/commit/diff", [Repository.name, Commit.sha1], line.file.to_path) %]">diff</a>[% END %]
-     <a href="[% c.uri_for_action("/commit/blob", [Repository.name, Commit.sha1], line.file.to_path) %]">blob</a>
-     [% IF !line.is_new %]<a href="[% c.uri_for("/commit/shortlog", [Repository.name, Commit.sha1], line.file.to_path) %]">history</a>[% END %]
+     [% IF !line.is_new %]<a href="[% c.uri_for_action("//ref/diff", [Repository.name, Commit.sha1], line.file.to_path) %]">diff</a>[% END %]
+     <a href="[% c.uri_for_action("//ref/blob", [Repository.name, Commit.sha1], line.file.to_path) %]">blob</a>
+     [% IF !line.is_new %]<a href="[% c.uri_for("//ref/shortlog", [Repository.name, Commit.sha1], line.file.to_path) %]">history</a>[% END %]
    </td>
   </tr>
   [% END %]

diff --git a/root/commit/diff_plain.tt2 b/root/commit/diff_plain.tt2
deleted file mode 100644 (file)
index 9473814..0000000
--- a/root/commit/diff_plain.tt2
+++ /dev/null
@@ -1,3 +0,0 @@
-<pre>
-[% subinclude('/fragment/commit/diff_plain', c.req.captures) %]
-</pre>

diff --git a/root/commit/history.tt2 b/root/commit/history.tt2
deleted file mode 100644 (file)
index e580ead..0000000
--- a/root/commit/history.tt2
+++ /dev/null
@@ -1,3 +0,0 @@
-[% INCLUDE 'nav/actions.tt2' object = commit %]
-
-[% subinclude('/fragment/commit/history', c.req.captures, c.req.args.to_path) %]

diff --git a/root/fragment/collectionofrepositories.tt2 b/root/fragment/collectionofrepositories.tt2
index 3f8d754..6062e24 100644 (file)
--- a/root/fragment/collectionofrepositories.tt2
+++ b/root/fragment/collectionofrepositories.tt2
@@ -9,7 +9,7 @@
     <td class="link"><a href="[% repos_link %]">summary</a>
        | <a href="[% c.uri_for_action('/repository/shortlog', [p.name]) %]">shortlog</a>
        | <a href="[% c.uri_for_action('/repository/longlog', [p.name]) %]">log</a>
-       | <a href="[% c.uri_for_action('/commit/tree', [p.name, 'HEAD']) %]">tree</a></td>
+       | <a href="[% c.uri_for_action('/ref/tree', [p.name, 'HEAD']) %]">tree</a></td>
 </tr>
   [% END %]
 </tbody>

diff --git a/root/fragment/commit/blame.tt2 b/root/fragment/ref/blame.tt2
similarity index 75%
rename from root/fragment/commit/blame.tt2
rename to root/fragment/ref/blame.tt2
index d5db5f6..47fc8f7 100644 (file)
--- a/root/fragment/commit/blame.tt2
+++ b/root/fragment/ref/blame.tt2
@@ -7,13 +7,13 @@
        styleinfo = " style='border-top: solid 3px #" _ linecolour _ ";'"; -%]
    <td nowrap class='author'[% styleinfo %]>[% info.commit.author %]</td>
    <td nowrap class='date'[% styleinfo %]>[% info.commit.author_dt.ymd %]</td>
-   <td nowrap class='commit-info chroma-hash'[% styleinfo %]><a title="[% info.commit.author %] on [% info.commit.author_dt %]" href='[% c.uri_for_action('/commit/commit', [Repository.name, info.commit.sha1]) %]'>[% linecolour %]</td>
+   <td nowrap class='commit-info chroma-hash'[% styleinfo %]><a title="[% info.commit.author %] on [% info.commit.author_dt %]" href='[% c.uri_for_action('/ref/commit', [Repository.name, info.commit.sha1]) %]'>[% linecolour %]</td>
      [%- ELSE -%]
      <td nowrap class='author'></td>
      <td nowrap class='date'></td>
      <td nowrap class='commit-info'></td>
      [%- END -%]
-   <td nowrap class='lineno' id='l[% info.meta.lineno %]' style='border-right: solid 3px #[% linecolour %]; border-left: solid 3px #[% linecolour %];'><tt><a href='[% c.uri_for_action('/commit/blame', [Repository.name, info.commit.sha1], filename.to_path ) %]#l[% info.meta.orig_lineno %]'>[% info.meta.lineno %]</a></tt></td>
+   <td nowrap class='lineno' id='l[% info.meta.lineno %]' style='border-right: solid 3px #[% linecolour %]; border-left: solid 3px #[% linecolour %];'><tt><a href='[% c.uri_for_action('/ref/blame', [Repository.name, info.commit.sha1], filename.to_path ) %]#l[% info.meta.orig_lineno %]'>[% info.meta.lineno %]</a></tt></td>
    <td nowrap class='data'><pre>[% blame_lines.${loop.index} %]</pre></td>
    [% lastsha1 = info.commit.sha1 %]
  </tr>

diff --git a/root/fragment/commit/blob.tt2 b/root/fragment/ref/blob.tt2
similarity index 100%
rename from root/fragment/commit/blob.tt2
rename to root/fragment/ref/blob.tt2

diff --git a/root/fragment/commit/commit.tt2 b/root/fragment/ref/commit.tt2
similarity index 79%
rename from root/fragment/commit/commit.tt2
rename to root/fragment/ref/commit.tt2
index c23283a..cc0ee50 100644 (file)
--- a/root/fragment/commit/commit.tt2
+++ b/root/fragment/ref/commit.tt2
@@ -16,14 +16,14 @@
     <dd>[% Commit.sha1 %]</dd>
    <dt>tree</dt>
     <dd>[% Commit.tree_sha1 %]
-       <span class='action-list'><a href="[% c.uri_for_action("/commit/tree", c.req.captures) %]">tree</a></span>
+       <span class='action-list'><a href="[% c.uri_for_action("/ref/tree", c.req.captures) %]">tree</a></span>
     </dd>
    [% FOREACH parent IN Commit.parents %]
    <dt>parent</dt>
     <dd>[% parent.sha1  %]
       <span class='action-list'>
-       <a href="[% c.uri_for_action('/commit/commit', [Repository.name, parent.sha1]) %]">commit</a>
-       <a href="[% c.uri_for_action('/commit/diff_fancy', [Repository.name, parent.sha1]) %]">diff</a>
+       <a href="[% c.uri_for_action('/ref/commit', [Repository.name, parent.sha1]) %]">commit</a>
+       <a href="[% c.uri_for_action('/ref/diff_fancy', [Repository.name, parent.sha1]) %]">diff</a>
       </span>
      </dd>
    [% END %]

diff --git a/root/fragment/commit/diff_fancy.tt2 b/root/fragment/ref/diff_fancy.tt2
similarity index 100%
rename from root/fragment/commit/diff_fancy.tt2
rename to root/fragment/ref/diff_fancy.tt2

diff --git a/root/fragment/commit/diff_plain.tt2 b/root/fragment/ref/diff_plain.tt2
similarity index 100%
rename from root/fragment/commit/diff_plain.tt2
rename to root/fragment/ref/diff_plain.tt2

diff --git a/root/fragment/commit/history.tt2 b/root/fragment/ref/history.tt2
similarity index 100%
rename from root/fragment/commit/history.tt2
rename to root/fragment/ref/history.tt2

diff --git a/root/fragment/commit/tree.tt2 b/root/fragment/ref/tree.tt2
similarity index 62%
rename from root/fragment/commit/tree.tt2
rename to root/fragment/ref/tree.tt2
index fc3c695..b3f7a69 100644 (file)
--- a/root/fragment/commit/tree.tt2
+++ b/root/fragment/ref/tree.tt2
@@ -19,7 +19,7 @@
    <td class='file-mode'>[% item.modestr %]</td>
    [%-
         action_type = item.type == 'tree' ? 'tree' : 'blob';
-        action_for_link = item.type == 'tree' ? '/commit/tree' : '/commit/blob';
+        action_for_link = item.type == 'tree' ? '/ref/tree' : '/ref/blob';
         blob_or_tree_link = c.uri_for_action(action_for_link, c.req.captures, c.req.args.to_path(item.file))
    -%]
    <td class='file-name'>
@@ -28,12 +28,12 @@
    <td class='action-list'>
      <a href="[% blob_or_tree_link %]">[% theact %]</a>
          [% IF item.type == 'blob' %]
-         <a href="[% c.uri_for_action('/commit/blob', c.req.captures, c.req.args.to_path(item.file)) %]">blob</a>
-         <a href="[% c.uri_for_action('/commit/blame', c.req.captures, c.req.args.to_path(item.file)) %]">blame</a>
+         <a href="[% c.uri_for_action('/ref/blob', c.req.captures, c.req.args.to_path(item.file)) %]">blob</a>
+         <a href="[% c.uri_for_action('/ref/blame', c.req.captures, c.req.args.to_path(item.file)) %]">blame</a>
          [% END %]
-     <a href="[% c.uri_for_action('/commit/history', c.req.captures, c.req.args.to_path(item.file)) %]">history</a>
+     <a href="[% c.uri_for_action('/ref/history', c.req.captures, c.req.args.to_path(item.file)) %]">history</a>
      [% IF item.type == 'blob' %]
-     <a href="[% c.uri_for_action('/commit/raw', c.req.captures, c.req.args.to_path(item.file)) %]">raw</a>
+     <a href="[% c.uri_for_action('/ref/raw', c.req.captures, c.req.args.to_path(item.file)) %]">raw</a>
      [% END %]
    </td>
   </tr>

diff --git a/root/fragment/repository/heads.tt2 b/root/fragment/repository/heads.tt2
index a2ca50e..a05a2ed 100644 (file)
--- a/root/fragment/repository/heads.tt2
+++ b/root/fragment/repository/heads.tt2
@@ -21,9 +21,9 @@
    <td class='time-since' title='[% head.last_change %]'>[% time_since(head.last_change) %]</td>
    <td class='head[% head.sha1 == HEAD ? ' current' : '' %]'>[% head.name %]</td>
    <td class='action-list'>[%# FIXME %]
-     <a href="[% c.uri_for_action('/commit/shortlog', [Repository.name, head.name]) %]">shortlog</a>
-     <a href="[% c.uri_for_action('/commit/longlog', [Repository.name, head.name]) %]">log</a>
-     <a href="[% c.uri_for_action('/commit/tree', [Repository.name, head.name]) %]">tree</a>
+     <a href="[% c.uri_for_action('/ref/shortlog', [Repository.name, head.name]) %]">shortlog</a>
+     <a href="[% c.uri_for_action('/ref/longlog', [Repository.name, head.name]) %]">log</a>
+     <a href="[% c.uri_for_action('/ref/tree', [Repository.name, head.name]) %]">tree</a>
    </td>
   </tr>
  [% END %]

diff --git a/root/fragment/repository/longlog.tt2 b/root/fragment/repository/longlog.tt2
index adf9557..c4f8cec 100644 (file)
--- a/root/fragment/repository/longlog.tt2
+++ b/root/fragment/repository/longlog.tt2
@@ -22,9 +22,9 @@
        </table>
        <span class="time-since">[% time_since(line.authored_time) %]</span>
        <div class="action-list">
-        <a href="[% c.uri_for_action("/commit/commit", [Repository.name, line.sha1]) %]">commit</a>
-       | <a href="[% c.uri_for_action("/commit/diff_fancy", [Repository.name, line.sha1]) %]">commitdiff</a>
-       | <a href="[% c.uri_for_action("/commit/tree", [Repository.name, line.sha1]) %]">tree</a>
+        <a href="[% c.uri_for_action("/ref/commit", [Repository.name, line.sha1]) %]">commit</a>
+       | <a href="[% c.uri_for_action("/ref/diff_fancy", [Repository.name, line.sha1]) %]">commitdiff</a>
+       | <a href="[% c.uri_for_action("/ref/tree", [Repository.name, line.sha1]) %]">tree</a>
        </div>
       </div>
     </div>

diff --git a/root/fragment/repository/shortlog.tt2 b/root/fragment/repository/shortlog.tt2
index 6008dbd..c6549c4 100644 (file)
--- a/root/fragment/repository/shortlog.tt2
+++ b/root/fragment/repository/shortlog.tt2
@@ -31,9 +31,9 @@
      [%# INCLUDE '_refs.tt2' object = line %]
    </td>
    <td class='action-list'>
-     <a href="[% c.uri_for_action("/commit/commit", [Repository.name, line.sha1]) %]">commit</a>
-     <a href="[% c.uri_for_action("/commit/diff_fancy", [Repository.name, line.sha1]) %]">commitdiff</a>
-     <a href="[% c.uri_for_action("/commit/tree", [Repository.name, line.sha1]) %]">tree</a>
+     <a href="[% c.uri_for_action("/ref/commit", [Repository.name, line.sha1]) %]">commit</a>
+     <a href="[% c.uri_for_action("/ref/diff_fancy", [Repository.name, line.sha1]) %]">commitdiff</a>
+     <a href="[% c.uri_for_action("/ref/tree", [Repository.name, line.sha1]) %]">tree</a>
    </td>
   </tr>
  [% END %]

diff --git a/root/nav/actions.tt2 b/root/nav/actions.tt2
index aa3fa0e..2778685 100644 (file)
--- a/root/nav/actions.tt2
+++ b/root/nav/actions.tt2
@@ -5,16 +5,16 @@
     <a href="[% c.uri_for_action('/repository/log', [c.req.captures.0]) %]">log</a>
     [% IF Commit %]
         &sect;
-        <a href="[% c.uri_for_action('/commit/commit', [c.req.captures.0, Commit.sha1]) %]">commit</a> &bull;
-        <a href="[% c.uri_for_action('/commit/diff_fancy', [c.req.captures.0, Commit.sha1]) %]">commitdiff</a> &bull;
-        <a href="[% c.uri_for_action('/commit/tree', [c.req.captures.0, Commit.sha1]) %]">tree</a>
+        <a href="[% c.uri_for_action('/ref/commit', [c.req.captures.0, Commit.sha1]) %]">commit</a> &bull;
+        <a href="[% c.uri_for_action('/ref/diff_fancy', [c.req.captures.0, Commit.sha1]) %]">commitdiff</a> &bull;
+        <a href="[% c.uri_for_action('/ref/tree', [c.req.captures.0, Commit.sha1]) %]">tree</a>
     [% END %]
     [% IF filename %]
     &sect;
-    <a href="[% c.uri_for_action('/commit/blob', [c.req.captures.0, Commit.sha1], filename) %]">blob</a> &bull;
-    <a href="[% c.uri_for_action('/commit/raw', [c.req.captures.0, Commit.sha1], filename) %]">raw</a> &bull;
-    <a href="[% c.uri_for_action('/commit/blame', [c.req.captures.0, Commit.sha1], filename)  %]">blame</a> &bull;
-    <a href="[% c.uri_for_action('/commit/shortlog', [c.req.captures.0, Commit.sha1], filename)  %]">history</a> &bull;
+    <a href="[% c.uri_for_action('/ref/blob', [c.req.captures.0, Commit.sha1], filename) %]">blob</a> &bull;
+    <a href="[% c.uri_for_action('/ref/raw', [c.req.captures.0, Commit.sha1], filename) %]">raw</a> &bull;
+    <a href="[% c.uri_for_action('/ref/blame', [c.req.captures.0, Commit.sha1], filename)  %]">blame</a> &bull;
+    <a href="[% c.uri_for_action('/ref/shortlog', [c.req.captures.0, Commit.sha1], filename)  %]">history</a> &bull;
     <a href="[% c.uri_for(c.controller.action_for('commit'), [c.req.captures.0, Repository.head_hash]) %]">HEAD</a>
     [% END %]
     <div class='chroma-hash'>[% INCLUDE 'inc/chroma_hash.tt2' sha1 = object.sha1 %]</div>

diff --git a/root/nav/path.tt2 b/root/nav/path.tt2
index de01987..96c85de 100644 (file)
--- a/root/nav/path.tt2
+++ b/root/nav/path.tt2
@@ -1,7 +1,7 @@
 <div class='path'>
- <a href="[% c.uri_for_action("/commit/tree", [Repository.name, Commit.sha1]) %]">[% Repository.name %]</a>
+ <a href="[% c.uri_for_action("/ref/tree", [Repository.name, Commit.sha1]) %]">[% Repository.name %]</a>
  [% FOREACH part IN filename.split('/') %]
   [% path = loop.first ? part : path _ '/' _ part %]
-  / <a href="[% action_name = loop.last ? '/commit/blob' : '/commit/tree'; c.uri_for_action(action_name, [Repository.name,Commit.sha1], path.to_path ) %]">[% part %]</a>
+  / <a href="[% action_name = loop.last ? '/ref/blob' : '/commit/tree'; c.uri_for_action(action_name, [Repository.name,Commit.sha1], path.to_path ) %]">[% part %]</a>
  [% END %]
 </div>

diff --git a/root/nav/search.tt2 b/root/nav/search.tt2
index b0a7b59..868fc52 100644 (file)
--- a/root/nav/search.tt2
+++ b/root/nav/search.tt2
@@ -14,4 +14,4 @@
   <span title="Extended regular expression"><label><input type="checkbox" name="regexp" value="1">re</label></span>
   </form>
 </div>
-[% END %]
\ No newline at end of file
+[% END %]

diff --git a/root/commit/blame.tt2 b/root/ref/blame.tt2
similarity index 87%
rename from root/commit/blame.tt2
rename to root/ref/blame.tt2
index 868b73e..d1a25a4 100644 (file)
--- a/root/commit/blame.tt2
+++ b/root/ref/blame.tt2
@@ -29,7 +29,7 @@
  </tfoot>
 
  <tbody>
- [% subinclude('/fragment/commit/blame', c.req.captures, c.req.arguments.to_path ) %]
+ [% subinclude('/fragment/ref/blame', c.req.captures, c.req.arguments.to_path ) %]
  </tbody>
 </table>
 </div>

diff --git a/root/commit/blob.tt2 b/root/ref/blob.tt2
similarity index 73%
rename from root/commit/blob.tt2
rename to root/ref/blob.tt2
index 994b9d7..29a3b7b 100644 (file)
--- a/root/commit/blob.tt2
+++ b/root/ref/blob.tt2
@@ -9,6 +9,6 @@
   [% END %]
   [% INCLUDE 'nav/path.tt2' %]
   <div>
-   <pre class='blob'>[% subinclude('/fragment/commit/blob', c.req.captures, c.req.args.to_path) %]</pre>
+   <pre class='blob'>[% subinclude('/fragment/ref/blob', c.req.captures, c.req.args.to_path) %]</pre>
   </div>
 </div>

diff --git a/root/commit/commit.tt2 b/root/ref/commit.tt2
similarity index 55%
rename from root/commit/commit.tt2
rename to root/ref/commit.tt2
index 20b1cca..423d13f 100644 (file)
--- a/root/commit/commit.tt2
+++ b/root/ref/commit.tt2
@@ -1,5 +1,5 @@
 [% INCLUDE 'nav/actions.tt2' object = commit %]
 
 <div class='content'>
-  [% subinclude('/fragment/commit/commit', c.req.captures) %]
+  [% subinclude('/fragment/ref/commit', c.req.captures) %]
 </div>

diff --git a/root/commit/diff_fancy.tt2 b/root/ref/diff_fancy.tt2
similarity index 82%
rename from root/commit/diff_fancy.tt2
rename to root/ref/diff_fancy.tt2
index a2ce0bd..bdecf06 100644 (file)
--- a/root/commit/diff_fancy.tt2
+++ b/root/ref/diff_fancy.tt2
@@ -10,5 +10,5 @@
   </div>
 
 
-  [% subinclude('/fragment/commit/diff_fancy', c.req.captures c.req.args.to_path) %]
+  [% subinclude('/fragment/ref/diff_fancy', c.req.captures c.req.args.to_path) %]
 </div>

diff --git a/root/ref/diff_plain.tt2 b/root/ref/diff_plain.tt2
new file mode 100644 (file)
index 0000000..2d01f98
--- /dev/null
+++ b/root/ref/diff_plain.tt2
@@ -0,0 +1,3 @@
+<pre>
+[% subinclude('/fragment/ref/diff_plain', c.req.captures) %]
+</pre>

diff --git a/root/ref/history.tt2 b/root/ref/history.tt2
new file mode 100644 (file)
index 0000000..3ee6374
--- /dev/null
+++ b/root/ref/history.tt2
@@ -0,0 +1,3 @@
+[% INCLUDE 'nav/actions.tt2' object = commit %]
+
+[% subinclude('/fragment/ref/history', c.req.captures, c.req.args.to_path) %]

diff --git a/root/commit/shortlog.tt2 b/root/ref/shortlog.tt2
similarity index 100%
rename from root/commit/shortlog.tt2
rename to root/ref/shortlog.tt2

diff --git a/root/commit/tree.tt2 b/root/ref/tree.tt2
similarity index 81%
rename from root/commit/tree.tt2
rename to root/ref/tree.tt2
index 806fced..4c055f6 100644 (file)
--- a/root/commit/tree.tt2
+++ b/root/ref/tree.tt2
@@ -10,6 +10,6 @@
       INCLUDE 'nav/path.tt2' filename = path;
     END;
 
-    subinclude('/fragment/commit/tree', c.req.captures);
+    subinclude('/fragment/ref/tree', c.req.captures);
   %]
 </div>

diff --git a/root/repository/search.tt2 b/root/repository/search.tt2
index 9c003ce..2f43c79 100644 (file)
--- a/root/repository/search.tt2
+++ b/root/repository/search.tt2
@@ -3,7 +3,7 @@
   [%# XXX Nabbed the HTML below from gitweb's log action. %]
   [% FOREACH result IN results %]
   <div class="header">
-   <a class="title" href="[% c.uri_for_action('/commit/commit', [ Repository.name, result.sha1 ]) %]">
+   <a class="title" href="[% c.uri_for_action('/ref/commit', [ Repository.name, result.sha1 ]) %]">
     <span class="age">[% result.authored_time %]</span>
     [% short_cmt(result.comment) | html %]
    </a>
@@ -11,9 +11,9 @@
 
   <div class="title_text">
    <div class="log_link">
-     <a href="[% c.uri_for_action('/commit/commit', [Repository.name, result.sha1]) %]">commit</a>
-   | <a href="[% c.uri_for_action('/commit/diff_fancy', [Repository.name, result.sha1]) %]">commitdiff</a>
-   | <a href="[% c.uri_for_action('/commit/tree', [Repository.name, result.tree_sha1]); %][%# hb=line.sha1 %]">tree</a>
+     <a href="[% c.uri_for_action('/ref/commit', [Repository.name, result.sha1]) %]">commit</a>
+   | <a href="[% c.uri_for_action('/ref/diff_fancy', [Repository.name, result.sha1]) %]">commitdiff</a>
+   | <a href="[% c.uri_for_action('/ref/tree', [Repository.name, result.tree_sha1]); %][%# hb=line.sha1 %]">tree</a>
    </div>
    <i>[% result.author.name | html %] [% line.authored_time %]</i>
   </div>

diff --git a/root/search.tt2 b/root/search.tt2
index a9437ed..06d845c 100644 (file)
--- a/root/search.tt2
+++ b/root/search.tt2
@@ -1 +1 @@
-search
\ No newline at end of file
+search