# HG changeset patch
# User Aleksej Bobylev <al.bobylev@gmail.com>
# Date 1420969891 -7200
# Node ID c4c2d523a7195823973e9d0b08c95896e7823938
# Parent  31829db351f21ecfcdb5872e8c7f36b0edddc2e9
pkgs.cgi: show last recharge date in a different way; fix Makefile.

diff -r 31829db351f2 -r c4c2d523a719 Makefile
--- a/Makefile	Fri Jan 09 17:05:12 2015 +0200
+++ b/Makefile	Sun Jan 11 11:51:31 2015 +0200
@@ -21,8 +21,8 @@
 	xgettext -o po/tazpkg.pot -L Shell \
 		--package-name=TazPkg \
 		--package-version="$(VERSION)" -kaction -ktitle -k_ -k_n -k_p:1,2 \
-		./tazpkg ./tazpkg-convert ./tazpkg-find-depends ./tazpkg-box \
-		./pkgs ./pkgs.cgi ./tazpkg-notify
+		./tazpkg ./modules/tazpkg-convert ./modules/tazpkg-find-depends ./tazpkg-box \
+		./tazpanel/pkgs ./tazpanel/pkgs.cgi ./tazpkg-notify
 
 msgmerge:
 	@for l in $(LINGUAS); do \
diff -r 31829db351f2 -r c4c2d523a719 tazpanel/pkgs.cgi
--- a/tazpanel/pkgs.cgi	Fri Jan 09 17:05:12 2015 +0200
+++ b/tazpanel/pkgs.cgi	Sun Jan 11 11:51:31 2015 +0200
@@ -1166,23 +1166,28 @@
 		cat << EOT
 </div>
 
-<table class="zebra outbox">
+<table class="zebra summary">
 <tbody>
-<tr><td>$(_ 'Last recharge:')</td><td>
-EOT
-		recharged="$(date -r $PKGS_DB/packages.info +%c 2>/dev/null)"
-		if [ -z "$recharged" ]; then
-			_ 'never'
-		else
-			echo "<b>$recharged</b>"
-			if [ -n "$(find $PKGS_DB/packages.info -mtime +10)" ]; then
-				_ '(Older than 10 days)'
-			else
-				_ '(Not older than 10 days)'
-			fi
-		fi
-		cat << EOT
-</td></tr>
+<tr>
+	<td>$(_ 'Last recharge:')</td>
+	<td>$(list=$PKGS_DB/packages.info
+	if [ -e $list ]; then
+		$((days=$(date +%s)/86400-$(date -r $list +%s)/86400))
+		time=$(date -r $list +%R)
+		ago="$(_p '%d day ago.' '%d days ago.' $days $days)"
+		case $days in
+			0) _ 'Today at %s.' $time;;
+			1) _ 'Yesterday at %s.' $time;;
+			[2-9]) echo $ago;;
+			*) echo "<span style='color:red'>$ago</span>"
+				_ 'It is recommended to [recharge] the lists.' | \
+				sed 's|\[|<a href="?recharge">|;s|\]|</a>|';;
+		esac
+	else
+		_ 'never.'
+		_ 'You need to [download] the lists for further work.' | \
+		sed 's|\[|<a href="?recharge">|;s|\]|</a>|'
+	fi)</td></tr>
 <tr>
 	<td>$(_ 'Installed packages:')</td>
 	<td><b>$(cat $PKGS_DB/installed.info | wc -l)</a></b>
diff -r 31829db351f2 -r c4c2d523a719 tazpanel/pkgs.css
--- a/tazpanel/pkgs.css	Fri Jan 09 17:05:12 2015 +0200
+++ b/tazpanel/pkgs.css	Sun Jan 11 11:51:31 2015 +0200
@@ -29,7 +29,7 @@
 .select_wrap select {
 	padding: 5px;
 	margin:-5px -20px -5px -5px;
-	width: 157px;
+	width: 162px;
 	font-size: small;
 }
 
@@ -100,8 +100,11 @@
 
 .pkglist tr { border-bottom: 1pt solid #DDD; }
 
-.pkglist, .pkglist thead { border: 1.5pt solid #BBB!important; }
+.pkglist, .pkglist thead, .summary { border: 1.5pt solid #BBB!important; }
 
+.summary td:nth-child(1) {
+	width:10%; white-space: nowrap; /* to have minimal width of first column */
+	}
 
 #actions { overflow: auto; }