wok-6.x rev 18005

busybox: fix using 404 (not found) page; show URL in the page.
author Aleksej Bobylev <al.bobylev@gmail.com>
date Tue Apr 28 17:26:09 2015 +0300 (2015-04-28)
parents ac769de6c7c1
children c85231500a1d
files busybox/stuff/applications/httpd.desktop busybox/stuff/httpd.conf busybox/stuff/www/httpd/404.html
line diff
     1.1 --- a/busybox/stuff/applications/httpd.desktop	Tue Apr 28 10:50:53 2015 +0200
     1.2 +++ b/busybox/stuff/applications/httpd.desktop	Tue Apr 28 17:26:09 2015 +0300
     1.3 @@ -5,5 +5,5 @@
     1.4  Name[pt_BR]=Servidor Web local
     1.5  Name[ru]=Локальный веб-сервер
     1.6  Exec=browser http://localhost/
     1.7 -Icon=text-html
     1.8 +Icon=network-server
     1.9  Categories=Network;

     2.1 --- a/busybox/stuff/httpd.conf	Tue Apr 28 10:50:53 2015 +0200
     2.2 +++ b/busybox/stuff/httpd.conf	Tue Apr 28 17:26:09 2015 +0300
     2.3 @@ -7,10 +7,10 @@
     2.4  A:192.168.
     2.5  
     2.6  # File to open by default.
     2.7 -#I:index.html      
     2.8 +#I:index.html
     2.9  
    2.10  # Path to the 404 error page.
    2.11 -E404:/httpd/404.html 
    2.12 +E404:/var/www/httpd/404.html
    2.13  
    2.14  # Require user root on urls starting with /adm/. use passwd system db
    2.15  /adm:root:*

     3.1 --- a/busybox/stuff/www/httpd/404.html	Tue Apr 28 10:50:53 2015 +0200
     3.2 +++ b/busybox/stuff/www/httpd/404.html	Tue Apr 28 17:26:09 2015 +0300
     3.3 @@ -1,28 +1,32 @@
     3.4  <!DOCTYPE html>
     3.5 -<html xmlns="http://www.w3.org/1999/xhtml">
     3.6 +<html>
     3.7  <head>
     3.8 +	<meta charset="utf-8" />
     3.9  	<title>404 Not Found</title>
    3.10 -	<meta charset="utf-8" />
    3.11 -	<link rel="stylesheet" type="text/css" href="../style.css" />
    3.12 +	<link rel="stylesheet" type="text/css" href="/style.css" />
    3.13  </head>
    3.14  <body>
    3.15  
    3.16 -<!-- Header -->
    3.17 -<div id="header">
    3.18 +<header>
    3.19  	<h1>SliTaz Web Server</h1>
    3.20 -</div>
    3.21 +</header>
    3.22  
    3.23  <!-- Content -->
    3.24  <div id="content">
    3.25 -<h2>404 Not Found</h2>
    3.26 +<h2>Not Found</h2>
    3.27 +
    3.28 +<p>The requested URL <b id="uri"></b> was not found on this server.</p>
    3.29  
    3.30  <!-- End content -->
    3.31  </div>
    3.32  
    3.33 -<!-- Footer -->
    3.34 -<div id="footer">
    3.35 -    Copyright &copy; 2014 <a href="http://www.slitaz.org/">SliTaz GNU/Linux</a>
    3.36 -</div>
    3.37 +<script type="text/javascript">
    3.38 +document.getElementById('uri').innerText = window.location.pathname
    3.39 +</script>
    3.40 +
    3.41 +<footer>
    3.42 +Copyright &copy; 2015 <a href="http://www.slitaz.org/">SliTaz GNU/Linux</a>
    3.43 +</footer>
    3.44  
    3.45  </body>
    3.46  </html>