slitaz-forge rev 601

mirror: fixes to previous commit
author Aleksej Bobylev <al.bobylev@gmail.com>
date Sat Oct 10 14:22:49 2015 +0300 (2015-10-10)
parents d3a31a897d56
children 8f7ddeaffa3b
files mirror/root/dir-generator.php mirror/root/static/README mirror/root/static/image-jpeg.png mirror/root/static/image-png.png mirror/root/static/slitaz.css mirror/root/static/slitaz.min.css mirror/root/static/text-css.png mirror/root/static/text-x-javascript.png
line diff
     1.1 --- a/mirror/root/dir-generator.php	Fri Oct 02 01:31:59 2015 +0300
     1.2 +++ b/mirror/root/dir-generator.php	Sat Oct 10 14:22:49 2015 +0300
     1.3 @@ -180,13 +180,14 @@
     1.4  	//	<meta http-equiv="cache-control" content="public" />
     1.5  	//	<meta http-equiv="last-modified" content="$modified" />
     1.6  	//	<meta http-equiv="expires" content="$expires" />
     1.7 -	?>
     1.8 +	print "
     1.9  <!DOCTYPE html>
    1.10 -<html lang="en">
    1.11 +<html lang=\"en\">
    1.12  <head>
    1.13  	<title>Index of /$vpath</title>
    1.14 -	<meta charset="UTF-8">
    1.15 -	<meta name="description" content="Index of /$vpath">
    1.16 +	<meta charset=\"UTF-8\">
    1.17 +	<meta name=\"description\" content=\"Index of /$vpath\">"
    1.18 +?>
    1.19  	<meta name="robots" content="index, nofollow">
    1.20  	<meta name="author" content="SliTaz Contributors">
    1.21  	<meta name="viewport" content="width=device-width, initial-scale=1.0">
    1.22 @@ -496,28 +497,29 @@
    1.23  foreach($folderlist as $folder)
    1.24  	print "<tr><td class='dir'><a href='" . addslashes($folder['name']). "'>" .
    1.25  		htmlentities($folder['name']) . "</a>/</td>" .
    1.26 -		"<td" . $folder['modtimeasc'] . "</td>" .
    1.27 +		"<td>" . $folder['modtimeasc'] . "</td>" .
    1.28  		"<td>- &nbsp;</td></tr>\n";
    1.29  
    1.30  
    1.31  
    1.32  // Print file information
    1.33  foreach($filelist as $file) {
    1.34 +	$filename = $file['name'];
    1.35  	$url = addslashes($file['name']);
    1.36  
    1.37 -	if (preg_match('/\.tazpkg$/', $file))
    1.38 +	if (preg_match('/\.tazpkg$/', $filename))
    1.39  		$class = "pkg";
    1.40 -	elseif (preg_match('/\.iso$/', $file))
    1.41 +	elseif (preg_match('/\.iso$/', $filename))
    1.42  		$class = "iso";
    1.43 -	elseif (preg_match('/\.(exe|com)$/', $file))
    1.44 +	elseif (preg_match('/\.(exe|com)$/', $filename))
    1.45  		$class = "exe";
    1.46 -	elseif (preg_match('/^README$/', $file))
    1.47 +	elseif (preg_match('/^README$/', $filename))
    1.48  		$class = "rme";
    1.49 -	elseif (preg_match('/^bzImage$/', $file))
    1.50 +	elseif (preg_match('/^bzImage$/', $filename))
    1.51  		$class = "krn";
    1.52 -	elseif (preg_match('/\.zip$/', $file))
    1.53 +	elseif (preg_match('/\.zip$/', $filename))
    1.54  		$class = "zip";
    1.55 -	elseif (preg_match('/\.log$/', $file))
    1.56 +	elseif (preg_match('/\.log$/', $filename))
    1.57  		$class = "log";
    1.58  	else {
    1.59  		$classes = explode('/', $file['file_type']);
    1.60 @@ -525,7 +527,7 @@
    1.61  	}
    1.62  
    1.63  
    1.64 -	print "<tr><td class='$class'><a href='$url'>" . htmlentities($file['name']) . "</a></td>" .
    1.65 +	print "<tr><td class='$class'><a href='$url'>" . htmlentities($filename) . "</a></td>" .
    1.66  		"<td>" . $file['modtimeasc'] .
    1.67  		" <img src='/static/qr.png' alt='#' " .
    1.68  		"onmouseover=\"this.title = location.href+'$url'\" " .
     2.1 --- a/mirror/root/static/README	Fri Oct 02 01:31:59 2015 +0300
     2.2 +++ b/mirror/root/static/README	Sat Oct 10 14:22:49 2015 +0300
     2.3 @@ -1,4 +1,4 @@
     2.4 ---------------------------------------------------------------------------------
     2.5 +------------------------------------------------------------------------
     2.6  
     2.7  Countries flags by Go Squared:
     2.8  
     2.9 @@ -29,7 +29,7 @@
    2.10  IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
    2.11  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
    2.12  
    2.13 ---------------------------------------------------------------------------------
    2.14 +------------------------------------------------------------------------
    2.15  
    2.16  MIME Types icons from Faenza icon theme:
    2.17  
    2.18 @@ -44,14 +44,18 @@
    2.19    * folder.png
    2.20    * go-up.png
    2.21    * home.png
    2.22 +  * image-jpeg.png
    2.23 +  * image-png.png
    2.24    * package-x-generic.png
    2.25 +  * text-css.png
    2.26    * text-plain.png
    2.27    * text-x-changelog.png
    2.28 +  * text-x-javascript.png
    2.29    * text-x-readme.png
    2.30  
    2.31  Copyright (c) 2010 Matthieu James <matthieu.james@gmail.com> GPL-3+
    2.32  
    2.33 ---------------------------------------------------------------------------------
    2.34 +------------------------------------------------------------------------
    2.35  
    2.36  qrcode.js -- QR code generator in Javascript (revision 2011-01-19)
    2.37  Written by Kang Seonghoon <public+qrjs@mearie.org>.
    2.38 @@ -60,7 +64,7 @@
    2.39  recognize the public domain the terms of Creative Commons CC0 license apply. In
    2.40  the other words, you can always do what you want.
    2.41  
    2.42 ---------------------------------------------------------------------------------
    2.43 +------------------------------------------------------------------------
    2.44  
    2.45  SliTaz Contributors commits:
    2.46  
    2.47 @@ -69,12 +73,12 @@
    2.48    * qr.png
    2.49    * slitaz.css
    2.50  
    2.51 ---------------------------------------------------------------------------------
    2.52 +------------------------------------------------------------------------
    2.53  
    2.54  Minified script and styles using tools from
    2.55 -"Free Online Tools For Developers"(http://www.freeformatter.com/)
    2.56 +"Free Online Tools For Developers"( http://www.freeformatter.com/ )
    2.57  
    2.58    * qrcode.min.js
    2.59    * slitaz.min.css
    2.60  
    2.61 ---------------------------------------------------------------------------------
    2.62 +------------------------------------------------------------------------
     3.1 Binary file mirror/root/static/image-jpeg.png has changed
     4.1 Binary file mirror/root/static/image-png.png has changed
     5.1 --- a/mirror/root/static/slitaz.css	Fri Oct 02 01:31:59 2015 +0300
     5.2 +++ b/mirror/root/static/slitaz.css	Sat Oct 10 14:22:49 2015 +0300
     5.3 @@ -408,6 +408,10 @@
     5.4  .plain::before { content: url(text-plain.png); }
     5.5  .x-bittorrent::before { content: url(application-x-bittorrent.png); }
     5.6  .octet-stream::before { content: url(application-octet-stream.png); }
     5.7 +.jpeg::before { content: url(image-jpeg.png); }
     5.8 +.png::before { content: url(image-png.png); }
     5.9 +.javascript::before { content: url(text-x-javascript); }
    5.10 +.css::before { content: url(text-css.png); }
    5.11  .dir::before { content: url(folder.png); }
    5.12  .up::before { content: url(go-up.png); }
    5.13  .zip::before { content: url(application-zip.png); }
     6.1 --- a/mirror/root/static/slitaz.min.css	Fri Oct 02 01:31:59 2015 +0300
     6.2 +++ b/mirror/root/static/slitaz.min.css	Sat Oct 10 14:22:49 2015 +0300
     6.3 @@ -1,1 +1,1 @@
     6.4 -html{min-height:102%}body{height:100%;margin:0;box-sizing:border-box;color:#222;background:#fff;font:13px Ubuntu,"Droid Sans","DejaVu Sans",FreeSans,"Liberation Sans",sans-serif;-moz-hyphens:auto;-epub-hyphens:auto;-webkit-hyphens:auto;hyphens:auto}code,pre,samp,kbd{color:#000;background-color:rgba(0,0,0,.05)}a{text-decoration:none;color:#215090}a:hover{text-decoration:underline}img{border:0 none;vertical-align:middle}h2{color:#444;font-size:26px;font-weight:300;margin:26px 0 13px;border-bottom:2px solid #999;letter-spacing:1px}h3{color:#666;font-size:19px;font-weight:300;margin:26px 0 0;line-height:1;letter-spacing:.5px}pre{background-color:#f8f8f8;border:1px solid #DDD;padding:10px;white-space:pre-wrap;overflow-x:auto;line-height:1}table{background-color:#f8f8f8;border:1px solid #DDD;width:100%;margin-bottom:20px;padding:6px}body>header{display:table;width:100%;vertical-align:middle;min-height:40px;background:#222}h1{display:table-cell;height:40px;vertical-align:middle;line-height:20px;white-space:nowrap}h1::before{display:inline-block;content:url(logo.png);vertical-align:middle}h1 a{color:#FFF;font-size:20px;font-style:italic}#network{display:table-cell;text-align:right;vertical-align:middle;font-size:12px}#network a{display:inline-block;padding:0 6px;vertical-align:middle}.home::before{content:url(home.png)}.br::before{content:url(BR.png)}.ch::before{content:url(CH.png)}.de::before{content:url(DE.png)}.fr::before{content:url(FR.png)}.it::before{content:url(IT.png)}.pl::before{content:url(PL.png)}.us::before{content:url(US.png)}#block{padding:30px 6px;background:#CCC}#block div{max-width:600px;margin:0 auto}#block_info{padding:6px 12px 0 0}#block_info input{width:100%}#block a,#network a{color:#FFF}#block header{font-weight:400;font-size:18px;line-height:18px}#block_info p{margin:7px 0;padding:0;text-align:justify}#block_info a{font-weight:400;color:#B51}nav{background:#666;color:#fff;padding:6px;width:40%}nav a{white-space:nowrap}nav header img{margin:0 4px 0 0;padding:0}nav,#block_info{display:table-cell}#lang{margin:0;text-align:right;padding:6px;font-size:11px}#lang a{padding:0 2px}#content{max-width:600px;margin:6px auto;padding:0 6px;text-align:justify;line-height:1.5rem}.news li{list-style-type:square;border-bottom:1px dotted #bebebe;margin-left:-25px;padding:4px 0}#twitter{margin:20px 0}#gallery{text-align:center}#sponsor{font-size:90%;background-color:#fbfbfb;border:2px solid #DDD;width:200px;height:160px;float:right;text-align:center;margin:10px 0 20px 20px}#mirrors{padding:10px;margin:10px 0 20px;text-align:center;background:#f1f1f1;border:1px solid #DDD}#mirrors a,#mirrors a::before{display:inline-block;padding:0 3px}#mirrors a::before{vertical-align:-4px}.right_box{width:48%;float:right}.left_box{width:48%;float:left}.box{margin:20px 60px;padding:12px;background:#efefef;border:1px solid #DDD}.searchbox{margin:20px 80px;padding:12px;background:#f8f8f8;text-align:center;border:1px solid #DDD}.activity{margin:0 0 20px;background:#efefef;padding:5px 2px 0;border:1px solid #DDD}.activity div{padding:5px 10px;background:#FFF;margin-top:5px}.activity p{margin:0;padding:5px 10px;font-weight:700}.activity ul{list-style-type:none;margin:4px 0;padding:0 4px;line-height:150%}.activity_more{text-align:right}.activity_more a{font-weight:400;color:#000;padding:0 4px}.activity span,.news span{color:#666;font-size:11px;font-weight:400}nav,pre,table,textarea,select,.box,.searchbox,.activity,.activity div,#twitter,#sponsor,#mirrors{-moz-border-radius:4px;-webkit-border-radius:4px;border-radius:4px}body>footer{background:#f1f1f1;text-align:center;border-top:1px solid #DDD;padding:30px;color:#666;clear:both;margin-bottom:-2%}footer a+a{margin:0 6px}.year:after{content:"2015"}table{border-collapse:collapse;line-height:1}caption{caption-side:bottom;text-align:left;padding:6px 0}thead tr{background-color:#DDD}th{padding:4px 1px}th:nth-child(3),td:nth-child(3){text-align:right}td:nth-child(1){vertical-align:middle}tbody tr:nth-child(odd){background-color:#FFF}tbody tr:nth-child(even){background-color:#EEE}.touch td,.touch th{padding:6px}.touch #network a,.touch nav a,.touch #mirrors a,.touch footer a{display:inline-block;padding:6px}td:nth-child(1)::before{display:inline-block;vertical-align:middle;padding-right:3px}.x-bzip::before{content:url(application-x-bzip.png)}.x-gzip::before{content:url(application-x-gzip.png)}.plain::before{content:url(text-plain.png)}.x-bittorrent::before{content:url(application-x-bittorrent.png)}.octet-stream::before{content:url(application-octet-stream.png)}.dir::before{content:url(folder.png)}.up::before{content:url(go-up.png)}.zip::before{content:url(application-zip.png)}.iso::before{content:url(application-x-cd-image.png)}.krn::before{content:url(application-x-executable.png)}.exe::before{content:url(application-x-ms-dos-executable.png)}.rme::before{content:url(text-x-readme.png)}.log::before{content:url(text-x-changelog.png)}.pkg::before{content:url(package-x-generic.png)}ul ul,ol ol,ul ol,ol ul{margin:0}ul,ol,dd{padding:0 0 0 21px}
     6.5 +html{min-height:102%}body{height:100%;margin:0;box-sizing:border-box;color:#222;background:#fff;font:13px Ubuntu,"Droid Sans","DejaVu Sans",FreeSans,"Liberation Sans",sans-serif;-moz-hyphens:auto;-epub-hyphens:auto;-webkit-hyphens:auto;hyphens:auto}code,pre,samp,kbd{color:#000;background-color:rgba(0,0,0,.05)}a{text-decoration:none;color:#215090}a:hover{text-decoration:underline}img{border:0 none;vertical-align:middle}h2{color:#444;font-size:26px;font-weight:300;margin:26px 0 13px;border-bottom:2px solid #999;letter-spacing:1px}h3{color:#666;font-size:19px;font-weight:300;margin:26px 0 0;line-height:1;letter-spacing:.5px}pre{background-color:#f8f8f8;border:1px solid #DDD;padding:10px;white-space:pre-wrap;overflow-x:auto;line-height:1}table{background-color:#f8f8f8;border:1px solid #DDD;width:100%;margin-bottom:20px;padding:6px}body>header{display:table;width:100%;vertical-align:middle;min-height:40px;background:#222}h1{display:table-cell;height:40px;vertical-align:middle;line-height:20px;white-space:nowrap}h1::before{display:inline-block;content:url(logo.png);vertical-align:middle}h1 a{color:#FFF;font-size:20px;font-style:italic}#network{display:table-cell;text-align:right;vertical-align:middle;font-size:12px}#network a{display:inline-block;padding:0 6px;vertical-align:middle}.home::before{content:url(home.png)}.br::before{content:url(BR.png)}.ch::before{content:url(CH.png)}.de::before{content:url(DE.png)}.fr::before{content:url(FR.png)}.it::before{content:url(IT.png)}.pl::before{content:url(PL.png)}.us::before{content:url(US.png)}#block{padding:30px 6px;background:#CCC}#block div{max-width:600px;margin:0 auto}#block_info{padding:6px 12px 0 0}#block_info input{width:100%}#block a,#network a{color:#FFF}#block header{font-weight:400;font-size:18px;line-height:18px}#block_info p{margin:7px 0;padding:0;text-align:justify}#block_info a{font-weight:400;color:#B51}nav{background:#666;color:#fff;padding:6px;width:40%}nav a{white-space:nowrap}nav header img{margin:0 4px 0 0;padding:0}nav,#block_info{display:table-cell}#lang{margin:0;text-align:right;padding:6px;font-size:11px}#lang a{padding:0 2px}#content{max-width:600px;margin:6px auto;padding:0 6px;text-align:justify;line-height:1.5rem}.news li{list-style-type:square;border-bottom:1px dotted #bebebe;margin-left:-25px;padding:4px 0}#twitter{margin:20px 0}#gallery{text-align:center}#sponsor{font-size:90%;background-color:#fbfbfb;border:2px solid #DDD;width:200px;height:160px;float:right;text-align:center;margin:10px 0 20px 20px}#mirrors{padding:10px;margin:10px 0 20px;text-align:center;background:#f1f1f1;border:1px solid #DDD}#mirrors a,#mirrors a::before{display:inline-block;padding:0 3px}#mirrors a::before{vertical-align:-4px}.right_box{width:48%;float:right}.left_box{width:48%;float:left}.box{margin:20px 60px;padding:12px;background:#efefef;border:1px solid #DDD}.searchbox{margin:20px 80px;padding:12px;background:#f8f8f8;text-align:center;border:1px solid #DDD}.activity{margin:0 0 20px;background:#efefef;padding:5px 2px 0;border:1px solid #DDD}.activity div{padding:5px 10px;background:#FFF;margin-top:5px}.activity p{margin:0;padding:5px 10px;font-weight:700}.activity ul{list-style-type:none;margin:4px 0;padding:0 4px;line-height:150%}.activity_more{text-align:right}.activity_more a{font-weight:400;color:#000;padding:0 4px}.activity span,.news span{color:#666;font-size:11px;font-weight:400}nav,pre,table,textarea,select,.box,.searchbox,.activity,.activity div,#twitter,#sponsor,#mirrors{-moz-border-radius:4px;-webkit-border-radius:4px;border-radius:4px}body>footer{background:#f1f1f1;text-align:center;border-top:1px solid #DDD;padding:30px;color:#666;clear:both;margin-bottom:-2%}footer a+a{margin:0 6px}.year:after{content:"2015"}table{border-collapse:collapse;line-height:1}caption{caption-side:bottom;text-align:left;padding:6px 0}thead tr{background-color:#DDD}th{padding:4px 1px}th:nth-child(3),td:nth-child(3){text-align:right}td:nth-child(1){vertical-align:middle}tbody tr:nth-child(odd){background-color:#FFF}tbody tr:nth-child(even){background-color:#EEE}.touch td,.touch th{padding:6px}.touch #network a,.touch nav a,.touch #mirrors a,.touch footer a{display:inline-block;padding:6px}td:nth-child(1)::before{display:inline-block;vertical-align:middle;padding-right:3px}.x-bzip::before{content:url(application-x-bzip.png)}.x-gzip::before{content:url(application-x-gzip.png)}.plain::before{content:url(text-plain.png)}.x-bittorrent::before{content:url(application-x-bittorrent.png)}.octet-stream::before{content:url(application-octet-stream.png)}.jpeg::before{content:url(image-jpeg.png)}.png::before{content:url(image-png.png)}.javascript::before{content:url(text-x-javascript.png)}.css::before{content:url(text-css.png)}.dir::before{content:url(folder.png)}.up::before{content:url(go-up.png)}.zip::before{content:url(application-zip.png)}.iso::before{content:url(application-x-cd-image.png)}.krn::before{content:url(application-x-executable.png)}.exe::before{content:url(application-x-ms-dos-executable.png)}.rme::before{content:url(text-x-readme.png)}.log::before{content:url(text-x-changelog.png)}.pkg::before{content:url(package-x-generic.png)}ul ul,ol ol,ul ol,ol ul{margin:0}ul,ol,dd{padding:0 0 0 21px}
     7.1 Binary file mirror/root/static/text-css.png has changed
     8.1 Binary file mirror/root/static/text-x-javascript.png has changed