From: Foxtons Web Design Date: Wed, 24 Mar 2010 10:48:06 +0000 (+0000) Subject: more design changes X-Git-Tag: 0.000006_01~1^2~1^2~6 X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FGitalist.git;a=commitdiff_plain;h=eab82ed135b830ff718ee9c581a62085955d754e more design changes --- diff --git a/root/fragment/collectionofrepositories.tt2 b/root/fragment/collectionofrepositories.tt2 index 992b319..afcc4fd 100755 --- a/root/fragment/collectionofrepositories.tt2 +++ b/root/fragment/collectionofrepositories.tt2 @@ -1,15 +1,17 @@ - - [% FOR p IN repositories %] - [%- repos_link = c.uri_for_action('/repository/summary', [p.name]) -%] - - [% p.name %] - [% abridged_description(p.description) %] - [% p.owner %] + +[% FOR p IN repositories %] + [%- repos_link = c.uri_for_action('/repository/summary', [p.name]) -%] + + [% loop.count %] + [% p.name %] + [% abridged_description(p.description) %] [% time_since(p.last_change) %] - summary - | shortlog - | log - | tree + [% p.owner %] + + short log + long log + tree + - [% END %] +[% END %] diff --git a/root/fragment/ref/history.tt2 b/root/fragment/ref/history.tt2 old mode 100644 new mode 100755 index c054650..868a4de --- a/root/fragment/ref/history.tt2 +++ b/root/fragment/ref/history.tt2 @@ -3,27 +3,25 @@ <[% cell %]>sha1 <[% cell %]>time - <[% cell %]>author <[% cell %]>message + <[% cell %]>author <[% cell %]>actions [% END %] -[% - INCLUDE 'inc/log_pager.tt2'; -%] +
[% PROCESS history_table_headfoot type = 'head' %][% PROCESS history_table_headfoot type = 'foot' %] [% FOREACH line IN log_lines %] - + - + + - <[% cell %]>mode - <[% cell %]>file - <[% cell %]>actions + <[% cell %]>Mode + <[% cell %]>File + <[% cell %]>Actions [% END %] -
[% 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.0 %] [% line.author.name | html %] [% IF filetype == 'tree' %] blob diff --git a/root/fragment/ref/tree.tt2 b/root/fragment/ref/tree.tt2 old mode 100644 new mode 100755 index f690386..6a68e53 --- a/root/fragment/ref/tree.tt2 +++ b/root/fragment/ref/tree.tt2 @@ -1,18 +1,16 @@ [% BLOCK tree_table_headfoot %] [% SET cell = type == 'head' ? 'th' : 'td' %]
+
[% PROCESS tree_table_headfoot type = 'head' %] - [% PROCESS tree_table_headfoot type = 'foot' %] - [% FOREACH item IN tree_list %] - + [%- action_type = item.type == 'tree' ? 'tree' : 'blob'; @@ -23,15 +21,13 @@ [% item.file %] [% END %] diff --git a/root/fragment/repository/shortlog.tt2 b/root/fragment/repository/shortlog.tt2 index 4f41d2d..6c7414d 100755 --- a/root/fragment/repository/shortlog.tt2 +++ b/root/fragment/repository/shortlog.tt2 @@ -2,16 +2,16 @@ [% SET cell = type == 'head' ? 'th' : 'td' %] <[% cell %]>ID (sha1) - <[% cell %]>Time + <[% cell %]>Last change <[% cell %]>Message - <[% cell %]>Author + <[% cell %]>By <[% cell %]>Actions [% END %] -
[% item.modestr %] - [% theact %] + [% theact %] [% IF item.type == 'blob' %] - blob - blame + Blob + raw + blame [% END %] - history - [% IF item.type == 'blob' %] - raw - [% END %] + Short log
+
[% PROCESS shortlog_table_headfoot type = 'head' %] [% FOREACH line IN log_lines %] diff --git a/root/index.tt2 b/root/index.tt2 index 916dcbd..5df3c17 100755 --- a/root/index.tt2 +++ b/root/index.tt2 @@ -1,29 +1,20 @@ [% BLOCK repos_table_headfoot %] [% SET cell = type == 'head' ? 'th' : 'td' %] + <[% cell %]> <[% cell %]>Repository <[% cell %]>Description - <[% cell %]>Owner - <[% cell %]>Last Change - <[% cell %]> + <[% cell %]>Last change + <[% cell %]>By + <[% cell %]>Actions [% END %] -
-
-

Search: - -

- -
- - [% INCLUDE repos_table_headfoot type = 'head' %] - - - [% INCLUDE repos_table_headfoot type = 'foot'%] - +
+ + [% INCLUDE repos_table_headfoot type = 'head' %] + +[% subinclude('/fragment/collectionofrepositories') %] +
- [% subinclude('/fragment/collectionofrepositories') %] - - diff --git a/root/ref/tree.tt2 b/root/ref/tree.tt2 old mode 100644 new mode 100755 index 91d2082..33ed034 --- a/root/ref/tree.tt2 +++ b/root/ref/tree.tt2 @@ -1,8 +1,5 @@ -
-
- [% short_cmt(commit.comment) | html %] ... -
+ [% IF path; @@ -11,4 +8,7 @@ subinclude('/fragment/ref/tree', c.req.captures, c.req.args.to_path); %] -
+ +
+ [% short_cmt(commit.comment) | html %] ... +
diff --git a/root/static/css/core.css b/root/static/css/core.css index 96246a2..a7b1945 100755 --- a/root/static/css/core.css +++ b/root/static/css/core.css @@ -30,12 +30,13 @@ div{ aborder:1px solid olive; } #content{ + min-height:200px; padding:0 12px 40px 10px; - aborder:1px solid red; background:transparent url(/static/i/bg_bottom.png) no-repeat center bottom; } #content_inner{ aborder:1px solid blue; + padding-bottom:30px; background:transparent url(/static/i/bg_top.png) no-repeat; } #logo{ @@ -46,7 +47,30 @@ div{ margin-right:50px; float:right; } +#git_logo{ + float:left; + margin-left:15px; +} +#feeds{ + float:right; + margin-right:15px; +} + +#footer p{ + margin-left:15px; +} +#debug_holder{ + clear:both; + padding-top:30px; + margin:30px 0; +} +#debug_holder pre{ + margin:0; + padding:10px; + border:1px solid #ddd; + background-color:#f0f0f0; +} /* nav tabs */ #nav_logs{ @@ -134,7 +158,24 @@ a:hover{ .tree{ background:transparent url(/static/i/icons/tree.png) no-repeat; } - +.shortlog{ + background:transparent url(/static/i/icons/shortlog.png) no-repeat; +} +.longlog{ + background:transparent url(/static/i/icons/longlog.png) no-repeat; +} +.blob{ + background:transparent url(/static/i/icons/blob.png) no-repeat; +} +.blame{ + background:transparent url(/static/i/icons/blame.png) no-repeat; +} +.history{ + background:transparent url(/static/i/icons/history.png) no-repeat; +} +.raw{ + background:transparent url(/static/i/icons/raw.png) no-repeat; +} .sha1_holder{ background:transparent url(/static/i/icons/button_sha1.png) no-repeat; } @@ -185,12 +226,18 @@ th{ text-align:left; color:#fff; } +th a{ + color:#fff; +} tr.invert{ background-color:#f0f0f0; } .sha1{ width:80px; } +.file-mode{ + width:80px; +} .time-since{ width:95px; font-weight:bold; @@ -210,5 +257,5 @@ table.listing{ padding:9px 5px 9px 10px; } .action-list{ - width:90px; + width:120px; } \ No newline at end of file diff --git a/root/static/i/icons/blame.png b/root/static/i/icons/blame.png new file mode 100755 index 0000000..690a489 Binary files /dev/null and b/root/static/i/icons/blame.png differ diff --git a/root/static/i/icons/blob.png b/root/static/i/icons/blob.png new file mode 100755 index 0000000..c5261b8 Binary files /dev/null and b/root/static/i/icons/blob.png differ diff --git a/root/static/i/icons/history.png b/root/static/i/icons/history.png new file mode 100755 index 0000000..690a489 Binary files /dev/null and b/root/static/i/icons/history.png differ diff --git a/root/static/i/icons/longlog.png b/root/static/i/icons/longlog.png new file mode 100755 index 0000000..4859ac9 Binary files /dev/null and b/root/static/i/icons/longlog.png differ diff --git a/root/static/i/icons/raw.png b/root/static/i/icons/raw.png new file mode 100755 index 0000000..f2854f6 Binary files /dev/null and b/root/static/i/icons/raw.png differ diff --git a/root/static/i/icons/shortlog.png b/root/static/i/icons/shortlog.png new file mode 100755 index 0000000..9c48a2a Binary files /dev/null and b/root/static/i/icons/shortlog.png differ diff --git a/root/wrapper.tt2 b/root/wrapper.tt2 index d9506fb..b32c888 100755 --- a/root/wrapper.tt2 +++ b/root/wrapper.tt2 @@ -30,7 +30,14 @@
- [% IF Repository; INCLUDE 'nav/search.tt2'; END %] + [% IF Repository; INCLUDE 'nav/search.tt2'; ELSE; %] + +
+

Search: + +

+
+ [% END %]
@@ -50,8 +57,11 @@ [%- END %] / - [% c.action.name.replace("_"," ").replace("log", " log") FILTER ucfirst %] - + + [% c.action.name.replace("_"," ").replace("log", " log").replace("index","Repositories") FILTER ucfirst %] + + + @@ -69,28 +79,39 @@ - [% INCLUDE 'nav/actions.tt2' %] + [%# INCLUDE 'nav/actions.tt2' %] -