wok-current rev 7936
tazpkg-web: Up to 2.1 with last CSS and layout working smothly
| author | Christophe Lincoln <pankso@slitaz.org> |
|---|---|
| date | Tue Jan 11 20:49:09 2011 +0100 (2011-01-11) |
| parents | 72e26afe0ad0 |
| children | 00998d06c429 |
| files | tazpkg-web/receipt tazpkg-web/stuff/html/footer.html tazpkg-web/stuff/html/header.html tazpkg-web/stuff/html/home.html tazpkg-web/stuff/html/menu.html tazpkg-web/stuff/style/pics/website/network.png tazpkg-web/stuff/style/pics/website/text.png tazpkg-web/stuff/tazpkg-web |
line diff
1.1 --- a/tazpkg-web/receipt Tue Jan 11 15:57:00 2011 +0100 1.2 +++ b/tazpkg-web/receipt Tue Jan 11 20:49:09 2011 +0100 1.3 @@ -1,7 +1,7 @@ 1.4 # SliTaz package receipt. 1.5 1.6 PACKAGE="tazpkg-web" 1.7 -VERSION="2.0" 1.8 +VERSION="2.1" 1.9 CATEGORY="network" 1.10 SHORT_DESC="SliTaz packages Web interfaces (http://pkgs.slitaz.org/)." 1.11 MAINTAINER="pankso@slitaz.org"
2.1 --- a/tazpkg-web/stuff/html/footer.html Tue Jan 11 15:57:00 2011 +0100 2.2 +++ b/tazpkg-web/stuff/html/footer.html Tue Jan 11 20:49:09 2011 +0100 2.3 @@ -24,7 +24,7 @@ 2.4 <li>Page modified the _DATE_</li> 2.5 <li><a href="http://validator.w3.org/check?uri=referer"><img 2.6 src="http://pkgs.slitaz.org/pics/website/xhtml10.png" 2.7 - title="Code validé XHTML 1.0" alt="Valid XHTML 1.0" 2.8 + title="Valid XHTML 1.0" alt="Valid XHTML 1.0" 2.9 style="width: 80px; height: 15px; vertical-align: middle;" /></a></li> 2.10 </ul> 2.11 </div>
3.1 --- a/tazpkg-web/stuff/html/header.html Tue Jan 11 15:57:00 2011 +0100 3.2 +++ b/tazpkg-web/stuff/html/header.html Tue Jan 11 20:49:09 2011 +0100 3.3 @@ -28,3 +28,7 @@ 3.4 title="pkgs.slitaz.org" alt="pkgs.slitaz.org" /></a> 3.5 <p id="titre">#!/Packages</p> 3.6 </div> 3.7 + 3.8 +<!-- Content --> 3.9 +<div id="content-full"> 3.10 +
4.1 --- a/tazpkg-web/stuff/html/home.html Tue Jan 11 15:57:00 2011 +0100 4.2 +++ b/tazpkg-web/stuff/html/home.html Tue Jan 11 20:49:09 2011 +0100 4.3 @@ -1,22 +1,32 @@ 4.4 -<!-- Content --> 4.5 -<div id="content-full"> 4.6 - 4.7 <!-- Block begin --> 4.8 <div class="block"> 4.9 <!-- Nav block begin --> 4.10 - <div id="block_nav"> 4.11 - <h3><img src="pics/tazpkg.png" alt="users.png" />Packages</h3> 4.12 + <div id="block_nav" style="height: 220px;"> 4.13 + <h3><img src="/pics/website/network.png" alt=".png" />Tools</h3> 4.14 <ul> 4.15 <li><a href="http://hg.slitaz.org/wok">Hg Repos</a></li> 4.16 <li><a href="http://bb.slitaz.org/">Build Bot</a></li> 4.17 + <li><a href="http://labs.slitaz.org/issues">Bug Tracker</a></li> 4.18 + </ul> 4.19 + <h3><img src="/pics/website/text.png" alt=".png" />Documentation</h3> 4.20 + <ul> 4.21 + <li><a href="http://doc.slitaz.org/en:cookbook:wok">Wok & Tools</a></li> 4.22 + <li><a href="http://doc.slitaz.org/en:cookbook:receipt">Receipts</a></li> 4.23 </ul> 4.24 <!-- Nav block end --> 4.25 </div> 4.26 <!-- Top block begin --> 4.27 - <div id="block_top"> 4.28 + <div id="block_top" style="height: 220px;"> 4.29 <h1>Packages</h1> 4.30 <p> 4.31 - <a href="stable/">Stable packages</a> | <a href="cooking/">Cooking packages</a> 4.32 + Welcome to the SliTaz packages web interface. The site allows 4.33 + you to search and view all of the software packages available 4.34 + on the SliTaz mirror. The pages are automatically updated daily 4.35 + via a cron job. 4.36 + </p> 4.37 + <p> 4.38 + Browse the packages web interface: <a href="stable/">Stable packages</a> 4.39 + | <a href="cooking/">Cooking packages</a> 4.40 </p> 4.41 <!-- Top block end --> 4.42 </div> 4.43 @@ -24,29 +34,27 @@ 4.44 </div> 4.45 4.46 <div class="pkgs-search"> 4.47 -<form method="post" action="http://pkgs.slitaz.org/search.cgi"> 4.48 - <select name="object"> 4.49 - <option>Package</option> 4.50 - <option>Desc</option> 4.51 - <option>Tags</option> 4.52 - <option>Receipt</option> 4.53 - <option>Depends</option> 4.54 - <option>BuildDepends</option> 4.55 - <option>File</option> 4.56 - <option>File_list</option> 4.57 - <option>FileOverlap</option> 4.58 - </select> 4.59 - <strong>:</strong> 4.60 - <input type="text" name="query" size="30" /> 4.61 - <select name="version"> 4.62 - <option>stable</option> 4.63 - <option>cooking</option> 4.64 - <option>2.0</option> 4.65 - <option>1.0</option> 4.66 - </select> 4.67 - <input type="submit" name="search" value="Search" /> 4.68 -</form> 4.69 + <form method="post" action="http://pkgs.slitaz.org/search.cgi"> 4.70 + <p> 4.71 + <input type="text" name="query" size="30" /> 4.72 + <input type="submit" name="search" value="Search" /> 4.73 + </p> 4.74 + <select name="object"> 4.75 + <option>Package</option> 4.76 + <option>Desc</option> 4.77 + <option>Tags</option> 4.78 + <option>Receipt</option> 4.79 + <option>Depends</option> 4.80 + <option>BuildDepends</option> 4.81 + <option>File</option> 4.82 + <option>File_list</option> 4.83 + <option>FileOverlap</option> 4.84 + </select> 4.85 + <select name="version"> 4.86 + <option>stable</option> 4.87 + <option>cooking</option> 4.88 + <option>2.0</option> 4.89 + <option>1.0</option> 4.90 + </select> 4.91 + </form> 4.92 </div> 4.93 - 4.94 -<!-- End of content --> 4.95 -</div>
5.1 --- a/tazpkg-web/stuff/html/menu.html Tue Jan 11 15:57:00 2011 +0100 5.2 +++ b/tazpkg-web/stuff/html/menu.html Tue Jan 11 20:49:09 2011 +0100 5.3 @@ -1,38 +1,47 @@ 5.4 - 5.5 -<!-- Navigation menu --> 5.6 -<div id="nav"> 5.7 - 5.8 -<div class="nav_box"> 5.9 -<h4>Packages Categories</h4> 5.10 -<ul> 5.11 - <li><a href="base-system.html">Base-system</a></li> 5.12 - <li><a href="x-window.html">X-window</a></li> 5.13 - <li><a href="utilities.html">Utilities</a></li> 5.14 - <li><a href="network.html">Network</a></li> 5.15 - <li><a href="games.html">Games</a></li> 5.16 - <li><a href="graphics.html">Graphics</a></li> 5.17 - <li><a href="multimedia.html">Multimedia</a></li> 5.18 - <li><a href="office.html">Office</a></li> 5.19 - <li><a href="development.html">Development</a></li> 5.20 - <li><a href="system-tools.html">System-tools</a></li> 5.21 - <li><a href="security.html">Security</a></li> 5.22 - <li><a href="misc.html">Misc</a></li> 5.23 - <li><a href="meta.html">Meta packages</a></li> 5.24 - <li><a href="non-free.html">Non free</a></li> 5.25 -</ul> 5.26 +<!-- Block begin --> 5.27 +<div class="block"> 5.28 + <!-- Nav block begin --> 5.29 + <div id="block_nav" style="height: 220px;"> 5.30 + <h3><img src="/pics/tazpkg.png" alt=".png" />Categories</h3> 5.31 + <div class="right_box"> 5.32 + <ul> 5.33 + <li><a href="development.html">Development</a></li> 5.34 + <li><a href="system-tools.html">System-tools</a></li> 5.35 + <li><a href="security.html">Security</a></li> 5.36 + <li><a href="misc.html">Misc</a></li> 5.37 + <li><a href="meta.html">Meta packages</a></li> 5.38 + <li><a href="non-free.html">Non free</a></li> 5.39 + </ul> 5.40 + </div> 5.41 + <ul> 5.42 + <li><a href="base-system.html">Base-system</a></li> 5.43 + <li><a href="x-window.html">X-window</a></li> 5.44 + <li><a href="utilities.html">Utilities</a></li> 5.45 + <li><a href="network.html">Network</a></li> 5.46 + <li><a href="games.html">Games</a></li> 5.47 + <li><a href="graphics.html">Graphics</a></li> 5.48 + <li><a href="multimedia.html">Multimedia</a></li> 5.49 + <li><a href="office.html">Office</a></li> 5.50 + </ul> 5.51 + <!-- Nav block end --> 5.52 + </div> 5.53 + <!-- Top block begin --> 5.54 + <div id="block_top" style="height: 220px;"> 5.55 + <h1>Packages _RELEASE_</h1> 5.56 + <p> 5.57 + The SliTaz packages web interface allows you to search and view 5.58 + all of the software packages available for SliTaz. The pages are 5.59 + updated daily via a cron job. 5.60 + </p> 5.61 + <p> 5.62 + Documentation: 5.63 + <a href="http://doc.slitaz.org/en:handbook:packages">Package manager</a> 5.64 + </p> 5.65 + <p> 5.66 + Browse the packages web interface: <a href="../stable/">Stable packages</a> 5.67 + | <a href="../cooking/">Cooking packages</a> 5.68 + </p> 5.69 + <!-- Top block end --> 5.70 + </div> 5.71 +<!-- Block end --> 5.72 </div> 5.73 - 5.74 -<div class="nav_box"> 5.75 -<h4>SliTaz Network</h4> 5.76 -<ul> 5.77 - <li><a href="http://www.slitaz.org/">Main Website</a></li> 5.78 - <li><a href="http://doc.slitaz.org/">Documentation</a></li> 5.79 - <li><a href="http://forum.slitaz.org/">Support Forum</a></li> 5.80 - <li><a href="http://labs.slitaz.org/">SliTaz Labs</a></li> 5.81 - <li><a href="http://twitter.com/slitaz">SliTaz on Twitter</a></li> 5.82 - <li><a href="http://www.distrowatch.com/slitaz">SliTaz on DistroWatch</a></li> 5.83 -</ul> 5.84 -</div> 5.85 - 5.86 -<!-- End navigation menu --> 5.87 -</div>
6.1 Binary file tazpkg-web/stuff/style/pics/website/network.png has changed
7.1 Binary file tazpkg-web/stuff/style/pics/website/text.png has changed
8.1 --- a/tazpkg-web/stuff/tazpkg-web Tue Jan 11 15:57:00 2011 +0100 8.2 +++ b/tazpkg-web/stuff/tazpkg-web Tue Jan 11 20:49:09 2011 +0100 8.3 @@ -1,7 +1,7 @@ 8.4 #!/bin/sh 8.5 # SliTaz Packages Web interface generator: http://pkgs.slitaz.org/ 8.6 # 8.7 -# (C) 2009 SliTaz project - GNU General Public License v3. 8.8 +# (C) 2011 SliTaz project - GNU General Public License v3. 8.9 # Christophe Lincoln <pankso@slitaz.org> 8.10 # 8.11 8.12 @@ -30,33 +30,21 @@ 8.13 { 8.14 if [ "$RELEASE" == "stable" ]; then 8.15 cat << _EOT_ 8.16 - <option>stable</option> 8.17 - <option>cooking</option> 8.18 - <option>2.0</option> 8.19 - <option>1.0</option> 8.20 + <option>stable</option> 8.21 + <option>cooking</option> 8.22 + <option>2.0</option> 8.23 + <option>1.0</option> 8.24 _EOT_ 8.25 else 8.26 cat << _EOT_ 8.27 - <option>cooking</option> 8.28 - <option>stable</option> 8.29 - <option>2.0</option> 8.30 - <option>1.0</option> 8.31 + <option>cooking</option> 8.32 + <option>stable</option> 8.33 + <option>2.0</option> 8.34 + <option>1.0</option> 8.35 _EOT_ 8.36 fi 8.37 } 8.38 8.39 -content_top() 8.40 -{ 8.41 - cat >> $PAGES_DIR/$page.html << _EOF_ 8.42 - 8.43 -<!-- Content --> 8.44 -<div id="content"> 8.45 - 8.46 -<h1>Packages $RELEASE</h1> 8.47 -<h2>$h2</font></h2> 8.48 -_EOF_ 8.49 -} 8.50 - 8.51 # xHTML Header. 8.52 xhtml_header() 8.53 { 8.54 @@ -79,31 +67,33 @@ 8.55 { 8.56 cat >> $PAGES_DIR/$page.html << _EOT_ 8.57 8.58 -<div style="text-align: center; padding: 20px;"> 8.59 -<form method="post" action="http://pkgs.slitaz.org/search.cgi"> 8.60 - <select name="object"> 8.61 - <option>Package</option> 8.62 - <option>Desc</option> 8.63 - <option>Tags</option> 8.64 - <option>Receipt</option> 8.65 - <option>Depends</option> 8.66 - <option>BuildDepends</option> 8.67 - <option>File</option> 8.68 - <option>File_list</option> 8.69 - <option>FileOverlap</option> 8.70 - </select> 8.71 - <strong>:</strong> 8.72 - <input type="text" name="query" size="32" /> 8.73 - <select name="version"> 8.74 +<div class="pkgs-search"> 8.75 + <form method="post" action="http://pkgs.slitaz.org/search.cgi"> 8.76 + <p> 8.77 + <input type="text" name="query" size="32" /> 8.78 + <input type="submit" name="search" value="Search" /> 8.79 + </p> 8.80 + <select name="object"> 8.81 + <option>Package</option> 8.82 + <option>Desc</option> 8.83 + <option>Tags</option> 8.84 + <option>Receipt</option> 8.85 + <option>Depends</option> 8.86 + <option>BuildDepends</option> 8.87 + <option>File</option> 8.88 + <option>File_list</option> 8.89 + <option>FileOverlap</option> 8.90 + </select> 8.91 + <select name="version"> 8.92 `search_form_option` 8.93 - </select> 8.94 - <input type="submit" name="search" value="Search" /> 8.95 -</form> 8.96 -<p> 8.97 -$packages packages - Database generated on: $DATE 8.98 -</p> 8.99 + </select> 8.100 + </form> 8.101 + <p> 8.102 + $packages packages - Database generated on: $DATE 8.103 + </p> 8.104 </div> 8.105 _EOT_ 8.106 + sed -i s/"_RELEASE_"/"$RELEASE"/ $PAGES_DIR/$page.html 8.107 } 8.108 8.109 # Packages <h3> and infos in <pre>. Some packages use EXTRAVERSION in 8.110 @@ -171,7 +161,7 @@ 8.111 do 8.112 # Gen categories menu/links 8.113 echo '' >> $PAGES_DIR/$page.html 8.114 - echo '<p class="pkg_nav">' >> $PAGES_DIR/$page.html 8.115 + echo '<div class="infobox"><p>' >> $PAGES_DIR/$page.html 8.116 echo 'Categories' >> $PAGES_DIR/$page.html 8.117 for i in $CATEGORIES 8.118 do 8.119 @@ -179,7 +169,7 @@ 8.120 | <a href="$i.html">$i</a> 8.121 _EOF_ 8.122 done 8.123 - echo '</p>' >> $PAGES_DIR/$page.html 8.124 + echo '</p></div>' >> $PAGES_DIR/$page.html 8.125 xhtml_footer 8.126 done 8.127 } 8.128 @@ -192,7 +182,6 @@ 8.129 h2="Web interface" 8.130 RELEASE="" 8.131 xhtml_header 8.132 - content_top 8.133 cat $LIB_DIR/html/home.html >> $PAGES_DIR/$page.html 8.134 xhtml_footer 8.135 } 8.136 @@ -212,7 +201,8 @@ 8.137 h2=$page 8.138 xhtml_header 8.139 cat $LIB_DIR/html/menu.html >> $PAGES_DIR/$page.html 8.140 - content_top 8.141 + sed -i s/"_RELEASE_"/"$RELEASE"/ $PAGES_DIR/$page.html 8.142 + echo "<h2>Category: $h2</h2>" >> $PAGES_DIR/$page.html 8.143 done 8.144 status 8.145 # Scan the wok and classify packages by category. 8.146 @@ -229,7 +219,6 @@ 8.147 h2="Categories" 8.148 xhtml_header 8.149 cat $LIB_DIR/html/menu.html >> $PAGES_DIR/$page.html 8.150 - content_top 8.151 gen_index_content 8.152 xhtml_footer 8.153 home_page