From fa1af472028ab2f74a3bb6f8a7cc76343e2f89a5 Mon Sep 17 00:00:00 2001 From: Bart Van Der Meerssche Date: Mon, 24 Aug 2009 11:56:12 +0000 Subject: [PATCH] openwrt: web configuration itf now points to wifi by default --- .../luci/libs/sgi-cgi/htdocs/index.html | 4 +-- .../htdocs/luci-static/oxygen/cascade.css | 32 +++++++++---------- .../luasrc/view/themes/oxygen/header.htm | 27 ++++++++-------- ...m.patch => 245.ignore.dhcpc.sigterm.patch} | 4 +-- openwrt/patches/INSTALL.txt | 5 ++- 5 files changed, 37 insertions(+), 35 deletions(-) rename openwrt/patches/{130.ignore.dhcpc.sigterm.patch => 245.ignore.dhcpc.sigterm.patch} (81%) diff --git a/openwrt/packages/luci/libs/sgi-cgi/htdocs/index.html b/openwrt/packages/luci/libs/sgi-cgi/htdocs/index.html index a229860..1787b6f 100644 --- a/openwrt/packages/luci/libs/sgi-cgi/htdocs/index.html +++ b/openwrt/packages/luci/libs/sgi-cgi/htdocs/index.html @@ -2,9 +2,9 @@ - + -Flukso Configuration Interface +Flukso Configuration Interface diff --git a/openwrt/packages/luci/themes/oxygen/htdocs/luci-static/oxygen/cascade.css b/openwrt/packages/luci/themes/oxygen/htdocs/luci-static/oxygen/cascade.css index c1b19f7..4012fdf 100644 --- a/openwrt/packages/luci/themes/oxygen/htdocs/luci-static/oxygen/cascade.css +++ b/openwrt/packages/luci/themes/oxygen/htdocs/luci-static/oxygen/cascade.css @@ -104,23 +104,21 @@ code { } .menubar { - background: #000000; - background: rgba(100, 100, 100, 0.8); - color: #ffffff; + clear: both; width: 80%; - font-size: 0.8em; + margin: 0.7em auto; + padding: 0.5em; + background: #f5f5f5; + background: rgba(245, 245, 245, 0.9); + color: #000000; + border-width: 1px solid #444444; + font-size: 80%; - margin: 0.5em auto; - - padding: 0.4em; - padding-left: 0.5em; - padding-right: 0.5em; - - border-radius: 0.8em; - -khtml-border-radius: 0.8em; - -moz-border-radius: 0.8em; - -webkit-border-radius:0.8em; - -opera-border-radius: 0.8em; + border-radius: 1em; + -khtml-border-radius: 1em; + -moz-border-radius: 1em; + -webkit-border-radius: 1em; + -opera-border-radius: 1em; } .menubar .warning { @@ -130,7 +128,7 @@ code { html .menubar a:link, html .menubar a:visited { - color: #ffffff; + color: #000000; text-decoration: none; font-weight: bold; } @@ -175,7 +173,7 @@ html .menubar a:visited.warning { #maincontent { clear: both; width: 80%; - margin: 0 auto; + margin: 0.7em auto; padding: 0.5em; background: #f5f5f5; background: rgba(245, 245, 245, 0.9); diff --git a/openwrt/packages/luci/themes/oxygen/luasrc/view/themes/oxygen/header.htm b/openwrt/packages/luci/themes/oxygen/luasrc/view/themes/oxygen/header.htm index fa86096..b6057fe 100644 --- a/openwrt/packages/luci/themes/oxygen/luasrc/view/themes/oxygen/header.htm +++ b/openwrt/packages/luci/themes/oxygen/luasrc/view/themes/oxygen/header.htm @@ -109,20 +109,21 @@ ucimenu("/" .. category .. "/uci/", tree.nodes[category].nodes["uci"], "changes" <% end %>
-

<%:navigation Navigation%>

-Home +
+
+ Wifi +
-<% - local pointer = tree - for k, v in ipairs(crequest) do - if pointer.nodes and pointer.nodes[v] then - pointer = pointer.nodes[v] - %> - » <%=pointer.title or v%> - <% - end - end -%> +
+ Network +
+ +
+ System +
+
+ +
diff --git a/openwrt/patches/130.ignore.dhcpc.sigterm.patch b/openwrt/patches/245.ignore.dhcpc.sigterm.patch similarity index 81% rename from openwrt/patches/130.ignore.dhcpc.sigterm.patch rename to openwrt/patches/245.ignore.dhcpc.sigterm.patch index 03180cc..642c8b5 100644 --- a/openwrt/patches/130.ignore.dhcpc.sigterm.patch +++ b/openwrt/patches/245.ignore.dhcpc.sigterm.patch @@ -1,5 +1,5 @@ ---- dhcpc.c 2009-08-18 23:24:17.000000000 +0200 -+++ dhcpc.c 2009-08-18 23:25:52.000000000 +0200 +--- a/networking/udhcp/dhcpc.c ++++ b/networking/udhcp/dhcpc.c @@ -616,10 +616,10 @@ timeout = INT_MAX; break; diff --git a/openwrt/patches/INSTALL.txt b/openwrt/patches/INSTALL.txt index 984d29b..034a1e7 100644 --- a/openwrt/patches/INSTALL.txt +++ b/openwrt/patches/INSTALL.txt @@ -5,4 +5,7 @@ apply following patches to a fresh 8.09 installation: 100.disable.console.patch in 8.09_base_dir/target/linux/generic-2.6/ 110.set.console.baud.to.4800.patch in 8.09_base_dir/target/linux/atheros/ 120.set.AR5315_RESET_GPIO.to.6.patch in 8.09_base_dir/target/linux/atheros/files/include/asm-mips/mach-atheros/ar5315/ -130.ignore.dhcpc.sigterm.patch in 8.09_base_dir/build_dir/mips/busybox-1.11.2/networking/udhcp/ + +symlink these patches in the appropriate directory: +--------------------------------------------------- +245.ignore.dhcpc.sigterm.patch in 8.09_base_dir/package/busybox/patches/