tazpanel rev 307 1.5.7
fix bug with config file. config reverts (mainly) to the old format
| author | Aleksej Bobylev <al.bobylev@gmail.com> |
|---|---|
| date | Fri May 04 22:58:21 2012 +0300 (2012-05-04) |
| parents | e0428185a37f |
| children | ed3cea09613d |
| files | data/tazpanel.conf lib/libtazpanel styles/default/footer.html styles/default/footer.sh styles/default/header.html styles/default/header.sh |
line diff
1.1 --- a/data/tazpanel.conf Fri May 04 14:36:02 2012 +0000 1.2 +++ b/data/tazpanel.conf Fri May 04 22:58:21 2012 +0300 1.3 @@ -9,8 +9,8 @@ 1.4 1.5 # Absolute paths to images and xHTML skel from $PANEL 1.6 IMAGES="/styles/$STYLE/images" 1.7 -HEADER="/styles/$STYLE/header.sh" 1.8 -FOOTER="/styles/$STYLE/footer.sh" 1.9 +HEADER="/styles/$STYLE/header.html" 1.10 +FOOTER="/styles/$STYLE/footer.html" 1.11 1.12 # Display some debug messages 1.13 DEBUG="0"
2.1 --- a/lib/libtazpanel Fri May 04 14:36:02 2012 +0000 2.2 +++ b/lib/libtazpanel Fri May 04 22:58:21 2012 +0300 2.3 @@ -6,6 +6,10 @@ 2.4 # Get parameters with GET, POST and FILE functions 2.5 . /usr/bin/httpd_helper.sh 2.6 2.7 +# Disk usage warnings in percents 2.8 +DU_WARN="70" 2.9 +DU_CRIT="90" 2.10 + 2.11 # I18n 2.12 . /etc/locale.conf 2.13 . /usr/bin/gettext.sh
3.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 3.2 +++ b/styles/default/footer.html Fri May 04 22:58:21 2012 +0300 3.3 @@ -0,0 +1,13 @@ 3.4 +cat << EOT 3.5 +<!-- End of content--> 3.6 +</div> 3.7 + 3.8 +<div id="footer"> 3.9 + $(gettext 'Copyright') © 2012 3.10 + <a href="http://www.slitaz.org/">SliTaz GNU/Linux</a> 3.11 + - <a href="/index.cgi?file=/usr/share/licenses/bsd.txt">$(gettext 'BSD License')</a> 3.12 +</div> 3.13 + 3.14 +</body> 3.15 +</html> 3.16 +EOT
4.1 --- a/styles/default/footer.sh Fri May 04 14:36:02 2012 +0000 4.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 4.3 @@ -1,13 +0,0 @@ 4.4 -cat << EOT 4.5 -<!-- End of content--> 4.6 -</div> 4.7 - 4.8 -<div id="footer"> 4.9 - $(gettext 'Copyright') © 2012 4.10 - <a href="http://www.slitaz.org/">SliTaz GNU/Linux</a> 4.11 - - <a href="/index.cgi?file=/usr/share/licenses/bsd.txt">$(gettext 'BSD License')</a> 4.12 -</div> 4.13 - 4.14 -</body> 4.15 -</html> 4.16 -EOT
5.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 5.2 +++ b/styles/default/header.html Fri May 04 22:58:21 2012 +0300 5.3 @@ -0,0 +1,103 @@ 5.4 +cat << EOT 5.5 +<!DOCTYPE html> 5.6 +<html xmlns="http://www.w3.org/1999/xhtml" lang="$(echo $LANG | cut -f1 -d_)"> 5.7 +<head> 5.8 + <title>$TITLE</title> 5.9 + <meta charset="utf-8" /> 5.10 + <link rel="shortcut icon" href="/styles/default/favicon.ico" /> 5.11 + <link rel="stylesheet" type="text/css" href="/styles/default/style.css" /> 5.12 + <!-- Function to hide the loading message when page is generated. --> 5.13 + <script type="text/javascript"> 5.14 + function showLoading(){ 5.15 + document.getElementById("loading").style.display='none'; 5.16 + } 5.17 + </script> 5.18 +</head> 5.19 +<body onload="showLoading()"> 5.20 + 5.21 +<div id="toolbar"> 5.22 + <div id="icons"> 5.23 + <a href="/help.cgi"> 5.24 + <img src="/styles/default/images/help.png" alt="Help" /></a> 5.25 + </div> 5.26 + <ul id="menu"> 5.27 + <li><a href="/">$(gettext 'Panel')</a> 5.28 + <ul> 5.29 + <li><a href="/index.cgi?terminal"><img 5.30 + src="/styles/default/images/terminal.png" />$(gettext 'Terminal')</a></li> 5.31 + <li><a href="/index.cgi?top"><img 5.32 + src="/styles/default/images/monitor.png" />$(gettext 'Processes')</a></li> 5.33 + <li><a href="/index.cgi?report"><img 5.34 + src="/styles/default/images/text.png" />$(gettext 'Create Report')</a></li> 5.35 + </ul> 5.36 + </li> 5.37 + <li><a href="/pkgs.cgi">$(gettext 'Packages')</a> 5.38 + <ul> 5.39 + <li><a href="/pkgs.cgi?list"><img 5.40 + src="/styles/default/images/tazpkg.png" />$(gettext 'My packages')</a></li> 5.41 + <li><a href="/pkgs.cgi?recharge"><img 5.42 + src="/styles/default/images/update.png" />$(gettext 'Recharge list')</a></li> 5.43 + <li><a href="/pkgs.cgi?up"><img 5.44 + src="/styles/default/images/update.png" />$(gettext 'Check updates')</a></li> 5.45 + <li><a href="/pkgs.cgi?admin"><img 5.46 + src="/styles/default/images/edit.png" />$(gettext 'Administration')</a></li> 5.47 + </ul> 5.48 + </li> 5.49 + <li><a href="/network.cgi">$(gettext 'Network')</a> 5.50 + <ul> 5.51 + <li><a href="/network.cgi?eth"><img 5.52 + src="/styles/default/images/ethernet.png" />$(gettext 'Ethernet')</a></li> 5.53 + <li><a href="/network.cgi?wifi"><img 5.54 + src="/styles/default/images/wireless.png" />$(gettext 'Wireless')</a></li> 5.55 + <li><a href="/index.cgi?file=/etc/network.conf"><img 5.56 + src="/styles/default/images/edit.png" />$(gettext 'Config file')</a></li> 5.57 + </ul> 5.58 + </li> 5.59 + <li><a href="/settings.cgi">$(gettext 'Settings')</a> 5.60 + <ul> 5.61 + <li><a href="/settings.cgi?users"><img 5.62 + src="/styles/default/images/users.png" />$(gettext 'Users')</a></li> 5.63 + </ul> 5.64 + </li> 5.65 + <li><a href="/boot.cgi">$(gettext 'Boot')</a> 5.66 + <ul> 5.67 + <li><a href="/boot.cgi?log"><img 5.68 + src="/styles/default/images/text.png" />$(gettext 'Boot logs')</a></li> 5.69 + <li><a href="/boot.cgi?daemons"><img 5.70 + src="/styles/default/images/recharge.png" />$(gettext 'Manage daemons')</a></li> 5.71 + <li><a href="/boot.cgi?grub"><img 5.72 + src="/styles/default/images/tux.png" />$(gettext 'Boot loader')</a></li> 5.73 + </ul> 5.74 + </li> 5.75 + <li><a href="/hardware.cgi">$(gettext 'Hardware')</a> 5.76 + <ul> 5.77 + <li><a href="/hardware.cgi?modules"><img 5.78 + src="/styles/default/images/tux.png" />$(gettext 'Kernel modules')</a></li> 5.79 + <li><a href="/hardware.cgi?detect"><img 5.80 + src="/styles/default/images/monitor.png" />$(gettext 'Detect PCI/USB')</a></li> 5.81 + </ul> 5.82 + </li> 5.83 + <li><a href="/live.cgi">$(gettext 'Live')</a> 5.84 + <ul> 5.85 + <li><a href="/live.cgi?liveusb">$(gettext 'Create a live USB key')</a></li> 5.86 + <li><a href="/live.cgi#liveiso">$(gettext 'Create a live CD-ROM')</a></li> 5.87 + <li><a href="/live.cgi#loram">$(gettext 'Convert ISO to loram')</a></li> 5.88 + <li><a href="/live.cgi#meta">$(gettext 'Build a meta ISO')</a></li> 5.89 + </ul> 5.90 + </li> 5.91 + <li><a href="/installer.cgi">$(gettext 'Install')</a> 5.92 + <ul> 5.93 + <li><a href="/installer.cgi?page=menu_install">$(gettext 'Install SliTaz')</a></li> 5.94 + <li><a href="/installer.cgi?page=menu_upgrade">$(gettext 'Upgrade system')</a></li> 5.95 + </ul> 5.96 + </li> 5.97 + </ul> 5.98 +</div> 5.99 + 5.100 +<div id="header"> 5.101 + <h1>$TITLE</h1> 5.102 +</div> 5.103 + 5.104 +<!-- Page content --> 5.105 +<div id="content"> 5.106 +EOT
6.1 --- a/styles/default/header.sh Fri May 04 14:36:02 2012 +0000 6.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 6.3 @@ -1,103 +0,0 @@ 6.4 -cat << EOT 6.5 -<!DOCTYPE html> 6.6 -<html xmlns="http://www.w3.org/1999/xhtml" lang="$(echo $LANG | cut -f1 -d_)"> 6.7 -<head> 6.8 - <title>$TITLE</title> 6.9 - <meta charset="utf-8" /> 6.10 - <link rel="shortcut icon" href="/styles/default/favicon.ico" /> 6.11 - <link rel="stylesheet" type="text/css" href="/styles/default/style.css" /> 6.12 - <!-- Function to hide the loading message when page is generated. --> 6.13 - <script type="text/javascript"> 6.14 - function showLoading(){ 6.15 - document.getElementById("loading").style.display='none'; 6.16 - } 6.17 - </script> 6.18 -</head> 6.19 -<body onload="showLoading()"> 6.20 - 6.21 -<div id="toolbar"> 6.22 - <div id="icons"> 6.23 - <a href="/help.cgi"> 6.24 - <img src="/styles/default/images/help.png" alt="Help" /></a> 6.25 - </div> 6.26 - <ul id="menu"> 6.27 - <li><a href="/">$(gettext 'Panel')</a> 6.28 - <ul> 6.29 - <li><a href="/index.cgi?terminal"><img 6.30 - src="/styles/default/images/terminal.png" />$(gettext 'Terminal')</a></li> 6.31 - <li><a href="/index.cgi?top"><img 6.32 - src="/styles/default/images/monitor.png" />$(gettext 'Processes')</a></li> 6.33 - <li><a href="/index.cgi?report"><img 6.34 - src="/styles/default/images/text.png" />$(gettext 'Create Report')</a></li> 6.35 - </ul> 6.36 - </li> 6.37 - <li><a href="/pkgs.cgi">$(gettext 'Packages')</a> 6.38 - <ul> 6.39 - <li><a href="/pkgs.cgi?list"><img 6.40 - src="/styles/default/images/tazpkg.png" />$(gettext 'My packages')</a></li> 6.41 - <li><a href="/pkgs.cgi?recharge"><img 6.42 - src="/styles/default/images/update.png" />$(gettext 'Recharge list')</a></li> 6.43 - <li><a href="/pkgs.cgi?up"><img 6.44 - src="/styles/default/images/update.png" />$(gettext 'Check updates')</a></li> 6.45 - <li><a href="/pkgs.cgi?admin"><img 6.46 - src="/styles/default/images/edit.png" />$(gettext 'Administration')</a></li> 6.47 - </ul> 6.48 - </li> 6.49 - <li><a href="/network.cgi">$(gettext 'Network')</a> 6.50 - <ul> 6.51 - <li><a href="/network.cgi?eth"><img 6.52 - src="/styles/default/images/ethernet.png" />$(gettext 'Ethernet')</a></li> 6.53 - <li><a href="/network.cgi?wifi"><img 6.54 - src="/styles/default/images/wireless.png" />$(gettext 'Wireless')</a></li> 6.55 - <li><a href="/index.cgi?file=/etc/network.conf"><img 6.56 - src="/styles/default/images/edit.png" />$(gettext 'Config file')</a></li> 6.57 - </ul> 6.58 - </li> 6.59 - <li><a href="/settings.cgi">$(gettext 'Settings')</a> 6.60 - <ul> 6.61 - <li><a href="/settings.cgi?users"><img 6.62 - src="/styles/default/images/users.png" />$(gettext 'Users')</a></li> 6.63 - </ul> 6.64 - </li> 6.65 - <li><a href="/boot.cgi">$(gettext 'Boot')</a> 6.66 - <ul> 6.67 - <li><a href="/boot.cgi?log"><img 6.68 - src="/styles/default/images/text.png" />$(gettext 'Boot logs')</a></li> 6.69 - <li><a href="/boot.cgi?daemons"><img 6.70 - src="/styles/default/images/recharge.png" />$(gettext 'Manage daemons')</a></li> 6.71 - <li><a href="/boot.cgi?grub"><img 6.72 - src="/styles/default/images/tux.png" />$(gettext 'Boot loader')</a></li> 6.73 - </ul> 6.74 - </li> 6.75 - <li><a href="/hardware.cgi">$(gettext 'Hardware')</a> 6.76 - <ul> 6.77 - <li><a href="/hardware.cgi?modules"><img 6.78 - src="/styles/default/images/tux.png" />$(gettext 'Kernel modules')</a></li> 6.79 - <li><a href="/hardware.cgi?detect"><img 6.80 - src="/styles/default/images/monitor.png" />$(gettext 'Detect PCI/USB')</a></li> 6.81 - </ul> 6.82 - </li> 6.83 - <li><a href="/live.cgi">$(gettext 'Live')</a> 6.84 - <ul> 6.85 - <li><a href="/live.cgi?liveusb">$(gettext 'Create a live USB key')</a></li> 6.86 - <li><a href="/live.cgi#liveiso">$(gettext 'Create a live CD-ROM')</a></li> 6.87 - <li><a href="/live.cgi#loram">$(gettext 'Convert ISO to loram')</a></li> 6.88 - <li><a href="/live.cgi#meta">$(gettext 'Build a meta ISO')</a></li> 6.89 - </ul> 6.90 - </li> 6.91 - <li><a href="/installer.cgi">$(gettext 'Install')</a> 6.92 - <ul> 6.93 - <li><a href="/installer.cgi?page=menu_install">$(gettext 'Install SliTaz')</a></li> 6.94 - <li><a href="/installer.cgi?page=menu_upgrade">$(gettext 'Upgrade system')</a></li> 6.95 - </ul> 6.96 - </li> 6.97 - </ul> 6.98 -</div> 6.99 - 6.100 -<div id="header"> 6.101 - <h1>$TITLE</h1> 6.102 -</div> 6.103 - 6.104 -<!-- Page content --> 6.105 -<div id="content"> 6.106 -EOT