# HG changeset patch
# User Christophe Lincoln <pankso@slitaz.org>
# Date 1390255679 -3600
# Node ID 8ae65a4e430a245adb758bf94caa392409cf116a
# Parent  44090397e2ec622e50672257989499b239668421
tank: up web interface add tinycm vhost

diff -r 44090397e2ec -r 8ae65a4e430a tank/files/etc/lighttpd/vhosts.conf
--- a/tank/files/etc/lighttpd/vhosts.conf	Sun Jan 19 19:35:57 2014 +0100
+++ b/tank/files/etc/lighttpd/vhosts.conf	Mon Jan 20 23:07:59 2014 +0100
@@ -52,17 +52,6 @@
   accesslog.filename = "/var/log/lighttpd/people.slitaz.org-access.log"
 }
 
-# pkgs.slitaz.org
-#
-$HTTP["host"] =~ "pkgs\.slitaz\.org$" {
-  server.document-root = "/home/slitaz/www/pkgs"
-  server.errorlog = "/var/log/lighttpd/pkgs.slitaz.org-error.log"
-  accesslog.filename = "/var/log/lighttpd/pkgs.slitaz.org-access.log"
-  cgi.assign = (
-    ".cgi" => "/bin/sh"
-  )
-}
-
 # cook.slitaz.org
 #
 $HTTP["host"] =~ "cook\.slitaz\.org$" {
@@ -123,7 +112,7 @@
 
 # scn.slitaz.org
 #
-$HTTP["host"] =~ "^scn\.slitaz\.org$" {
+$HTTP["host"] =~ "scn\.slitaz\.org$" {
   server.document-root = "/home/slitaz/www/scn"
   server.errorlog = "/var/log/lighttpd/scn.slitaz.org-error.log"
   accesslog.filename = "/var/log/lighttpd/scn.slitaz.org-access.log"
@@ -135,7 +124,7 @@
 
 # codex.slitaz.org
 #
-$HTTP["host"] =~ "^codex\.slitaz\.org$" {
+$HTTP["host"] =~ "codex\.slitaz\.org$" {
   server.document-root = "/home/slitaz/www/codex"
   server.errorlog = "/var/log/lighttpd/codex.slitaz.org-error.log"
   accesslog.filename = "/var/log/lighttpd/codex.slitaz.org-access.log"
@@ -147,7 +136,7 @@
 
 # irc.slitaz.org
 #
-$HTTP["host"] =~ "^irc\.slitaz\.org$" {
+$HTTP["host"] =~ "irc\.slitaz\.org$" {
   server.document-root = "/home/slitaz/www/irc"
   server.errorlog = "/var/log/lighttpd/irc.slitaz.org-error.log"
   accesslog.filename = "/var/log/lighttpd/irc.slitaz.org-access.log"
@@ -157,6 +146,18 @@
   )
 }
 
+# tinycm.slitaz.org - TinyCM official website
+#
+$HTTP["host"] =~ "tiny\.slitaz\.org$" {
+  server.document-root = "/home/slitaz/www/tinycm"
+  server.errorlog = "/var/log/lighttpd/tinycm.slitaz.org-error.log"
+  accesslog.filename = "/var/log/lighttpd/tinycm.slitaz.org-access.log"
+  index-file.names = ( "index.cgi" )
+  cgi.assign = (
+    ".cgi" => "/bin/sh"
+  )
+}
+
 # ssfs.slitaz.org
 #
 $HTTP["host"] =~ "ssfs\.slitaz\.org$" {
diff -r 44090397e2ec -r 8ae65a4e430a tank/web/images/development.png
Binary file tank/web/images/development.png has changed
diff -r 44090397e2ec -r 8ae65a4e430a tank/web/index.php
--- a/tank/web/index.php	Sun Jan 19 19:35:57 2014 +0100
+++ b/tank/web/index.php	Mon Jan 20 23:07:59 2014 +0100
@@ -18,12 +18,21 @@
 <div id="block">
 	<!-- Navigation -->
 	<div id="block_nav">
-		<h4><img src="images/server.png" alt="[ Server ]" />Project servers</h4>
-		<ul>
-			<li><a href="http://chub.slitaz.org/">Chub server</a></li>
-			<li><a href="http://mirror.slitaz.org/">Mirror server</a></li>
-			<li><a href="http://pangolin.slitaz.org/">Pangolin server</a></li>
-		</ul>
+		<h4><img src="images/development.png" alt="development.png" />Developers Corner</h4>
+		<div class="right_box">
+			<ul>
+				<li><a href="http://tank.slitaz.org/">Tank Server</a></li>
+				<li><a href="http://mirror.slitaz.org/">Main Mirror</a></li>
+			</ul>
+		</div>
+		<div class="left_box">
+			<ul>
+				<li><a href="http://www.slitaz.org/en/devel/">Devel Doc</a></li>
+				<li><a href="http://people.slitaz.org/">SliTaz People</a></li>
+				<li><a href="http://cook.slitaz.org/">Cooker</a></li>
+				<li><a href="http://pizza.slitaz.me/">Pizza Builder</a></li>
+			</ul>
+		</div>
 	</div>
 	<!-- Information/image -->
 	<div id="block_info">
@@ -31,8 +40,7 @@
 		<p>
 			This is the SliTaz GNU/Linux main server and build host. 
 			The server runs naturally SliTaz and provides some services
-			to all contributors such as: secure access, disk space, a 
-			public directory or cron jobs.
+			to all contributors.
 		</p>
 		<p>
 			Tank CPU is a <?php system("sed -e '/^model name/!d;s/.*Intel(R) //;" .         
@@ -52,7 +60,7 @@
 <div id="content">
 
 <h2><a href="graphs.php"><img 
-	style="vertical-align: middle; padding: 0 4px 0 0;"
+	style="vertical-align: middle; padding: 0 4px 4px 0;"
 	title="Tank RRDtool graphs" alt="graphs"
     src="images/monitor.png" /></a>System stats</h2>
 
@@ -79,13 +87,13 @@
 </pre>
 
 <h2><a href="/stats/awstats.pl?config=www.slitaz.org"><img
-	style="padding: 0 4px 0 0;" title="Tank Virtual hosts" alt="vhosts"
+	style="padding: 0 4px 4px 0;" title="Tank Virtual hosts" alt="vhosts"
     src="images/network.png" /></a>Virtual hosts</h2>
 
 <ul>
 	<!-- <li><a href="http://pkgs.slitaz.org/">pkgs.slitaz.org</a> - Packages Web interface.
 		(<a href="/stats/awstats.pl?config=pkgs.slitaz.org">stats</a>)</li> -->
-	<li><a href="http://boot.slitaz.org/">boot.slitaz.org</a> - gPXE Web boot.
+	<li><a href="http://boot.slitaz.org/">boot.slitaz.org</a> - SliTaz Web boot.
 		(<a href="/stats/awstats.pl?config=boot.slitaz.org">stats</a>)</li>
 	<!-- <li><a href="http://hg.slitaz.org/?sort=lastchange">hg.slitaz.org</a> - Mercurial repositories.
 		(<a href="/stats/awstats.pl?config=hg.slitaz.org">stats</a>)</li> -->
@@ -96,15 +104,24 @@
 		<li><a href="http://roadmap.slitaz.org/">roadmap.slitaz.org</a> - 
 		SliTaz Roadmap.
 	(<a href="/stats/awstats.pl?config=roadmap.slitaz.org">stats</a>)</li>
-	<li><a href="http://slitaz.pro/">slitaz.pro</a> - SliTaz Professional services.
-	(<a href="/stats/awstats.pl?config=slitaz.pro">stats</a>)</li>
+	<li><a href="http://bugs.slitaz.org/">bugs.slitaz.org</a> - 
+		SliTaz Bug Tracker.</li>
+	<li><a href="http://irc.slitaz.org/">irc.slitaz.org</a> - 
+		SliTaz IRC logs and webchat.</li>
+	<li><a href="http://try.slitaz.org/">try.slitaz.org</a> - 
+		To try some CGI scripts and other web services.</li>
 </ul>
 
+<ul>
+	<li><a href="http://slitaz.pro">slitaz.pro</a> - SliTaz Professional services.
+	(<a href="/stats/awstats.pl?config=slitaz.pro">stats</a>)</li>
+	<li><a href="http://slitaz.me">slitaz.me</a> - 
+		Domain used for users services such as Pizza.</li>
 <h2>Tank Log</h2>
 
 <pre>
 <?php
-system("tac /var/log/tank.log | head -40");
+system("tac /var/log/tank.log | head -50");
 ?>
 </pre>
 
diff -r 44090397e2ec -r 8ae65a4e430a tank/web/lib/html/header.html
--- a/tank/web/lib/html/header.html	Sun Jan 19 19:35:57 2014 +0100
+++ b/tank/web/lib/html/header.html	Mon Jan 20 23:07:59 2014 +0100
@@ -6,11 +6,11 @@
 		<a href="http://scn.slitaz.org/">Community</a>
 		<a href="http://doc.slitaz.org/">Doc</a>
 		<a href="http://forum.slitaz.org/">Forum</a>
+		<a href="http://irc.slitaz.org/">IRC</a>
 		<a href="http://slitaz.pro/">Pro</a>
-		<a href="http://slitaz.spreadshirt.net/">Shop</a>
+		<a href="http://shop.slitaz.org/">Shop</a>
 		<a href="http://bugs.slitaz.org">Bugs</a>
 		<a href="http://hg.slitaz.org/?sort=lastchange">Hg</a>
-		<a href="http://cook.slitaz.org/">Cook</a>
 	</div>
 	<h1><a href="http://tank.slitaz.org/">SliTaz Tank</a></h1>
 </div>
diff -r 44090397e2ec -r 8ae65a4e430a tank/web/slitaz.css
--- a/tank/web/slitaz.css	Sun Jan 19 19:35:57 2014 +0100
+++ b/tank/web/slitaz.css	Mon Jan 20 23:07:59 2014 +0100
@@ -11,7 +11,8 @@
 	color: black;
 	font: 13px sans-serif, vernada, arial;
 	margin: 0;
-	min-width: 900px;
+	min-width: 780px;
+	height: 100%;
 }
 
 a { text-decoration: underline; color: #215090; }
@@ -30,7 +31,7 @@
 
 #header { 
 	height: 40px; 
-	background: #351a0a;
+	background: #222;
 }
 
 #header h1 {
@@ -46,8 +47,8 @@
 	font-style: italic;
 }
 
-#header h1 a:hover { 
-	color: #d66018;
+#header h1 a:hover, #network a:hover, #network span { 
+	color: #afafaf;
 }
 
 /* Logo */
@@ -66,22 +67,22 @@
 
 #network { 
 	float: right; 
-	padding: 12px 5px 0; 
+	padding: 14px 5px 0; 
 	font-size: 12px;
 }
 
-#network a { padding: 0 6px; }
-#network a:hover { color: #cfcfcf; }
+#network a, #network span { padding: 0 4px; }
+#network span { font-weight: bold; }
 
 /* Block */
 
 #block { 
-	min-height: 200px; 
-	background: #d66018; 
-	padding: 26px 10% 0px;
+	min-height: 180px; 
+	background: #ccc; 
+	padding: 20px 10% 0px;
 	text-align: center;
-	color: #333;
-	border-bottom: 1px solid #f5f5f5;
+	color: #222;
+	border-bottom: 1px solid #afafaf;
 }
 
 #block_info {
@@ -91,28 +92,29 @@
 }
 
 #block a, #network a { 
-	color: #fff; 
+	color: #fff;
 	font-weight: bold;
 	text-decoration: none;
 }
 
 #block h4 {
