From d7fdd890304e4b684ed842f22a2b210e3fb41666 Mon Sep 17 00:00:00 2001
From: Jo-Philipp Wich <jow@openwrt.org>
Date: Wed, 29 Oct 2008 18:54:56 +0000
Subject: [PATCH] * luci-0.8: merge template changes from trunk

---
 .../luasrc/i18n/hd_idle.pt-br.lua             |  4 ++--
 .../luasrc/i18n/initmgr.pt-br.lua             |  2 +-
 .../luasrc/view/status-olsr/error_olsr.htm    |  2 +-
 .../luci-olsr/luasrc/view/status-olsr/hna.htm |  2 +-
 .../luasrc/view/status-olsr/index.htm         |  2 +-
 .../luci-olsr/luasrc/view/status-olsr/mid.htm |  2 +-
 .../luasrc/view/status-olsr/routes.htm        |  2 +-
 .../luasrc/view/status-olsr/topology.htm      |  2 +-
 .../luci-p910nd/luasrc/i18n/p910nd.pt-br.lua  |  2 +-
 .../luci-p910nd/luasrc/i18n/p910nd.pt-br.xml  |  2 +-
 .../luci-splash/luasrc/view/splash/splash.htm |  2 +-
 .../luasrc/view/admin_statistics/index.htm    |  2 +-
 .../view/admin_statistics/networkplugins.htm  |  2 +-
 .../view/admin_statistics/outputplugins.htm   |  2 +-
 .../view/admin_statistics/systemplugins.htm   |  2 +-
 .../luasrc/view/public_statistics/graph.htm   |  2 +-
 .../luasrc/i18n/admin-core.pt-br.lua          | 12 +++++------
 libs/cbi/htdocs/luci-static/resources/cbi.js  | 21 ++++++++++---------
 libs/cbi/luasrc/view/cbi/button.htm           |  2 +-
 libs/cbi/luasrc/view/cbi/dynlist.htm          |  6 +++---
 libs/cbi/luasrc/view/cbi/fvalue.htm           |  2 +-
 libs/cbi/luasrc/view/cbi/lvalue.htm           |  4 ++--
 libs/cbi/luasrc/view/cbi/map.htm              |  2 +-
 libs/cbi/luasrc/view/cbi/mvalue.htm           |  4 ++--
 libs/cbi/luasrc/view/cbi/simpleform.htm       |  2 +-
 libs/cbi/luasrc/view/cbi/tvalue.htm           |  2 +-
 libs/cbi/luasrc/view/cbi/value.htm            |  2 +-
 .../boa-patches/210-accept_fix.patch          | 15 +++++++++++++
 libs/web/root/etc/config/luci                 |  9 ++++----
 modules/admin-core/luasrc/view/about.htm      |  2 +-
 modules/admin-core/luasrc/view/error404.htm   |  2 +-
 modules/admin-core/luasrc/view/error500.htm   |  2 +-
 modules/admin-core/luasrc/view/sysauth.htm    |  6 +++---
 .../luasrc/view/admin_index/index.htm         |  2 +-
 .../luasrc/view/admin_services/index.htm      |  2 +-
 .../luasrc/view/admin_status/index.htm        |  2 +-
 .../luasrc/view/admin_status/syslog.htm       |  4 ++--
 .../luasrc/view/admin_system/applyreboot.htm  |  2 +-
 .../luasrc/view/admin_system/backup.htm       |  4 ++--
 .../luasrc/view/admin_system/packages.htm     |  4 ++--
 .../luasrc/view/admin_system/reboot.htm       |  4 ++--
 .../luasrc/view/admin_system/upgrade.htm      |  4 ++--
 .../luasrc/view/admin_uci/apply.htm           |  2 +-
 .../luasrc/view/admin_uci/changes.htm         |  4 ++--
 .../luasrc/view/admin_uci/revert.htm          |  2 +-
 .../luasrc/view/mini/applyreboot.htm          |  2 +-
 .../admin-mini/luasrc/view/mini/backup.htm    |  4 ++--
 modules/admin-mini/luasrc/view/mini/index.htm |  2 +-
 .../admin-mini/luasrc/view/mini/reboot.htm    |  4 ++--
 .../admin-mini/luasrc/view/mini/uci_apply.htm |  2 +-
 .../luasrc/view/mini/uci_changes.htm          |  4 ++--
 .../luasrc/view/mini/uci_revert.htm           |  2 +-
 .../admin-mini/luasrc/view/mini/upgrade.htm   |  4 ++--
 .../freifunk/luasrc/view/freifunk/contact.htm |  2 +-
 .../freifunk/luasrc/view/freifunk/index.htm   |  2 +-
 .../view/themes/openwrt-light/header.htm      |  2 +-
 .../luci-static/openwrt.org/cascade.css       |  7 +++++++
 .../luasrc/view/themes/openwrt.org/footer.htm |  7 ++++---
 58 files changed, 117 insertions(+), 92 deletions(-)
 create mode 100644 libs/sgi-webuci/boa-patches/210-accept_fix.patch

diff --git a/applications/luci-hd_idle/luasrc/i18n/hd_idle.pt-br.lua b/applications/luci-hd_idle/luasrc/i18n/hd_idle.pt-br.lua
index 856523a243..a1d253d087 100644
--- a/applications/luci-hd_idle/luasrc/i18n/hd_idle.pt-br.lua
+++ b/applications/luci-hd_idle/luasrc/i18n/hd_idle.pt-br.lua
@@ -1,7 +1,7 @@
 disk = 'Disco'
 enable_debug = 'Habilitar debug'
-hd_idle = 'hd-idle'
-hd_idle_desc = 'hd-idle é um programa utilitário para ativar o modo &quot;economia de energia&quot; (spinning-down) de discos externos após um período de ociosidade.'
+hd_idle = 'Hd-idle'
+hd_idle_desc = 'Hd-idle é um programa utilitário para ativar o modo &quot;economia de energia&quot; (spinning-down) de discos externos após um período de ociosidade.'
 idle_time_interval = 'Tempo de ociosidade'
 idle_time_unit = 'Unidade do tempo de ociosidade'
 settings = 'Configurações'
diff --git a/applications/luci-initmgr/luasrc/i18n/initmgr.pt-br.lua b/applications/luci-initmgr/luasrc/i18n/initmgr.pt-br.lua
index 9831948b6c..f6e3d5d1e6 100644
--- a/applications/luci-initmgr/luasrc/i18n/initmgr.pt-br.lua
+++ b/applications/luci-initmgr/luasrc/i18n/initmgr.pt-br.lua
@@ -1,5 +1,5 @@
 initmgr = 'Scripts de Inicialização'
-initmgr_desc = 'Você pode ativar ou desativar os scripts de inicialização instalados aqui. As mudanças serão aplicadas após a reinicialização do equipamento.<br /><strong>Aviso: Se você desativar algum script de inicialização essencial &quot;rede/network&quot;, o dispositivo poderá tornar-se inacessível!</strong>'
+initmgr_desc = 'Você pode ativar ou desativar os scripts de inicialização instalados aqui. As mudanças serão aplicadas após a reinicialização do equipamento.<br /><strong>Aviso: Se você desativar algum script de inicialização essencial como por exemplo &quot;rede/network&quot;, o dispositivo poderá tornar-se inacessível!</strong>'
 initmgr_index = 'Prioridade de inicialização'
 initmgr_name = 'Script de inicialização'
 initmgr_enabled = 'Ativar/Desativar'
diff --git a/applications/luci-olsr/luasrc/view/status-olsr/error_olsr.htm b/applications/luci-olsr/luasrc/view/status-olsr/error_olsr.htm
index f401603d28..c23f52b4f8 100644
--- a/applications/luci-olsr/luasrc/view/status-olsr/error_olsr.htm
+++ b/applications/luci-olsr/luasrc/view/status-olsr/error_olsr.htm
@@ -13,7 +13,7 @@ $Id$
 
 -%>
 <%+header%>
