# HG changeset patch
# User Christophe Lincoln <pankso@slitaz.org>
# Date 1294775349 -3600
# Node ID ca810674c318d2499ce6819bdfe5f7a390700db8
# Parent  72e26afe0ad038cc0b811eb287d7aeff75a4abe0
tazpkg-web: Up to 2.1 with last CSS and layout working smothly

diff -r 72e26afe0ad0 -r ca810674c318 tazpkg-web/receipt
--- a/tazpkg-web/receipt	Tue Jan 11 15:57:00 2011 +0100
+++ b/tazpkg-web/receipt	Tue Jan 11 20:49:09 2011 +0100
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="tazpkg-web"
-VERSION="2.0"
+VERSION="2.1"
 CATEGORY="network"
 SHORT_DESC="SliTaz packages Web interfaces (http://pkgs.slitaz.org/)."
 MAINTAINER="pankso@slitaz.org"
diff -r 72e26afe0ad0 -r ca810674c318 tazpkg-web/stuff/html/footer.html
--- a/tazpkg-web/stuff/html/footer.html	Tue Jan 11 15:57:00 2011 +0100
+++ b/tazpkg-web/stuff/html/footer.html	Tue Jan 11 20:49:09 2011 +0100
@@ -24,7 +24,7 @@
 		<li>Page modified the _DATE_</li>
 		<li><a href="http://validator.w3.org/check?uri=referer"><img
 		src="http://pkgs.slitaz.org/pics/website/xhtml10.png" 
-		title="Code validé XHTML 1.0" alt="Valid XHTML 1.0"
+		title="Valid XHTML 1.0" alt="Valid XHTML 1.0"
 		style="width: 80px; height: 15px; vertical-align: middle;" /></a></li>
 	</ul>
 </div>
diff -r 72e26afe0ad0 -r ca810674c318 tazpkg-web/stuff/html/header.html
--- a/tazpkg-web/stuff/html/header.html	Tue Jan 11 15:57:00 2011 +0100
+++ b/tazpkg-web/stuff/html/header.html	Tue Jan 11 20:49:09 2011 +0100
@@ -28,3 +28,7 @@
 		title="pkgs.slitaz.org" alt="pkgs.slitaz.org" /></a>
 	<p id="titre">#!/Packages</p>
 </div>
+
+<!-- Content -->
+<div id="content-full">
+
diff -r 72e26afe0ad0 -r ca810674c318 tazpkg-web/stuff/html/home.html
--- a/tazpkg-web/stuff/html/home.html	Tue Jan 11 15:57:00 2011 +0100
+++ b/tazpkg-web/stuff/html/home.html	Tue Jan 11 20:49:09 2011 +0100
@@ -1,22 +1,32 @@
-<!-- Content -->
-<div id="content-full">
-
 <!-- Block begin -->
 <div class="block">
 	<!-- Nav block begin -->
-	<div id="block_nav">
-		<h3><img src="pics/tazpkg.png" alt="users.png" />Packages</h3>
+	<div id="block_nav" style="height: 220px;">
+		<h3><img src="/pics/website/network.png" alt=".png" />Tools</h3>
 		<ul>
 			<li><a href="http://hg.slitaz.org/wok">Hg Repos</a></li>
 			<li><a href="http://bb.slitaz.org/">Build Bot</a></li>
+			<li><a href="http://labs.slitaz.org/issues">Bug Tracker</a></li>
+		</ul>
+		<h3><img src="/pics/website/text.png" alt=".png" />Documentation</h3>
+		<ul>
+			<li><a href="http://doc.slitaz.org/en:cookbook:wok">Wok &amp; Tools</a></li>
+			<li><a href="http://doc.slitaz.org/en:cookbook:receipt">Receipts</a></li>
 		</ul>
 	<!-- Nav block end -->
 	</div>
 	<!-- Top block begin -->
