[PATCH 0/3] Fix date tooltips in the distant past

[PATCH 0/3] Fix date tooltips in the distant past

[john]

This addresses an oversight in commit caed6cb (ui-shared: show absolute
time in tooltip for relative dates, 2014-12-20) which missed the case
where we show a short date if a time is too long ago, which should also
show the full date as a tooltip.

The first two patches are preparatory refactoring and the final one is
the point of the series.

John Keeping (3):
  ui-shared: extract date formatting to a function
  ui-shared: use common function in print_rel_date()
  ui-shared: show full date in tooltip if longer ago than max_relative

 ui-shared.c | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

-- 
2.5.0.466.g9af26fa

[PATCH 1/3] ui-shared: extract date formatting to a function

[john]

This will allow this code to be common with print_rel_date.

Signed-off-by: John Keeping <john at keeping.me.uk>
---
 ui-shared.c | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/ui-shared.c b/ui-shared.c
index 6be0c2e..a6d4b65 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -604,19 +604,24 @@ void cgit_submodule_link(const char *class, char *path, const char *rev)
 		path[len - 1] = tail;
 }
 
-void cgit_print_date(time_t secs, const char *format, int local_time)
+static const char *fmt_date(time_t secs, const char *format, int local_time)
 {
-	char buf[64];
+	static char buf[64];
 	struct tm *time;
 
 	if (!secs)
-		return;
+		return "";
 	if (local_time)
 		time = localtime(&secs);
 	else
 		time = gmtime(&secs);
 	strftime(buf, sizeof(buf)-1, format, time);
-	html_txt(buf);
+	return buf;
+}
+
+void cgit_print_date(time_t secs, const char *format, int local_time)
+{
+	html_txt(fmt_date(secs, format, local_time));
 }
 
 static void print_rel_date(time_t t, double value,
-- 
2.5.0.466.g9af26fa

[PATCH 2/3] ui-shared: use common function in print_rel_date()

[john]

Signed-off-by: John Keeping <john at keeping.me.uk>
---
 ui-shared.c | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/ui-shared.c b/ui-shared.c
index a6d4b65..792f3ee 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -627,17 +627,8 @@ void cgit_print_date(time_t secs, const char *format, int local_time)
 static void print_rel_date(time_t t, double value,
 	const char *class, const char *suffix)
 {
-	char buf[64];
-	struct tm *time;
-
-	if (ctx.cfg.local_time)
-		time = localtime(&t);
-	else
-		time = gmtime(&t);
-	strftime(buf, sizeof(buf) - 1, FMT_LONGDATE, time);
-
 	htmlf("<span class='%s' title='", class);
-	html_attr(buf);
+	html_attr(fmt_date(t, FMT_LONGDATE, ctx.cfg.local_time));
 	htmlf("'>%.0f %s</span>", value, suffix);
 }
 
-- 
2.5.0.466.g9af26fa

[PATCH 3/3] ui-shared: show full date in tooltip if longer ago than max_relative

[john]

Commit caed6cb (ui-shared: show absolute time in tooltip for relative
dates, 2014-12-20) added a toolip when we show a relative time.

However, in some cases we show a short date (that is, the date but not
the time) if an event was sufficiently far in the past and that commit
did not update that case to add the same tooltip.

Signed-off-by: John Keeping <john at keeping.me.uk>
---
 ui-shared.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/ui-shared.c b/ui-shared.c
index 792f3ee..57d7336 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -644,7 +644,11 @@ void cgit_print_age(time_t t, time_t max_relative, const char *format)
 		secs = 0;
 
 	if (secs > max_relative && max_relative >= 0) {
+		html("<span title='");
+		html_attr(fmt_date(t, FMT_LONGDATE, ctx.cfg.local_time));
+		html("'>");
 		cgit_print_date(t, format, ctx.cfg.local_time);
+		html("</span>");
 		return;
 	}
 
-- 
2.5.0.466.g9af26fa

[PATCH 0/3] Fix date tooltips in the distant past

[Jason]

Excellent series, thank you.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.zx2c4.com/pipermail/cgit/attachments/20150813/72682a11/attachment.html>