From: Foxtons Web Design Date: Thu, 25 Mar 2010 12:20:37 +0000 (+0000) Subject: final design tidy up - handing over now X-Git-Tag: 0.000006_01~1^2~1^2~4 X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=189f3b00a6f99a59268fd89d67d7f5fde9b0e519;p=catagits%2FGitalist.git final design tidy up - handing over now --- diff --git a/root/fragment/ref/blame.tt2 b/root/fragment/ref/blame.tt2 old mode 100644 new mode 100755 index 47fc8f7..af465d4 --- a/root/fragment/ref/blame.tt2 +++ b/root/fragment/ref/blame.tt2 @@ -7,14 +7,15 @@ styleinfo = " style='border-top: solid 3px #" _ linecolour _ ";'"; -%] [% info.commit.author %] [% info.commit.author_dt.ymd %] - [% linecolour %] + [% INCLUDE 'inc/chroma_hash.tt2' sha1 = info.commit.sha1.substr(0, 7) %] +[%# linecolour %] [%- ELSE -%] [%- END -%] [% info.meta.lineno %] - 
[% blame_lines.${loop.index} %]
+ 
[% blame_lines.${loop.index} | html %]
[% lastsha1 = info.commit.sha1 %] [% END %] diff --git a/root/fragment/ref/diff_fancy.tt2 b/root/fragment/ref/diff_fancy.tt2 index 9554934..7cba200 100755 --- a/root/fragment/ref/diff_fancy.tt2 +++ b/root/fragment/ref/diff_fancy.tt2 @@ -7,7 +7,7 @@ INCLUDE '_diff.tt2'; ELSE %] -
+

[% IF commit && commit.parents > 1; 'Trivial merge'; @@ -15,6 +15,6 @@ 'No differences found'; END; %] -

+

[% END %] diff --git a/root/fragment/ref/history.tt2 b/root/fragment/ref/history.tt2 index 868a4de..92b22b1 100755 --- a/root/fragment/ref/history.tt2 +++ b/root/fragment/ref/history.tt2 @@ -24,13 +24,13 @@ [% line.author.name | html %] [% IF filetype == 'tree' %] - blob + blob [% ELSIF filetype == 'blob' %] - blob + blob [% END %] - commitdiff + commitdiff [% IF filetype == 'blob' %] - diff to current + diff to current [% END %] diff --git a/root/fragment/repository/heads.tt2 b/root/fragment/repository/heads.tt2 index 2ce0339..69c5766 100755 --- a/root/fragment/repository/heads.tt2 +++ b/root/fragment/repository/heads.tt2 @@ -1,16 +1,15 @@ [% BLOCK repository_heads_headfoot %] [% SET cell = type == 'head' ? 'th' : 'td' %] - + <[% cell %]>HEAD - <[% cell %]>age - <[% cell %]>branch - <[% cell %]>actions + <[% cell %]>Last change + <[% cell %]>Branch + <[% cell %]>Actions [% END %] + [% PROCESS repository_heads_headfoot type = 'head' %] - [% PROCESS repository_heads_headfoot type = 'foot' %] - [% FOREACH head IN heads %] @@ -18,9 +17,9 @@ [% END %] diff --git a/root/fragment/repository/longlog.tt2 b/root/fragment/repository/longlog.tt2 index aefca13..33c9b88 100755 --- a/root/fragment/repository/longlog.tt2 +++ b/root/fragment/repository/longlog.tt2 @@ -1 +1,5 @@ -[% INCLUDE 'fragment/repository/shortlog.tt2' longlogformat = 1 %] \ No newline at end of file +[% INCLUDE 'fragment/repository/shortlog.tt2' longlogformat = 1 %] + + +

Branches