-<h1><%:olsrd%></h1>
+<h2><a id="content" name="content"><%:olsrd%></a></h2>
 <p class="error"><%:olsrd_error%></p>
 <p><%:olsrd_error_desc%></p>
 <%+footer%>
diff --git a/applications/luci-olsr/luasrc/view/status-olsr/hna.htm b/applications/luci-olsr/luasrc/view/status-olsr/hna.htm
index 5757e84343..e0ec8846a1 100644
--- a/applications/luci-olsr/luasrc/view/status-olsr/hna.htm
+++ b/applications/luci-olsr/luasrc/view/status-olsr/hna.htm
@@ -13,7 +13,7 @@ $Id$
 
 -%>
 <%+header%>
-<h1><%:olsrd_hna2%></h1>
+<h2><a id="content" name="content"><%:olsrd_hna2%></a></h2>
 <p><%:olsrd_hna_desc%></p>
 <br />
 <table class="smalltext" cellspacing="0" cellpadding="6">
diff --git a/applications/luci-olsr/luasrc/view/status-olsr/index.htm b/applications/luci-olsr/luasrc/view/status-olsr/index.htm
index 291e3a47e2..3dc56f992f 100644
--- a/applications/luci-olsr/luasrc/view/status-olsr/index.htm
+++ b/applications/luci-olsr/luasrc/view/status-olsr/index.htm
@@ -13,7 +13,7 @@ $Id$
 
 -%>
 <%+header%>
-<h1><%:olsrd_links%></h1>
+<h2><a id="content" name="content"><%:olsrd_links%></a></h2>
 <p><%:olsrd_links_desc%></p>
 <br />
 <table class="smalltext" cellspacing="0" cellpadding="6">
diff --git a/applications/luci-olsr/luasrc/view/status-olsr/mid.htm b/applications/luci-olsr/luasrc/view/status-olsr/mid.htm
index 1d0bef7396..2c3b70366b 100644
--- a/applications/luci-olsr/luasrc/view/status-olsr/mid.htm
+++ b/applications/luci-olsr/luasrc/view/status-olsr/mid.htm
@@ -13,7 +13,7 @@ $Id$
 
 -%>
 <%+header%>
-<h1><%:olsrd_mid%></h1>
+<h2><a id="content" name="content"><%:olsrd_mid%></a></h2>
 <p><%:olsrd_mid_desc%></p>
 <br />
 <table class="smalltext" cellspacing="0" cellpadding="6">
diff --git a/applications/luci-olsr/luasrc/view/status-olsr/routes.htm b/applications/luci-olsr/luasrc/view/status-olsr/routes.htm
index c5cce76145..1f42964416 100644
--- a/applications/luci-olsr/luasrc/view/status-olsr/routes.htm
+++ b/applications/luci-olsr/luasrc/view/status-olsr/routes.htm
@@ -13,7 +13,7 @@ $Id$
 
 -%>
 <%+header%>
-<h1><%:olsrd_routes%></h1>
+<h2><a id="content" name="content"><%:olsrd_routes%></a></h2>
 <p><%:olsrd_routes_desc%></p>
 <br />
 <table class="smalltext" cellspacing="0" cellpadding="6">
diff --git a/applications/luci-olsr/luasrc/view/status-olsr/topology.htm b/applications/luci-olsr/luasrc/view/status-olsr/topology.htm
index 3ce16a4c29..d919aa904a 100644
--- a/applications/luci-olsr/luasrc/view/status-olsr/topology.htm
+++ b/applications/luci-olsr/luasrc/view/status-olsr/topology.htm
@@ -13,7 +13,7 @@ $Id$
 
 -%>
 <%+header%>
-<h1><%:olsrd_topology%></h1>
+<h2><a id="content" name="content"><%:olsrd_topology%></a></h2>
 <p><%:olsrd_topology_desc%></p>
 <br />
 <table class="smalltext" cellspacing="0" cellpadding="6">
diff --git a/applications/luci-p910nd/luasrc/i18n/p910nd.pt-br.lua b/applications/luci-p910nd/luasrc/i18n/p910nd.pt-br.lua
index 3ec3ec0f32..71e4acba77 100644
--- a/applications/luci-p910nd/luasrc/i18n/p910nd.pt-br.lua
+++ b/applications/luci-p910nd/luasrc/i18n/p910nd.pt-br.lua
@@ -1,4 +1,4 @@
-p910nd = 'p910nd - Servidor de impressão'
+p910nd = 'P910nd - Servidor de impressão'
 p910nd_desc = 'Primeiro você deve instalar os pacotes para obter suporte USB (kmod-usb-printer) ou porta paralela (kmod-lp).'
 bidirectional = 'Modo bidirecional'
 port_help = 'p910nd escuta na porta 910+N. Ex. 9100 para a primeira impressora.'
diff --git a/applications/luci-p910nd/luasrc/i18n/p910nd.pt-br.xml b/applications/luci-p910nd/luasrc/i18n/p910nd.pt-br.xml
index bed614d28e..2936115158 100644
--- a/applications/luci-p910nd/luasrc/i18n/p910nd.pt-br.xml
+++ b/applications/luci-p910nd/luasrc/i18n/p910nd.pt-br.xml
@@ -2,7 +2,7 @@
 
 <i18n:msgs xmlns:i18n="http://luci.freifunk-halle.net/2008/i18n#" xmlns="http://www.w3.org/1999/xhtml">
 
-<i18n:msg xml:id="910nd">P910nd - Servidor de impressão</i18n:msg>
+<i18n:msg xml:id="p910nd">P910nd - Servidor de impressão</i18n:msg>
 <i18n:msg xml:id="p910nd_desc">Primeiro você deve instalar os pacotes para obter suporte USB (kmod-usb-printer) ou porta paralela (kmod-lp).</i18n:msg>
 <i18n:msg xml:id="bidirectional">Modo bidirecional</i18n:msg>
 <i18n:msg xml:id="port_help">p910nd escuta na porta 910+N. Ex. 9100 para a primeira impressora.</i18n:msg>
diff --git a/applications/luci-splash/luasrc/view/splash/splash.htm b/applications/luci-splash/luasrc/view/splash/splash.htm
index 28a038409b..659d4f0717 100644
--- a/applications/luci-splash/luasrc/view/splash/splash.htm
+++ b/applications/luci-splash/luasrc/view/splash/splash.htm
@@ -14,7 +14,7 @@ $Id$
 -%>
 <% local c = luci.model.uci.cursor():get_all("freifunk", "community") %>
 
-<h1>Willkommen!</h1>
+<h2><a id="content" name="content">Willkommen!</a></h2>
 <p>
 Du bist jetzt mit dem freien Funknetz 
 <a href="<%=c.homepage%>"><%=c.name%></a> verbunden.<br />
diff --git a/applications/luci-statistics/luasrc/view/admin_statistics/index.htm b/applications/luci-statistics/luasrc/view/admin_statistics/index.htm
index 4a0c924e27..dfeb0628d9 100644
--- a/applications/luci-statistics/luasrc/view/admin_statistics/index.htm
+++ b/applications/luci-statistics/luasrc/view/admin_statistics/index.htm
@@ -14,7 +14,7 @@ $Id$
 -%>
 <%+header%>
 
-<h1><%:stat_statistics Statistics%></h1>
+<h2><a id="content" name="content"><%:stat_statistics Statistics%></a></h2>
 
 <p><%:stat_desc The statistics package is based on <a href="http://collectd.org/index.shtml">Collectd</a>
 and uses <a href="http://oss.oetiker.ch/rrdtool/">RRD Tool</a> to render diagram images from collected data.%></p>
