From 9e93c15a4135619a038665dd0e810fb3666fb3b4 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Fri, 6 Oct 2006 20:10:37 +0000 Subject: [PATCH] restructure webif similar to x-wrt SVN-Revision: 4938 --- openwrt/package/webif/files/etc/httpd.conf | 4 ++++ .../package/webif/files/www/cgi-bin/webif/about.sh | 11 +++++++++-- openwrt/package/webif/files/www/cgi-bin/webif/info.sh | 2 +- .../www/cgi-bin/webif/{hosts.sh => network-hosts.sh} | 2 +- .../www/cgi-bin/webif/{lan.sh => network-lan.sh} | 2 +- .../www/cgi-bin/webif/{wan.sh => network-wan.sh} | 2 +- ...{wireless-advanced.sh => network-wlan-advanced.sh} | 2 +- .../webif/{wireless-config.sh => network-wlan.sh} | 2 +- .../webif/{connection.sh => status-connection.sh} | 2 +- .../www/cgi-bin/webif/{leases.sh => status-dhcp.sh} | 2 +- .../webif/{wireless-status.sh => status-wireless.sh} | 2 +- .../www/cgi-bin/webif/{ipkg.sh => system-ipkg.sh} | 2 +- .../cgi-bin/webif/{password.sh => system-password.sh} | 2 +- .../cgi-bin/webif/{system.sh => system-settings.sh} | 2 +- .../cgi-bin/webif/{upgrade.sh => system-upgrade.sh} | 2 +- 15 files changed, 26 insertions(+), 15 deletions(-) rename openwrt/package/webif/files/www/cgi-bin/webif/{hosts.sh => network-hosts.sh} (99%) rename openwrt/package/webif/files/www/cgi-bin/webif/{lan.sh => network-lan.sh} (98%) rename openwrt/package/webif/files/www/cgi-bin/webif/{wan.sh => network-wan.sh} (99%) rename openwrt/package/webif/files/www/cgi-bin/webif/{wireless-advanced.sh => network-wlan-advanced.sh} (98%) rename openwrt/package/webif/files/www/cgi-bin/webif/{wireless-config.sh => network-wlan.sh} (99%) rename openwrt/package/webif/files/www/cgi-bin/webif/{connection.sh => status-connection.sh} (94%) rename openwrt/package/webif/files/www/cgi-bin/webif/{leases.sh => status-dhcp.sh} (96%) rename openwrt/package/webif/files/www/cgi-bin/webif/{wireless-status.sh => status-wireless.sh} (85%) rename openwrt/package/webif/files/www/cgi-bin/webif/{ipkg.sh => system-ipkg.sh} (97%) rename openwrt/package/webif/files/www/cgi-bin/webif/{password.sh => system-password.sh} (94%) rename openwrt/package/webif/files/www/cgi-bin/webif/{system.sh => system-settings.sh} (97%) rename openwrt/package/webif/files/www/cgi-bin/webif/{upgrade.sh => system-upgrade.sh} (98%) diff --git a/openwrt/package/webif/files/etc/httpd.conf b/openwrt/package/webif/files/etc/httpd.conf index 29bafa926b..5197b88378 100644 --- a/openwrt/package/webif/files/etc/httpd.conf +++ b/openwrt/package/webif/files/etc/httpd.conf @@ -1,4 +1,8 @@ .asp:text/html /cgi-bin/webif:root:$p$root /cgi-bin/webif:admin:$p$root +.svg:image/svg+xml +.png:image/png +.gif:image/gif +.jpg:image/jpg diff --git a/openwrt/package/webif/files/www/cgi-bin/webif/about.sh b/openwrt/package/webif/files/www/cgi-bin/webif/about.sh index abaf27b435..0d7416a691 100755 --- a/openwrt/package/webif/files/www/cgi-bin/webif/about.sh +++ b/openwrt/package/webif/files/www/cgi-bin/webif/about.sh @@ -8,17 +8,24 @@ header "Info" "About" "@TR<>..."
@TR<modify it under the terms of the GNU General Public License
as published by the Free Software Foundation; either version 2
of the License, or (at your option) any later version.
>>
-@TR<> © 2005 Felix Fietkau <openwrt@nbd.name>
+@TR<> © 2005-2006 OpenWrt.org