+[% subinclude('/fragment/repository/heads', c.req.captures) %] \ No newline at end of file diff --git a/root/ref/blame.tt2 b/root/ref/blame.tt2 old mode 100644 new mode 100755 index 009b2d3..f943636 --- a/root/ref/blame.tt2 +++ b/root/ref/blame.tt2 @@ -1,36 +1,37 @@ [%- BLOCK blame_table_headfoot %] - - - - - + + + [% END -%] + [%- INCLUDE inc/syntax_highlight_css.tt2 -%] -
-[% IF object.type == 'commit' %] -
[% short_cmt(head.comment) %]
-[% END %] -[% INCLUDE 'nav/path.tt2' %] + + +
-
[% time_since(head.last_change) %] [% head.name %] [%# FIXME %] - shortlog - log - tree + shortlog + log + tree
authordatesha1dataAuthorDateID (sha1) + + Data
+
[% PROCESS blame_table_headfoot %] - - [% PROCESS blame_table_headfoot %] - - [% subinclude('/fragment/ref/blame', c.req.captures, c.req.arguments.to_path ) %]
- +

[% INCLUDE 'nav/path.tt2' %]

+ + +[% IF object.type == 'commit' %] +
[% short_cmt(head.comment) %]
+[% END %] + diff --git a/root/repository/shortlog.tt2 b/root/repository/shortlog.tt2 old mode 100644 new mode 100755 index a0c9f4b..33aa93c --- a/root/repository/shortlog.tt2 +++ b/root/repository/shortlog.tt2 @@ -1 +1,4 @@ [% subinclude('/fragment/' _ c.action, c.req.captures, c.req.parameters) %] + +

Branches

+[% subinclude('/fragment/repository/heads', c.req.captures) %] \ No newline at end of file diff --git a/root/repository/summary.tt2 b/root/repository/summary.tt2 index 9554c0f..a0646e8 100755 --- a/root/repository/summary.tt2 +++ b/root/repository/summary.tt2 @@ -1,15 +1,15 @@ -
+ [% subinclude('/fragment/repository/shortlog', c.req.captures) %] -

branches

+

Branches

[% subinclude('/fragment/repository/heads', c.req.captures) %] [% IF Repository.tags.size > 0 %] -

tags

+

Tags

[% subinclude('/fragment/repository/tags', c.req.captures) %] [% END %] -
+ diff --git a/root/static/css/core.css b/root/static/css/core.css index ce3442d..1018603 100755 --- a/root/static/css/core.css +++ b/root/static/css/core.css @@ -52,11 +52,14 @@ a img{ float:right; margin-right:15px; } - +#footer_holder{ + margin-bottom:100px; +} #footer p{ margin-left:15px; } #debug_holder{ + display:none; clear:both; padding-top:30px; margin:30px 0; @@ -182,6 +185,9 @@ a.commit{ a.diff{ background:transparent url(/static/i/icons/diff.png) no-repeat; } +a.diffcurrent{ + background:transparent url(/static/i/icons/diffcurrent.png) no-repeat; +} a.tree{ background:transparent url(/static/i/icons/tree.png) no-repeat; } @@ -213,7 +219,12 @@ a.raw{ padding-top:2px; float:left; } - +.msg{ + padding:5px 10px 5px 35px; + background:#f0f0f0 url(/static/i/icons/attention.png) no-repeat 10px center; + border:1px solid #ddd; + margin:30px 15px; +} a.rss_logo { float: right; @@ -290,6 +301,9 @@ th a{ tr.invert{ background-color:#f0f0f0; } +tr.header{ + background-color:#666; +} .sha1{ width:80px; } @@ -366,16 +380,17 @@ table.listing{ /* /blame */ #blame pre, #blame tt { margin: 0; - font-size: 0.9em; + font-size: 12px; } #blame .commit-info { + } #blame .lineno { text-align: right; padding: 0 8px; } #blame a { - text-decoration: none; + atext-decoration: none; } #blame { overflow-x: scroll; @@ -387,7 +402,8 @@ table.listing{ background-color: #fefeaa; } #blame td { - padding: 0 0.2em; + vertical-align:middle; + padding: 3px; } #blame td.lineno { background-color: #eee; @@ -409,6 +425,7 @@ pre.blob { padding-left: 15px; margin: 20px 15px 20px; overflow:auto; + font-size:12px; } /* /blobdiff etc */ diff --git a/root/static/i/icons/attention.png b/root/static/i/icons/attention.png new file mode 100755 index 0000000..db00074 Binary files /dev/null and b/root/static/i/icons/attention.png differ diff --git a/root/static/i/icons/diffcurrent.png b/root/static/i/icons/diffcurrent.png new file mode 100755 index 0000000..8f4827f Binary files /dev/null and b/root/static/i/icons/diffcurrent.png differ diff --git a/root/wrapper.tt2 b/root/wrapper.tt2 index ebcdeab..593246a 100755 --- a/root/wrapper.tt2 +++ b/root/wrapper.tt2 @@ -46,6 +46,7 @@