From: Chris Morgan Date: Sat, 8 Jan 2022 06:05:31 +0000 (+1100) Subject: Improve time markup and tooltips X-Git-Url: https://git.chrismorgan.info/gitweb/commitdiff_plain/662457e5a80e8f1037547efc535d6e888a7d5a74 Improve time markup and tooltips --- diff --git a/gitweb.cgi b/gitweb.cgi index 953d177..ea06c90 100755 --- a/gitweb.cgi +++ b/gitweb.cgi @@ -3582,12 +3582,13 @@ sub parse_commit_text { $co{'age'} = $age; $co{'age_string'} = age_string($age); my ($sec, $min, $hour, $mday, $mon, $year, $wday, $yday) = gmtime($co{'committer_epoch'}); + $co{'age_string_iso8601'} = sprintf "%4i-%02u-%02i %02u:%02u:%02uZ", 1900 + $year, $mon+1, $mday, $hour, $min, $sec; if ($age > 60*60*24*7*2) { $co{'age_string_date'} = sprintf "%4i-%02u-%02i", 1900 + $year, $mon+1, $mday; - $co{'age_string_age'} = $co{'age_string'}; + $co{'age_string_age'} = "$co{'age_string_iso8601'} ($co{'age_string'})"; } else { $co{'age_string_date'} = $co{'age_string'}; - $co{'age_string_age'} = sprintf "%4i-%02u-%02i", 1900 + $year, $mon+1, $mday; + $co{'age_string_age'} = $co{'age_string_iso8601'}; } return %co; } @@ -4478,7 +4479,7 @@ sub git_print_header_div { sub format_repo_url { my ($name, $url) = @_; - return "$name$url\n"; + return "$name$url\n"; } # Group output by placing it in a DIV element and adding a header. @@ -5882,7 +5883,7 @@ sub git_log_body { my $commit = $co{'id'}; my $ref = format_ref_marker($refs, $commit); git_print_header_div('commit', - "$co{'age_string'}" . + "" . esc_html($co{'title'}) . $ref, $commit); print "
\n" . @@ -5927,7 +5928,7 @@ sub git_shortlog_body { } $alternate ^= 1; # git_summary() used print "$co{'age_string'}\n" . - print "$co{'age_string_date'}\n" . + print "\n" . format_author_html('td', \%co, 10) . ""; print format_subject_html($co{'title'}, $co{'title_short'}, href(action=>"commit", hash=>$commit), $ref); @@ -5976,7 +5977,7 @@ sub git_history_body { print "\n"; } $alternate ^= 1; - print "$co{'age_string_date'}\n" . + print "\n" . # shortlog: format_author_html('td', \%co, 10) format_author_html('td', \%co, 15, 3) . ""; # originally git_history used chop_str($co{'title'}, 50) @@ -6306,7 +6307,7 @@ sub git_search_changes { $alternate ^= 1; %co = parse_commit($set{'commit'}); my $author = chop_and_escape_str($co{'author_name'}, 15, 5); - print "$co{'age_string_date'}\n" . + print "\n" . "$author\n" . "" . $cgi->a({-href => href(action=>"commit", hash=>$co{'id'}), @@ -6440,7 +6441,7 @@ sub git_search_grep_body { print "\n"; } $alternate ^= 1; - print "$co{'age_string_date'}\n" . + print "\n" . format_author_html('td', \%co, 15, 5) . "" . $cgi->a({-href => href(action=>"commit", hash=>$co{'id'}), diff --git a/static/gitweb.css b/static/gitweb.css index bedc480..0cd760a 100644 --- a/static/gitweb.css +++ b/static/gitweb.css @@ -141,11 +141,13 @@ div.log_body { padding: 8px 8px 8px 150px; } -span.age { - position: relative; +time { + font-style: italic; +} + +time.age { float: left; width: 142px; - font-style: italic; } span.signoff {