-	color: #351a0a;
+	color: #222;
 	margin: 0px;
 	font-weight: bold;
 	font-size: 110%;
 }
 
 #block_info p { margin: 6px 0; padding: 0 12px 0 0; }
-#block_info a { font-weight: normal; }
+#block_info a { font-weight: normal; color: #215090; }
+#block_info a:hover { text-decoration: underline; }
 #block ul { list-style-type: square; }
-#block a:hover { color: #351a0a; }
+#block_nav a:hover { color: #afafaf; }
 
 /* Navigation */
 
 #block_nav {
-	background: #cc5b17;
-	padding: 10px 10px 40px;
+	background: #666;
+	padding: 10px 10px 20px;
 	text-align: justify;
 	width: 48%;
 	float: right;
@@ -132,9 +134,10 @@
 /* Languages */
 
 #lang {
-	float: right;
 	padding: 6px;
 	font-size: 11px;
+	position: absolute;
+	right: 0px;
 }
 
 #lang a {
@@ -146,6 +149,9 @@
 	text-decoration: underline;
 }
 
+.box #lang { text-align: center; position: relative; 
+	font-size: 13px; }	 /* for /i18n page */
+
 /* Content */
 
 #content {
@@ -153,19 +159,30 @@
 	text-align: justify;
 }
 
