# HG changeset patch
# User Aleksej Bobylev <al.bobylev@gmail.com>
# Date 1428065466 -10800
# Node ID 5a6155d9197a5a34d0743cec1d8ca4d1dde344bd
# Parent  ad921c2aee59a09863527c7831bec5c001197448
pkgs.cgi: show type of packages (installed/not installed/blocked) in the search; auto-search files if '/' present in query; use radio-buttons in the categories selector (may fix appearance in other browsers); tazpkg: show package sizes in the info.

diff -r ad921c2aee59 -r 5a6155d9197a tazpanel/pkgs.cgi
--- a/tazpanel/pkgs.cgi	Wed Apr 01 04:29:22 2015 +0300
+++ b/tazpanel/pkgs.cgi	Fri Apr 03 15:51:06 2015 +0300
@@ -21,7 +21,7 @@
 _()  { local T="$1"; shift; printf "$(gettext "$T")" "$@"; echo; }
 _n() { local T="$1"; shift; printf "$(gettext "$T")" "$@"; }
 _p() {
-	local S="$1" P="$2" N="$3"; shift; shift; shift;
+	local S="$1" P="$2" N="$3"; shift 3;
 	printf "$(ngettext "$S" "$P" "$N")" "$@"; }
 
 
@@ -74,7 +74,11 @@
 parse_packages_info() {
 	IFS=$'\t'
 	while read PACKAGE VERSION CATEGORY SHORT_DESC WEB_SITE TAGS SIZES DEPENDS; do
-		class=pkg; grep -q "^$PACKAGE$'\t'" $PKGS_DB/installed.info && class=pkgi
+		class='pkg'
+		if grep -q "^$PACKAGE"$'\t' $PKGS_DB/installed.info; then
+			class='pkgi'
+			grep -q "^$PACKAGE$" $PKGS_DB/blocked-packages.list && class='pkgib'
+		fi
 		i18n_desc $PACKAGE
 		cat << EOT
 <tr>
@@ -136,8 +140,6 @@
 # ENTER will search but user may search for a button, so put one.
 
 search_form() {
-	[ -z "$repo" ] && repo="$(GET repo)"
-	[ -z "$repo" ] && repo="Any"
 	cat << EOT
 <form class="search"><!--
 	--><input type="search" name="search" results="5" autosave="pkgsearch" autocomplete="on"><!--
@@ -171,10 +173,22 @@
 	cat << EOT
 <script type="text/javascript">
 function setCookie(name) {
-	document.cookie = name+"="+document.getElementById(name).value; }
+	if (name=='cat') {
+		var cats = document.getElementsByName('cat');
+		for (var i = 0; i < cats.length; i++) {
+			if (cats[i].checked) {
+				document.cookie = name + "=" + cats[i].value;
+				break;
+			}
+		}
+	} else {
+		document.cookie = name+"="+document.getElementById(name).value;
+	}
+}
 function setValue(name, value) {
 	document.getElementById(name).value=value;
-	setCookie(name); }
+	setCookie(name);
+}
 </script>
 <form method="post" action="?list">
 
@@ -183,32 +197,21 @@
 		<option value="my">$(_ 'My packages')</option>
 		<option value="no">$(_ 'All packages')</option>
 	</select>
+	<script type="text/javascript">setValue('my', "$my")</script>
 
 	<h4>$(_ 'Categories')</h4>
 