-	<div id="block_top">
+	<div id="block_top" style="height: 220px;">
 		<h1>Packages</h1>
 		<p>
-			<a href="stable/">Stable packages</a> | <a href="cooking/">Cooking packages</a>
+			Welcome to the SliTaz packages web interface. The site allows
+			you to search and view all of the software packages available
+			on the SliTaz mirror. The pages are automatically updated daily
+			via a cron job.
+		</p>
+		<p>
+			Browse the packages web interface: <a href="stable/">Stable packages</a>
+			| <a href="cooking/">Cooking packages</a>
 		</p>
 	<!-- Top block end -->
 	</div>
@@ -24,29 +34,27 @@
 </div>
 
 <div class="pkgs-search">
-<form method="post" action="http://pkgs.slitaz.org/search.cgi">
-	<select name="object">
-		<option>Package</option>
-		<option>Desc</option>
-		<option>Tags</option>
-		<option>Receipt</option>
-		<option>Depends</option>
-		<option>BuildDepends</option>
-		<option>File</option>
-		<option>File_list</option>
-		<option>FileOverlap</option>
-	</select>
-	<strong>:</strong>
-	<input type="text" name="query" size="30" />
-	<select name="version">
-		<option>stable</option>
-		<option>cooking</option>
-		<option>2.0</option>
-		<option>1.0</option>
-	</select>
-	<input type="submit" name="search" value="Search" />
-</form>
+	<form method="post" action="http://pkgs.slitaz.org/search.cgi">
+		<p>
+			<input type="text" name="query" size="30" />
+			<input type="submit" name="search" value="Search" />
+		</p>
+		<select name="object">
+			<option>Package</option>
+			<option>Desc</option>
+			<option>Tags</option>
+			<option>Receipt</option>
+			<option>Depends</option>
+			<option>BuildDepends</option>
+			<option>File</option>
+			<option>File_list</option>
+			<option>FileOverlap</option>
+		</select>
+		<select name="version">
+			<option>stable</option>
+			<option>cooking</option>
+			<option>2.0</option>
+			<option>1.0</option>
+		</select>
+	</form>
 </div>
-
-<!-- End of content -->
-</div>
diff -r 72e26afe0ad0 -r ca810674c318 tazpkg-web/stuff/html/menu.html
--- a/tazpkg-web/stuff/html/menu.html	Tue Jan 11 15:57:00 2011 +0100
+++ b/tazpkg-web/stuff/html/menu.html	Tue Jan 11 20:49:09 2011 +0100
@@ -1,38 +1,47 @@
-
-<!-- Navigation menu -->
-<div id="nav">
-
-<div class="nav_box">
-<h4>Packages Categories</h4>
-<ul>
-	<li><a href="base-system.html">Base-system</a></li>
-	<li><a href="x-window.html">X-window</a></li>
-	<li><a href="utilities.html">Utilities</a></li>
-	<li><a href="network.html">Network</a></li>
-	<li><a href="games.html">Games</a></li>
-	<li><a href="graphics.html">Graphics</a></li>
-	<li><a href="multimedia.html">Multimedia</a></li>
-	<li><a href="office.html">Office</a></li>
-	<li><a href="development.html">Development</a></li>
-	<li><a href="system-tools.html">System-tools</a></li>
-	<li><a href="security.html">Security</a></li>
-	<li><a href="misc.html">Misc</a></li>
-	<li><a href="meta.html">Meta packages</a></li>
-	<li><a href="non-free.html">Non free</a></li>
-</ul>
+<!-- Block begin -->
+<div class="block">
+	<!-- Nav block begin -->
+	<div id="block_nav" style="height: 220px;">
+		<h3><img src="/pics/tazpkg.png" alt=".png" />Categories</h3>
+		<div class="right_box">
+			<ul>
+				<li><a href="development.html">Development</a></li>
+				<li><a href="system-tools.html">System-tools</a></li>
+				<li><a href="security.html">Security</a></li>
+				<li><a href="misc.html">Misc</a></li>
+				<li><a href="meta.html">Meta packages</a></li>
+				<li><a href="non-free.html">Non free</a></li>
+			</ul>
+		</div>
+		<ul>
+			<li><a href="base-system.html">Base-system</a></li>
+			<li><a href="x-window.html">X-window</a></li>
+			<li><a href="utilities.html">Utilities</a></li>
+			<li><a href="network.html">Network</a></li>
+			<li><a href="games.html">Games</a></li>
+			<li><a href="graphics.html">Graphics</a></li>
+			<li><a href="multimedia.html">Multimedia</a></li>
+			<li><a href="office.html">Office</a></li>
+		</ul>
+	<!-- Nav block end -->
+	</div>
+	<!-- Top block begin -->
+	<div id="block_top" style="height: 220px;">
+		<h1>Packages _RELEASE_</h1>
+		<p>
+			The SliTaz packages web interface allows you to search and view 
+			all of the software packages available for SliTaz. The pages are
+			updated daily via a cron job.
+		</p>
+		<p>
+			Documentation: 
+			<a href="http://doc.slitaz.org/en:handbook:packages">Package manager</a>
+		</p>
+		<p>
+			Browse the packages web interface: <a href="../stable/">Stable packages</a>
+			| <a href="../cooking/">Cooking packages</a>
+		</p>
+	<!-- Top block end -->
+	</div>
+<!-- Block end -->
 </div>
