X-Git-Url: https://git.chrismorgan.info/gitweb/blobdiff_plain/3cca22ac8cb362e0187b9a609355db662b23f158..d7a4a812ea574f04d7901e21f081e6337df76389:/gitweb.cgi

diff --git a/gitweb.cgi b/gitweb.cgi
index 1de74b6..953d177 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,
@@ -4318,20 +4306,13 @@ sub git_footer_html {
 		      qq!           "!. esc_attr(href()) .qq!");\n!.
 		      qq!</script>\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!<script src="!.esc_url($javascript).qq!"></script>\n!;
 			print qq!<script>\n!.
 				qq!window.onload = function () {\n!;
 			if (gitweb_check_feature('javascript-actions')) {
 				print qq!	fixLinks();\n!;
 			}
-			if ($jstimezone && $tz_cookie && $datetime_class) {
-				print qq!	var tz_cookie = { name: '$tz_cookie', expires: 14, path: '/' };\n!. # in days
-					qq!	onloadTZSetup('$jstimezone', tz_cookie, '$datetime_class');\n!;
-			}
 			print qq!};\n!.
 				qq!</script>\n!;
 		}
@@ -4540,20 +4521,8 @@ sub git_print_section {
 
 sub format_timestamp_html {
 	my $date = shift;
-	my $strtime = $date->{'rfc2822'};
-
-	my (undef, undef, $datetime_class) =
-		gitweb_get_feature('javascript-timezone');
-	if ($datetime_class) {
-		$strtime = qq!<span class="$datetime_class">$strtime</span>!;
-	}
-
-	my $localtime_format = '(%02d:%02d %s)';
-	$strtime .= ' ' .
-	            sprintf($localtime_format,
-	                    $date->{'hour_local'}, $date->{'minute_local'}, $date->{'tz_local'});
 
-	return $strtime;
+	return qq!<time datetime="$date->{'iso-8601'}" title="$date->{'iso-tz'}">$date->{'rfc2822'}</time>!;
 }
 
 # Outputs the author name and date in long form