-	<div class="select_wrap">
-	<select id="cat" size="16" onclick="setCookie('cat'); this.form.submit()">
-		<option value="base-system" >$(_ 'base-system')</option>
-		<option value="x-window"    >$(_ 'x-window')</option>
-		<option value="utilities"   >$(_ 'utilities')</option>
-		<option value="network"     >$(_ 'network')</option>
-		<option value="games"       >$(_ 'games')</option>
-		<option value="graphics"    >$(_ 'graphics')</option>
-		<option value="office"      >$(_ 'office')</option>
-		<option value="multimedia"  >$(_ 'multimedia')</option>
-		<option value="development" >$(_ 'development')</option>
-		<option value="system-tools">$(_ 'system-tools')</option>
-		<option value="security"    >$(_ 'security')</option>
-		<option value="misc"        >$(_ 'misc')</option>
-		<option value="meta"        >$(_ 'meta')</option>
-		<option value="non-free"    >$(_ 'non-free')</option>
-		<option value="all"         >$(_ 'all')</option>
-		<option value="extra"       >$(_ 'extra')</option>
-	</select>
-	<script type="text/javascript">
-		setValue('my', "$my")
-		setValue('cat', "$cat")
-	</script>
+	<div class="wide zebra">
+		$(echo 'base-system x-window utilities network games graphics office
+		multimedia development system-tools security misc meta non-free all
+		extra' | tr ' ' '\n' | awk -vcat="$cat" -vn="1" '{
+			system("gettext " $1 | getline tr)
+			printf "<input type=\"radio\" name=\"cat\" id=\"c%s\" ", n
+			printf "value=\"%s\"%s ", $1, $1==cat?" checked":""
+			printf "onclick=\"setCookie(&#39;cat&#39;); this.form.submit()\">"
+			printf "<label for=\"c%s\">%s</label>\n", n, tr
+			n++
+		}')
 	</div>
 EOT
 
@@ -564,7 +567,7 @@
 
 <form id="pkglist" class="wide">
 EOT
-		if [ -n "$(GET files)" ]; then
+		if [ -n "$(GET files)" -o -n "$(echo $pkg | grep '/')" ]; then
 			cat <<EOT
 	<table class="wide zebra filelist">
 	<thead>
@@ -578,7 +581,11 @@
 			lzcat $(repo_list /files.list.lzma) | grep -Ei ": .*$(GET search)" | \
 			while read PACKAGE FILE; do
 				PACKAGE=${PACKAGE%:}
-				class=pkg; [ -d $INSTALLED/$PACKAGE ] && class=pkgi
+				class='pkg'
+				if [ -d $INSTALLED/$PACKAGE ]; then
+					class='pkgi'
+					grep -q "^$PACKAGE$" $PKGS_DB/blocked-packages.list && class='pkgib'
+				fi
 				cat << EOT
 <tr>
 	<td><input type="checkbox" name="pkg" value="$PACKAGE">$(pkg_info_link $PACKAGE $class)</td>
diff -r ad921c2aee59 -r 5a6155d9197a tazpanel/pkgs.css
--- a/tazpanel/pkgs.css	Wed Apr 01 04:29:22 2015 +0300
+++ b/tazpanel/pkgs.css	Fri Apr 03 15:51:06 2015 +0300
@@ -8,13 +8,13 @@
  */
 
 #content-sidebar {
-	margin-right: 138px; /* sidebar width */
-	padding: 10px;
+	margin-right: 140px; /* sidebar width */
+	padding: 5px;
 }
 
-#sidebar { /* full width = width(132) + h-padding(5) + border(1) = 138px */
+#sidebar { /* full width = width(139) + h-padding(0) + border(1) = 140px */
 	position: fixed; top: 65px; bottom: 0; right: 0;
-	width: 132px; padding: 5px 5px 0 0;
+	width: 139px; padding: 0;
 	border-left: 1pt solid;
 	overflow-y: auto; overflow-x: hidden; /* for tiny screens */
 }
@@ -26,32 +26,14 @@
 }
 
 
-
-
-
 /**
  * Sidebar category selector
  */
 
-/* hack to remove unwanted scrollbar from multiline selector */
-
-.select_wrap {
-	display: inline-block;
-	vertical-align: top;
-	overflow: hidden;
-}
-.select_wrap select {
-	padding: 5px;
-	margin:-5px -20px -5px -5px;
-	width: 162px; /* sidebar:(138px) + this h-margin:(20px+5px) */
-	font-size: small;
-}
-
-/* zebra on selector */
-select option:nth-child(even) {
-	background-color: rgba(0,0,0,0.05);
-}
-
+#sidebar input[type="radio"] { display: none; }
+#sidebar label { display: block; padding-left: 5px; }
+#sidebar input+label:nth-child(4n) { background-color: hsla(0, 0%, 50%, 0.1); }
+#sidebar input:checked+label { background-color: hsla(0, 0%, 50%, 0.5); }
 
 /* sidebar links */
 #sidebar a {
