tazpkg rev 788

pkgs.cgi: allow predefined package icons; tiny improvements.
author Aleksej Bobylev <al.bobylev@gmail.com>
date Fri Apr 24 16:04:14 2015 +0300 (2015-04-24)
parents c389814e4f9a
children 10aa58220cc5
files tazpanel/pkgs.cgi
line diff
     1.1 --- a/tazpanel/pkgs.cgi	Sat Apr 18 16:25:03 2015 +0300
     1.2 +++ b/tazpanel/pkgs.cgi	Fri Apr 24 16:04:14 2015 +0300
     1.3 @@ -94,14 +94,20 @@
     1.4  		echo -n "<a data-icon=\"$class\" href=\"?info=${pkg//+/%2B}\">$pkg</a>"
     1.5  		exit 0 ;;
     1.6  
     1.7 +
     1.8  	*\ app_img\ * )
     1.9  		# Show application image
    1.10  		pkg=$(GET app_img)
    1.11 +		if [ -f "$PKGS_DB/packages.icons" ]; then
    1.12 +			predefined_icon="$(awk -F$'\t' -vpkg="$pkg" '{if ($1 == pkg) print $2}' $PKGS_DB/packages.icons)"
    1.13 +		fi
    1.14 +		predefined_icon="${predefined_icon:-package-x-generic}.png"
    1.15 +
    1.16  		current_user="$(who | cut -d' ' -f1)"
    1.17  		if [ -n "$current_user" ]; then
    1.18  			current_user_home="$(awk -F: -vu=$current_user '{if($1==u) print $6}' /etc/passwd)"
    1.19  			current_icon_theme="/usr/share/icons/$(grep gtk-icon-theme-name $current_user_home/.gtkrc-2.0 | cut -d'"' -f2)"
    1.20 -			default_pkg_icon="$(find -L $current_icon_theme -type f -path '*48*' -name 'package-x-generic.png' | head -n1)"
    1.21 +			default_pkg_icon="$(find -L $current_icon_theme -type f -path '*48*' -name $predefined_icon | head -n1)"
    1.22  			pkg_icon="$(find -L $current_icon_theme -type f -path '*48*' -name "$pkg.png" | head -n1)"
    1.23  			if [ -z "$pkg_icon" ]; then
    1.24  				pkg_icon="$(find -L /usr/share/pixmaps -type f -name "$pkg.png" | head -n1)"
    1.25 @@ -110,10 +116,11 @@
    1.26  			header "Content-Type: image/png"
    1.27  			cat "${pkg_icon:-$default_pkg_icon}"
    1.28  		else
    1.29 -			default_pkg_icon="$(find -L /usr/share/icons -type f -name 'package-x-generic.png' | sort | tail -n1)"
    1.30 +			default_pkg_icon="$(find -L /usr/share/icons -type f -name $predefined_icon | sort | tail -n1)"
    1.31  		fi
    1.32  		exit 0 ;;
    1.33  
    1.34 +
    1.35  	*\ show_receipt\ * )
    1.36  		# Show package receipt
    1.37  		pkg=$(GET show_receipt)
    1.38 @@ -307,7 +314,7 @@
    1.39  	setCookie(name);
    1.40  }
    1.41  </script>
    1.42 -<form method="post" action="?list">
    1.43 +<form method="post" action="?list" style="position: absolute">
    1.44  
    1.45  <div id="sidebar">
    1.46  	<select id="my" value="$my" onchange="setCookie('my'); this.form.submit()">
    1.47 @@ -913,7 +920,7 @@
    1.48  	$([ -n "$LICENSE" ] && echo "<tr><td><b>$(_ 'License')</b></td><td><a href=\"?license=$pkg\">$LICENSE</a></td></tr>")
    1.49  	<tr><td><b>$(_ 'Website')</b></td><td><a href="$WEB_SITE" target="_blank">$WEB_SITE</a></td></tr>
    1.50  	$(show_info_links "$TAGS" "$(_ 'Tags')" 'tag')
    1.51 -	<tr><td><b>$(_ 'Sizes')</b></td><td>$PACKED_SIZE/$UNPACKED_SIZE</td></tr>
    1.52 +	<tr><td><b>$(_ 'Sizes')</b></td><td>${PACKED_SIZE/.0/}/${UNPACKED_SIZE/.0/}</td></tr>
    1.53  	$(show_info_links "$DEPENDS" "$(_ 'Depends')" 'info')
    1.54  	$(show_info_links "$SUGGESTED" "$(_ 'Suggested')" 'info')
    1.55  </tbody>