X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=root%2Fwrapper.tt2;h=e4a90571d4244987ddd7afe0e73eacc42ad4dece;hb=b4384d547ff095b99eeb3004655bce43de51dbc5;hp=27abff87050b8b1589253ef23c448c65fe0e01eb;hpb=71eba67cc0f4d557d942d46911f503cca73bc77f;p=catagits%2FGitalist.git diff --git a/root/wrapper.tt2 b/root/wrapper.tt2 index 27abff8..e4a9057 100755 --- a/root/wrapper.tt2 +++ b/root/wrapper.tt2 @@ -1,7 +1,6 @@ [%- IF no_wrapper || template.name.match('\.(css|js|txt)'); content; ELSE; -%] - - + + @@ -20,33 +19,9 @@ [% INCLUDE '_header_feeds.tt2' %] - - + + + @@ -57,13 +32,16 @@

- [% IF Repository; INCLUDE 'nav/search.tt2'; ELSE; %] - - + [% IF Repository; INCLUDE 'nav/search.tt2'; ELSE; %] + + [% END %]

@@ -74,7 +52,7 @@ [% IF c.req.captures.size == 1; SET path = 'repository'; ELSE; SET path = 'ref'; END %]

Tree + Tree Long log @@ -82,15 +60,16 @@

- [%# FIXME: convert to c.uri_for_action #%] - Branches - - - [% FOREACH branch_head IN Repository.heads %] - - [% END %] + [%- FOREACH branch IN Repository.heads -%] + + [% IF loop.count == c.config.paging.summary %] + + [% LAST %] + [% END %] + [% END -%]

@@ -102,35 +81,64 @@ Home [%- IF Repository %] - / [% Repository.name %] + / [% Repository.name %] [%- END %] / [%- IF Repository %] [%# FIXME: output branch name in a nicer way!!! #%] - [% FOREACH branch_head IN Repository.heads %] - [% IF c.req.path.search(branch_head.name) %] + [%- FOREACH branch_head IN Repository.heads %] + [%- IF c.req.path.search(branch_head.name) %] [% branch_head.name %] / - [% END %] - [% END %] + [% END -%] + [% END -%] [%- END %] + [%- - c.action.name - .replace("_"," ") - .replace("log", " log") - .replace("fancy","") - .replace("index","Repositories") - FILTER ucfirst + + #FIXME on a history view of a folder, don't show extra actions in dropdown + SET on_file_page = 1; + + SET actions_list = { + "blob" => 1, + "raw" => 1, + "blame" => 1, + "history" => 1, + }; + + SET action_name = c.action.name + .replace("_"," ") + .replace("log", " log") + .replace("fancy","") + .replace("index","Repositories"); + action_name_ucfirst = action_name FILTER ucfirst; + IF actions_list.$action_name && on_file_page; + '' _ action_name_ucfirst _ ''; + ELSE; + action_name_ucfirst; + END; + -%] - - - + + [%- + IF actions_list.$action_name; + '

' _ action_output _ '

'; + END; + -%] + - +

@@ -147,7 +155,7 @@

[% IF Repository; Repository.description | html; END; %]

[% IF Repository; Repository.description | html IF Repository.description != "Unnamed repository; edit this file to name it for gitweb." ; END; %]

@@ -168,12 +176,27 @@ [% USE Dumper %]

 	[% Repository.path %]
-	[%# Dumper.dump(c.req.arguments.0) %]
+	[% Dumper.dump(c.req.args) %]

+[% + # A bit of smoke and mirrors to get the /repository/shortlog URIs working + cur_act = '' _ c.action; + cur_uri = cur_act.match("log") || cur_act.match("^ref") + ? '/ref/' _ cur_act.replace("^(repository|ref)/", '') + : cur_act; + # XXX I just want lists! + IF c.req.args.size > 0; + c.uri_for_action(cur_uri, [Repository.name, 'HEAD'], c.req.args.0); + ELSE; + c.uri_for_action(cur_uri, [Repository.name, 'HEAD']); + END; +%] +[% c.uri_for_action('/repository/heads', [Repository.name]) %] + [%- END -%]