-
-<div class="nav_box">
-<h4>SliTaz Network</h4>
-<ul>
-	<li><a href="http://www.slitaz.org/">Main Website</a></li>
-	<li><a href="http://doc.slitaz.org/">Documentation</a></li>
-	<li><a href="http://forum.slitaz.org/">Support Forum</a></li>
-	<li><a href="http://labs.slitaz.org/">SliTaz Labs</a></li>
-	<li><a href="http://twitter.com/slitaz">SliTaz on Twitter</a></li>
-	<li><a href="http://www.distrowatch.com/slitaz">SliTaz on DistroWatch</a></li>
-</ul>
-</div>
-
-<!-- End navigation menu -->
-</div>
diff -r 72e26afe0ad0 -r ca810674c318 tazpkg-web/stuff/style/pics/website/network.png
Binary file tazpkg-web/stuff/style/pics/website/network.png has changed
diff -r 72e26afe0ad0 -r ca810674c318 tazpkg-web/stuff/style/pics/website/text.png
Binary file tazpkg-web/stuff/style/pics/website/text.png has changed
diff -r 72e26afe0ad0 -r ca810674c318 tazpkg-web/stuff/tazpkg-web
--- a/tazpkg-web/stuff/tazpkg-web	Tue Jan 11 15:57:00 2011 +0100
+++ b/tazpkg-web/stuff/tazpkg-web	Tue Jan 11 20:49:09 2011 +0100
@@ -1,7 +1,7 @@
 #!/bin/sh
 # SliTaz Packages Web interface generator: http://pkgs.slitaz.org/
 #
-# (C) 2009 SliTaz project - GNU General Public License v3.
+# (C) 2011 SliTaz project - GNU General Public License v3.
 # Christophe Lincoln <pankso@slitaz.org>
 #
 
@@ -30,33 +30,21 @@
 {
 	if [ "$RELEASE" == "stable" ]; then
 		cat << _EOT_
-		<option>stable</option>
-		<option>cooking</option>
-		<option>2.0</option>
-		<option>1.0</option>
+			<option>stable</option>
+			<option>cooking</option>
+			<option>2.0</option>
+			<option>1.0</option>
 _EOT_
 	else
 		cat << _EOT_
-		<option>cooking</option>
-		<option>stable</option>
-		<option>2.0</option>
-		<option>1.0</option>
+			<option>cooking</option>
+			<option>stable</option>
+			<option>2.0</option>
+			<option>1.0</option>
 _EOT_
 	fi
 }
 