diff --git a/applications/luci-statistics/luasrc/view/admin_statistics/networkplugins.htm b/applications/luci-statistics/luasrc/view/admin_statistics/networkplugins.htm
index 34d62b2efd..e29d97c9e3 100644
--- a/applications/luci-statistics/luasrc/view/admin_statistics/networkplugins.htm
+++ b/applications/luci-statistics/luasrc/view/admin_statistics/networkplugins.htm
@@ -14,7 +14,7 @@ $Id$
 -%>
 <%+header%>
 
-<h1><%:stat_networkplugins Network plugins%></h1>
+<h2><a id="content" name="content"><%:stat_networkplugins Network plugins%></a></h2>
 
 <p><%:stat_networkplugins_desc Network plugins are used to collect information
 about open tcp connections, interface traffic, iptables rules etc.%></p>
diff --git a/applications/luci-statistics/luasrc/view/admin_statistics/outputplugins.htm b/applications/luci-statistics/luasrc/view/admin_statistics/outputplugins.htm
index c8d18f95b5..d230109cc0 100644
--- a/applications/luci-statistics/luasrc/view/admin_statistics/outputplugins.htm
+++ b/applications/luci-statistics/luasrc/view/admin_statistics/outputplugins.htm
@@ -14,7 +14,7 @@ $Id$
 -%>
 <%+header%>
 
-<h1><%:stat_outputplugins Output plugins%></h1>
+<h2><a id="content" name="content"><%:stat_outputplugins Output plugins%></a></h2>
 
 <p><%:stat_outputplugins_desc Output plugins provide different possibilities to store collected data.
 It is possible to enable multiple plugin at one, for example to store collected data in rrd databases
diff --git a/applications/luci-statistics/luasrc/view/admin_statistics/systemplugins.htm b/applications/luci-statistics/luasrc/view/admin_statistics/systemplugins.htm
index 4fdfec1b9b..bb63228b67 100644
--- a/applications/luci-statistics/luasrc/view/admin_statistics/systemplugins.htm
+++ b/applications/luci-statistics/luasrc/view/admin_statistics/systemplugins.htm
@@ -14,7 +14,7 @@ $Id$
 -%>
 <%+header%>
 
-<h1><%:stat_systemplugins System plugins%></h1>
+<h2><a id="content" name="content"><%:stat_systemplugins System plugins%></a></h2>
 
 <p><%:stat_systemplugins_desc System plugins collecting values about system state and ressource usage on the device.:%>
 	<ul>
diff --git a/applications/luci-statistics/luasrc/view/public_statistics/graph.htm b/applications/luci-statistics/luasrc/view/public_statistics/graph.htm
index ff058b8b70..bf304c7b45 100644
--- a/applications/luci-statistics/luasrc/view/public_statistics/graph.htm
+++ b/applications/luci-statistics/luasrc/view/public_statistics/graph.htm
@@ -14,7 +14,7 @@ $Id$
 -%>
 <%+header%>
 
-<h1><%:stat_statistics Statistics%></h1>
+<h2><a id="content" name="content"><%:stat_statistics Statistics%></a></h2>
 
 <form action="" method="get">
 	<select name="timespan">
diff --git a/i18n/portuguese_brazilian/luasrc/i18n/admin-core.pt-br.lua b/i18n/portuguese_brazilian/luasrc/i18n/admin-core.pt-br.lua
index 4dd90910fd..de6a31d452 100644
--- a/i18n/portuguese_brazilian/luasrc/i18n/admin-core.pt-br.lua
+++ b/i18n/portuguese_brazilian/luasrc/i18n/admin-core.pt-br.lua
@@ -37,7 +37,7 @@ a_s_changepw = 'Senha do Admin'
 a_s_p_ipkg = 'Configuração-IPKG'
 a_s_sshkeys = 'Chaves-<abbr title="Shell Seguro">SSH</abbr>'
 a_s_fstab = 'Pontos de Montagem'
-a_s_flash = 'Gravar Firmware'
+a_s_flash = 'Atualizar Firmware'
 a_s_i_system1 = 'Altera as configurações relacionadas com o sistema em si, sua identificação, hardware e software instalados, autenticação ou pontos de montagem.'
 a_s_i_system2 = 'Essas configurações definem a base do seu sistema.'
 a_s_i_system3 = 'Preste atenção de que qualquer configuração errada aqui pode impedir o seu equipamento de inicilizar ou talvez bloquear seu acesso de fora à ele.'
@@ -53,7 +53,7 @@ a_s_packages_updatelist = 'Atualizar listas de pacotes'
 a_s_packages_upgrade = 'Atualizar os pacotes instalados'
 a_s_p_ipkg_pkglists = 'Listas de pacotes'
 a_s_p_ipkg_targets = 'Destino de Instalação'
-a_s_changepw1 = 'Alterar a senha do administrador do sistema (Usuário <code>root</code>)'
+a_s_changepw1 = 'Altera a senha do administrador do sistema (Usuário <code>root</code>)'
 a_s_changepw_changed = 'Senha alterada com sucesso'
 a_s_changepw_nomatch = 'Erro: As senhas estão diferentes'
 a_s_sshkeys1 = 'Aqui você pode colar suas Chaves-<abbr title="Shell Seguro">SSH</abbr> públicas (uma por linha) para a autenticação <abbr title="Shell Seguro">SSH</abbr> por chave-pública.'
@@ -69,15 +69,15 @@ a_s_fstab_swap1 = 'Se a sua memória física for insuficiente, os dados poderão
 a_s_flash_flashed = 'Firmware gravado com sucesso. Reiniciando o equipamento...'
 a_s_flash_flasherr = 'Falha na gravação'
 a_s_flash_fwimage = 'Imagem do firmware'
-a_s_flash_received = 'Imagem recebida. Durante o processo de gravação, NAO DESLIGUE O EQUIPAMENTO!'
+a_s_flash_received = 'Imagem recebida. Durante o processo de gravação, NÃO DESLIGUE O EQUIPAMENTO!'
 a_s_flash_inprogress = 'Gravando firmware...'
 a_s_flash_fwupgrade = 'Atualizar Firmware'
 a_s_flash_keepcfg = 'Manter arquivos de configuração'
 a_s_flash_notimplemented = 'Desculpe, esta função não está (ainda) disponível para sua plataforma.'
 a_s_flash_upgrade1 = 'Substitui o firmware instalado por um mais novo. O formato do firmware depende da plataforma.'
-a_s_reboot1 = 'Reinicia o sistema operacional do seu equipamento'
+a_s_reboot1 = 'Reinicia o seu equipamento'
 a_s_reboot_do = 'Executar reinicialização'
-a_s_reboot_running = 'Por favor aguarde: Esquipamento reiniciando...'
+a_s_reboot_running = 'Por favor aguarde: Equipamento reiniciando...'
 a_s_reboot_u = 'Aviso: Existem alterações não salvas que serão perdidas durante a reinicialização!'
 a_s_applyreboot1 = 'Alterações aplicadas.'
 a_s_backup = 'Backup / Restauração'
@@ -98,7 +98,7 @@ a_srv_http_config1 = 'padrão é <code>/etc/httpd.conf</code>'
 a_srv_http_root = 'Diretório raiz'
 a_srv_dropbear1 = 'Dropbear oferece um acesso shell seguro à rede <abbr title="Shell Seguro">(SSH)</abbr> e um servidor <abbr title="Cópia Segura">SCP</abbr> integrado'
 a_srv_d_pwauth = 'Autenticação por senha'
