# HG changeset patch
# User Aleksej Bobylev <al.bobylev@gmail.com>
# Date 1467492301 -10800
# Node ID 166a91b87ac81e060fd40168a52a1954c377f438
# Parent  b2bf21185d4d4269d0ac398ecdd1291c539f9779
cooker.cgi: show variables $src, $install, $fs, $stuff in the cook log; hide empty boxes on the main page.

diff -r b2bf21185d4d -r 166a91b87ac8 web/cooker.cgi
--- a/web/cooker.cgi	Thu Jun 30 22:22:50 2016 +0300
+++ b/web/cooker.cgi	Sat Jul 02 23:45:01 2016 +0300
@@ -115,7 +115,12 @@
 				-e s"#^====\([^']*\).#<span class='span-line'>\0</span>#"g \
 				-e s"#^[a-zA-Z0-9]\([^']*\) :: #<span class='span-sky'>\0</span>#"g \
 				-e s"#ftp://[^ '\"]*#<a href='\0'>\0</a>#"g	\
-				-e s"#http://[^ '\"]*#<a href='\0'>\0</a>#"g ;;
+				-e s"#http://[^ '\"]*#<a href='\0'>\0</a>#"g | \
+			sed "s|$src|<span class='var'>\${src}</span>|g;
+				 s|$install|<span class='var'>\${install}</span>|g;
+				 s|$fs|<span class='var'>\${fs}</span>|g;
+				 s|$stuff|<span class='var'>\${stuff}</span>|g"
+				;;
 
 		receipt)
 			sed	-e s'|&|\&amp;|g' -e 's|<|\&lt;|g' -e 's|>|\&gt;|'g \
@@ -209,6 +214,13 @@
 		log=$LOGS/$pkg.log
 		echo "<h2>Package: $pkg</h2>"
 
+		# Define cook variables for syntax highlighter
+		. "$WOK/$pkg/receipt"
+		src="$WOK/$pkg/source/$PACKAGE-$VERSION"
+		install="$WOK/$pkg/install"
+		fs="$WOK/$pkg/taz/$PACKAGE-$VERSION/fs"
+		stuff="$WOK/$pkg/stuff"
+
 		# Package info.
 		echo '<div id="info">'
 		if [ -f "$wok/$pkg/receipt" ]; then
@@ -441,51 +453,56 @@
 EOT
 		[ -e $CACHE/cooker-request ] &&
 		[ $CACHE/activity -nt $CACHE/cooker-request ] && cat <<EOT
-
 <a class="button" href="cooker.cgi?poke">Poke cooker</a>
 EOT
+
 		cat <<EOT
-
 <h2 id="activity">Activity</h2>
 <pre>
 $(tac $CACHE/activity | head -n 12 | syntax_highlighter activity)
 </pre>
 $(more_button activity "More activity" $CACHE/activity 12)
+EOT
 
-
+		[ -s $cooknotes ] && cat <<EOT
 <h2 id="cooknotes">Cooknotes</h2>
 <pre>
 $(tac $cooknotes | head -n 12 | syntax_highlighter activity)
 </pre>
 $(more_button cooknotes "More notes" $cooknotes 12)
+EOT
 
-
+		[ -s $commits ] && cat <<EOT
 <h2 id="commits">Commits</h2>
 <pre>
 $(cat $commits)
 </pre>
+EOT
 
-
+		[ -s $cooklist ] && cat <<EOT
 <h2 id="cooklist">Cooklist</h2>
 <pre>
 $(cat $cooklist | head -n 20)
 </pre>
 $(more_button cooklist "Full cooklist" $cooklist 20)
+EOT
 
-
+		[ -s $broken ] && cat <<EOT
 <h2 id="broken">Broken</h2>
 <pre>
 $(cat $broken | head -n 20 | sed s"#^[^']*#<a href='cooker.cgi?pkg=\0'>\0</a>#"g)
 </pre>
 $(more_button broken "All broken packages" $broken 20)
+EOT
 
-
+		[ -s $blocked ] && cat <<EOT
 <h2 id="blocked">Blocked</h2>
 <pre>
 $(cat $blocked | sed s"#^[^']*#<a href='cooker.cgi?pkg=\0'>\0</a>#"g)
 </pre>
+EOT
 
-
+		cat <<EOT
 <h2 id="lastcook">Latest cook</h2>
 <pre>
 $(list_packages | sed s"#^\([^']*\).* : #<span class='log-date'>\0</span>#"g)
diff -r b2bf21185d4d -r 166a91b87ac8 web/style.css
--- a/web/style.css	Thu Jun 30 22:22:50 2016 +0300
+++ b/web/style.css	Sat Jul 02 23:45:01 2016 +0300
@@ -65,14 +65,15 @@
 	text-align: justify;
 }
 
-.span-ok    { color: green; }
+.span-ok    { color: #0a0; }
 .span-red   { color: red; }
 .span-sky   { color: blue; }
-.span-no    { color: orange; }
+.span-no    { color: #d90; }
 .span-line  { color: #888; }
 .log-date   { color: #666; font-size: 95%; }
-.sh-comment { color: #b20000; }
-.sh-val     { color: #f35a00; }
+.sh-comment { color: #a00; }
+.sh-val     { color: #e50; font-weight: bold; }
+.var        { color: #05a; }
 
 /* Buttons */