From: Foxtons Web Design Date: Tue, 23 Mar 2010 15:06:03 +0000 (+0000) Subject: Web Design first wave of conversion X-Git-Tag: 0.000006_01~1^2~1^2~8 X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FGitalist.git;a=commitdiff_plain;h=82f94bcedbe5e1be19fbe96df3448cb31faa0c3b Web Design first wave of conversion --- diff --git a/root/fragment/collectionofrepositories.tt2 b/root/fragment/collectionofrepositories.tt2 old mode 100644 new mode 100755 index 6062e24..992b319 --- a/root/fragment/collectionofrepositories.tt2 +++ b/root/fragment/collectionofrepositories.tt2 @@ -3,7 +3,7 @@ [%- repos_link = c.uri_for_action('/repository/summary', [p.name]) -%] [% p.name %] - [% abridged_description(p.description) %] + [% abridged_description(p.description) %] [% p.owner %] [% time_since(p.last_change) %] summary diff --git a/root/fragment/repository/heads.tt2 b/root/fragment/repository/heads.tt2 old mode 100644 new mode 100755 diff --git a/root/fragment/repository/shortlog.tt2 b/root/fragment/repository/shortlog.tt2 old mode 100644 new mode 100755 index 4875181..4f41d2d --- a/root/fragment/repository/shortlog.tt2 +++ b/root/fragment/repository/shortlog.tt2 @@ -1,38 +1,36 @@ [% BLOCK shortlog_table_headfoot %] [% SET cell = type == 'head' ? 'th' : 'td' %] - <[% cell %]>sha1 - <[% cell %]>time - <[% cell %]>author - <[% cell %]>message - <[% cell %]>actions + <[% cell %]>ID (sha1) + <[% cell %]>Time + <[% cell %]>Message + <[% cell %]>Author + <[% cell %]>Actions [% END %] -
- [% INCLUDE 'inc/log_pager.tt2' %] - - [% PROCESS shortlog_table_headfoot type = 'head' %] - [% PROCESS shortlog_table_headfoot type = 'foot' %] - + + +
+[% PROCESS shortlog_table_headfoot type = 'head' %] + [% FOREACH line IN log_lines %] - - - - - - - - [% 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 %] - - commit - commitdiff - tree -
[% - INCLUDE 'inc/log_pager.tt2'; -%] -
+ + [% INCLUDE 'inc/chroma_hash.tt2' sha1 = line.sha1.substr(0, 7) %] + [% time_since(line.authored_time) %] + + [% short_cmt(line.comment) | html %] + [% INCLUDE '_refs.tt2' object = line %] + + [% line.author.name | html %] + + commit + commitdiff + tree + + +[% END %] + + + +[% INCLUDE 'inc/log_pager.tt2' %] \ No newline at end of file diff --git a/root/fragment/repository/summary.tt2 b/root/fragment/repository/summary.tt2 old mode 100644 new mode 100755 diff --git a/root/inc/chroma_hash.tt2 b/root/inc/chroma_hash.tt2 old mode 100644 new mode 100755 index d7a0bb7..3dcb31c --- a/root/inc/chroma_hash.tt2 +++ b/root/inc/chroma_hash.tt2 @@ -1,9 +1,10 @@ [%- sha1 = sha1 || HEAD -%] -[%- +[%- hptr = 0; WHILE hptr < sha1.length - 6; sha1part = sha1.substr(hptr, 6); - "" _ sha1part _ ""; hptr = hptr + 6; END; --%] +-%] + +
[% sha1part %]
diff --git a/root/inc/log_pager.tt2 b/root/inc/log_pager.tt2 old mode 100644 new mode 100755 index 79282c5..e58aaab --- a/root/inc/log_pager.tt2 +++ b/root/inc/log_pager.tt2 @@ -1,12 +1,11 @@ -
- HEAD § - [% IF log_lines.first.sha1 != Commit.sha1 || (log_lines.size != 25 && page) %] - « newer - [% END %] - [% IF log_lines.first.sha1 != Commit.sha1 && log_lines.size == 25%] - • - [% END %] - [% IF log_lines.size == 25 %] - older » - [% END %] -
+ diff --git a/root/index.tt2 b/root/index.tt2 old mode 100644 new mode 100755 diff --git a/root/nav/search.tt2 b/root/nav/search.tt2 old mode 100644 new mode 100755 index 868fc52..8e15e07 --- a/root/nav/search.tt2 +++ b/root/nav/search.tt2 @@ -1,6 +1,9 @@ [% IF Repository %] [% END %] diff --git a/root/repository/summary.tt2 b/root/repository/summary.tt2 old mode 100644 new mode 100755 index f79b15f..9554c0f --- a/root/repository/summary.tt2 +++ b/root/repository/summary.tt2 @@ -1,8 +1,8 @@
- [% subinclude('/fragment/repository/summary', c.req.captures) %] + [% subinclude('/fragment/repository/shortlog', c.req.captures) %]

