slitaz-pizza rev 40

Add HTML FAQ
author Christophe Lincoln <pankso@slitaz.org>
date Tue Mar 27 11:32:23 2012 +0200 (2012-03-27)
parents 2d78c44e8ad5
children 96974e330b86
files Makefile README doc/faq.en.html doc/help.en.html web/lib/header.html web/pizza.cgi web/pkgs.cgi
line diff
     1.1 --- a/Makefile	Tue Mar 27 10:50:17 2012 +0200
     1.2 +++ b/Makefile	Tue Mar 27 11:32:23 2012 +0200
     1.3 @@ -40,7 +40,7 @@
     1.4  	install -m 0755 data/* $(DESTDIR)$(PREFIX)/share/pizza
     1.5  	install -m 0644 pizza.conf $(DESTDIR)/etc/slitaz
     1.6  	install -m 0644 README $(DESTDIR)$(PREFIX)/share/doc/pizza
     1.7 -	#install -m 0644 doc/* $(DESTDIR)$(PREFIX)/share/doc/pizza
     1.8 +	cp -a doc/* $(DESTDIR)$(PREFIX)/share/doc/pizza
     1.9  	cp -a po/mo/* $(DESTDIR)$(PREFIX)/share/locale
    1.10  	cp -a web $(DESTDIR)$(PREFIX)/share/pizza
    1.11  	chown -R root.root $(DESTDIR)$(PREFIX)/share/pizza
     2.1 --- a/README	Tue Mar 27 10:50:17 2012 +0200
     2.2 +++ b/README	Tue Mar 27 11:32:23 2012 +0200
     2.3 @@ -29,23 +29,6 @@
     2.4  is generated.
     2.5  
     2.6  
     2.7 -FAQ
     2.8 ----
     2.9 -
    2.10 -	* Is it long to build ?
    2.11 -    
    2.12 -	  By default Pizza builds a distro every 20 min but skips a run if 
    2.13 -	  another distro is still building. After it depends on the build queue,
    2.14 -	  and the size of your custom SliTaz distro.
    2.15 -
    2.16 -	* How long do you keep my ISO ?
    2.17 -	
    2.18 -	  We can't guarantee hosting for a long time actually, we will keep your
    2.19 -	  product as long as we can. But surely enough time to share it with
    2.20 -	  your friends or family.
    2.21 -
    2.22 -
    2.23 -
    2.24  Installation and Administration
    2.25  -------------------------------
    2.26  Pizza uses a chroot to build ISOs and a web interface to create the flavor
     3.1 --- a/doc/faq.en.html	Tue Mar 27 10:50:17 2012 +0200
     3.2 +++ b/doc/faq.en.html	Tue Mar 27 11:32:23 2012 +0200
     3.3 @@ -0,0 +1,19 @@
     3.4 +
     3.5 +<h3>FAQ</h3>
     3.6 +<ul>
     3.7 +	<li>Is it long to build ?
     3.8 +		<p>By default Pizza builds a distro every 20 min but skips a run if 
     3.9 +		another distro is still building. After it depends on the build queue,
    3.10 +		and the size of your custom SliTaz distro.</p>
    3.11 +	</li>
    3.12 +	
    3.13 +	<li>How long do you keep my ISO ?
    3.14 +		<p>We can't guarantee hosting for a long time actually, we will keep
    3.15 +		your product as long as we can. But surely enough time to share it
    3.16 +		with your friends or family.</p>
    3.17 +	</li>
    3.18 +	
    3.19 +	<!-- <li>
    3.20 +		<p></p>
    3.21 +	</li> -->
    3.22 +</ul>
     4.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     4.2 +++ b/doc/help.en.html	Tue Mar 27 11:32:23 2012 +0200
     4.3 @@ -0,0 +1,4 @@
     4.4 +
     4.5 +<p>
     4.6 +	SliTaz Pizza Help
     4.7 +</p>
     5.1 --- a/web/lib/header.html	Tue Mar 27 10:50:17 2012 +0200
     5.2 +++ b/web/lib/header.html	Tue Mar 27 11:32:23 2012 +0200
     5.3 @@ -18,6 +18,7 @@
     5.4  		<a href="./">Pizza:</a>
     5.5  		<a href="./?info">Info</a>
     5.6  		<a href="./?rss">RSS</a>
     5.7 +		<a href="./?help">Help</a>
     5.8  	</div>
     5.9  	<h1><a href="./">SliTaz Pizza</a></h1>
    5.10  </div>
     6.1 --- a/web/pizza.cgi	Tue Mar 27 10:50:17 2012 +0200
     6.2 +++ b/web/pizza.cgi	Tue Mar 27 11:32:23 2012 +0200
     6.3 @@ -298,7 +298,8 @@
     6.4  		fi ;;
     6.5  	*\ help\ *)
     6.6  		echo "<h2>$(gettext "Help")</h2>"
     6.7 -		echo "<b>TODO: HTML faq/doc</b>"
     6.8 +		cat /usr/share/doc/pizza/index.en.html
     6.9 +		cat /usr/share/doc/pizza/faq.en.html
    6.10  		echo '<pre>'
    6.11  		cat /usr/share/doc/pizza/README
    6.12  		echo '</pre>' ;;
     7.1 --- a/web/pkgs.cgi	Tue Mar 27 10:50:17 2012 +0200
     7.2 +++ b/web/pkgs.cgi	Tue Mar 27 11:32:23 2012 +0200
     7.3 @@ -84,8 +84,8 @@
     7.4  				name=$(echo $pkginfo | cut -d "|" -f 1)
     7.5  				vers=$(echo $pkginfo | cut -d "|" -f 2)
     7.6  				desc=$(echo $pkginfo | cut -d "|" -f 3)
     7.7 -				echo "$name $vers \" $desc \"" >> $pkgsdesc
     7.8 -				echo "$name" >> $list
     7.9 +				echo "$pkg $vers \" $desc \"" >> $pkgsdesc
    7.10 +				echo "$pkg" >> $list
    7.11  			fi
    7.12  		done ;;
    7.13  	*\ rm\ *)