X-Git-Url: https://git.chrismorgan.info/gitweb/blobdiff_plain/3cca22ac8cb362e0187b9a609355db662b23f158..15c020263f5c99b3598a48428ad9a7fd4af0c06b:/gitweb.cgi diff --git a/gitweb.cgi b/gitweb.cgi index 1de74b6..1aba48a 100755 --- a/gitweb.cgi +++ b/gitweb.cgi @@ -519,18 +519,6 @@ our %feature = ( 'override' => 0, 'default' => [0]}, - # Enable and configure ability to change common timezone for dates - # in gitweb output via JavaScript. Enabled by default. - # Project specific override is not supported. - 'javascript-timezone' => { - 'override' => 0, - 'default' => [ - 'local', # default timezone: 'utc', 'local', or '(-|+)HHMM' format, - # or undef to turn off this feature - 'gitweb_tz', # name of cookie where to store selected timezone - 'datetime', # CSS class used to mark up dates for manipulation - ]}, - # Syntax highlighting support. This is based on Daniel Svensson's # and Sham Chukoury's work in gitweb-xmms2.git. # It requires the 'highlight' program present in $PATH, @@ -3594,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; } @@ -4318,20 +4307,13 @@ sub git_footer_html { qq! "!. esc_attr(href()) .qq!");\n!. qq!\n!; } else { - my ($jstimezone, $tz_cookie, $datetime_class) = - gitweb_get_feature('javascript-timezone'); - - if (gitweb_check_feature('javascript-actions') || ($jstimezone && $tz_cookie && $datetime_class)) { + if (gitweb_check_feature('javascript-actions')) { print qq!\n!; print qq!\n!; } @@ -4497,7 +4479,7 @@ sub git_print_header_div { sub format_repo_url { my ($name, $url) = @_; - return "
$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); @@ -6007,7 +5981,7 @@ sub git_history_body { 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) @@ -6337,7 +6311,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'}), @@ -6471,7 +6445,7 @@ sub git_search_grep_body { print " |
$co{'age_string_date'} | \n" . + print "\n" . format_author_html('td', \%co, 15, 5) . " | " . $cgi->a({-href => href(action=>"commit", hash=>$co{'id'}), @@ -6655,51 +6629,66 @@ sub git_summary { print " |