-content_top()
-{
-	cat >> $PAGES_DIR/$page.html << _EOF_
-
-<!-- Content -->
-<div id="content">
-
-<h1>Packages $RELEASE</h1>
-<h2>$h2</font></h2>
-_EOF_
-}
-
 # xHTML Header.
 xhtml_header()
 {
@@ -79,31 +67,33 @@
 {
 	cat >> $PAGES_DIR/$page.html << _EOT_
 
-<div style="text-align: center; padding: 20px;">
-<form method="post" action="http://pkgs.slitaz.org/search.cgi">
-	<select name="object">
-		<option>Package</option>
-		<option>Desc</option>
-		<option>Tags</option>
-		<option>Receipt</option>
-		<option>Depends</option>
-		<option>BuildDepends</option>
-		<option>File</option>
-		<option>File_list</option>
-		<option>FileOverlap</option>
-	</select>
-	<strong>:</strong>
-	<input type="text" name="query" size="32" />
-	<select name="version">
+<div class="pkgs-search">
+	<form method="post" action="http://pkgs.slitaz.org/search.cgi">
+		<p>
+			<input type="text" name="query" size="32" />
+			<input type="submit" name="search" value="Search" />
+		</p>
+		<select name="object">
+			<option>Package</option>
+			<option>Desc</option>
+			<option>Tags</option>
+			<option>Receipt</option>
+			<option>Depends</option>
+			<option>BuildDepends</option>
+			<option>File</option>
+			<option>File_list</option>
+			<option>FileOverlap</option>
+		</select>
+		<select name="version">
 `search_form_option`
-	</select>
-	<input type="submit" name="search" value="Search" />
-</form>
-<p>
-$packages packages - Database generated on: $DATE
-</p>
+		</select>
+	</form>
+	<p>
+		$packages packages - Database generated on: $DATE
+	</p>
 </div>
 _EOT_
+	sed -i s/"_RELEASE_"/"$RELEASE"/ $PAGES_DIR/$page.html
 }
 
 # Packages <h3> and infos in <pre>. Some packages use EXTRAVERSION in
@@ -171,7 +161,7 @@
 	do
 		# Gen categories menu/links
 		echo '' >> $PAGES_DIR/$page.html
-		echo '<p class="pkg_nav">' >> $PAGES_DIR/$page.html
+		echo '<div class="infobox"><p>' >> $PAGES_DIR/$page.html
 		echo 'Categories' >> $PAGES_DIR/$page.html
 		for i in $CATEGORIES
 		do
@@ -179,7 +169,7 @@
 | <a href="$i.html">$i</a>
 _EOF_
 		done
-		echo '</p>' >> $PAGES_DIR/$page.html
+		echo '</p></div>' >> $PAGES_DIR/$page.html
 		xhtml_footer
 	done
 }
@@ -192,7 +182,6 @@
 	h2="Web interface"
 	RELEASE=""
 	xhtml_header
-	content_top
 	cat $LIB_DIR/html/home.html >> $PAGES_DIR/$page.html
 	xhtml_footer
 }
@@ -212,7 +201,8 @@
 		h2=$page
 		xhtml_header
 		cat $LIB_DIR/html/menu.html >> $PAGES_DIR/$page.html
-		content_top
+		sed -i s/"_RELEASE_"/"$RELEASE"/ $PAGES_DIR/$page.html
+		echo "<h2>Category: $h2</h2>" >> $PAGES_DIR/$page.html
 	done
 	status
 	# Scan the wok and classify packages by category.
@@ -229,7 +219,6 @@
 	h2="Categories"
 	xhtml_header
 	cat $LIB_DIR/html/menu.html >> $PAGES_DIR/$page.html
-	content_top
 	gen_index_content
 	xhtml_footer
 	home_page