# HG changeset patch
# User Christophe Lincoln <pankso@slitaz.org>
# Date 1304782697 -7200
# Node ID ffb061b0826f90ca4ed9653691d9dbbea810cdd7
# Parent  99b24823dbc7f1bfd9dacbf56faae7de0152a8fe
Improve web interface, keep and show more activity and cooknote

diff -r 99b24823dbc7 -r ffb061b0826f cooker
--- a/cooker	Sat May 07 16:33:12 2011 +0200
+++ b/cooker	Sat May 07 17:38:17 2011 +0200
@@ -56,7 +56,7 @@
 }
 
 # Lograte activity.
-[ -s "$activity" ] && tail -n 20 $activity > /tmp/tail && \
+[ -s "$activity" ] && tail -n 60 $activity > /tmp/tail && \
 	mv -f /tmp/tail $activity
 
 # Log activities, we want first letter capitalized.
diff -r 99b24823dbc7 -r ffb061b0826f web/cooker.cgi
--- a/web/cooker.cgi	Sat May 07 16:33:12 2011 +0200
+++ b/web/cooker.cgi	Sat May 07 17:38:17 2011 +0200
@@ -34,7 +34,7 @@
 				-e 's#no$#<span class="span-no">no</span>#g' \
 				-e 's#error$#<span class="span-error">error</span>#g' \
 				-e 's#ERROR:#<span class="span-error">ERROR:</span>#g' \
-				-e s"#^Executing:\([^']*\).#<span class='span-sky'>\0</span>#"g \
+				-e s"#^Executing:\([^']*\).#<span class='sh-val'>\0</span>#"g \
 				-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	\
@@ -121,23 +121,34 @@
 		else
 			echo "<pre>No log: $pkg</pre>"
 		fi ;;
-	log=*)
-		log=${QUERY_STRING#log=}
-		file=$LOGS/$log.log
-		echo "<h2>Log for: $log</h2>"
-		if [ -f "$LOGS/$log.log" ]; then
-			if fgrep -q "Summary" $file; then
+	file=*)
+		# Dont allown all files on the system for security reason.
+		file=${QUERY_STRING#file=}
+		case "$file" in
+			activity|cooknotes)
+				echo "<h2>DB: $file</h2>"
 				echo '<pre>'
-				grep -A 8 "^Summary" $file | sed /^$/d | \
-					syntax_highlighter log
-				echo '</pre>'
-			fi
-			echo '<pre>'
-			cat $file | syntax_highlighter log
-			echo '</pre>'
-		else
-			echo "<pre>No log for: $log</pre>"
-		fi ;;
+				tac $CACHE/$file | \
+					sed s"#^\([^']* : \)#<span class='log-date'>\0</span>#"g
+				echo '</pre>' ;;
+			*.log)
+				file=$LOGS/$file
+				name=$(basename $file)
+				echo "<h2>Log for: ${name%.log}</h2>"
+				if [ -f "$LOGS/$log.log" ]; then
+					if fgrep -q "Summary" $file; then
+						echo '<pre>'
+						grep -A 8 "^Summary" $file | sed /^$/d | \
+							syntax_highlighter log
+						echo '</pre>'
+					fi
+					echo '<pre>'
+					cat $file | syntax_highlighter log
+					echo '</pre>'
+				else
+					echo "<pre>No log for: $log</pre>"
+				fi ;;
+		esac ;;
 	receipt=*)
 		pkg=${QUERY_STRING#receipt=}
 		echo "<h2>Receipt for: $pkg</h2>"
@@ -164,23 +175,29 @@
 Packages in wok  : $(ls $WOK | wc -l)
 Wok revision     : <a href="http://hg.slitaz.org/wok">$(cd $WOK && hg head --template '{rev}\n')</a>
 Commits to cook  : $(cat $commits | wc -l)
+Current cooklist : $(cat $cooklist | wc -l)
 Broken packages  : $(cat $broken | wc -l)
 </pre>
 
 <div id="info">
-	Latest logs: <a href="cooker.cgi?log=cookorder">cookorder</a>
-	<a href="cooker.cgi?log=commits">commits</a>
+	Logs:
+	<a class="button" href="cooker.cgi?file=cookorder.log">cookorder</a>
+	<a class="button" href="cooker.cgi?file=commits.log">commits</a>
 </div>
 
 <h2>Activity</h2>
 <pre>
-$(tac $CACHE/activity | sed s"#^\([^']* : \)#<span class='log-date'>\0</span>#"g)
+$(tac $CACHE/activity | head -n 12 | \
+	sed s"#^\([^']* : \)#<span class='log-date'>\0</span>#"g)
 </pre>
+<a class="button" href="cooker.cgi?file=activity">More activity</a>
 
 <h2>Cooknotes</h2>
 <pre>
-$(cat $cooknotes)
+$(tac $cooknotes | head -n 12 | \
+	sed s"#^\([^']* : \)#<span class='log-date'>\0</span>#"g)
 </pre>
+<a class="button" href="cooker.cgi?file=cooknotes">More notes</a>
 
 <h2>Commits</h2>
 <pre>
diff -r 99b24823dbc7 -r ffb061b0826f web/style.css
--- a/web/style.css	Sat May 07 16:33:12 2011 +0200
+++ b/web/style.css	Sat May 07 17:38:17 2011 +0200
@@ -1,6 +1,6 @@
 /* CSS style for SliTaz Cooker */
 
-body { font: 96% sans-serif, vernada, arial; margin: 0; }
+body { font: 13px sans-serif, vernada, arial; margin: 0; }
 h1 { margin: 0; padding: 8px; color: #fff; font-size: 20px; }
 h1 a { color: #fff; text-decoration: none; }
 h2 { color: #444; } h3 { color: #666; font-size: 140%; }
@@ -9,8 +9,8 @@
 	background-color: #f8f8f8;
 	border: 1px solid #ddd;
 	padding: 10px;
-	border-radius: 4px;
 	overflow: auto;
+	font-size: 96%;
 }
 
 #header {
@@ -39,3 +39,32 @@
 .log-date { color: #666; font-size: 95%; }
 .sh-comment { color: #b20000; }
 .sh-val { color: #f35a00; }
+
+/* Buttons */
+
+.button {
+	padding: 2px 4px;
+	margin: 0;
+	background-color: #f1f1f1;
+	border: 1px solid #ddd;
+	cursor: pointer;
+	color: #000;
+}
+
+a.button  {
+	text-decoration: none;
+	color: #666;
+}
+
+.button:hover {
+	background-color: #ddd;
+	border: 1px solid #999;
+}
+
+/* Round corner */
+
+pre, .button {
+	/*-moz-border-radius: 4px;
+	-webkit-border-radius: 4px; */
+	border-radius: 4px;
+}