branches

diff --git a/root/static/css/core.css b/root/static/css/core.css new file mode 100755 index 0000000..96246a2 --- /dev/null +++ b/root/static/css/core.css @@ -0,0 +1,214 @@ +body{ + background:#FAFAFA url(/static/i/bg.png) repeat-x left top; + padding:0; + margin:0; + font-family:Arial, Verdana, sans-serif; + font-size:80%; +} +a img{ + border:0; +} +div{ + aborder:1px solid red; +} + + +/* structure */ +.sub_holder{ + width:970px; + margin:0 auto; + aborder:1px solid red; + text-align:left; +} + +#header{ + margin-top:20px; + aheight:300px; +} +#content_holder{ + background:transparent url(/static/i/bg_content.png) repeat-y center center; + aborder:1px solid olive; +} +#content{ + 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; + background:transparent url(/static/i/bg_top.png) no-repeat; +} +#logo{ + margin-left:-10px; + float:left; +} +#header .search{ + margin-right:50px; + float:right; +} + + +/* nav tabs */ +#nav_logs{ + clear:both; + float:right; + margin:-18px 50px 0 50px; +} +#nav_logs li{ + display:block; + float:left; + list-style:none; + margin:0; + padding:0; +} +#nav_logs li a{ + display:block; + margin-left:20px; + padding:10px 15px 10px 48px; + color:#ffffff; + font-size:1.4em; + text-transform:uppercase; + text-decoration:none; +} +a#log_short{ + background:#666 url(/static/i/icons/shortlog.gif) no-repeat 15px center; +} +a#log_full{ + background:#666 url(/static/i/icons/fulllog.gif) no-repeat 15px center; +} +#nav_logs li a:hover{ + text-decoration:underline; + background-color:#DC143C; +} +#nav_logs li.selected a{ + background-color:#333; +} + + + + + + + +/* formating */ +h1{ + margin:0; + padding:20px 0; + clear:both; + font-weight:normal; + font-size:1.85em; + color:#fff; +} +h1 a{ + margin-right:10px; + color:#fff; +} +h1 a:hover{ + color:#EAF2F5; +} +p, +td, +a{ + color:#666; +} +a:hover{ + color:#DC143C; +} + + +.button{ + display:block; + float:left; + vertical-align:middle; + margin-right:8px; + text-indent:-999999999999px; + width:21px; + height:21px; +} +.commit{ + background:transparent url(/static/i/icons/commit.png) no-repeat; +} +.diff{ + background:transparent url(/static/i/icons/diff.png) no-repeat; +} +.tree{ + background:transparent url(/static/i/icons/tree.png) no-repeat; +} + +.sha1_holder{ + background:transparent url(/static/i/icons/button_sha1.png) no-repeat; +} +.sha1_holder_invert{ + background:transparent url(/static/i/icons/button_sha1_invert.png) no-repeat; +} +.sha1_label{ + padding-top:2px; + float:left; +} + + +/* paging */ +.pager{ + width:100%; + float:left; + margin:10px 0; + padding:0; +} +.pager li{ + margin:0; + padding:0; + display:block; + list-style:none; +} +.pager li a{ + display:block; + padding:4px 6px; + color:#fff; + border:1px solid #ddd; + background-color:#333; +} +.pager .pager_prev a{ + margin-left:20px; + float:left; +} +.pager .pager_next a{ + margin-right:20px; + float:right; +} + + + + +/* table listings */ +th{ + padding:9px 5px 9px 10px; + text-align:left; + color:#fff; +} +tr.invert{ + background-color:#f0f0f0; +} +.sha1{ + width:80px; +} +.time-since{ + width:95px; + font-weight:bold; +} +.author{ + width:180px; +} +.author img{ + margin-right:5px; + vertical-align:middle; +} +table.listing{ + width:970px; + border-collapse:collapse; +} +.listing td{ + padding:9px 5px 9px 10px; +} +.action-list{ + width:90px; +} \ No newline at end of file diff --git a/root/static/i/arrow_grey.gif b/root/static/i/arrow_grey.gif new file mode 100755 index 0000000..3a4429e Binary files /dev/null and b/root/static/i/arrow_grey.gif differ diff --git a/root/static/i/arrow_grey_left.gif b/root/static/i/arrow_grey_left.gif new file mode 100755 index 0000000..42e070a Binary files /dev/null and b/root/static/i/arrow_grey_left.gif differ diff --git a/root/static/i/bg.png b/root/static/i/bg.png new file mode 100755 index 0000000..1c48ca4 Binary files /dev/null and b/root/static/i/bg.png differ diff --git a/root/static/i/bg_bottom.png b/root/static/i/bg_bottom.png new file mode 100755 index 0000000..cda2f73 Binary files /dev/null and b/root/static/i/bg_bottom.png differ diff --git a/root/static/i/bg_content.png b/root/static/i/bg_content.png new file mode 100755 index 0000000..c6dc6b5 Binary files /dev/null and b/root/static/i/bg_content.png differ diff --git a/root/static/i/bg_top.png b/root/static/i/bg_top.png new file mode 100755 index 0000000..39b765f Binary files /dev/null and b/root/static/i/bg_top.png differ diff --git a/root/static/i/icons/Thumbs.db b/root/static/i/icons/Thumbs.db new file mode 100644 index 0000000..bdf3302 Binary files /dev/null and b/root/static/i/icons/Thumbs.db differ diff --git a/root/static/i/icons/button_sha1.png b/root/static/i/icons/button_sha1.png new file mode 100755 index 0000000..77915e0 Binary files /dev/null and b/root/static/i/icons/button_sha1.png differ diff --git a/root/static/i/icons/button_sha1_invert.png b/root/static/i/icons/button_sha1_invert.png new file mode 100755 index 0000000..2f1724b Binary files /dev/null and b/root/static/i/icons/button_sha1_invert.png differ diff --git a/root/static/i/icons/commit.png b/root/static/i/icons/commit.png new file mode 100755 index 0000000..692f11e Binary files /dev/null and b/root/static/i/icons/commit.png differ diff --git a/root/static/i/icons/diff.png b/root/static/i/icons/diff.png new file mode 100755 index 0000000..9883936 Binary files /dev/null and b/root/static/i/icons/diff.png differ diff --git a/root/static/i/icons/fulllog.gif b/root/static/i/icons/fulllog.gif new file mode 100755 index 0000000..536da14 Binary files /dev/null and b/root/static/i/icons/fulllog.gif differ diff --git a/root/static/i/icons/shortlog.gif b/root/static/i/icons/shortlog.gif new file mode 100755 index 0000000..0f1e9b0 Binary files /dev/null and b/root/static/i/icons/shortlog.gif differ diff --git a/root/static/i/icons/tree.png b/root/static/i/icons/tree.png new file mode 100755 index 0000000..139a962 Binary files /dev/null and b/root/static/i/icons/tree.png differ diff --git a/root/static/i/logo.png b/root/static/i/logo.png new file mode 100755 index 0000000..cb0e1f8 Binary files /dev/null and b/root/static/i/logo.png differ diff --git a/root/wrapper.tt2 b/root/wrapper.tt2 old mode 100644 new mode 100755 index 37c7dff..d9506fb --- a/root/wrapper.tt2 +++ b/root/wrapper.tt2 @@ -1,11 +1,12 @@ [%- IF no_wrapper || template.name.match('\.(css|js|txt)'); content; ELSE; -%] - - + + - - - + + + [%# FIXME - MING %][%- title = BLOCK; c.config.sitename; @@ -17,59 +18,78 @@ title; -%] (Gitalist) [% INCLUDE '_header_feeds.tt2' %] - - - - - - + + + -
+ + + + +
+
+
- [% INCLUDE 'nav/actions.tt2' %] + -
-
[% content %] -
-
- + + + [% INCLUDE 'nav/actions.tt2' %] +
+
+
+ + + +[% USE Dumper %] +
 [% Repository.path %]
-+[% Dumper.dump(c.stash) %]
++[% Dumper.dump(c.req.action) %]
 +