-a_srv_d_pwauth1 = 'Permitir <abbr title="Shell Seguro">SSH</abbr> autenticação por senha'
+a_srv_d_pwauth1 = 'Permitir autenticação <abbr title="Shell Seguro">SSH</abbr> por senha'
 a_w_channel = 'Canal'
 a_w_wifi1 = 'Nesta página você encontrará opções de configuração <abbr title="Wireless Local Area Network">WLAN</abbr> baseada em redes sem fio.'
 a_w_wifi2 = 'Você pode facilmente integrar seus equipamentos 802.11a/b/g/n com sua rede física e usar o adaptador virtual para construir repetidoras wireless ou oferecer várias redes com um equipamento.'
diff --git a/libs/cbi/htdocs/luci-static/resources/cbi.js b/libs/cbi/htdocs/luci-static/resources/cbi.js
index 2c7f99f062..d7bc74bc5f 100644
--- a/libs/cbi/htdocs/luci-static/resources/cbi.js
+++ b/libs/cbi/htdocs/luci-static/resources/cbi.js
@@ -19,7 +19,7 @@ function cbi_d_add(field, dep, next) {
 				"deps": []
 			};
 			cbi_d.unshift(entry);
-		}	
+		}
 		entry.deps.push(dep)
 	}
 }
@@ -27,17 +27,17 @@ function cbi_d_add(field, dep, next) {
 function cbi_d_checkvalue(target, ref) {
 	var t = document.getElementById(target);
 	var value;
-	
+
 	if (!t || !t.value) {
 		value = "";
 	} else {
 		value = t.value;
-		
+
 		if (t.type == "checkbox") {
 			value = t.checked ? value : "";
 		}
 	}
-	
+
 	return (value == ref)
 }
 
@@ -50,7 +50,7 @@ function cbi_d_check(deps) {
 		if (istat) {
 			return true
 		}
-	}		
+	}
 }
 
 function cbi_d_update() {
@@ -69,7 +69,7 @@ function cbi_d_update() {
 				parent.appendChild(entry.node);
 			} else {
 				next.parentNode.insertBefore(entry.node, next);
-			}		
+			}
 			state = (state || (node && node.parentNode))
 		}
 	}
@@ -100,16 +100,17 @@ function cbi_bind(obj, type, callback, mode) {
 }
 
 function cbi_combobox(id, values, def, man) {
-	var selid = "cbi.combobox." + id
+	var selid = "cbi.combobox." + id;
 	if (document.getElementById(selid)) {
 		return
 	}
 
 	var obj = document.getElementById(id)
 	var sel = document.createElement("select");
-	sel.id = selid
+	sel.id = selid;
+	sel.className = 'cbi-input-select';
 	if (obj.nextSibling) {
-		obj.parentNode.insertBefore(sel, obj.nextSibling);	
+		obj.parentNode.insertBefore(sel, obj.nextSibling);
 	} else {
 		obj.parentNode.appendChild(sel);
 	}
@@ -165,4 +166,4 @@ function cbi_combobox_init(id, values, def, man) {
 		cbi_combobox(id, values, def, man)
 	});
 	cbi_combobox(id, values, def, man);
-}
\ No newline at end of file
+}
diff --git a/libs/cbi/luasrc/view/cbi/button.htm b/libs/cbi/luasrc/view/cbi/button.htm
index c2a0d437e8..c6606622d6 100644
--- a/libs/cbi/luasrc/view/cbi/button.htm
+++ b/libs/cbi/luasrc/view/cbi/button.htm
@@ -14,7 +14,7 @@ $Id$
 -%>
 <%+cbi/valueheader%>
 	<% if self:cfgvalue(section) ~= false then %>
-		<input<% if self.inputstyle then %> class="cbi-input-<%=self.inputstyle%>"<% end %> type="submit"<%= attr("name", cbid) .. attr("id", cbid) .. attr("value", self.title)%> />
+		<input class="cbi-input-<% self.inputstyle or "button" %>" type="submit"<%= attr("name", cbid) .. attr("id", cbid) .. attr("value", self.title)%> />
 	<% else %>
 		-
 	<% end %>
diff --git a/libs/cbi/luasrc/view/cbi/dynlist.htm b/libs/cbi/luasrc/view/cbi/dynlist.htm
index 606831421f..a23a4ebcdf 100644
--- a/libs/cbi/luasrc/view/cbi/dynlist.htm
+++ b/libs/cbi/luasrc/view/cbi/dynlist.htm
@@ -18,11 +18,11 @@ $Id$
 	for i=1, #vals + 1 do
 		local val = vals[i]
 %>
-	<input value="<%=val%>" onchange="cbi_d_update(this.id)" type="text"<%= attr("id", cbid .. "." .. i) .. attr("name", cbid) .. ifattr(self.size, "size")%> />
+	<input class="cbi-input-text" value="<%=val%>" onchange="cbi_d_update(this.id)" type="text"<%= attr("id", cbid .. "." .. i) .. attr("name", cbid) .. ifattr(self.size, "size")%> />
 	<% if i <= #vals then %>
-		<input type="image" value="<%:cbi_del%>" name="cbi.rle.<%=section .. "." .. self.option .. "." .. i%>" alt="<%:cbi_del%>" title="<%:cbi_del%>" src="<%=resource%>/cbi/remove.gif" />
+		<input class="cbi-input-image" type="image" value="<%:cbi_del%>" name="cbi.rle.<%=section .. "." .. self.option .. "." .. i%>" alt="<%:cbi_del%>" title="<%:cbi_del%>" src="<%=resource%>/cbi/remove.gif" />
 	<% else %>
-		<input type="image" value="<%:cbi_add%>" name="cbi.ale.<%=section .. "." .. self.option%>" alt="<%:cbi_add%>" title="<%:cbi_add%>" src="<%=resource%>/cbi/add.gif" />
+		<input class="cbi-input-image" type="image" value="<%:cbi_add%>" name="cbi.ale.<%=section .. "." .. self.option%>" alt="<%:cbi_add%>" title="<%:cbi_add%>" src="<%=resource%>/cbi/add.gif" />
 	<% end %>
 	<% if #self.keylist > 0 then -%>
 		<script type="text/javascript">
diff --git a/libs/cbi/luasrc/view/cbi/fvalue.htm b/libs/cbi/luasrc/view/cbi/fvalue.htm
index 4c977e2871..b46817c6f7 100644
--- a/libs/cbi/luasrc/view/cbi/fvalue.htm
+++ b/libs/cbi/luasrc/view/cbi/fvalue.htm
@@ -13,5 +13,5 @@ $Id$
 
 -%>
 <%+cbi/valueheader%>
-	<input onclick="cbi_d_update(this.id)" onchange="cbi_d_update(this.id)" type="checkbox"<%= attr("id", cbid) .. attr("name", cbid) .. ifattr(self:cfgvalue(section) == self.enabled, "checked", "checked") %> value="1" />
+	<input class="cbi-input-checkbox" onclick="cbi_d_update(this.id)" onchange="cbi_d_update(this.id)" type="checkbox"<%= attr("id", cbid) .. attr("name", cbid) .. ifattr(self:cfgvalue(section) == self.enabled, "checked", "checked") %> value="1" />
 <%+cbi/valuefooter%>
diff --git a/libs/cbi/luasrc/view/cbi/lvalue.htm b/libs/cbi/luasrc/view/cbi/lvalue.htm
index 6d658c22d1..c6b54128f7 100644
--- a/libs/cbi/luasrc/view/cbi/lvalue.htm
+++ b/libs/cbi/luasrc/view/cbi/lvalue.htm
@@ -14,7 +14,7 @@ $Id$
 -%>
 <%+cbi/valueheader%>
 <% if self.widget == "select" then %>
