From: Tomas Doran Date: Sun, 17 Jan 2010 22:20:11 +0000 (+0000) Subject: Template cleanups. Move _template to inc/template, remove currently spurious includes... X-Git-Tag: 0.000006_01~1^2~97 X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=7e8a7295fe9bf3bd459a25abcb511f8db8393e86;p=catagits%2FGitalist.git Template cleanups. Move _template to inc/template, remove currently spurious includes, rename the wrapper page. --- diff --git a/lib/Gitalist/View/Default.pm b/lib/Gitalist/View/Default.pm index d89b1bb..4bc7be6 100644 --- a/lib/Gitalist/View/Default.pm +++ b/lib/Gitalist/View/Default.pm @@ -9,7 +9,7 @@ use Template::Plugin::Cycle; __PACKAGE__->config( TEMPLATE_EXTENSION => '.tt2', - WRAPPER => 'default.tt2', + WRAPPER => 'wrapper.tt2', subinclude_plugin => 'SubRequest', ); diff --git a/root/_history.tt2 b/root/_history.tt2 index 83f09e1..48e926d 100644 --- a/root/_history.tt2 +++ b/root/_history.tt2 @@ -22,7 +22,7 @@ [% FOREACH line IN log_lines %] - [% INCLUDE '_chroma_hash.tt2' sha1 = line.sha1.substr(0, 7) %] + [% INCLUDE 'inc/chroma_hash.tt2' sha1 = line.sha1.substr(0, 7) %] [% time_since(line.authored_time) %] [% line.author.name | html %] diff --git a/root/_shortlog.tt2 b/root/_shortlog.tt2 deleted file mode 100644 index 19caaf1..0000000 --- a/root/_shortlog.tt2 +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - [% FOREACH line IN log_lines %] - - - - - - - - [% END %] - -
sha1timeauthormessageactions
sha1timeauthormessageactions
[% INCLUDE '_chroma_hash.tt2' sha1 = line.sha1.substr(0, 7) %][% time_since(line.authored_time) %][% line.author.name | html %] - [% short_cmt(line.comment) | html %] - [% INCLUDE '_refs.tt2' object = line %] - - commit - commitdiff - tree -
diff --git a/root/fragment/repository/heads.tt2 b/root/fragment/repository/heads.tt2 index 0eb77e7..e2e3329 100644 --- a/root/fragment/repository/heads.tt2 +++ b/root/fragment/repository/heads.tt2 @@ -19,7 +19,7 @@ [% FOREACH head IN heads %] - [% INCLUDE '_chroma_hash.tt2' sha1 = head.sha1.substr(0,7) %] + [% INCLUDE 'inc/chroma_hash.tt2' sha1 = head.sha1.substr(0,7) %] [% time_since(head.last_change) %] [% head.name %] diff --git a/root/fragment/repository/log.tt2 b/root/fragment/repository/log.tt2 index aeb1b60..7170be7 100644 --- a/root/fragment/repository/log.tt2 +++ b/root/fragment/repository/log.tt2 @@ -4,7 +4,7 @@
[% message = line.comment | html; message.replace("\n", "
") %] -
[% INCLUDE '_chroma_hash.tt2' sha1 = line.sha1 %]
+
[% INCLUDE 'inc/chroma_hash.tt2' sha1 = line.sha1 %]
diff --git a/root/fragment/repository/shortlog.tt2 b/root/fragment/repository/shortlog.tt2 index c1c7383..c31bb45 100644 --- a/root/fragment/repository/shortlog.tt2 +++ b/root/fragment/repository/shortlog.tt2 @@ -1,7 +1,46 @@
[% - INCLUDE '_log_pager.tt2'; - INCLUDE '_shortlog.tt2'; - INCLUDE '_log_pager.tt2'; + INCLUDE 'inc/log_pager.tt2'; +%]
+ + + + + + + + + + + + + + + + + + + + + + [% FOREACH line IN log_lines %] + + + + + + + + [% END %] + +
sha1timeauthormessageactions
sha1timeauthormessageactions
[% INCLUDE 'inc/chroma_hash.tt2' sha1 = line.sha1.substr(0, 7) %][% time_since(line.authored_time) %][% line.author.name | html %] + [% short_cmt(line.comment) | html %] + [% INCLUDE '_refs.tt2' object = line %] + + commit + commitdiff + tree +
[% + INCLUDE 'inc/log_pager.tt2'; %]
diff --git a/root/_chroma_hash.tt2 b/root/inc/chroma_hash.tt2 similarity index 100% rename from root/_chroma_hash.tt2 rename to root/inc/chroma_hash.tt2 diff --git a/root/_log_pager.tt2 b/root/inc/log_pager.tt2 similarity index 100% rename from root/_log_pager.tt2 rename to root/inc/log_pager.tt2 diff --git a/root/log.tt2 b/root/log.tt2 deleted file mode 100644 index 3e3908a..0000000 --- a/root/log.tt2 +++ /dev/null @@ -1,35 +0,0 @@ -[% INCLUDE 'nav/actions.tt2' object = commit %] - -
- [% INCLUDE '_log_pager.tt2' %] - -
- [% FOREACH line IN log_lines %] -
-
- [% message = line.comment | html; - message.replace("\n", "
") %] -
[% INCLUDE '_chroma_hash.tt2' sha1 = line.sha1 %]
-
-
- - - - [% IF line.author.name != line.committer.name %] - - - [% END %] -
author[% line.author.name | html %]
authored time[% line.authored_time %]
committer[% line.committer.name | html %]
committered time[% line.committed_time %]
- [% time_since(line.authored_time) %] -
- commit - | commitdiff - | tree -
-
-
- [% END %] -
- - [% INCLUDE '_log_pager.tt2' %] -
diff --git a/root/nav/actions.tt2 b/root/nav/actions.tt2 index 52ca63e..21fb026 100644 --- a/root/nav/actions.tt2 +++ b/root/nav/actions.tt2 @@ -16,5 +16,5 @@ history • HEAD [% END %] -
[% INCLUDE '_chroma_hash.tt2' sha1 = object.sha1 %]
+
[% INCLUDE 'inc/chroma_hash.tt2' sha1 = object.sha1 %]
diff --git a/root/shortlog.tt2 b/root/shortlog.tt2 deleted file mode 100644 index 6f9636e..0000000 --- a/root/shortlog.tt2 +++ /dev/null @@ -1,9 +0,0 @@ -[% INCLUDE 'nav/actions.tt2' object = commit %] - -
-[% - INCLUDE '_log_pager.tt2'; - INCLUDE '_shortlog.tt2'; - INCLUDE '_log_pager.tt2'; -%] -
diff --git a/root/default.tt2 b/root/wrapper.tt2 similarity index 100% rename from root/default.tt2 rename to root/wrapper.tt2