slitaz-forge rev 436
tank: up web interface add tinycm vhost
| author | Christophe Lincoln <pankso@slitaz.org> |
|---|---|
| date | Mon Jan 20 23:07:59 2014 +0100 (2014-01-20) |
| parents | 44090397e2ec |
| children | b086806d9ad0 |
| files | tank/files/etc/lighttpd/vhosts.conf tank/web/images/development.png tank/web/index.php tank/web/lib/html/header.html tank/web/slitaz.css |
line diff
1.1 --- a/tank/files/etc/lighttpd/vhosts.conf Sun Jan 19 19:35:57 2014 +0100 1.2 +++ b/tank/files/etc/lighttpd/vhosts.conf Mon Jan 20 23:07:59 2014 +0100 1.3 @@ -52,17 +52,6 @@ 1.4 accesslog.filename = "/var/log/lighttpd/people.slitaz.org-access.log" 1.5 } 1.6 1.7 -# pkgs.slitaz.org 1.8 -# 1.9 -$HTTP["host"] =~ "pkgs\.slitaz\.org$" { 1.10 - server.document-root = "/home/slitaz/www/pkgs" 1.11 - server.errorlog = "/var/log/lighttpd/pkgs.slitaz.org-error.log" 1.12 - accesslog.filename = "/var/log/lighttpd/pkgs.slitaz.org-access.log" 1.13 - cgi.assign = ( 1.14 - ".cgi" => "/bin/sh" 1.15 - ) 1.16 -} 1.17 - 1.18 # cook.slitaz.org 1.19 # 1.20 $HTTP["host"] =~ "cook\.slitaz\.org$" { 1.21 @@ -123,7 +112,7 @@ 1.22 1.23 # scn.slitaz.org 1.24 # 1.25 -$HTTP["host"] =~ "^scn\.slitaz\.org$" { 1.26 +$HTTP["host"] =~ "scn\.slitaz\.org$" { 1.27 server.document-root = "/home/slitaz/www/scn" 1.28 server.errorlog = "/var/log/lighttpd/scn.slitaz.org-error.log" 1.29 accesslog.filename = "/var/log/lighttpd/scn.slitaz.org-access.log" 1.30 @@ -135,7 +124,7 @@ 1.31 1.32 # codex.slitaz.org 1.33 # 1.34 -$HTTP["host"] =~ "^codex\.slitaz\.org$" { 1.35 +$HTTP["host"] =~ "codex\.slitaz\.org$" { 1.36 server.document-root = "/home/slitaz/www/codex" 1.37 server.errorlog = "/var/log/lighttpd/codex.slitaz.org-error.log" 1.38 accesslog.filename = "/var/log/lighttpd/codex.slitaz.org-access.log" 1.39 @@ -147,7 +136,7 @@ 1.40 1.41 # irc.slitaz.org 1.42 # 1.43 -$HTTP["host"] =~ "^irc\.slitaz\.org$" { 1.44 +$HTTP["host"] =~ "irc\.slitaz\.org$" { 1.45 server.document-root = "/home/slitaz/www/irc" 1.46 server.errorlog = "/var/log/lighttpd/irc.slitaz.org-error.log" 1.47 accesslog.filename = "/var/log/lighttpd/irc.slitaz.org-access.log" 1.48 @@ -157,6 +146,18 @@ 1.49 ) 1.50 } 1.51 1.52 +# tinycm.slitaz.org - TinyCM official website 1.53 +# 1.54 +$HTTP["host"] =~ "tiny\.slitaz\.org$" { 1.55 + server.document-root = "/home/slitaz/www/tinycm" 1.56 + server.errorlog = "/var/log/lighttpd/tinycm.slitaz.org-error.log" 1.57 + accesslog.filename = "/var/log/lighttpd/tinycm.slitaz.org-access.log" 1.58 + index-file.names = ( "index.cgi" ) 1.59 + cgi.assign = ( 1.60 + ".cgi" => "/bin/sh" 1.61 + ) 1.62 +} 1.63 + 1.64 # ssfs.slitaz.org 1.65 # 1.66 $HTTP["host"] =~ "ssfs\.slitaz\.org$" {
2.1 Binary file tank/web/images/development.png has changed
3.1 --- a/tank/web/index.php Sun Jan 19 19:35:57 2014 +0100 3.2 +++ b/tank/web/index.php Mon Jan 20 23:07:59 2014 +0100 3.3 @@ -18,12 +18,21 @@ 3.4 <div id="block"> 3.5 <!-- Navigation --> 3.6 <div id="block_nav"> 3.7 - <h4><img src="images/server.png" alt="[ Server ]" />Project servers</h4> 3.8 - <ul> 3.9 - <li><a href="http://chub.slitaz.org/">Chub server</a></li> 3.10 - <li><a href="http://mirror.slitaz.org/">Mirror server</a></li> 3.11 - <li><a href="http://pangolin.slitaz.org/">Pangolin server</a></li> 3.12 - </ul> 3.13 + <h4><img src="images/development.png" alt="development.png" />Developers Corner</h4> 3.14 + <div class="right_box"> 3.15 + <ul> 3.16 + <li><a href="http://tank.slitaz.org/">Tank Server</a></li> 3.17 + <li><a href="http://mirror.slitaz.org/">Main Mirror</a></li> 3.18 + </ul> 3.19 + </div> 3.20 + <div class="left_box"> 3.21 + <ul> 3.22 + <li><a href="http://www.slitaz.org/en/devel/">Devel Doc</a></li> 3.23 + <li><a href="http://people.slitaz.org/">SliTaz People</a></li> 3.24 + <li><a href="http://cook.slitaz.org/">Cooker</a></li> 3.25 + <li><a href="http://pizza.slitaz.me/">Pizza Builder</a></li> 3.26 + </ul> 3.27 + </div> 3.28 </div> 3.29 <!-- Information/image --> 3.30 <div id="block_info"> 3.31 @@ -31,8 +40,7 @@ 3.32 <p> 3.33 This is the SliTaz GNU/Linux main server and build host. 3.34 The server runs naturally SliTaz and provides some services 3.35 - to all contributors such as: secure access, disk space, a 3.36 - public directory or cron jobs. 3.37 + to all contributors. 3.38 </p> 3.39 <p> 3.40 Tank CPU is a <?php system("sed -e '/^model name/!d;s/.*Intel(R) //;" . 3.41 @@ -52,7 +60,7 @@ 3.42 <div id="content"> 3.43 3.44 <h2><a href="graphs.php"><img 3.45 - style="vertical-align: middle; padding: 0 4px 0 0;" 3.46 + style="vertical-align: middle; padding: 0 4px 4px 0;" 3.47 title="Tank RRDtool graphs" alt="graphs" 3.48 src="images/monitor.png" /></a>System stats</h2> 3.49 3.50 @@ -79,13 +87,13 @@ 3.51 </pre> 3.52 3.53 <h2><a href="/stats/awstats.pl?config=www.slitaz.org"><img 3.54 - style="padding: 0 4px 0 0;" title="Tank Virtual hosts" alt="vhosts" 3.55 + style="padding: 0 4px 4px 0;" title="Tank Virtual hosts" alt="vhosts" 3.56 src="images/network.png" /></a>Virtual hosts</h2> 3.57 3.58 <ul> 3.59 <!-- <li><a href="http://pkgs.slitaz.org/">pkgs.slitaz.org</a> - Packages Web interface. 3.60 (<a href="/stats/awstats.pl?config=pkgs.slitaz.org">stats</a>)</li> --> 3.61 - <li><a href="http://boot.slitaz.org/">boot.slitaz.org</a> - gPXE Web boot. 3.62 + <li><a href="http://boot.slitaz.org/">boot.slitaz.org</a> - SliTaz Web boot. 3.63 (<a href="/stats/awstats.pl?config=boot.slitaz.org">stats</a>)</li> 3.64 <!-- <li><a href="http://hg.slitaz.org/?sort=lastchange">hg.slitaz.org</a> - Mercurial repositories. 3.65 (<a href="/stats/awstats.pl?config=hg.slitaz.org">stats</a>)</li> --> 3.66 @@ -96,15 +104,24 @@ 3.67 <li><a href="http://roadmap.slitaz.org/">roadmap.slitaz.org</a> - 3.68 SliTaz Roadmap. 3.69 (<a href="/stats/awstats.pl?config=roadmap.slitaz.org">stats</a>)</li> 3.70 - <li><a href="http://slitaz.pro/">slitaz.pro</a> - SliTaz Professional services. 3.71 - (<a href="/stats/awstats.pl?config=slitaz.pro">stats</a>)</li> 3.72 + <li><a href="http://bugs.slitaz.org/">bugs.slitaz.org</a> - 3.73 + SliTaz Bug Tracker.</li> 3.74 + <li><a href="http://irc.slitaz.org/">irc.slitaz.org</a> - 3.75 + SliTaz IRC logs and webchat.</li> 3.76 + <li><a href="http://try.slitaz.org/">try.slitaz.org</a> - 3.77 + To try some CGI scripts and other web services.</li> 3.78 </ul> 3.79 3.80 +<ul> 3.81 + <li><a href="http://slitaz.pro">slitaz.pro</a> - SliTaz Professional services. 3.82 + (<a href="/stats/awstats.pl?config=slitaz.pro">stats</a>)</li> 3.83 + <li><a href="http://slitaz.me">slitaz.me</a> - 3.84 + Domain used for users services such as Pizza.</li> 3.85 <h2>Tank Log</h2> 3.86 3.87 <pre> 3.88 <?php 3.89 -system("tac /var/log/tank.log | head -40"); 3.90 +system("tac /var/log/tank.log | head -50"); 3.91 ?> 3.92 </pre> 3.93
4.1 --- a/tank/web/lib/html/header.html Sun Jan 19 19:35:57 2014 +0100 4.2 +++ b/tank/web/lib/html/header.html Mon Jan 20 23:07:59 2014 +0100 4.3 @@ -6,11 +6,11 @@ 4.4 <a href="http://scn.slitaz.org/">Community</a> 4.5 <a href="http://doc.slitaz.org/">Doc</a> 4.6 <a href="http://forum.slitaz.org/">Forum</a> 4.7 + <a href="http://irc.slitaz.org/">IRC</a> 4.8 <a href="http://slitaz.pro/">Pro</a> 4.9 - <a href="http://slitaz.spreadshirt.net/">Shop</a> 4.10 + <a href="http://shop.slitaz.org/">Shop</a> 4.11 <a href="http://bugs.slitaz.org">Bugs</a> 4.12 <a href="http://hg.slitaz.org/?sort=lastchange">Hg</a> 4.13 - <a href="http://cook.slitaz.org/">Cook</a> 4.14 </div> 4.15 <h1><a href="http://tank.slitaz.org/">SliTaz Tank</a></h1> 4.16 </div>
5.1 --- a/tank/web/slitaz.css Sun Jan 19 19:35:57 2014 +0100 5.2 +++ b/tank/web/slitaz.css Mon Jan 20 23:07:59 2014 +0100 5.3 @@ -11,7 +11,8 @@ 5.4 color: black; 5.5 font: 13px sans-serif, vernada, arial; 5.6 margin: 0; 5.7 - min-width: 900px; 5.8 + min-width: 780px; 5.9 + height: 100%; 5.10 } 5.11 5.12 a { text-decoration: underline; color: #215090; } 5.13 @@ -30,7 +31,7 @@ 5.14 5.15 #header { 5.16 height: 40px; 5.17 - background: #351a0a; 5.18 + background: #222; 5.19 } 5.20 5.21 #header h1 { 5.22 @@ -46,8 +47,8 @@ 5.23 font-style: italic; 5.24 } 5.25 5.26 -#header h1 a:hover { 5.27 - color: #d66018; 5.28 +#header h1 a:hover, #network a:hover, #network span { 5.29 + color: #afafaf; 5.30 } 5.31 5.32 /* Logo */ 5.33 @@ -66,22 +67,22 @@ 5.34 5.35 #network { 5.36 float: right; 5.37 - padding: 12px 5px 0; 5.38 + padding: 14px 5px 0; 5.39 font-size: 12px; 5.40 } 5.41 5.42 -#network a { padding: 0 6px; } 5.43 -#network a:hover { color: #cfcfcf; } 5.44 +#network a, #network span { padding: 0 4px; } 5.45 +#network span { font-weight: bold; } 5.46 5.47 /* Block */ 5.48 5.49 #block { 5.50 - min-height: 200px; 5.51 - background: #d66018; 5.52 - padding: 26px 10% 0px; 5.53 + min-height: 180px; 5.54 + background: #ccc; 5.55 + padding: 20px 10% 0px; 5.56 text-align: center; 5.57 - color: #333; 5.58 - border-bottom: 1px solid #f5f5f5; 5.59 + color: #222; 5.60 + border-bottom: 1px solid #afafaf; 5.61 } 5.62 5.63 #block_info { 5.64 @@ -91,28 +92,29 @@ 5.65 } 5.66 5.67 #block a, #network a { 5.68 - color: #fff; 5.69 + color: #fff; 5.70 font-weight: bold; 5.71 text-decoration: none; 5.72 } 5.73 5.74 #block h4 { 5.75 - color: #351a0a; 5.76 + color: #222; 5.77 margin: 0px; 5.78 font-weight: bold; 5.79 font-size: 110%; 5.80 } 5.81 5.82 #block_info p { margin: 6px 0; padding: 0 12px 0 0; } 5.83 -#block_info a { font-weight: normal; } 5.84 +#block_info a { font-weight: normal; color: #215090; } 5.85 +#block_info a:hover { text-decoration: underline; } 5.86 #block ul { list-style-type: square; } 5.87 -#block a:hover { color: #351a0a; } 5.88 +#block_nav a:hover { color: #afafaf; } 5.89 5.90 /* Navigation */ 5.91 5.92 #block_nav { 5.93 - background: #cc5b17; 5.94 - padding: 10px 10px 40px; 5.95 + background: #666; 5.96 + padding: 10px 10px 20px; 5.97 text-align: justify; 5.98 width: 48%; 5.99 float: right; 5.100 @@ -132,9 +134,10 @@ 5.101 /* Languages */ 5.102 5.103 #lang { 5.104 - float: right; 5.105 padding: 6px; 5.106 font-size: 11px; 5.107 + position: absolute; 5.108 + right: 0px; 5.109 } 5.110 5.111 #lang a { 5.112 @@ -146,6 +149,9 @@ 5.113 text-decoration: underline; 5.114 } 5.115 5.116 +.box #lang { text-align: center; position: relative; 5.117 + font-size: 13px; } /* for /i18n page */ 5.118 + 5.119 /* Content */ 5.120 5.121 #content { 5.122 @@ -153,19 +159,30 @@ 5.123 text-align: justify; 5.124 } 5.125 5.126 -#news li { 5.127 +.news li { 5.128 list-style-type: square; 5.129 border-bottom: 1px dotted #BEBEBE; 5.130 margin-left: -25px; 5.131 padding: 4px 0px 4px 0px; 5.132 } 5.133 5.134 -#news a, .feed-grid a { text-decoration: none; } 5.135 -#news p a { text-decoration: underline; } 5.136 -#news p a:hover { text-decoration: none; } 5.137 -#twitter { margin: 20px 0; } 5.138 +.news a, .feed-grid a { text-decoration: none; } 5.139 +.news p a { text-decoration: underline; } 5.140 +.news p a:hover { text-decoration: none; } 5.141 +#twitter { margin: 20px 0; text-align: center; } 5.142 #gallery { text-align: center; } 5.143 5.144 +#sponsor { 5.145 + font-size: 90%; 5.146 + background-color: #fbfbfb; 5.147 + border: 2px solid #ddd; 5.148 + width: 200px; 5.149 + height: 160px; 5.150 + float: right; 5.151 + text-align: center; 5.152 + margin: 10px 0px 20px 20px; 5.153 +} 5.154 + 5.155 /* Classes */ 5.156 5.157 .right_box { width: 48%; float: right; } 5.158 @@ -178,6 +195,21 @@ 5.159 border: 1px solid #ddd; 5.160 } 5.161 5.162 +.box-dl, .box-up { 5.163 + margin: 20px 60px; 5.164 + padding: 12px 12px 12px 66px; 5.165 + min-height: 48px; 5.166 + border: 1px solid #ddd; 5.167 + vertical-align: middle; 5.168 +} 5.169 +.box-dl { 5.170 + background: url("/images/download.png") no-repeat 12px 12px #efefef; 5.171 +} 5.172 +.box-up { 5.173 + background: url("/images/update.png") no-repeat center left #efefef; 5.174 +} 5.175 +.box-dl p { color: #456; } 5.176 + 5.177 .searchbox { 5.178 margin: 20px 80px; 5.179 padding: 12px; 5.180 @@ -186,56 +218,59 @@ 5.181 border: 1px solid #ddd; 5.182 } 5.183 5.184 -.feed-grid { height: 180px; overflow: hidden; text-align: left; } 5.185 -.feed-grid h3 { 5.186 - margin: 15px 0 0; font-size: 16px; 5.187 - padding: 0 22px; 5.188 - background: url(images/feed.png) no-repeat left; } 5.189 -.feed-grid span { font-size: 10px; color: #888; margin-left: 24px; } 5.190 -.feed-grid ul { color: #666; } 5.191 -.feed-grid a { color: #666; } 5.192 -.feed-grid a:hover { color: blue; } 5.193 +/* Activity Box */ 5.194 + 5.195 +.activity { 5.196 + margin: 0 0 20px; 5.197 + background: #efefef; 5.198 + padding: 5px 2px 0; 5.199 + border: 1px solid #ddd; 5.200 +} 5.201 +.activity div { padding: 5px 10px; background: #fff; margin-top: 5px; } 5.202 +.activity p { margin: 0; padding: 5px 10px; font-weight: bold; } 5.203 +.activity a { text-decoration: none; } 5.204 +.activity ul { list-style-type: none; 5.205 + margin: 4px 0; padding: 0 4px; line-height: 150%; } 5.206 +.activity_more { text-align: right; } 5.207 +.activity_more a { font-weight: normal; color: #000; padding: 0 4px; } 5.208 +.activity_more a:hover { text-decoration: underline; } 5.209 + 5.210 +.activity span, .news span { 5.211 + color: #666; 5.212 + font-size: 11px; 5.213 + font-weight: normal; 5.214 +} 5.215 5.216 /* Button */ 5.217 5.218 -.button a { 5.219 - background-color: #b64b22; 5.220 +#block_info .button a { 5.221 + background-color: #666; 5.222 color: #ffffff; 5.223 - margin-right: 6px; 5.224 + margin: 0px 4px; 5.225 padding: 6px 10px; 5.226 font-size: 12px; 5.227 text-decoration: none; 5.228 font-weight: bold; 5.229 } 5.230 -.button a:hover, input[type=submit]:hover { 5.231 - background-color: #a3431f; 5.232 +#block_info .button a:hover, input[type=submit]:hover { 5.233 + background-color: #444; 5.234 color: #ffffff; 5.235 } 5.236 5.237 /* Round corner */ 5.238 5.239 -#block_nav, pre, .box, .searchbox, .button a, #twitter { 5.240 +#block_nav, pre, .box, .box-dl, .box-up, .searchbox, .button a, #twitter, .activity, 5.241 +.activity div, #sponsor { 5.242 -moz-border-radius: 4px; 5.243 -webkit-border-radius: 4px; 5.244 border-radius: 4px; 5.245 } 5.246 5.247 -/* Transition */ 5.248 - 5.249 -.box { 5.250 - -webkit-transition-property: background-color; 5.251 - -webkit-transition-duration: 2s; 5.252 - -moz-transition-property: background-color; 5.253 - -moz-transition-duration: 2s; 5.254 - transition-property: background-color; 5.255 - transition-duration: 2s; 5.256 -} 5.257 - 5.258 /* Form */ 5.259 5.260 input[type=submit] { 5.261 - border: 1px solid #b64b22; 5.262 - background-color: #b64b22; 5.263 + border: 1px solid #666; 5.264 + background-color: #666; 5.265 color: white; 5.266 font-weight: bold; 5.267 cursor: pointer; 5.268 @@ -250,7 +285,7 @@ 5.269 border-bottom-right-radius: 4px; 5.270 } 5.271 5.272 -input[type=submit]:hover { background-color: #a3431f; } 5.273 +input[type=submit]:hover { background-color: #444; } 5.274 5.275 input[type=text] { 5.276 border: 1px solid #333333; 5.277 @@ -273,6 +308,8 @@ 5.278 border-top: 1px solid #ddd; 5.279 padding: 40px; 5.280 color: #666; 5.281 + clear: both; 5.282 + margin-bottom: -2%; 5.283 } 5.284 5.285 #footer a { color: #666; padding: 0 2px; } 5.286 @@ -281,3 +318,57 @@ 5.287 /* content: "2007-2014"; */ 5.288 content: "2014"; 5.289 } 5.290 + 5.291 +p, li { 5.292 + -moz-hyphens: auto; 5.293 + -webkit-hyphens: auto; 5.294 + hyphens: auto; 5.295 +} 5.296 + 5.297 + 5.298 +/* --- SEARCH --- */ 5.299 + 5.300 +input.gsc-search-button { 5.301 + border: 1px solid #b64b22; 5.302 + background-color: #b64b22; 5.303 + color: white; 5.304 + font-weight: bold; 5.305 + cursor: pointer; 5.306 + padding: 2px 10px; 5.307 + font-size: 14px; 5.308 + margin-left: -4px; 5.309 + -webkit-border-top-right-radius: 4px; 5.310 + -webkit-border-bottom-right-radius: 4px; 5.311 + -moz-border-radius-topright: 4px; 5.312 + -moz-border-radius-bottomright: 4px; 5.313 + border-top-right-radius: 4px; 5.314 + border-bottom-right-radius: 4px; 5.315 +} 5.316 + 5.317 +.gs-webResult.gs-result a.gs-title:link, 5.318 +.gs-webResult.gs-result a.gs-title:link b { 5.319 + color: #103a5e; 5.320 +} 5.321 + 5.322 +#cse { 5.323 + margin-bottom: 120px; 5.324 + width:100%; 5.325 +} 5.326 + 5.327 + 5.328 +/* --- GALLERY --- */ 5.329 + 5.330 +#gallery div { 5.331 + width: 496px; 5.332 + border: none; 5.333 + border-radius: 12px; 5.334 + padding-bottom: 8px; 5.335 + margin: 12px auto; 5.336 + webkit-box-shadow: 0 0 6px rgba(0,0,0,0.5); 5.337 + -moz-box-shadow: 0 0 6px rgba(0,0,0,0.5); 5.338 + box-shadow: 0 0 6px rgba(0,0,0,0.5); 5.339 +} 5.340 +#gallery img { 5.341 + width: 480px; 5.342 + margin: 8px; 5.343 +}