From: Foxtons Web Design Date: Wed, 14 Apr 2010 17:00:10 +0000 (+0100) Subject: sorted design of search X-Git-Tag: 0.001003~10 X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=ef0ad44d281eb459d1d3968096f69cdc63021db1;p=catagits%2FGitalist.git sorted design of search --- diff --git a/root/nav/search.tt2 b/root/nav/search.tt2 index 8e15e07..9721094 100755 --- a/root/nav/search.tt2 +++ b/root/nav/search.tt2 @@ -14,7 +14,9 @@ --> - ? + ? + + [% END %] diff --git a/root/repository/search.tt2 b/root/repository/search.tt2 old mode 100644 new mode 100755 index 76b3e6a..f9f670d --- a/root/repository/search.tt2 +++ b/root/repository/search.tt2 @@ -1,30 +1,44 @@ -
- [%# XXX Nabbed the HTML below from gitweb's log action. %] - [% FOREACH result IN results %] -
- - [% result.authored_time %] - [% short_cmt(result.comment) | html %] - -
+[% BLOCK shortlog_table_headfoot %] +[% SET cell = type == 'head' ? 'th' : 'td' %] + + <[% cell %] colspan="2">Compare + <[% cell %]>ID (sha1) + <[% cell %]>Last change + <[% cell %]>Message + <[% cell %]>By + <[% cell %]>Actions + +[% END %] -
-
- commit - | commitdiff - | tree -
- [% result.author.name | html %] [% line.authored_time %] -
- -
- [% +
+ +[% PROCESS shortlog_table_headfoot type = 'head' %] + +[% FOREACH result IN results %] + + + + + + + + + +[% END %] + + + + + +
[% INCLUDE 'inc/chroma_hash.tt2' sha1 = result.sha1.substr(0, 7) %][% time_since(result.authored_time) %][% # XXX This is fragile at best. html_comment = result.comment | html; html_comment.replace( c.req.param('text'), '' _ c.req.param('text') _ '' ); - %] - - [% END %] - + %][% result.author.name | html %] + commit + commitdiff + tree +
Compare
+
diff --git a/root/search.tt2 b/root/search.tt2 old mode 100644 new mode 100755 diff --git a/root/search_help.tt2 b/root/search_help.tt2 old mode 100644 new mode 100755 index 60a97a1..86e8154 --- a/root/search_help.tt2 +++ b/root/search_help.tt2 @@ -1,8 +1,12 @@ +

Search help

+ +

Pattern is by default a normal string that is matched precisely (but without regard to case, except in the case of pickaxe). However, when you check the re checkbox, the pattern entered is recognized as the POSIX extended regular expression (also case insensitive).

+
commit
The commit messages and authorship information will be scanned for the given pattern.
@@ -23,4 +27,4 @@ added, removed or "modified" the string) will be listed. This search can take a takes a lot of strain on the server, so please use it wisely. Note that since you may be interested even in changes just changing the case as well, this search is case sensitive.
- +
diff --git a/root/static/css/core.css b/root/static/css/core.css index befb5d2..fca2565 100755 --- a/root/static/css/core.css +++ b/root/static/css/core.css @@ -53,6 +53,9 @@ a img{ padding-bottom:30px; background:transparent url([% c.uri_for('/static/i/bg_top.png') %]) no-repeat; } +.copy{ + padding:10px; +} #logo{ margin-left:-10px; float:left; @@ -275,7 +278,9 @@ a.raw{ border:1px solid #ddd; margin:30px 15px; } - +.match{ + background-color:#ffff00; +} a.rss_logo { float: right; padding: 3px 0px; @@ -299,6 +304,16 @@ a.rss_logo:hover { } +.button_submit{ + text-indent:-999999px; + overflow:hidden; + width:95px; + height:26px; + border:0; + background:transparent url([% c.uri_for('/static/i/buttons/search.png') %]) no-repeat; + cursor: pointer; +} + /* paging */ .pager{ diff --git a/root/static/i/buttons/search.png b/root/static/i/buttons/search.png new file mode 100755 index 0000000..4768621 Binary files /dev/null and b/root/static/i/buttons/search.png differ diff --git a/root/wrapper.tt2 b/root/wrapper.tt2 index 7f482d1..3cef238 100755 --- a/root/wrapper.tt2 +++ b/root/wrapper.tt2 @@ -118,13 +118,16 @@
- [% IF Repository; INCLUDE 'nav/search.tt2'; ELSE; %] - -
-

Search: - -

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