@@ -71,17 +53,17 @@
  */
 
 /* not break the line */
-.pkglist td:nth-child(1),
+.pkglist  td:nth-child(1),
 .filelist td:nth-child(1) { white-space: nowrap; }
 
-.pkglist td:nth-child(1) a,
+.pkglist  td:nth-child(1) a,
 .filelist td:nth-child(1) a { max-width: 12em; }
-.pkglist td:nth-child(2)   { max-width:  7em; }
+.pkglist  td:nth-child(2)   { max-width:  7em; }
 /*.filelist td:nth-child(2)   { white-space: pre-wrap; }*/
 
 /* ellipsize content of 1st and 2nd columns */
-.pkglist td:nth-child(1) a,
-.pkglist td:nth-child(2),
+.pkglist  td:nth-child(1) a,
+.pkglist  td:nth-child(2),
 .filelist td:nth-child(1) a,
 .filelist td:nth-child(2) {
 	white-space: nowrap;
@@ -104,6 +86,9 @@
 #head1h { display: none; position: fixed; }
 
 
+
+
+
 /**
  * Summary table
  */
@@ -111,8 +96,7 @@
 /* to have minimal width of first column */
 .summary td:nth-child(1) { width:10%; white-space: nowrap; }
 
-/* light blue links on summary table */
-.summary a { color: #248; }
+
 
 
 
@@ -124,14 +108,17 @@
 	display: inline-block;
 	padding: 0.5ex;
 	margin: 0.5ex 0;
-	border: 1px solid #AAA;
+	border: 1px solid hsla(0, 0%, 0%, 0.5);
 	width: 3ex;
 	text-align: center;
 }
+.dark  .pages { background-color: #222; }
+.light .pages { background-color: #CCC; }
 .pages:hover {
-	border: 1px solid #F94;
-	background: #F94;
-	color: black;
+	//border: 1px solid #F94;
+	//background: #F94;
+	//color: black;
+	box-shadow: 0 0 2pt 0 hsl(0, 0%, 50%);
 }
 .pages.current, .pages.current:hover {
 	font-weight: bold;
@@ -142,6 +129,8 @@
 
 
 
+
+
 /*
  * Tags
  */
@@ -167,15 +156,7 @@
 
 
 
-.button img {
-	padding: 0 4px 0 0;
-}
 
 
 /* Disable too much borders */
 section .hborders thead tr { border-top: none; border-bottom: 1pt solid #DDD; }
-
-
-
-
-/* •‣⁕←↑→↓↔↕↥↯↶↷↺↻⇄⇅⇈⌫⏏█▶▷▸▹►▻▪▫◯●◻◼◽◾☐☑☒♺♻⚙⚠⚡⚪⚫✉✎✏✐✓✔✕✖✗✘❖➤➜➝➛⟲⟳⧎ */
diff -r ad921c2aee59 -r 5a6155d9197a tazpkg
--- a/tazpkg	Wed Apr 01 04:29:22 2015 +0300
+++ b/tazpkg	Fri Apr 03 15:51:06 2015 +0300
@@ -1477,6 +1477,8 @@
 				[ -n "$LOCDESC" ] && SHORT_DESC="$LOCDESC"
 			fi
 		done
+		SIZES=$(echo $PACKED_SIZE/$UNPACKED_SIZE | sed 's|\.0||g' | sed 's|^/$||')
+
 		emsg "$(
 		{
 			_ 'Package    : %s' "$PACKAGE"
@@ -1490,6 +1492,7 @@
 			_ 'Build deps : %s' "$BUILD_DEPENDS"
 			_ 'Wanted src : %s' "$WANTED"
 			_ 'Web site   : %s' "$WEB_SITE"
+			_ 'Size       : %s' "$SIZES"
 			_ 'Tags       : %s' "$TAGS"
 		} | sed '/: $/d; s|^\([^:]*\):|<b>\1:</b>|')"
 		im && footer