mirrors/cgit
0
0
Fork 0
mirror of https://git.zx2c4.com/cgit synced 2024-11-09 18:18:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

ui: show ages in the originator's timezone

Browse Source 
This affects the tooltip showing the full time and the case when a date
is sufficiently old to be shown in full rather than as an offset.

Signed-off-by: John Keeping <john@keeping.me.uk>
This commit is contained in:
John Keeping 2016-01-19 19:33:05 +00:00 committed by Jason A. Donenfeld
parent 21dcf10386
commit f2a901d2e1
5 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ui-log.c
View File

@ -204,7 +204,7 @@ static void print_commit(struct commit *commit, struct rev_info *revs)
} }
else { else {
html("<td>"); html("<td>");
cgit_print_age(commit->date, TM_WEEK * 2); cgit_print_age(info->committer_date, info->committer_tz, TM_WEEK * 2);
html("</td>"); html("</td>");
} }
@ -244,7 +244,7 @@ static void print_commit(struct commit *commit, struct rev_info *revs)
if (revs->graph) { if (revs->graph) {
html("</td><td>"); html("</td><td>");
cgit_print_age(commit->date, TM_WEEK * 2); cgit_print_age(info->committer_date, info->committer_tz, TM_WEEK * 2);
} }
if (!lines_counted && (ctx.repo->enable_log_filecount || if (!lines_counted && (ctx.repo->enable_log_filecount ||

6
ui-refs.c
View File

@ -73,7 +73,7 @@ static int print_branch(struct refinfo *ref)
html_txt(info->author); html_txt(info->author);
cgit_close_filter(ctx.repo->email_filter); cgit_close_filter(ctx.repo->email_filter);
html("</td><td colspan='2'>"); html("</td><td colspan='2'>");
cgit_print_age(info->commit->date, -1); cgit_print_age(info->committer_date, info->committer_tz, -1);
} else { } else {
html("</td><td></td><td>"); html("</td><td></td><td>");
cgit_object_link(ref->object); cgit_object_link(ref->object);
@ -161,9 +161,9 @@ static int print_tag(struct refinfo *ref)
html("</td><td colspan='2'>"); html("</td><td colspan='2'>");
if (info) { if (info) {
if (info->tagger_date > 0) if (info->tagger_date > 0)
cgit_print_age(info->tagger_date, -1); cgit_print_age(info->tagger_date, info->tagger_tz, -1);
} else if (ref->object->type == OBJ_COMMIT) { } else if (ref->object->type == OBJ_COMMIT) {
cgit_print_age(ref->commit->commit->date, -1); cgit_print_age(ref->commit->commit->date, 0, -1);
} }
html("</td></tr>\n"); html("</td></tr>\n");

2
ui-repolist.c
View File

@ -79,7 +79,7 @@ static void print_modtime(struct cgit_repo *repo)
{ {
time_t t; time_t t;
if (get_repo_modtime(repo, &t)) if (get_repo_modtime(repo, &t))
cgit_print_age(t, -1); cgit_print_age(t, 0, -1);
} }
static int is_match(struct cgit_repo *repo) static int is_match(struct cgit_repo *repo)

22
ui-shared.c
View File

@ -636,15 +636,15 @@ const struct date_mode *cgit_date_mode(const char *format)
return &mode; return &mode;
} }
static void print_rel_date(time_t t, double value, static void print_rel_date(time_t t, int tz, double value,
const char *class, const char *suffix) const char *class, const char *suffix)
{ {
htmlf("<span class='%s' title='", class); htmlf("<span class='%s' title='", class);
html_attr(fmt_date(t, FMT_LONGDATE, ctx.cfg.local_time)); html_attr(show_date(t, tz, cgit_date_mode(FMT_LONGDATE)));
htmlf("'>%.0f %s</span>", value, suffix); htmlf("'>%.0f %s</span>", value, suffix);
} }
void cgit_print_age(time_t t, time_t max_relative) void cgit_print_age(time_t t, int tz, time_t max_relative)
{ {
time_t now, secs; time_t now, secs;
@ -657,34 +657,34 @@ void cgit_print_age(time_t t, time_t max_relative)
if (secs > max_relative && max_relative >= 0) { if (secs > max_relative && max_relative >= 0) {
html("<span title='"); html("<span title='");
html_attr(fmt_date(t, FMT_LONGDATE, ctx.cfg.local_time)); html_attr(show_date(t, tz, cgit_date_mode(FMT_LONGDATE)));
html("'>"); html("'>");
cgit_print_date(t, FMT_SHORTDATE, ctx.cfg.local_time); html_txt(show_date(t, tz, cgit_date_mode(FMT_SHORTDATE)));
html("</span>"); html("</span>");
return; return;
} }
if (secs < TM_HOUR * 2) { if (secs < TM_HOUR * 2) {
print_rel_date(t, secs * 1.0 / TM_MIN, "age-mins", "min."); print_rel_date(t, tz, secs * 1.0 / TM_MIN, "age-mins", "min.");
return; return;
} }
if (secs < TM_DAY * 2) { if (secs < TM_DAY * 2) {
print_rel_date(t, secs * 1.0 / TM_HOUR, "age-hours", "hours"); print_rel_date(t, tz, secs * 1.0 / TM_HOUR, "age-hours", "hours");
return; return;
} }
if (secs < TM_WEEK * 2) { if (secs < TM_WEEK * 2) {
print_rel_date(t, secs * 1.0 / TM_DAY, "age-days", "days"); print_rel_date(t, tz, secs * 1.0 / TM_DAY, "age-days", "days");
return; return;
} }
if (secs < TM_MONTH * 2) { if (secs < TM_MONTH * 2) {
print_rel_date(t, secs * 1.0 / TM_WEEK, "age-weeks", "weeks"); print_rel_date(t, tz, secs * 1.0 / TM_WEEK, "age-weeks", "weeks");
return; return;
} }
if (secs < TM_YEAR * 2) { if (secs < TM_YEAR * 2) {
print_rel_date(t, secs * 1.0 / TM_MONTH, "age-months", "months"); print_rel_date(t, tz, secs * 1.0 / TM_MONTH, "age-months", "months");
return; return;
} }
print_rel_date(t, secs * 1.0 / TM_YEAR, "age-years", "years"); print_rel_date(t, tz, secs * 1.0 / TM_YEAR, "age-years", "years");
} }
void cgit_print_http_headers(void) void cgit_print_http_headers(void)

2
ui-shared.h
View File

@ -63,7 +63,7 @@ __attribute__((format (printf,1,0)))
extern void cgit_vprint_error(const char *fmt, va_list ap); extern void cgit_vprint_error(const char *fmt, va_list ap);
extern const struct date_mode *cgit_date_mode(const char *format); extern const struct date_mode *cgit_date_mode(const char *format);
extern void cgit_print_date(time_t secs, const char *format, int local_time); extern void cgit_print_date(time_t secs, const char *format, int local_time);
extern void cgit_print_age(time_t t, time_t max_relative); extern void cgit_print_age(time_t t, int tz, time_t max_relative);
extern void cgit_print_http_headers(void); extern void cgit_print_http_headers(void);
extern void cgit_redirect(const char *url, bool permanent); extern void cgit_redirect(const char *url, bool permanent);
extern void cgit_print_docstart(void); extern void cgit_print_docstart(void);