-#news li {
+.news li {
 	list-style-type: square;
 	border-bottom: 1px dotted #BEBEBE;
 	margin-left: -25px;
 	padding: 4px 0px 4px 0px;
 }
 
-#news a, .feed-grid a { text-decoration: none; }
-#news p a { text-decoration: underline; }
-#news p a:hover { text-decoration: none; }
-#twitter { margin: 20px 0; }
+.news a, .feed-grid a { text-decoration: none; }
+.news p a { text-decoration: underline; }
+.news p a:hover { text-decoration: none; }
+#twitter { margin: 20px 0; text-align: center; }
 #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 0px 20px 20px;
+}
+
 /* Classes */
 
 .right_box { width: 48%; float: right; }
@@ -178,6 +195,21 @@
 	border: 1px solid #ddd;
 }
 
+.box-dl, .box-up {
+	margin: 20px 60px;
+	padding: 12px 12px 12px 66px;
+	min-height: 48px;
+	border: 1px solid #ddd;
+	vertical-align: middle;
+}
+.box-dl {
+	background: url("/images/download.png") no-repeat 12px 12px #efefef;
+}
+.box-up {
+	background: url("/images/update.png") no-repeat  center left #efefef;
+}
+.box-dl p { color: #456; }
+
 .searchbox { 
 	margin: 20px 80px; 
 	padding: 12px; 
@@ -186,56 +218,59 @@
 	border: 1px solid #ddd;
 }
 
-.feed-grid { height: 180px; overflow: hidden; text-align: left; }
-.feed-grid h3 { 
-	margin: 15px 0 0; font-size: 16px; 
-	padding: 0 22px;
-	background: url(images/feed.png) no-repeat left; }
-.feed-grid span { font-size: 10px; color: #888; margin-left: 24px; }
-.feed-grid ul { color: #666; }
-.feed-grid a { color: #666; }
-.feed-grid a:hover { color: blue; }
+/* Activity Box */
+
+.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: bold; }
+.activity a { text-decoration: none; }
+.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: normal; color: #000; padding: 0 4px; }
+.activity_more a:hover { text-decoration: underline; }
+
+.activity span, .news span { 
+	color: #666; 
+	font-size: 11px; 
+	font-weight: normal;
+}
 
 /* Button */
 
-.button a { 
-	background-color: #b64b22;
+#block_info .button a { 
+	background-color: #666;
 	color: #ffffff;
-	margin-right: 6px;
+	margin: 0px 4px;
 	padding: 6px 10px;
 	font-size: 12px;
 	text-decoration: none;
 	font-weight: bold;
 }
-.button a:hover, input[type=submit]:hover { 
-	background-color: #a3431f;
+#block_info .button a:hover, input[type=submit]:hover { 
+	background-color: #444;
 	color: #ffffff;
 }
 
 /* Round corner */
 
-#block_nav, pre, .box, .searchbox, .button a, #twitter {
+#block_nav, pre, .box, .box-dl, .box-up, .searchbox, .button a, #twitter, .activity,
+.activity div, #sponsor {
 	-moz-border-radius: 4px;
 	-webkit-border-radius: 4px;
 	border-radius: 4px;
 }
 
-/* Transition */
-
-.box {	
-	-webkit-transition-property: background-color;
-	-webkit-transition-duration: 2s;
-	-moz-transition-property: background-color;
-	-moz-transition-duration: 2s;
-	transition-property: background-color;
-	transition-duration: 2s;
-}
-
 /* Form */
 
 input[type=submit] {
-	border: 1px solid #b64b22;
-	background-color: #b64b22;
+	border: 1px solid #666;
+	background-color: #666;
 	color: white;
 	font-weight: bold;
 	cursor: pointer;
@@ -250,7 +285,7 @@
 	border-bottom-right-radius: 4px;
 }
 
-input[type=submit]:hover { background-color: #a3431f; }
+input[type=submit]:hover { background-color: #444; }
 
 input[type=text] {
 	border: 1px solid #333333;
@@ -273,6 +308,8 @@
 	border-top: 1px solid #ddd;
 	padding: 40px;
 	color: #666;
+	clear: both;
+	margin-bottom: -2%;
 }
 
 #footer a { color: #666; padding: 0 2px; }
@@ -281,3 +318,57 @@
 	/* content: "2007-2014"; */
 	content: "2014";
 }
+
+p, li {
+	-moz-hyphens: auto;
+	-webkit-hyphens: auto;
+	hyphens: auto;
+}
+
+
+/* --- SEARCH --- */
+
+input.gsc-search-button {
+	border: 1px solid #b64b22;
+	background-color: #b64b22;
+	color: white;
+	font-weight: bold;
+	cursor: pointer;
+	padding: 2px 10px;
+	font-size: 14px;
+	margin-left: -4px;
+	-webkit-border-top-right-radius: 4px;
+	-webkit-border-bottom-right-radius: 4px;
+	-moz-border-radius-topright: 4px;
+	-moz-border-radius-bottomright: 4px;
+	border-top-right-radius: 4px;
+	border-bottom-right-radius: 4px;
+}
+
+.gs-webResult.gs-result a.gs-title:link,
+.gs-webResult.gs-result a.gs-title:link b {
+	color: #103a5e;
+}
+
+#cse {
+	margin-bottom: 120px;
+	width:100%;
+}
+
+
+/* --- GALLERY --- */
+
+#gallery div {
+	width: 496px;
+	border: none;
+	border-radius: 12px;
+	padding-bottom: 8px;
+	margin: 12px auto;
+	webkit-box-shadow: 0 0 6px rgba(0,0,0,0.5);
+	-moz-box-shadow: 0 0 6px rgba(0,0,0,0.5);
+	box-shadow: 0 0 6px rgba(0,0,0,0.5);
+}
+#gallery img {
+	width: 480px;
+	margin: 8px;
+}