X-Git-Url: https://gitweb.ps.run/ps-cgit/blobdiff_plain/6fb7d09fea94b3dd6932469283358cb24f1e7e29..57f6a8bf0de6c112cabc1d8e20ade2698bd886b7:/ui-shared.c?ds=sidebyside

diff --git a/ui-shared.c b/ui-shared.c
index 6f5cf2b..acc771b 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -45,7 +45,7 @@ char *cgit_rooturl()
 	if (cgit_virtual_root)
 		return fmt("%s/", cgit_virtual_root);
 	else
-		return "./cgit.cgi";
+		return cgit_script_name;
 }
 
 char *cgit_repourl(const char *reponame)
@@ -61,17 +61,24 @@ char *cgit_pageurl(const char *reponame, const char *pagename,
 		   const char *query)
 {
 	if (cgit_virtual_root) {
-		return fmt("%s/%s/%s/?%s", cgit_virtual_root, reponame,
-			   pagename, query);
+		if (query)
+			return fmt("%s/%s/%s/?%s", cgit_virtual_root, reponame,
+				   pagename, query);
+		else
+			return fmt("%s/%s/%s/", cgit_virtual_root, reponame,
+				   pagename);
 	} else {
-		return fmt("?r=%s&p=%s&%s", reponame, pagename, query);
+		if (query)
+			return fmt("?r=%s&p=%s&%s", reponame, pagename, query);
+		else
+			return fmt("?r=%s&p=%s", reponame, pagename);
 	}
 }
 
 char *cgit_currurl()
 {
 	if (!cgit_virtual_root)
-		return "./cgit.cgi";
+		return cgit_script_name;
 	else if (cgit_query_page)
 		return fmt("%s/%s/%s/", cgit_virtual_root, cgit_query_repo, cgit_query_page);
 	else if (cgit_query_repo)
@@ -81,16 +88,57 @@ char *cgit_currurl()
 }
 
 
-void cgit_print_date(unsigned long secs)
+void cgit_print_date(time_t secs, char *format)
 {
-	char buf[32];
+	char buf[64];
 	struct tm *time;
 
 	time = gmtime(&secs);
-	strftime(buf, sizeof(buf), "%Y-%m-%d %H:%M:%S", time);
+	strftime(buf, sizeof(buf)-1, format, time);
 	html_txt(buf);
 }
 
+void cgit_print_age(time_t t, time_t max_relative, char *format)
+{
+	time_t now, secs;
+
+	time(&now);
+	secs = now - t;
+
+	if (secs > max_relative && max_relative >= 0) {
+		cgit_print_date(t, format);
+		return;
+	}
+
+	if (secs < TM_HOUR * 2) {
+		htmlf("<span class='age-mins'>%.0f min.</span>",
+		      secs * 1.0 / TM_MIN);
+		return;
+	}
+	if (secs < TM_DAY * 2) {
+		htmlf("<span class='age-hours'>%.0f hours</span>",
+		      secs * 1.0 / TM_HOUR);
+		return;
+	}
+	if (secs < TM_WEEK * 2) {
+		htmlf("<span class='age-days'>%.0f days</span>",
+		      secs * 1.0 / TM_DAY);
+		return;
+	}
+	if (secs < TM_MONTH * 2) {
+		htmlf("<span class='age-weeks'>%.0f weeks</span>",
+		      secs * 1.0 / TM_WEEK);
+		return;
+	}
+	if (secs < TM_YEAR * 2) {
+		htmlf("<span class='age-months'>%.0f months</span>",
+		      secs * 1.0 / TM_MONTH);
+		return;
+	}
+	htmlf("<span class='age-years'>%.0f years</span>",
+	      secs * 1.0 / TM_YEAR);
+}
+
 void cgit_print_docstart(char *title, struct cacheitem *item)
 {
 	html("Content-Type: text/html; charset=utf-8\n");