-	<select onchange="cbi_d_update(this.id)"<%= attr("id", cbid) .. attr("name", cbid) .. ifattr(self.size, "size") %>>
+	<select class="cbi-input-select" onchange="cbi_d_update(this.id)"<%= attr("id", cbid) .. attr("name", cbid) .. ifattr(self.size, "size") %>>
 	<% for i, key in pairs(self.keylist) do -%>
 		<option id="cbi-<%=self.config.."-"..section.."-"..self.option.."-"..key%>"<%= attr("value", key) .. ifattr(self:cfgvalue(section) == key, "selected", "selected") %>><%=striptags(self.vallist[i])%></option>
 	<%- end %>
@@ -24,7 +24,7 @@ $Id$
 	for i, key in pairs(self.keylist) do
 	c = c + 1
 %>
-	<input onclick="cbi_d_update(this.id)" onchange="cbi_d_update(this.id)" type="radio"<%= attr("id", cbid..c) .. attr("name", cbid) .. attr("value", key) .. ifattr(self:cfgvalue(section) == key, "checked", "checked") %> />
+	<input class="cbi-input-radio" onclick="cbi_d_update(this.id)" onchange="cbi_d_update(this.id)" type="radio"<%= attr("id", cbid..c) .. attr("name", cbid) .. attr("value", key) .. ifattr(self:cfgvalue(section) == key, "checked", "checked") %> />
 	<label<%= attr("for", cbid..c) %>><%=self.vallist[i]%></label><br />
 <% if c == self.size then c = 0 %><br />
 <% end end %>
diff --git a/libs/cbi/luasrc/view/cbi/map.htm b/libs/cbi/luasrc/view/cbi/map.htm
index 6378f72abf..949edea5c5 100644
--- a/libs/cbi/luasrc/view/cbi/map.htm
+++ b/libs/cbi/luasrc/view/cbi/map.htm
@@ -14,7 +14,7 @@ $Id$
 -%>
 
 <div class="cbi-map" id="cbi-<%=self.config%>">
-	<h1><%=self.title%></h1>
+	<h2><a id="content" name="content"><%=self.title%></a></h2>
 	<div class="cbi-map-descr"><%=self.description%></div>
 	<%- if self._apply then -%>
 		<fieldset class="cbi-section">
diff --git a/libs/cbi/luasrc/view/cbi/mvalue.htm b/libs/cbi/luasrc/view/cbi/mvalue.htm
index 414089fb2e..3812a3f7ef 100644
--- a/libs/cbi/luasrc/view/cbi/mvalue.htm
+++ b/libs/cbi/luasrc/view/cbi/mvalue.htm
@@ -17,7 +17,7 @@ local v = self:valuelist(section) or {}
 %>
 <%+cbi/valueheader%>
 <% if self.widget == "select" then %>
-	<select multiple="multiple"<%= attr("name", cbid) .. ifattr(self.size, "size") %>>
+	<select class="cbi-input-select" multiple="multiple"<%= attr("name", cbid) .. ifattr(self.size, "size") %>>
 	<% for i, key in pairs(self.keylist) do -%>
 		<option<%= attr("value", key) .. ifattr(luci.util.contains(v, key), "selected", "selected") %>><%=striptags(self.vallist[i])%></option>
 	<%- end %>
@@ -27,7 +27,7 @@ local v = self:valuelist(section) or {}
 	for i, key in pairs(self.keylist) do
 	c = c + 1
 %>
-	<input type="checkbox"<%= attr("id", cbid..c) .. attr("name", cbid) .. attr("value", key) .. ifattr(luci.util.contains(v, key), "checked", "checked") %> />
+	<input class="cbi-input-checkbox" type="checkbox"<%= attr("id", cbid..c) .. attr("name", cbid) .. attr("value", key) .. ifattr(luci.util.contains(v, key), "checked", "checked") %> />
 	<label<%= attr("for", cbid..c) %>><%=self.vallist[i]%></label><br />
 <% if c == self.size then c = 0 %><br />
 <% end end %>
diff --git a/libs/cbi/luasrc/view/cbi/simpleform.htm b/libs/cbi/luasrc/view/cbi/simpleform.htm
index 1106e8b898..2a80723cb6 100644
--- a/libs/cbi/luasrc/view/cbi/simpleform.htm
+++ b/libs/cbi/luasrc/view/cbi/simpleform.htm
@@ -19,7 +19,7 @@ $Id$
 		<input type="hidden" name="cbi.submit" value="1" />
 	</div>
 	<div class="cbi-map" id="cbi-<%=self.config%>">
-		<h1><%=self.title%></h1>
+		<h2><a id="content" name="content"><%=self.title%></a></h2>
 		<div class="cbi-map-descr"><%=self.description%></div>
 		<% self:render_children() %>
 		<br />
diff --git a/libs/cbi/luasrc/view/cbi/tvalue.htm b/libs/cbi/luasrc/view/cbi/tvalue.htm
index 4d92545ae0..36782d82dc 100644
--- a/libs/cbi/luasrc/view/cbi/tvalue.htm
+++ b/libs/cbi/luasrc/view/cbi/tvalue.htm
@@ -13,7 +13,7 @@ $Id$
 
 -%>
 <%+cbi/valueheader%>
-	<textarea<% if not self.size then %> style="width: 100%"<% else %> cols="<%=self.size%>"<% end %> onchange="cbi_d_update(this.id)"<%= attr("name", cbid) .. attr("id", cbid) .. ifattr(self.rows, "rows") .. ifattr(self.wrap, "wrap") %>>
+	<textarea class="cbi-input-textarea" <% if not self.size then %> style="width: 100%"<% else %> cols="<%=self.size%>"<% end %> onchange="cbi_d_update(this.id)"<%= attr("name", cbid) .. attr("id", cbid) .. ifattr(self.rows, "rows") .. ifattr(self.wrap, "wrap") %>>
 	<%-=luci.util.pcdata(self:cfgvalue(section))-%>
 	</textarea>
 <%+cbi/valuefooter%>
diff --git a/libs/cbi/luasrc/view/cbi/value.htm b/libs/cbi/luasrc/view/cbi/value.htm
index 9ffefc423f..e6a7ab6d9f 100644
--- a/libs/cbi/luasrc/view/cbi/value.htm
+++ b/libs/cbi/luasrc/view/cbi/value.htm
@@ -13,7 +13,7 @@ $Id$
 
 -%>
 <%+cbi/valueheader%>
