cookutils diff lighttpd/index.cgi @ rev 998

lighttpd/index.cgi: improve titling; modules/compressor: show file names for warnings/errors, restore original if error, store in cache if no errors.
author Aleksej Bobylev <al.bobylev@gmail.com>
date Sat Nov 04 04:02:57 2017 +0200 (2017-11-04)
parents 061c4c621204
children 8190be7ad294
line diff
     1.1 --- a/lighttpd/index.cgi	Wed Nov 01 03:44:38 2017 +0200
     1.2 +++ b/lighttpd/index.cgi	Sat Nov 04 04:02:57 2017 +0200
     1.3 @@ -479,7 +479,7 @@
     1.4  			: ${_fs=#_#_#}
     1.5  			: ${_stuff=#_#_#}
     1.6  			# Use one-letter html tags to save some bytes :)
     1.7 -			# <b>is error (red)</b> <u>is warning (orange)</u> <i>is informal (green)</i>
     1.8 +			# <b>is error (red)</b> <u>is warning (orange)</u> <i>is informative (green)</i>
     1.9  			sed	-e 's/&/\&amp;/g; s/</\&lt;/g; s/>/\&gt;/g' \
    1.10  				-e 's#OK$#<i>OK</i>#' \
    1.11  				-e 's#\([Dd]one\)$#<i>\1</i>#' \
    1.12 @@ -661,12 +661,17 @@
    1.13  
    1.14  
    1.15  pkg_info() {
    1.16 -	local log active bpkg
    1.17 +	local log active bpkg short_desc=''
    1.18  	log="$LOGS/$pkg.log"
    1.19  
    1.20  	echo -n "<h2><a href=\"$base/${requested_pkg:-$pkg}\">${requested_pkg:-$pkg}</a>"
    1.21 -	[ -f $PKGS/packages.info ] && awk -F$'\t' -vp="${requested_pkg:-$pkg}" '{if ($1 == p) { print ": " $4; exit; }}' $PKGS/packages.info
    1.22 -	echo '</h2>'
    1.23 +	# Get short description for existing packages
    1.24 +	[ -f $PKGS/packages.info ] &&
    1.25 +	short_desc="$(awk -F$'\t' -vp="${requested_pkg:-$pkg}" '{if ($1 == p) { printf("%s", $4); exit; }}' $PKGS/packages.info)"
    1.26 +	# If package not exists (not created yet or broken), get short description
    1.27 +	# (but only for "main" package) from receipt
    1.28 +	[ -n "$short_desc" ] || short_desc="$(. $wok/$pkg/receipt; echo "$SHORT_DESC")"
    1.29 +	echo ": $short_desc</h2>"
    1.30  	echo '<div id="info">'
    1.31  	echo "<a class='button icon receipt$(active receipt stuff)' href='$base/$pkg/receipt'>receipt &amp; stuff</a>"
    1.32