@TR<>: diff --git a/openwrt/package/webif/files/www/cgi-bin/webif/info.sh b/openwrt/package/webif/files/www/cgi-bin/webif/info.sh index 1eee7f6808..cc7639702c 100755 --- a/openwrt/package/webif/files/www/cgi-bin/webif/info.sh +++ b/openwrt/package/webif/files/www/cgi-bin/webif/info.sh @@ -40,5 +40,5 @@ EOF footer ?> diff --git a/openwrt/package/webif/files/www/cgi-bin/webif/hosts.sh b/openwrt/package/webif/files/www/cgi-bin/webif/network-hosts.sh similarity index 99% rename from openwrt/package/webif/files/www/cgi-bin/webif/hosts.sh rename to openwrt/package/webif/files/www/cgi-bin/webif/network-hosts.sh index 22c8fe27e2..aeb58e1597 100755 --- a/openwrt/package/webif/files/www/cgi-bin/webif/hosts.sh +++ b/openwrt/package/webif/files/www/cgi-bin/webif/network-hosts.sh @@ -154,5 +154,5 @@ EOF footer ?> diff --git a/openwrt/package/webif/files/www/cgi-bin/webif/lan.sh b/openwrt/package/webif/files/www/cgi-bin/webif/network-lan.sh similarity index 98% rename from openwrt/package/webif/files/www/cgi-bin/webif/lan.sh rename to openwrt/package/webif/files/www/cgi-bin/webif/network-lan.sh index 3ed6a52b11..84137b6fc6 100755 --- a/openwrt/package/webif/files/www/cgi-bin/webif/lan.sh +++ b/openwrt/package/webif/files/www/cgi-bin/webif/network-lan.sh @@ -49,5 +49,5 @@ EOF footer ?> diff --git a/openwrt/package/webif/files/www/cgi-bin/webif/wan.sh b/openwrt/package/webif/files/www/cgi-bin/webif/network-wan.sh similarity index 99% rename from openwrt/package/webif/files/www/cgi-bin/webif/wan.sh rename to openwrt/package/webif/files/www/cgi-bin/webif/network-wan.sh index e172c56eaa..315626583f 100755 --- a/openwrt/package/webif/files/www/cgi-bin/webif/wan.sh +++ b/openwrt/package/webif/files/www/cgi-bin/webif/network-wan.sh @@ -216,5 +216,5 @@ EOF footer ?> diff --git a/openwrt/package/webif/files/www/cgi-bin/webif/wireless-advanced.sh b/openwrt/package/webif/files/www/cgi-bin/webif/network-wlan-advanced.sh similarity index 98% rename from openwrt/package/webif/files/www/cgi-bin/webif/wireless-advanced.sh rename to openwrt/package/webif/files/www/cgi-bin/webif/network-wlan-advanced.sh index 7a096c8b74..2d8caf49b3 100755 --- a/openwrt/package/webif/files/www/cgi-bin/webif/wireless-advanced.sh +++ b/openwrt/package/webif/files/www/cgi-bin/webif/network-wlan-advanced.sh @@ -100,5 +100,5 @@ EOF footer ?> diff --git a/openwrt/package/webif/files/www/cgi-bin/webif/wireless-config.sh b/openwrt/package/webif/files/www/cgi-bin/webif/network-wlan.sh similarity index 99% rename from openwrt/package/webif/files/www/cgi-bin/webif/wireless-config.sh rename to openwrt/package/webif/files/www/cgi-bin/webif/network-wlan.sh index 6709098fe2..fee14b9594 100755 --- a/openwrt/package/webif/files/www/cgi-bin/webif/wireless-config.sh +++ b/openwrt/package/webif/files/www/cgi-bin/webif/network-wlan.sh @@ -286,5 +286,5 @@ EOF footer ?> diff --git a/openwrt/package/webif/files/www/cgi-bin/webif/connection.sh b/openwrt/package/webif/files/www/cgi-bin/webif/status-connection.sh similarity index 94% rename from openwrt/package/webif/files/www/cgi-bin/webif/connection.sh rename to openwrt/package/webif/files/www/cgi-bin/webif/status-connection.sh index cab7ebd7c1..fbf329b1b3 100755 --- a/openwrt/package/webif/files/www/cgi-bin/webif/connection.sh +++ b/openwrt/package/webif/files/www/cgi-bin/webif/status-connection.sh @@ -25,5 +25,5 @@ header "Status" "Connections" "@TR<>" diff --git a/openwrt/package/webif/files/www/cgi-bin/webif/leases.sh b/openwrt/package/webif/files/www/cgi-bin/webif/status-dhcp.sh similarity index 96% rename from openwrt/package/webif/files/www/cgi-bin/webif/leases.sh rename to openwrt/package/webif/files/www/cgi-bin/webif/status-dhcp.sh index 48364f300d..5517b781f4 100755 --- a/openwrt/package/webif/files/www/cgi-bin/webif/leases.sh +++ b/openwrt/package/webif/files/www/cgi-bin/webif/status-dhcp.sh @@ -34,5 +34,5 @@ $1 > 0 { diff --git a/openwrt/package/webif/files/www/cgi-bin/webif/wireless-status.sh b/openwrt/package/webif/files/www/cgi-bin/webif/status-wireless.sh similarity index 85% rename from openwrt/package/webif/files/www/cgi-bin/webif/wireless-status.sh rename to openwrt/package/webif/files/www/cgi-bin/webif/status-wireless.sh index 47c044efaf..c7ad0a3068 100755 --- a/openwrt/package/webif/files/www/cgi-bin/webif/wireless-status.sh +++ b/openwrt/package/webif/files/www/cgi-bin/webif/status-wireless.sh @@ -8,5 +8,5 @@ header "Status" "Wireless" "@TR<>" diff --git a/openwrt/package/webif/files/www/cgi-bin/webif/ipkg.sh b/openwrt/package/webif/files/www/cgi-bin/webif/system-ipkg.sh similarity index 97% rename from openwrt/package/webif/files/www/cgi-bin/webif/ipkg.sh rename to openwrt/package/webif/files/www/cgi-bin/webif/system-ipkg.sh index 4c68297246..b21918d989 100755 --- a/openwrt/package/webif/files/www/cgi-bin/webif/ipkg.sh +++ b/openwrt/package/webif/files/www/cgi-bin/webif/system-ipkg.sh @@ -51,5 +51,5 @@ $1 ~ /status/ { diff --git a/openwrt/package/webif/files/www/cgi-bin/webif/password.sh b/openwrt/package/webif/files/www/cgi-bin/webif/system-password.sh similarity index 94% rename from openwrt/package/webif/files/www/cgi-bin/webif/password.sh rename to openwrt/package/webif/files/www/cgi-bin/webif/system-password.sh index f8618d8ab8..87a768aaac 100755 --- a/openwrt/package/webif/files/www/cgi-bin/webif/password.sh +++ b/openwrt/package/webif/files/www/cgi-bin/webif/system-password.sh @@ -36,5 +36,5 @@ EOF footer ?> diff --git a/openwrt/package/webif/files/www/cgi-bin/webif/system.sh b/openwrt/package/webif/files/www/cgi-bin/webif/system-settings.sh similarity index 97% rename from openwrt/package/webif/files/www/cgi-bin/webif/system.sh rename to openwrt/package/webif/files/www/cgi-bin/webif/system-settings.sh index e21f8d7ecc..cbb7f5ab94 100755 --- a/openwrt/package/webif/files/www/cgi-bin/webif/system.sh +++ b/openwrt/package/webif/files/www/cgi-bin/webif/system-settings.sh @@ -53,5 +53,5 @@ EOF footer ?> diff --git a/openwrt/package/webif/files/www/cgi-bin/webif/upgrade.sh b/openwrt/package/webif/files/www/cgi-bin/webif/system-upgrade.sh similarity index 98% rename from openwrt/package/webif/files/www/cgi-bin/webif/upgrade.sh rename to openwrt/package/webif/files/www/cgi-bin/webif/system-upgrade.sh index c5750fad0b..5bdd2f1941 100755 --- a/openwrt/package/webif/files/www/cgi-bin/webif/upgrade.sh +++ b/openwrt/package/webif/files/www/cgi-bin/webif/system-upgrade.sh @@ -110,4 +110,4 @@ EOF footer -##WEBIF:name:System:4:Firmware Upgrade +##WEBIF:name:System:400:Firmware Upgrade -- 2.30.2