-	<input type="<%=self.password and 'password" class="cbi-input-key' or "text"%>" onchange="cbi_d_update(this.id)"<%= attr("name", cbid) .. attr("id", cbid) .. attr("value", self:cfgvalue(section)) .. ifattr(self.size, "size")%> />
+	<input type="<%=self.password and 'password" class="cbi-input-password' or 'text" class="cbi-input-text' %>" onchange="cbi_d_update(this.id)"<%= attr("name", cbid) .. attr("id", cbid) .. attr("value", self:cfgvalue(section)) .. ifattr(self.size, "size")%> />
 	<% if #self.keylist > 0 then -%>
 	<script type="text/javascript">
 		cbi_combobox_init('<%=cbid%>', {
diff --git a/libs/sgi-webuci/boa-patches/210-accept_fix.patch b/libs/sgi-webuci/boa-patches/210-accept_fix.patch
new file mode 100644
index 0000000000..5a3bdf8b5e
--- /dev/null
+++ b/libs/sgi-webuci/boa-patches/210-accept_fix.patch
@@ -0,0 +1,15 @@
+Index: boa-0.94.13/src/request.c
+===================================================================
+--- boa-0.94.13.orig/src/request.c	2008-06-29 01:11:52.000000000 +0200
++++ boa-0.94.13/src/request.c	2008-10-07 18:10:59.000000000 +0200
+@@ -281,6 +281,10 @@
+     if (req->script_name)
+         free(req->script_name);
+ 
++#ifdef ACCEPT_ON
++    req->accept[0] = '\0';
++#endif
++
+     if ((req->keepalive == KA_ACTIVE) &&
+         (req->response_status < 500) && req->kacount > 0) {
+         int bytes_to_move;
diff --git a/libs/web/root/etc/config/luci b/libs/web/root/etc/config/luci
index 1499015684..bb90bde811 100644
--- a/libs/web/root/etc/config/luci
+++ b/libs/web/root/etc/config/luci
@@ -4,10 +4,10 @@ config core main
 	option resourcebase /luci-static/resources
 	
 config core brand
-	option title	"OpenWrt Kamikaze"
+	option title	"OpenWRT Kamikaze"
 	option subtitle	"Lua Configuration Interface"
-	option firmware	"OpenWrt Kamikaze"
-	option distro	""
+	option firmware	"OpenWRT Kamikaze"
+	option distro	"Development Snapshot"
 		
 config extern flash_keep
 	option uci 		"/etc/config/"
@@ -16,7 +16,8 @@ config extern flash_keep
 	option passwd	"/etc/passwd"
 	option opkg		"/etc/opkg.conf"
 	option firewall	"/etc/firewall.user"
-
+	option uploads	"/lib/uci/upload/"
+	
 config internal languages
 	
 config internal sauth
diff --git a/modules/admin-core/luasrc/view/about.htm b/modules/admin-core/luasrc/view/about.htm
index ca5a38e18f..ea20d1b112 100644
--- a/modules/admin-core/luasrc/view/about.htm
+++ b/modules/admin-core/luasrc/view/about.htm
@@ -13,7 +13,7 @@ $Id$
 
 -%>
 <%+header%>
-<h1><%:about%> LuCI</h1>
+<h2><a id="content" name="content"><%:about%> LuCI</a></h2>
 <p><%:c_lucidesc%></p>
 
 <p><strong><%:c_projecthome%>: </strong><a href="http://luci.freifunk-halle.net">luci.freifunk-halle.net</a></p>
diff --git a/modules/admin-core/luasrc/view/error404.htm b/modules/admin-core/luasrc/view/error404.htm
index 956a685549..4aa40f392a 100644
--- a/modules/admin-core/luasrc/view/error404.htm
+++ b/modules/admin-core/luasrc/view/error404.htm
@@ -13,7 +13,7 @@ $Id$
 
 -%>
 <%+header%>
-<h1>404 Not Found</h1>
+<h2><a id="content" name="content">404 Not Found</a></h2>
 <p>Sorry, the object you requested was not found.</p>
 <tt>Unable to dispatch: <%=luci.http.request.env.PATH_INFO%></tt>
 <%+footer%>
\ No newline at end of file
diff --git a/modules/admin-core/luasrc/view/error500.htm b/modules/admin-core/luasrc/view/error500.htm
index 8f3807d80e..982f9b9e94 100644
--- a/modules/admin-core/luasrc/view/error500.htm
+++ b/modules/admin-core/luasrc/view/error500.htm
@@ -13,7 +13,7 @@ $Id$
 
 -%>
 <%+header%>
-<h1>500 Internal Server Error</h1>
+<h2><a id="content" name="content">500 Internal Server Error</a></h2>
 <p>Sorry, the server encountered an unexpected error.</p>
 <pre class="error500"><%=message%></pre>
 <%+footer%>
diff --git a/modules/admin-core/luasrc/view/sysauth.htm b/modules/admin-core/luasrc/view/sysauth.htm
index e48f414c56..49652400fc 100644
--- a/modules/admin-core/luasrc/view/sysauth.htm
+++ b/modules/admin-core/luasrc/view/sysauth.htm
@@ -17,7 +17,7 @@ $Id$
 
 <form method="post" action="<%=REQUEST_URI%>">
 	<div class="cbi-map">
-		<h1><%:sysauth_head%></h1>
+		<h2><a id="content" name="content"><%:sysauth_head%></a></h2>
 		<div class="cbi-map-descr">
 			<%:sysauth_prompt%>
 			<%- if fuser then %>
@@ -35,7 +35,7 @@ $Id$
 			<div class="cbi-value">
 				<label class="cbi-value-title"><%:password%></label>
 				<div class="cbi-value-field">
-					<input class="cbi-input-key" type="password" name="password" />
+					<input class="cbi-input-password" type="password" name="password" />
 				</div>
 			</div>
 		</fieldset></fieldset>
@@ -46,4 +46,4 @@ $Id$
 		<input type="reset" value="<%:reset%>" class="cbi-button cbi-button-reset" />
 	</div>
 </form>
-<%+footer%>
\ No newline at end of file
+<%+footer%>
diff --git a/modules/admin-full/luasrc/view/admin_index/index.htm b/modules/admin-full/luasrc/view/admin_index/index.htm
index 4ea58c2b8a..e6e963c0c4 100644
--- a/modules/admin-full/luasrc/view/admin_index/index.htm
+++ b/modules/admin-full/luasrc/view/admin_index/index.htm
@@ -13,7 +13,7 @@ $Id$
 
 -%>
 <%+header%>
-<h1><%:a_i_i_hello%></h1>
+<h2><a id="content" name="content"><%:a_i_i_hello%></a></h2>
 <p><%:a_i_i_admin1%></p>
 <p><%:a_i_i_admin2%><br />
 <%:a_i_i_admin3%></p>
diff --git a/modules/admin-full/luasrc/view/admin_services/index.htm b/modules/admin-full/luasrc/view/admin_services/index.htm
index c0bd8b361f..973e244578 100644
--- a/modules/admin-full/luasrc/view/admin_services/index.htm
+++ b/modules/admin-full/luasrc/view/admin_services/index.htm
@@ -13,7 +13,7 @@ $Id$
 
 -%>
 <%+header%>
-<h1><%:services%></h1>
+<h2><a id="content" name="content"><%:services%></a></h2>
 <p><%:a_srv_services1%></p>
 <p><%:a_srv_services2%></p>
 <%+footer%>
\ No newline at end of file
diff --git a/modules/admin-full/luasrc/view/admin_status/index.htm b/modules/admin-full/luasrc/view/admin_status/index.htm
index e1f4b0e53b..e4c1cc410a 100644
--- a/modules/admin-full/luasrc/view/admin_status/index.htm
+++ b/modules/admin-full/luasrc/view/admin_status/index.htm
@@ -13,7 +13,7 @@ $Id$
 
 -%>
 <%+header%>
-<h1><%:status%></h1>
+<h2><a id="content" name="content"><%:status%></a></h2>
 <p><%:a_st_i_status1%></p>
 <p><%:a_st_i_status2%></p> 
 <%+footer%>
\ No newline at end of file
diff --git a/modules/admin-full/luasrc/view/admin_status/syslog.htm b/modules/admin-full/luasrc/view/admin_status/syslog.htm
index f4873bedd6..d5bf5d65a1 100644
--- a/modules/admin-full/luasrc/view/admin_status/syslog.htm
+++ b/modules/admin-full/luasrc/view/admin_status/syslog.htm
@@ -13,8 +13,8 @@ $Id$
 
 -%>
 <%+header%>
-<h1><%:status%></h1>
-<h2><%:syslog%></h2>
+<h2><a id="content" name="content"><%:status%></a></h2>
+<h3><%:syslog%></h3>
 <div id="content_syslog">
 <textarea readonly="readonly" wrap="off" id="syslog"><%=luci.util.pcdata(syslog)%></textarea>
 </div>
diff --git a/modules/admin-full/luasrc/view/admin_system/applyreboot.htm b/modules/admin-full/luasrc/view/admin_system/applyreboot.htm
index cbfa23d319..1a1a24bb0c 100644
--- a/modules/admin-full/luasrc/view/admin_system/applyreboot.htm
+++ b/modules/admin-full/luasrc/view/admin_system/applyreboot.htm
@@ -13,7 +13,7 @@ $Id$
 
 -%>
 <%+header%>
-<h1><%:system%></h1>
+<h2><a id="content" name="content"><%:system%></a></h2>
 <br />
 <p><% if msg then %><%=msg%><% else %><%:a_s_applyreboot1%><% end %></p>
 <p><%:a_s_reboot_running%></p>
diff --git a/modules/admin-full/luasrc/view/admin_system/backup.htm b/modules/admin-full/luasrc/view/admin_system/backup.htm
index a288e0be2b..2db044ddd3 100644
--- a/modules/admin-full/luasrc/view/admin_system/backup.htm
+++ b/modules/admin-full/luasrc/view/admin_system/backup.htm
@@ -13,8 +13,8 @@ $Id$
 
 -%>
 <%+header%>
-<h1><%:system%></h1>
-<h2><%:a_s_backup%></h2>
+<h2><a id="content" name="content"><%:system%></a></h2>
+<h3><%:a_s_backup%></h3>
 <p><%:a_s_backup1%></p>
 <br />
 <div>
diff --git a/modules/admin-full/luasrc/view/admin_system/packages.htm b/modules/admin-full/luasrc/view/admin_system/packages.htm
index 2794fd824d..34b8212a68 100644
--- a/modules/admin-full/luasrc/view/admin_system/packages.htm
+++ b/modules/admin-full/luasrc/view/admin_system/packages.htm
@@ -20,8 +20,8 @@ function rowstyle()
 end
 -%>
 <%+header%>
-<h1><%:system%></h1>
-<h2><%:a_s_packages%></h2>
+<h2><a id="content" name="content"><%:system%></a></h2>
+<h3><%:a_s_packages%></h3>
 
 <br />
 
diff --git a/modules/admin-full/luasrc/view/admin_system/reboot.htm b/modules/admin-full/luasrc/view/admin_system/reboot.htm
index b7b10b50fb..f1656fbb8d 100644
--- a/modules/admin-full/luasrc/view/admin_system/reboot.htm
+++ b/modules/admin-full/luasrc/view/admin_system/reboot.htm
@@ -13,8 +13,8 @@ $Id$
 
 -%>
 <%+header%>
-<h1><%:system%></h1>
-<h2><%:reboot%></h2>
+<h2><a id="content" name="content"><%:system%></a></h2>
+<h3><%:reboot%></h3>
 <p><%:a_s_reboot1%></p>
 <%-
 local c = require("luci.model.uci").cursor():changes()
diff --git a/modules/admin-full/luasrc/view/admin_system/upgrade.htm b/modules/admin-full/luasrc/view/admin_system/upgrade.htm
index a3d97d6497..bbc5215c45 100644
--- a/modules/admin-full/luasrc/view/admin_system/upgrade.htm
+++ b/modules/admin-full/luasrc/view/admin_system/upgrade.htm
@@ -13,8 +13,8 @@ $Id$
 
 -%>
 <%+header%>
-<h1><%:system%></h1>
-<h2><%:a_s_flash%></h2>
+<h2><a id="content" name="content"><%:system%></a></h2>
+<h3><%:a_s_flash%></h3>
 <p><%:a_s_flash_upgrade1%></p>
 <br />
 <% if sysupgrade and not ret then %>
diff --git a/modules/admin-full/luasrc/view/admin_uci/apply.htm b/modules/admin-full/luasrc/view/admin_uci/apply.htm
index 9a9a063f1d..8aa09c641e 100644
--- a/modules/admin-full/luasrc/view/admin_uci/apply.htm
+++ b/modules/admin-full/luasrc/view/admin_uci/apply.htm
@@ -13,7 +13,7 @@ $Id$
 
 -%>
 <%+header%>
-<h1><%:config%></h1>
+<h2><a id="content" name="content"><%:config%></a></h2>
 <p><%:uci_applied%>:</p>
 <code><%=(changes or "-")%>
 
diff --git a/modules/admin-full/luasrc/view/admin_uci/changes.htm b/modules/admin-full/luasrc/view/admin_uci/changes.htm
index ab66b78efd..da0d9f11c1 100644
--- a/modules/admin-full/luasrc/view/admin_uci/changes.htm
+++ b/modules/admin-full/luasrc/view/admin_uci/changes.htm
@@ -13,8 +13,8 @@ $Id$
 
 -%>
 <%+header%>
-<h1><%:config%></h1>
-<h2><%:changes%></h2>
+<h2><a id="content" name="content"><%:config%></a></h2>
+<h3><%:changes%></h3>
 <code><%=changes%></code>
 <br /><br />
 <form class="inline" method="get" action="<%=controller%>/admin/uci/apply">
diff --git a/modules/admin-full/luasrc/view/admin_uci/revert.htm b/modules/admin-full/luasrc/view/admin_uci/revert.htm
index 7f98a0435b..553ec7454e 100644
--- a/modules/admin-full/luasrc/view/admin_uci/revert.htm
+++ b/modules/admin-full/luasrc/view/admin_uci/revert.htm
@@ -13,7 +13,7 @@ $Id$
 
 -%>
 <%+header%>
-<h1><%:config%></h1>
+<h2><a id="content" name="content"><%:config%></a></h2>
 <p><%:uci_reverted%>:</p>
 <code><%=(changes or "-")%></code>
 <%+footer%>
\ No newline at end of file
diff --git a/modules/admin-mini/luasrc/view/mini/applyreboot.htm b/modules/admin-mini/luasrc/view/mini/applyreboot.htm
index cbfa23d319..1a1a24bb0c 100644
--- a/modules/admin-mini/luasrc/view/mini/applyreboot.htm
+++ b/modules/admin-mini/luasrc/view/mini/applyreboot.htm
@@ -13,7 +13,7 @@ $Id$
 
 -%>
 <%+header%>
-<h1><%:system%></h1>
+<h2><a id="content" name="content"><%:system%></a></h2>
 <br />
 <p><% if msg then %><%=msg%><% else %><%:a_s_applyreboot1%><% end %></p>
 <p><%:a_s_reboot_running%></p>
diff --git a/modules/admin-mini/luasrc/view/mini/backup.htm b/modules/admin-mini/luasrc/view/mini/backup.htm
index a288e0be2b..2db044ddd3 100644
--- a/modules/admin-mini/luasrc/view/mini/backup.htm
+++ b/modules/admin-mini/luasrc/view/mini/backup.htm
@@ -13,8 +13,8 @@ $Id$
 
 -%>
 <%+header%>
-<h1><%:system%></h1>
-<h2><%:a_s_backup%></h2>
+<h2><a id="content" name="content"><%:system%></a></h2>
+<h3><%:a_s_backup%></h3>
 <p><%:a_s_backup1%></p>
 <br />
 <div>
diff --git a/modules/admin-mini/luasrc/view/mini/index.htm b/modules/admin-mini/luasrc/view/mini/index.htm
index c0b2080541..127d36f5da 100644
--- a/modules/admin-mini/luasrc/view/mini/index.htm
+++ b/modules/admin-mini/luasrc/view/mini/index.htm
@@ -12,7 +12,7 @@ You may obtain a copy of the License at
 $Id$
 
 -%>
-<h1><%:a_i_i_hello%></h1>
+<h2><a id="content" name="content"><%:a_i_i_hello%></a></h2>
 <p><%:a_i_i_admin1%></p>
 <p><%:a_i_i_admin2%><br />
 <%:a_i_i_admin3%></p>
diff --git a/modules/admin-mini/luasrc/view/mini/reboot.htm b/modules/admin-mini/luasrc/view/mini/reboot.htm
index 9bf2d43cf5..724e0179a2 100644
--- a/modules/admin-mini/luasrc/view/mini/reboot.htm
+++ b/modules/admin-mini/luasrc/view/mini/reboot.htm
@@ -13,8 +13,8 @@ $Id$
 
 -%>
 <%+header%>
-<h1><%:system%></h1>
-<h2><%:reboot%></h2>
+<h2><a id="content" name="content"><%:system%></a></h2>
+<h3><%:reboot%></h3>
 <p><%:a_s_reboot1%></p>
 <%-
 local c = require("luci.model.uci").cursor():changes()
diff --git a/modules/admin-mini/luasrc/view/mini/uci_apply.htm b/modules/admin-mini/luasrc/view/mini/uci_apply.htm
index 9a9a063f1d..8aa09c641e 100644
--- a/modules/admin-mini/luasrc/view/mini/uci_apply.htm
+++ b/modules/admin-mini/luasrc/view/mini/uci_apply.htm
@@ -13,7 +13,7 @@ $Id$
 
 -%>
 <%+header%>
-<h1><%:config%></h1>
+<h2><a id="content" name="content"><%:config%></a></h2>
 <p><%:uci_applied%>:</p>
 <code><%=(changes or "-")%>
 
diff --git a/modules/admin-mini/luasrc/view/mini/uci_changes.htm b/modules/admin-mini/luasrc/view/mini/uci_changes.htm
index ae601aa1f6..591ae69989 100644
--- a/modules/admin-mini/luasrc/view/mini/uci_changes.htm
+++ b/modules/admin-mini/luasrc/view/mini/uci_changes.htm
@@ -13,8 +13,8 @@ $Id$
 
 -%>
 <%+header%>
-<h1><%:config%></h1>
-<h2><%:changes%></h2>
+<h2><a id="content" name="content"><%:config%></a></h2>
+<h3><%:changes%></h3>
 <code><%=changes%></code>
 <br /><br />
 <form class="inline" method="get" action="<%=controller%>/mini/uci/apply">
diff --git a/modules/admin-mini/luasrc/view/mini/uci_revert.htm b/modules/admin-mini/luasrc/view/mini/uci_revert.htm
index 7f98a0435b..553ec7454e 100644
--- a/modules/admin-mini/luasrc/view/mini/uci_revert.htm
+++ b/modules/admin-mini/luasrc/view/mini/uci_revert.htm
@@ -13,7 +13,7 @@ $Id$
 
 -%>
 <%+header%>
-<h1><%:config%></h1>
+<h2><a id="content" name="content"><%:config%></a></h2>
 <p><%:uci_reverted%>:</p>
 <code><%=(changes or "-")%></code>
 <%+footer%>
\ No newline at end of file
diff --git a/modules/admin-mini/luasrc/view/mini/upgrade.htm b/modules/admin-mini/luasrc/view/mini/upgrade.htm
index a3d97d6497..bbc5215c45 100644
--- a/modules/admin-mini/luasrc/view/mini/upgrade.htm
+++ b/modules/admin-mini/luasrc/view/mini/upgrade.htm
@@ -13,8 +13,8 @@ $Id$
 
 -%>
 <%+header%>
-<h1><%:system%></h1>
-<h2><%:a_s_flash%></h2>
+<h2><a id="content" name="content"><%:system%></a></h2>
+<h3><%:a_s_flash%></h3>
 <p><%:a_s_flash_upgrade1%></p>
 <br />
 <% if sysupgrade and not ret then %>
diff --git a/modules/freifunk/luasrc/view/freifunk/contact.htm b/modules/freifunk/luasrc/view/freifunk/contact.htm
index 3596827cfd..06177c2050 100644
--- a/modules/freifunk/luasrc/view/freifunk/contact.htm
+++ b/modules/freifunk/luasrc/view/freifunk/contact.htm
@@ -14,7 +14,7 @@ $Id$
 -%>
 <%+header%>
 <% local contact = luci.model.uci.cursor():get_all("freifunk", "contact") %>
-<h1><%:contact%></h1>
+<h2><a id="content" name="content"><%:contact%></a></h2>
 <table cellspacing="0" cellpadding="6">
 	<tr><th><%:ff_nickname%>:</th><td><%=contact.nickname%></td></tr>
 	<tr><th><%:ff_name%>:</th><td><%=contact.name%></td></tr>
diff --git a/modules/freifunk/luasrc/view/freifunk/index.htm b/modules/freifunk/luasrc/view/freifunk/index.htm
index 2cf1f6fdcc..49e8cd0354 100644
--- a/modules/freifunk/luasrc/view/freifunk/index.htm
+++ b/modules/freifunk/luasrc/view/freifunk/index.htm
@@ -14,7 +14,7 @@ $Id$
 -%>
 <%+header%>
 <% local ff = luci.model.uci.cursor():get_all("freifunk") %>
-<h1><%:ff_hellonet%> <%=ff.community.name or 'Freifunk Deutschland'%>!</h1>
+<h2><a id="content" name="content"><%:ff_hellonet%> <%=ff.community.name or 'Freifunk Deutschland'%>!</a></h2>
 <p><%:ff_public1%><br />
 <%:ff_public2%> <%=luci.sys.hostname()%>. <%:ff_public3%>
 <a href="<%=controller%>/public/index/contact"> <%=ff.contact.nickname%></a>.</p>
diff --git a/themes/openwrt-light/luasrc/view/themes/openwrt-light/header.htm b/themes/openwrt-light/luasrc/view/themes/openwrt-light/header.htm
index 0182f5beec..7972c93f97 100644
--- a/themes/openwrt-light/luasrc/view/themes/openwrt-light/header.htm
+++ b/themes/openwrt-light/luasrc/view/themes/openwrt-light/header.htm
@@ -160,4 +160,4 @@ else -%>
 
 <div class="clear"></div>
 </div>
-<div id="content">
+<div id="maincontent">
diff --git a/themes/openwrt.org/htdocs/luci-static/openwrt.org/cascade.css b/themes/openwrt.org/htdocs/luci-static/openwrt.org/cascade.css
index 2c0004cbb6..82d578f0dc 100644
--- a/themes/openwrt.org/htdocs/luci-static/openwrt.org/cascade.css
+++ b/themes/openwrt.org/htdocs/luci-static/openwrt.org/cascade.css
@@ -372,12 +372,19 @@ textarea#syslog {
 	font-style: italic;
 	font-family: Trebuchet MS, Verdana, sans-serif;
 	color: #27408B;
+	background: url('../resources/cbi/arrow.gif') left no-repeat;
+    padding-left: 17px;
 }
 
 #maincontent p {
 	margin-bottom: 1em;
 }
 
+#auth_buttons {
+	float: right;
+	padding-top: 0.5em;
+}
+
 .cbi-section {
 	margin-bottom: 0.5em;
 	padding: 0.5em 1em;
diff --git a/themes/openwrt.org/luasrc/view/themes/openwrt.org/footer.htm b/themes/openwrt.org/luasrc/view/themes/openwrt.org/footer.htm
index c1d4dfccbc..f8ea5ad577 100644
--- a/themes/openwrt.org/luasrc/view/themes/openwrt.org/footer.htm
+++ b/themes/openwrt.org/luasrc/view/themes/openwrt.org/footer.htm
@@ -12,9 +12,10 @@ You may obtain a copy of the License at
 $Id$
 
 -%>
-		<br class="clear" />
-	</div>
+<div class="clear"></div>
+</div>
 
-	<div class="luci separator black whitetext bold"><a href="<%=controller%>/about">Powered by <%= luci.__appname__ .. " " .. luci.__version__%></a></div>
+<p class="luci"><a href="<%=controller%>/about">Powered by <%= luci.__appname__ .. " " .. luci.__version__%></a></p>
 </body>
 </html>
+
-- 
2.30.2