slitaz-forge rev 183

mirror/info: Update pages and link to use files from static and images (the one only used here)
author Christophe Lincoln <pankso@slitaz.org>
date Tue Mar 20 20:37:15 2012 +0100 (2012-03-20)
parents 4a10efb174b6
children 1f27742b054c
files mirror/info/graphs.php mirror/info/images/iso.png mirror/info/index.php
line diff
     1.1 --- a/mirror/info/graphs.php	Tue Mar 20 20:22:39 2012 +0100
     1.2 +++ b/mirror/info/graphs.php	Tue Mar 20 20:37:15 2012 +0100
     1.3 @@ -7,8 +7,8 @@
     1.4  	<meta name="description" content="slitaz mirror rrdtool graphs" />
     1.5  	<meta name="robots" content="noindex" />
     1.6  	<meta name="author" content="SliTaz Contributors" />
     1.7 -	<link rel="shortcut icon" href="/css/favicon.ico" />
     1.8 -	<link rel="stylesheet" type="text/css" href="/css/slitaz.css" />
     1.9 +	<link rel="shortcut icon" href="/static/favicon.ico" />
    1.10 +	<link rel="stylesheet" type="text/css" href="/static/slitaz.css" />
    1.11  	<style type="text/css">
    1.12  #copy {
    1.13  	text-align: center;
    1.14 @@ -26,7 +26,7 @@
    1.15  	<div id="logo"></div>
    1.16  	<div id="network">
    1.17  		<a href="http://www.slitaz.org/">
    1.18 -		<img src="/css/pics/network.png" alt="network.png" /></a>
    1.19 +			<img src="/static/home.png" alt=" [ Home ] " /></a>
    1.20  		<a href="http://scn.slitaz.org/">Community</a>
    1.21  		<a href="http://doc.slitaz.org/" title="SliTaz Community Documentation">Doc</a>
    1.22  		<a href="http://forum.slitaz.org/" title="Slitaz Forum">Forum</a>
    1.23 @@ -41,15 +41,11 @@
    1.24  <div id="block">
    1.25  	<!-- Navigation -->
    1.26  	<div id="block_nav">
    1.27 -		<h4><img src="/css/pics/development.png" alt="development.png" />Developers Corner</h4>
    1.28 +		<h4><img src="images/server.png" alt="[ Server ]" />Project servers</h4>
    1.29  		<ul>
    1.30 -			<li><a href="http://www.slitaz.org/en/devel/">Website devel</a></li>
    1.31 -			<li><a href="http://scn.slitaz.org/">Community</a></li>
    1.32 -			<li><a href="http://labs.slitaz.org/">Laboratories</a></li>
    1.33 -			<li><a href="http://hg.slitaz.org/">Mercurial Repos</a></li>
    1.34 -			<li><a href="http://cook.slitaz.org/">Build Bot</a></li>
    1.35 -			<li><a href="http://tank.slitaz.org/">Tank Server</a></li>
    1.36 -			<li><a href="http://mirror.slitaz.org/info/">Mirror Server</a></li>
    1.37 +			<li><a href="http://tank.slitaz.org/">Tank server</a></li>
    1.38 +			<li><a href="http://pangolin.slitaz.org/">Pangolin server</a></li>
    1.39 +			<li><a href="http://chub.slitaz.org/">Chub server</a></li>
    1.40  		</ul>
    1.41  	</div>
    1.42  	<!-- Information/image -->
    1.43 @@ -119,26 +115,25 @@
    1.44  <!-- End of content -->
    1.45  </div>
    1.46  
    1.47 -<!-- Start of footer and copy notice -->
    1.48 -<div id="copy">
    1.49 -<p>                                                                          
    1.50 -Last update : <?php echo date('r'); ?>
    1.51 -</p> 
    1.52 -<p>
    1.53 -Copyright &copy; <?php echo date('Y'); ?> <a href="http://www.slitaz.org/">SliTaz</a> -
    1.54 -<a href="http://www.gnu.org/licenses/gpl.html">GNU General Public License</a>
    1.55 -</p>
    1.56 -<!-- End of copy -->
    1.57 -</div>
    1.58 -
    1.59 -<!-- Bottom and logo's -->
    1.60 -<div id="bottom">
    1.61 -<p>
    1.62 -<a href="http://validator.w3.org/check?uri=referer"><img
    1.63 -   src="/css/pics/website/xhtml10.png" alt="Valid XHTML 1.0"
    1.64 -   title="Code validé XHTML 1.0"
    1.65 -   style="width: 80px; height: 15px;" /></a>
    1.66 -</p>
    1.67 +<!-- Footer -->
    1.68 +<div id="footer">
    1.69 +	Copyright &copy; <span class="year"></span>
    1.70 +	<a href="http://www.slitaz.org/">SliTaz</a> - Network:
    1.71 +	<a href="http://scn.slitaz.org/">Community</a>
    1.72 +	<a href="http://doc.slitaz.org/">Doc</a>
    1.73 +	<a href="http://forum.slitaz.org/">Forum</a>
    1.74 +	<a href="http://pkgs.slitaz.org/">Packages</a>
    1.75 +	<a href="http://boot.slitaz.org/">Boot</a>
    1.76 +	<a href="http://bugs.slitaz.org">Bugs</a>
    1.77 +	<a href="http://hg.slitaz.org/">Hg</a>
    1.78 +	<p>
    1.79 +		SliTaz @
    1.80 +		<a href="http://twitter.com/slitaz">Twitter</a>
    1.81 +		<a href="http://www.facebook.com/slitaz">Facebook</a>
    1.82 +		<a href="http://distrowatch.com/slitaz">Distrowatch</a>
    1.83 +		<a href="http://en.wikipedia.org/wiki/SliTaz">Wikipedia</a>
    1.84 +		<a href="http://flattr.com/profile/slitaz">Flattr</a>
    1.85 +	</p>
    1.86  </div>
    1.87  
    1.88  </body>
     2.1 Binary file mirror/info/images/iso.png has changed
     3.1 --- a/mirror/info/index.php	Tue Mar 20 20:22:39 2012 +0100
     3.2 +++ b/mirror/info/index.php	Tue Mar 20 20:37:15 2012 +0100
     3.3 @@ -7,8 +7,8 @@
     3.4  	<meta name="description" content="slitaz mirror server" />
     3.5  	<meta name="robots" content="index, nofollow" />
     3.6  	<meta name="author" content="SliTaz Contributors" />
     3.7 -	<link rel="shortcut icon" href="/css/favicon.ico" />
     3.8 -	<link rel="stylesheet" type="text/css" href="/css/slitaz.css" />
     3.9 +	<link rel="shortcut icon" href="/static/favicon.ico" />
    3.10 +	<link rel="stylesheet" type="text/css" href="/static/slitaz.css" />
    3.11  	<style type="text/css">
    3.12  #copy {
    3.13  	text-align: center;
    3.14 @@ -41,15 +41,11 @@
    3.15  <div id="block">
    3.16  	<!-- Navigation -->
    3.17  	<div id="block_nav">
    3.18 -		<h4><img src="/css/pics/development.png" alt="development.png" />Developers Corner</h4>
    3.19 +		<h4><img src="images/server.png" alt="[ Server ]" />Project servers</h4>
    3.20  		<ul>
    3.21 -			<li><a href="http://www.slitaz.org/en/devel/">Website devel</a></li>
    3.22 -			<li><a href="http://scn.slitaz.org/">Community</a></li>
    3.23 -			<li><a href="http://cook.slitaz.org/">Build Bot</a></li>
    3.24 -			<li><a href="http://tank.slitaz.org/">Tank Server</a></li>
    3.25 -			<li><a href="http://mirror.slitaz.org/info/">Mirror Server</a> -
    3.26 -			<a href="http://mirror.slitaz.org/console/">Console</a>
    3.27 -			</li>
    3.28 +			<li><a href="http://tank.slitaz.org/">Tank server</a></li>
    3.29 +			<li><a href="http://pangolin.slitaz.org/">Pangolin server</a></li>
    3.30 +			<li><a href="http://chub.slitaz.org/">Chub server</a></li>
    3.31  		</ul>
    3.32  	</div>
    3.33  	<!-- Information/image -->
    3.34 @@ -79,13 +75,13 @@
    3.35  <div id="content">
    3.36  
    3.37  <h2><a href="graphs.php"><img 
    3.38 -	style="vertical-align: middle; padding: 0 4px 0 0;"
    3.39 +	style="padding: 0 4px 0 0;"
    3.40  	title="Mirror RRDtool graphs" alt="graphs"
    3.41 -    src="pics/website/monitor.png" /></a>System stats</h2>
    3.42 +    src="images/monitor.png" /></a>System stats</h2>
    3.43  
    3.44  <h4>Uptime</h4>
    3.45  
    3.46 -<pre class="package">
    3.47 +<pre class="box">
    3.48  <?php
    3.49  system("uptime | sed 's/^\s*//'");
    3.50  ?>
    3.51 @@ -93,14 +89,14 @@
    3.52  
    3.53  <h4>Disk usage</h4>
    3.54  
    3.55 -<pre class="package">
    3.56 +<pre class="box">
    3.57  <?php
    3.58  system("df -h | sed '/^rootfs/d' | grep  '\(^/dev\|Filesystem\)'");
    3.59  ?>
    3.60  </pre>
    3.61  
    3.62  <h4>Network</h4>
    3.63 -<pre class="package">
    3.64 +<pre class="box">
    3.65  <?php
    3.66  system("ifconfig eth0 | awk '{ if (/X packet/ || /X byte/) print }' | sed 's/^\s*//'");
    3.67  ?>
    3.68 @@ -109,14 +105,14 @@
    3.69  
    3.70  <?php if (isset($_GET["all"])) { ?>
    3.71  <h4>Logins</h4>
    3.72 -<pre class="package">
    3.73 +<pre class="box">
    3.74  <?php
    3.75  system("last");
    3.76  ?>
    3.77  </pre>
    3.78  
    3.79  <h4>Processes</h4>
    3.80 -<pre class="package">
    3.81 +<pre class="box">
    3.82  <?php
    3.83  system("top -n1 -b");
    3.84  ?>
    3.85 @@ -124,45 +120,45 @@
    3.86  <?php } ?>
    3.87  
    3.88  <a name="vhosts"></a>
    3.89 -<h3><a href="http://mirror.slitaz.org/awstats.pl?config=info.mirror.slitaz.org" target="_blank">
    3.90 +<h3><a href="http://mirror.slitaz.org/awstats.pl?config=info.mirror.slitaz.org">
    3.91  	<img title="Mirror Virtual hosts" alt="vhosts"
    3.92      src="pics/website/vhosts.png" /></a>Virtual hosts</h3>
    3.93  
    3.94  <ul>
    3.95  	<li><a href="http://mirror.slitaz.org/">mirror.slitaz.org</a> - SliTaz Mirror.
    3.96 -	(<a href="http://mirror.slitaz.org/stats" target="_blank">stats</a>)</li>
    3.97 +	(<a href="http://mirror.slitaz.org/stats">stats</a>)</li>
    3.98  	<li><a href="http://scn.slitaz.org/">scn.slitaz.org</a> - SliTaz Community Network.
    3.99 -	(<a href="http://mirror.slitaz.org/awstats.pl?config=scn.slitaz.org" target="_blank">stats</a>)</li>
   3.100 +	(<a href="http://mirror.slitaz.org/awstats.pl?config=scn.slitaz.org">stats</a>)</li>
   3.101  	<li><a href="http://pizza.slitaz.org/">pizza.slitaz.org</a> - SliTaz Flavor builder.
   3.102 -	(<a href="http://mirror.slitaz.org/awstats.pl?config=pizza.mirror.slitaz.org" target="_blank">stats</a>)</li>
   3.103 +	(<a href="http://mirror.slitaz.org/awstats.pl?config=pizza.mirror.slitaz.org">stats</a>)</li>
   3.104  	<li><a href="http://tiny.slitaz.org/">tiny.slitaz.org</a> - Tiny SliTaz builder.
   3.105 -	(<a href="http://mirror.slitaz.org/awstats.pl?config=tiny.slitaz.org" target="_blank">stats</a>)</li>
   3.106 +	(<a href="http://mirror.slitaz.org/awstats.pl?config=tiny.slitaz.org">stats</a>)</li>
   3.107  	<li><a href="https://ajaxterm.slitaz.org/">ajaxterm.slitaz.org</a> - Slitaz Web Console.
   3.108 -	(<a href="http://mirror.slitaz.org/awstats.pl?config=ajaxterm.slitaz.org" target="_blank">stats</a>)</li>
   3.109 +	(<a href="http://mirror.slitaz.org/awstats.pl?config=ajaxterm.slitaz.org">stats</a>)</li>
   3.110  </ul>
   3.111  
   3.112  <a name="replicas"></a>
   3.113 -<h3><a href="http://mirror.slitaz.org/awstats.pl?config=replicas.mirror.slitaz.org" target="_blank">
   3.114 +<h3><a href="http://mirror.slitaz.org/awstats.pl?config=replicas.mirror.slitaz.org">
   3.115           <img title="Tank replicas" alt="replicas"
   3.116      src="pics/website/vhosts.png" /></a>Tank replicas</h3>
   3.117  
   3.118  <ul>
   3.119  	<li><a href="http://mirror.slitaz.org/www/">www.slitaz.org</a> - SliTaz Website.
   3.120 -	(<a href="http://www.slitaz.org/" target="_blank">main</a>)</li>
   3.121 +	(<a href="http://www.slitaz.org/">main</a>)</li>
   3.122  	<li><a href="http://mirror.slitaz.org/doc/">doc.slitaz.org</a> - Documentation.
   3.123 -	(<a href="http://doc.slitaz.org/" target="_blank">main</a>)</li>
   3.124 +	(<a href="http://doc.slitaz.org/">main</a>)</li>
   3.125  	<li><a href="http://mirror.slitaz.org/pkgs/">pkgs.slitaz.org</a> - Packages Web interface.
   3.126 -	(<a href="http://pkgs.slitaz.org/" target="_blank">main</a>)</li>
   3.127 +	(<a href="http://pkgs.slitaz.org/">main</a>)</li>
   3.128  	<li><a href="http://mirror.slitaz.org/hg/">hg.slitaz.org</a> - Mercurial repositories (read only).
   3.129 -	(<a href="http://hg.slitaz.org/" target="_blank">main</a>
   3.130 -	<a href="http://hg.tuxfamily.org/mercurialroot/slitaz/" target="_blank">tuxfamily</a>)</li>
   3.131 +	(<a href="http://hg.slitaz.org/">main</a>
   3.132 +	<a href="http://hg.tuxfamily.org/mercurialroot/slitaz/">tuxfamily</a>)</li>
   3.133  	<li><a href="http://mirror.slitaz.org/webboot/">boot.slitaz.org</a> - gPXE Web boot.
   3.134 -	(<a href="http://boot.slitaz.org/" target="_blank">main</a>)</li>
   3.135 +	(<a href="http://boot.slitaz.org/">main</a>)</li>
   3.136  </ul>
   3.137  
   3.138  <a name="boot"></a>
   3.139 -<h3><a href="http://doc.slitaz.org/en:guides:pxe#web-booting" target="_blank">
   3.140 -	<img title="Web boot" src="pics/website/vhosts.png" 
   3.141 +<h3><a href="http://doc.slitaz.org/en:guides:pxe#web-booting">
   3.142 +	<img title="Web boot" src="/static/network.png" 
   3.143  	 alt="web boot" /></a>Web boot services</h3>
   3.144  	 The SliTaz mirror provides a <b>tftp</b> access and a 
   3.145  	 <a href="/pxe">pxe</a> tree. Simply add to your DHCP server configuration file:
   3.146 @@ -184,8 +180,8 @@
   3.147  	 </ul>
   3.148  
   3.149  <a name="mirrors"></a>
   3.150 -<h3><a href="http://mirror.slitaz.org/awstats.pl?config=rsync" target="_blank">
   3.151 -	<img title="Secondary mirrors" src="pics/website/vhosts.png" 
   3.152 +<h3><a href="http://mirror.slitaz.org/awstats.pl?config=rsync">
   3.153 +	<img title="Secondary mirrors" src="/static/network.png" 
   3.154  	 alt="mirrors" /></a>Mirrors</h3>
   3.155  	Most mirrors are updated using the url: <b>rsync://mirror.slitaz.org/slitaz/</b>
   3.156  	(<a href="http://mirror.slitaz.org/awstats.pl?config=rsync">stats</a>)
   3.157 @@ -286,7 +282,7 @@
   3.158  	array(	"flag"  => "us",
   3.159  		"http"  => "http://mirror.clarkson.edu/slitaz/",
   3.160  		"rsync" => "rsync://mirror.clarkson.edu/slitaz/")) as $mirror) {
   3.161 -	$flag = "pics/website/".$mirror["flag"].".png";
   3.162 +	$flag = "images/flags/".$mirror["flag"].".png";
   3.163  	$head = TRUE;
   3.164  	foreach(array("http", "ftp", "rsync") as $proto) {
   3.165  		if (!isset($mirror[$proto])) continue;
   3.166 @@ -317,7 +313,7 @@
   3.167  </ul>
   3.168  
   3.169  <a name="builds"></a>
   3.170 -<h3><img title="Daily builds" src="pics/website/cdrom.png" alt="builds" 
   3.171 +<h3><img title="Daily builds" src="images/iso.png" alt="builds" 
   3.172       width="25" height="25" />
   3.173      Daily builds</h3>
   3.174  
   3.175 @@ -344,31 +340,25 @@
   3.176  <!-- End of content -->
   3.177  </div>
   3.178  
   3.179 -<div id="content_bottom">
   3.180 -<div class="bottom_left"></div>
   3.181 -<div class="bottom_right"></div>
   3.182 -</div>
   3.183 -
   3.184 -<!-- Start of footer and copy notice -->
   3.185 -<div id="copy">
   3.186 -<p>                                                                          
   3.187 -Last update : <?php echo date('r'); ?>
   3.188 -</p> 
   3.189 -<p>
   3.190 -Copyright &copy; <?php echo date('Y'); ?> <a href="http://www.slitaz.org/">SliTaz</a> -
   3.191 -<a href="http://www.gnu.org/licenses/gpl.html">GNU General Public License</a>
   3.192 -</p>
   3.193 -<!-- End of copy -->
   3.194 -</div>
   3.195 -
   3.196 -<!-- Bottom and logo's -->
   3.197 -<div id="bottom">
   3.198 -<p>
   3.199 -<a href="http://validator.w3.org/check?uri=referer"><img
   3.200 -   src="/css/pics/website/xhtml10.png" alt="Valid XHTML 1.0"
   3.201 -   title="Code validé XHTML 1.0"
   3.202 -   style="width: 80px; height: 15px;" /></a>
   3.203 -</p>
   3.204 +<!-- Footer -->
   3.205 +<div id="footer">
   3.206 +	Copyright &copy; <span class="year"></span>
   3.207 +	<a href="http://www.slitaz.org/">SliTaz</a> - Network:
   3.208 +	<a href="http://scn.slitaz.org/">Community</a>
   3.209 +	<a href="http://doc.slitaz.org/">Doc</a>
   3.210 +	<a href="http://forum.slitaz.org/">Forum</a>
   3.211 +	<a href="http://pkgs.slitaz.org/">Packages</a>
   3.212 +	<a href="http://boot.slitaz.org/">Boot</a>
   3.213 +	<a href="http://bugs.slitaz.org">Bugs</a>
   3.214 +	<a href="http://hg.slitaz.org/">Hg</a>
   3.215 +	<p>
   3.216 +		SliTaz @
   3.217 +		<a href="http://twitter.com/slitaz">Twitter</a>
   3.218 +		<a href="http://www.facebook.com/slitaz">Facebook</a>
   3.219 +		<a href="http://distrowatch.com/slitaz">Distrowatch</a>
   3.220 +		<a href="http://en.wikipedia.org/wiki/SliTaz">Wikipedia</a>
   3.221 +		<a href="http://flattr.com/profile/slitaz">Flattr</a>
   3.222 +	</p>
   3.223  </div>
   3.224  
   3.225  </body>