diff --git a/applications/luci-ddns/luasrc/model/cbi/ddns/ddns.lua b/applications/luci-ddns/luasrc/model/cbi/ddns/ddns.lua
index a8ba0c73c5..45a8a3965c 100644
--- a/applications/luci-ddns/luasrc/model/cbi/ddns/ddns.lua
+++ b/applications/luci-ddns/luasrc/model/cbi/ddns/ddns.lua
@@ -31,7 +31,9 @@ svc:value("freedns.afraid.org")
s:option(Value, "domain", translate("hostname")).rmempty = true
s:option(Value, "username", translate("username")).rmempty = true
-s:option(Value, "password", translate("password")).rmempty = true
+pw = s:option(Value, "password", translate("password"))
+pw.rmempty = true
+pw.password = true
src = s:option(ListValue, "ip_source")
src:value("network", translate("network"))
@@ -69,4 +71,4 @@ unit:value("minutes", "min")
unit:value("hours", "h")
-return m
\ No newline at end of file
+return m
diff --git a/applications/luci-ddns/luasrc/model/cbi/ddns/ddnsmini.lua b/applications/luci-ddns/luasrc/model/cbi/ddns/ddnsmini.lua
index 51bebb6e66..2a91eda824 100644
--- a/applications/luci-ddns/luasrc/model/cbi/ddns/ddnsmini.lua
+++ b/applications/luci-ddns/luasrc/model/cbi/ddns/ddnsmini.lua
@@ -29,7 +29,9 @@ svc:value("freedns.afraid.org")
s:option(Value, "domain", translate("hostname")).rmempty = true
s:option(Value, "username", translate("username")).rmempty = true
-s:option(Value, "password", translate("password")).rmempty = true
+pw = s:option(Value, "password", translate("password"))
+pw.rmempty = true
+pw.password = true
s.defaults.ip_source = "network"
s.defaults.ip_network = "wan"
@@ -47,4 +49,4 @@ unit:value("minutes", "min")
unit:value("hours", "h")
-return m
\ No newline at end of file
+return m
diff --git a/applications/luci-statistics/luasrc/i18n/statistics.en.lua b/applications/luci-statistics/luasrc/i18n/statistics.en.lua
index d4e7eeac88..aecdba9f4e 100644
--- a/applications/luci-statistics/luasrc/i18n/statistics.en.lua
+++ b/applications/luci-statistics/luasrc/i18n/statistics.en.lua
@@ -1,4 +1,5 @@
stat_statistics = 'Statistics'
+stat_desc = 'The statistics package is based on Collectd and uses RRD Tool to render diagram images from collected data.'
stat_systemplugins = 'System plugins'
stat_networkplugins = 'Network plugins'
stat_outputplugins = 'Output plugins'
diff --git a/applications/luci-statistics/luasrc/i18n/statistics.en.xml b/applications/luci-statistics/luasrc/i18n/statistics.en.xml
index 927a330216..0f84ff8e62 100644
--- a/applications/luci-statistics/luasrc/i18n/statistics.en.xml
+++ b/applications/luci-statistics/luasrc/i18n/statistics.en.xml
@@ -3,6 +3,7 @@
Statistics
+The statistics package is based on Collectd and uses RRD Tool to render diagram images from collected data.
System plugins
Network plugins
Output plugins
diff --git a/applications/luci-statistics/luasrc/i18n/statistics.pt-br.lua b/applications/luci-statistics/luasrc/i18n/statistics.pt-br.lua
index 9aca2020fb..e2b5cacf1b 100644
--- a/applications/luci-statistics/luasrc/i18n/statistics.pt-br.lua
+++ b/applications/luci-statistics/luasrc/i18n/statistics.pt-br.lua
@@ -1,4 +1,5 @@
stat_statistics = 'Estatísticas'
+stat_desc = 'As estatísticas são baseadas no Collectd e é utilizado o RRD Tool para renderização das imagens à partir dos dados coletados.'
stat_systemplugins = 'Plugis de Sistema'
stat_networkplugins = 'Plugins de rede'
stat_outputplugins = 'Plugins de saída'
@@ -26,7 +27,7 @@ stat_email = 'Email'
stat_unixsock = 'UnixSock'
lucistatistics = 'Estatísticas'
lucistatistics_collectd = 'Configurações do Collectd'
-lucistatistics_collectd_desc = 'Collectd é um pequeno daemon que coleta dados de várias fontes através de diferentes plugins. Nesta página você pode alterar as configurações gerais do daemon collectdn.'
+lucistatistics_collectd_desc = 'Collectd é um pequeno daemon que coleta dados de várias fontes através de diferentes plugins. Nesta página você pode alterar as configurações gerais do daemon collectd.'
lucistatistics_collectd_hostname = 'Hostname'
lucistatistics_collectd_basedir = 'Diretório Base'
lucistatistics_collectd_include = 'Diretório para sub-configurações'
diff --git a/applications/luci-statistics/luasrc/i18n/statistics.pt-br.xml b/applications/luci-statistics/luasrc/i18n/statistics.pt-br.xml
index ed51ebfe26..d619f83a15 100644
--- a/applications/luci-statistics/luasrc/i18n/statistics.pt-br.xml
+++ b/applications/luci-statistics/luasrc/i18n/statistics.pt-br.xml
@@ -3,6 +3,7 @@
Estatísticas
+As estatísticas são baseadas no Collectd e é utilizado o RRD Tool para renderização das imagens à partir dos dados coletados.
Plugis de Sistema
Plugins de rede
Plugins de saída
@@ -33,7 +34,7 @@
Estatísticas
Configurações do Collectd
-Collectd é um pequeno daemon que coleta dados de várias fontes através de diferentes plugins. Nesta página você pode alterar as configurações gerais do daemon collectdn.
+Collectd é um pequeno daemon que coleta dados de várias fontes através de diferentes plugins. Nesta página você pode alterar as configurações gerais do daemon collectd.
Hostname
Diretório Base
diff --git a/applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.pt-br.lua b/applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.pt-br.lua
index f07765d192..624a885301 100644
--- a/applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.pt-br.lua
+++ b/applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.pt-br.lua
@@ -2,4 +2,4 @@ framespersecond = 'Frames por segundo'
resolution = 'Resolução'
settings = 'Configurações'
uvc_streamer = 'Webcam streaming'
-uvc_streamer_desc = 'Configure seu Linux-UVC compatível com uma webcam. Coloque no seu browser por ex. http://%s:%i/'
+uvc_streamer_desc = 'Configure a sua webcam compatível com o Linux-UVC. Coloque no seu browser por ex. http://%s:%i/'
diff --git a/applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.pt-br.xml b/applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.pt-br.xml
index 14fa4fdcc7..8594cc1980 100644
--- a/applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.pt-br.xml
+++ b/applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.pt-br.xml
@@ -6,6 +6,6 @@
Resolução
Configurações
Webcam streaming
-Configure seu Linux-UVC compatível com uma webcam. Coloque no seu browser por ex. http://%s:%i/
+Configure a sua webcam compatível com o Linux-UVC. Coloque no seu browser por ex. http://%s:%i/
diff --git a/i18n/english/luasrc/i18n/admin-core.en.lua b/i18n/english/luasrc/i18n/admin-core.en.lua
index ffd15a4fce..a9dab7e4b1 100644
--- a/i18n/english/luasrc/i18n/admin-core.en.lua
+++ b/i18n/english/luasrc/i18n/admin-core.en.lua
@@ -195,6 +195,8 @@ dhcp_timeremain = 'Leasetime remaining'
dhcp_leases_active = 'Active Leases'
a_n_ptp = 'Point-to-Point Connections'
a_n_ptp1 = 'Point-to-Point connections with PPPoE or PPTP are often used to connect a device over DSL or similar technologies to an internet access point.'
+network_interface_prereq = 'You need to install "comgt" for UMTS/GPRS, "ppp-mod-pppoe" for PPPoE, "ppp-mod-pppoa" for PPPoA or "pptp" for PPtP support'
+network_interface_prereq_mini = 'You need to install "ppp-mod-pppoe" for PPPoE or "pptp" for PPtP support'
network_interface_server = 'PPTP-Server'
network_interface_demand = 'Automatic Disconnect'
network_interface_demand_desc = 'Time (in seconds) after which an unused connection will be closed'
diff --git a/i18n/english/luasrc/i18n/admin-core.en.xml b/i18n/english/luasrc/i18n/admin-core.en.xml
index 266f362585..9e07e80f05 100644
--- a/i18n/english/luasrc/i18n/admin-core.en.xml
+++ b/i18n/english/luasrc/i18n/admin-core.en.xml
@@ -199,6 +199,8 @@
Active Leases
Point-to-Point Connections
Point-to-Point connections with PPPoE or PPTP are often used to connect a device over DSL or similar technologies to an internet access point.
+You need to install "comgt" for UMTS/GPRS, "ppp-mod-pppoe" for PPPoE, "ppp-mod-pppoa" for PPPoA or "pptp" for PPtP support
+You need to install "ppp-mod-pppoe" for PPPoE or "pptp" for PPtP support
PPTP-Server
Automatic Disconnect
Time (in seconds) after which an unused connection will be closed
diff --git a/i18n/german/luasrc/i18n/admin-core.de.lua b/i18n/german/luasrc/i18n/admin-core.de.lua
index 234cddd09c..245aed1ddf 100644
--- a/i18n/german/luasrc/i18n/admin-core.de.lua
+++ b/i18n/german/luasrc/i18n/admin-core.de.lua
@@ -199,6 +199,8 @@ dhcp_leases = 'Zuweisungen'
luci_ethers = 'Statische Einträge'
dhcp_timeremain = 'Verbleibende Gültigkeit'
dhcp_leases_active = 'Aktive Zuweisungen'
+network_interface_prereq = 'Für die Unterstützung von UMTS/GPRS muss "comgt", für PPPoE "ppp-mod-pppoe", für PPPoA "ppp-mod-pppoa" und für PPtP "pptp" installiert sein'
+network_interface_prereq_mini = 'Für die Unterstützung von PPPoE muss "ppp-mod-pppoe" und für PPtP "pptp" installiert sein'
network_interface_demand = 'Automatische Trennung'
network_interface_demand_desc = 'Zeit (in s) nach der die Verbindung bei Inaktivität getrennt wird'
network_interface_keepalive = 'Keep-Alive'
diff --git a/i18n/german/luasrc/i18n/admin-core.de.xml b/i18n/german/luasrc/i18n/admin-core.de.xml
index d2ffe000cd..8d72c08192 100644
--- a/i18n/german/luasrc/i18n/admin-core.de.xml
+++ b/i18n/german/luasrc/i18n/admin-core.de.xml
@@ -206,6 +206,8 @@
Verbleibende Gültigkeit
Aktive Zuweisungen
+Für die Unterstützung von UMTS/GPRS muss "comgt", für PPPoE "ppp-mod-pppoe", für PPPoA "ppp-mod-pppoa" und für PPtP "pptp" installiert sein
+Für die Unterstützung von PPPoE muss "ppp-mod-pppoe" und für PPtP "pptp" installiert sein
Automatische Trennung
Zeit (in s) nach der die Verbindung bei Inaktivität getrennt wird
Keep-Alive
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 7d914860b5..f9c1867cb1 100644
--- a/i18n/portuguese_brazilian/luasrc/i18n/admin-core.pt-br.lua
+++ b/i18n/portuguese_brazilian/luasrc/i18n/admin-core.pt-br.lua
@@ -195,6 +195,8 @@ dhcp_timeremain = 'Tempo de lease restante'
dhcp_leases_active = 'Leases Ativos'
a_n_ptp = 'Conexões Ponto-a-Ponto'
a_n_ptp1 = 'Conexões Ponto-a-Ponto com PPPoE ou PPTP muitas vezes são usados para conectar um dispositivo sobre DSL ou tecnologia similar para um ponto de acesso à internet.'
+network_interface_prereq = 'Você precisa instalar os pacotes "comgt" para UMTS/GPRS, "ppp-mod-pppoe" para PPPoE, "ppp-mod-pppoa" para PPPoA ou "pptp" para o suporte PPtP'
+network_interface_prereq_mini = 'Você precisa instalar os pacotes "ppp-mod-pppoe" para PPPoE ou "pptp" para o suporte PPtP'
network_interface_server = 'Servidor-PPTP'
network_interface_demand = 'Desconexão Automática'
network_interface_demand_desc = 'Tempo (em segundos) para desconexão de uma conexão não mais utilizada'
diff --git a/i18n/portuguese_brazilian/luasrc/i18n/admin-core.pt-br.xml b/i18n/portuguese_brazilian/luasrc/i18n/admin-core.pt-br.xml
index 672b2815b9..923b45b53e 100644
--- a/i18n/portuguese_brazilian/luasrc/i18n/admin-core.pt-br.xml
+++ b/i18n/portuguese_brazilian/luasrc/i18n/admin-core.pt-br.xml
@@ -162,10 +162,13 @@
Ignorar arquivo resolv
Consultas simultâneas
Porta do DNS
-tamanho max. EDNS0 do pacote
-max. DHCP-Leases
+tamanho max. do pacote EDNS0
+max. de DHCP-Leases
arquivo host adicional
-porta da consulta
+porta para consulta
+Ativar servidor TFTP
+Diretório raiz do servidor TFTP
+Imagem para o boot remoto
Switch
Conexões Ativas
Esta página fornece informações sobre as conexões de rede ativas.
@@ -196,6 +199,8 @@
Leases Ativos
Conexões Ponto-a-Ponto
Conexões Ponto-a-Ponto com PPPoE ou PPTP muitas vezes são usados para conectar um dispositivo sobre DSL ou tecnologia similar para um ponto de acesso à internet.
+Você precisa instalar os pacotes "comgt" para UMTS/GPRS, "ppp-mod-pppoe" para PPPoE, "ppp-mod-pppoa" para PPPoA ou "pptp" para o suporte PPtP
+Você precisa instalar os pacotes "ppp-mod-pppoe" para PPPoE ou "pptp" para o suporte PPtP
Servidor-PPTP
Desconexão Automática
Tempo (em segundos) para desconexão de uma conexão não mais utilizada
diff --git a/libs/core/luasrc/util.lua b/libs/core/luasrc/util.lua
index 678e36e411..51f6224093 100644
--- a/libs/core/luasrc/util.lua
+++ b/libs/core/luasrc/util.lua
@@ -35,7 +35,7 @@ local coroutine = require "coroutine"
local getmetatable, setmetatable = getmetatable, setmetatable
local getfenv, setfenv = getfenv, setfenv
local rawget, rawset, unpack = rawget, rawset, unpack
-local tostring, type, assert = tostring, type, assert
+local tostring, type, assert = tostring, type, assert
local ipairs, pairs, loadstring = ipairs, pairs, loadstring
local require, pcall, xpcall = require, pcall, xpcall
@@ -163,7 +163,7 @@ end
function dumptable(t, maxdepth, i, seen)
i = i or 0
seen = seen or setmetatable({}, {__mode="k"})
-
+
for k,v in pairs(t) do
perror(string.rep("\t", i) .. tostring(k) .. "\t" .. tostring(v))
if type(v) == "table" and (not maxdepth or i < maxdepth) then
@@ -196,11 +196,11 @@ end
-- @return String value containing the escaped data
function pcdata(value)
return value and tostring(value):gsub("[&\"'<>]", {
- ["&"] = "&",
- ['"'] = """,
- ["'"] = "'",
- ["<"] = "<",
- [">"] = ">"
+ ["&"] = "&",
+ ['"'] = """,
+ ["'"] = "'",
+ ["<"] = "<",
+ [">"] = ">"
})
end
@@ -407,7 +407,7 @@ end
function _serialize_table(t, seen)
assert(not seen[t], "Recursion detected.")
seen[t] = true
-
+
local data = ""
local idata = ""
local ilen = 0
@@ -426,7 +426,7 @@ function _serialize_table(t, seen)
for i = 1, ilen do
local v = serialize_data(t[i], seen)
idata = idata .. ( #idata > 0 and ", " or "" ) .. v
- end
+ end
return idata .. ( #data > 0 and #idata > 0 and ", " or "" ) .. data
end
@@ -439,7 +439,7 @@ end
-- @see get_bytecode
function serialize_data(val, seen)
seen = seen or setmetatable({}, {__mode="k"})
-
+
if val == nil then
return "nil"
elseif type(val) == "number" then
@@ -634,11 +634,11 @@ function execi(command)
return pp and function()
local line = pp:read()
-
+
if not line then
pp:close()
end
-
+
return line
end
end
diff --git a/libs/web/root/etc/config/luci b/libs/web/root/etc/config/luci
index d21ddc4add..1499015684 100644
--- a/libs/web/root/etc/config/luci
+++ b/libs/web/root/etc/config/luci
@@ -4,9 +4,9 @@ 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 firmware "OpenWrt Kamikaze"
option distro ""
config extern flash_keep
diff --git a/modules/admin-full/luasrc/model/cbi/admin_network/ifaces.lua b/modules/admin-full/luasrc/model/cbi/admin_network/ifaces.lua
index ce9c6ff506..acecee0cad 100644
--- a/modules/admin-full/luasrc/model/cbi/admin_network/ifaces.lua
+++ b/modules/admin-full/luasrc/model/cbi/admin_network/ifaces.lua
@@ -12,8 +12,16 @@ You may obtain a copy of the License at
$Id$
]]--
+
require("luci.tools.webadmin")
arg[1] = arg[1] or ""
+
+local has_3g = luci.fs.mtime("/usr/bin/gcom")
+local has_pptp = luci.fs.mtime("/usr/sbin/pptp")
+local has_pppd = luci.fs.mtime("/usr/sbin/pppd")
+local has_pppoe = luci.fs.glob("/usr/lib/pppd/*/rp-pppoe.so")
+local has_pppoa = luci.fs.glob("/usr/lib/pppd/*/pppoatm.so")
+
m = Map("network", translate("interfaces"), translate("a_n_ifaces1"))
s = m:section(NamedSection, arg[1], "interface")
@@ -24,13 +32,19 @@ back.value = ""
back.titleref = luci.dispatcher.build_url("admin", "network", "network")
p = s:option(ListValue, "proto", translate("protocol"))
+p.override_scheme = true
+p.default = "static"
p:value("static", translate("static"))
p:value("dhcp", "DHCP")
-p:value("pppoe", "PPPoE")
-p:value("ppp", "PPP")
-p:value("3g", "UMTS/3G")
-p:value("pptp", "PPTP")
-p.default = "static"
+if has_pppd then p:value("ppp", "PPP") end
+if has_pppoe then p:value("pppoe", "PPPoE") end
+if has_pppoa then p:value("pppoa", "PPPoA") end
+if has_3g then p:value("3g", "UMTS/3G") end
+if has_pptp then p:value("pptp", "PPTP") end
+
+if not ( has_pppd and has_pppoe and has_pppoa and has_3g and has_pptp ) then
+ p.description = translate("network_interface_prereq")
+end
br = s:option(Flag, "type", translate("a_n_i_bridge"), translate("a_n_i_bridge1"))
br.enabled = "bridge"
@@ -155,6 +169,7 @@ user:depends("proto", "3g")
pass = s:option(Value, "password", translate("password"))
pass.rmempty = true
+pass.password = true
pass:depends("proto", "pptp")
pass:depends("proto", "pppoe")
pass:depends("proto", "ppp")
diff --git a/modules/admin-full/luasrc/view/admin_status/syslog.htm b/modules/admin-full/luasrc/view/admin_status/syslog.htm
index bda7b3ed55..f4873bedd6 100644
--- a/modules/admin-full/luasrc/view/admin_status/syslog.htm
+++ b/modules/admin-full/luasrc/view/admin_status/syslog.htm
@@ -15,5 +15,7 @@ $Id$
<%+header%>
<%:status%>
<%:syslog%>
-<%=luci.util.pcdata(syslog)%>
+
+
+
<%+footer%>
diff --git a/modules/admin-mini/luasrc/model/cbi/mini/network.lua b/modules/admin-mini/luasrc/model/cbi/mini/network.lua
index ccb5dac898..d03e6a7773 100644
--- a/modules/admin-mini/luasrc/model/cbi/mini/network.lua
+++ b/modules/admin-mini/luasrc/model/cbi/mini/network.lua
@@ -12,8 +12,13 @@ You may obtain a copy of the License at
$Id$
]]--
+
require("luci.tools.webadmin")
require("luci.sys")
+require("luci.fs")
+
+local has_pptp = luci.fs.mtime("/usr/sbin/pptp")
+local has_pppoe = luci.fs.glob("/usr/lib/pppd/*/rp-pppoe.so")
local network = luci.model.uci.cursor_state():get_all("network")
@@ -52,13 +57,13 @@ txrx = s:option(DummyValue, "_txrx",
function txrx.cfgvalue(self, section)
local ix = self.map:get(section, "ifname")
-
+
local rx = netstat and netstat[ix] and netstat[ix][1]
rx = rx and luci.tools.webadmin.byte_format(tonumber(rx)) or "-"
-
+
local tx = netstat and netstat[ix] and netstat[ix][9]
tx = tx and luci.tools.webadmin.byte_format(tonumber(tx)) or "-"
-
+
return string.format("%s / %s", tx, rx)
end
@@ -67,13 +72,13 @@ errors = s:option(DummyValue, "_err",
function errors.cfgvalue(self, section)
local ix = self.map:get(section, "ifname")
-
+
local rx = netstat and netstat[ix] and netstat[ix][3]
local tx = netstat and netstat[ix] and netstat[ix][11]
-
+
rx = rx and tostring(rx) or "-"
tx = tx and tostring(tx) or "-"
-
+
return string.format("%s / %s", tx, rx)
end
@@ -97,11 +102,17 @@ dns.rmempty = true
s = m:section(NamedSection, "wan", "interface", translate("m_n_inet"))
s.addremove = false
p = s:option(ListValue, "proto", translate("protocol"))
+p.override_values = true
p:value("none", "disabled")
p:value("static", translate("manual", "manual"))
p:value("dhcp", translate("automatic", "automatic"))
-p:value("pppoe", "PPPoE")
-p:value("pptp", "PPTP")
+if has_pppoe then p:value("pppoe", "PPPoE") end
+if has_pptp then p:value("pptp", "PPTP") end
+
+if not ( has_pppoe and has_pptp ) then
+ p.description = translate("network_interface_prereq_mini")
+end
+
ip = s:option(Value, "ipaddr", translate("ipaddress"))
ip:depends("proto", "static")
@@ -122,6 +133,7 @@ usr:depends("proto", "pppoe")
usr:depends("proto", "pptp")
pwd = s:option(Value, "password", translate("password"))
+pwd.password = true
pwd:depends("proto", "pppoe")
pwd:depends("proto", "pptp")
@@ -143,4 +155,4 @@ srv.rmempty = true
-return m
\ No newline at end of file
+return m
diff --git a/themes/openwrt-light/htdocs/luci-static/openwrt-light/cascade.css b/themes/openwrt-light/htdocs/luci-static/openwrt-light/cascade.css
index 93b0a32eaf..6c0e282c5f 100644
--- a/themes/openwrt-light/htdocs/luci-static/openwrt-light/cascade.css
+++ b/themes/openwrt-light/htdocs/luci-static/openwrt-light/cascade.css
@@ -448,14 +448,14 @@ input.cbi-input-user {
background: url('../resources/cbi/user.gif') no-repeat scroll 1px center;
background-color: inherit;
color: #000000;
- padding-left: 17px;
+ text-indent: 17px;
}
input.cbi-input-password {
background: url('../resources/cbi/key.gif') no-repeat scroll 1px center;
background-color: inherit;
color: #000000;
- padding-left: 17px;
+ text-indent: 17px;
}
input.cbi-input-find {
diff --git a/themes/openwrt-light/htdocs/luci-static/openwrt-light/ie6.css b/themes/openwrt-light/htdocs/luci-static/openwrt-light/ie6.css
index d65da4a19d..1c951854b5 100644
--- a/themes/openwrt-light/htdocs/luci-static/openwrt-light/ie6.css
+++ b/themes/openwrt-light/htdocs/luci-static/openwrt-light/ie6.css
@@ -51,6 +51,12 @@
width: 50% !important;
}
+* html .cbi-input-user,
+* html .cbi-input-password {
+ text-indent: 0 !important;
+ padding-left: 1.5em !important;
+}
+
* html .cbi-section legend {
background-color: #ffffff;
color: #555555;
diff --git a/themes/openwrt-light/htdocs/luci-static/openwrt-light/ie7.css b/themes/openwrt-light/htdocs/luci-static/openwrt-light/ie7.css
index c410f11ff6..67ed9fb816 100644
--- a/themes/openwrt-light/htdocs/luci-static/openwrt-light/ie7.css
+++ b/themes/openwrt-light/htdocs/luci-static/openwrt-light/ie7.css
@@ -11,3 +11,10 @@ table.cbi-section-table td .cbi-input-text,
table.cbi-section-table td .cbi-input-select {
width: 95% !important;
}
+
+.cbi-input-user,
+.cbi-input-password {
+ text-indent: 0 !important;
+ padding-left: 1.5em !important;
+ width: 18.5em !important;
+}
diff --git a/themes/openwrt-light/root/etc/uci-defaults/luci-theme-openwrtlight b/themes/openwrt-light/root/etc/uci-defaults/luci-theme-openwrtlight
index b797a0073a..c2322a4b46 100755
--- a/themes/openwrt-light/root/etc/uci-defaults/luci-theme-openwrtlight
+++ b/themes/openwrt-light/root/etc/uci-defaults/luci-theme-openwrtlight
@@ -1,6 +1,6 @@
#!/bin/sh
uci batch <<-EOF
- set luci.themes.OpenWRT_Light=/luci-static/openwrt-light
+ set luci.themes.OpenWrt_Light=/luci-static/openwrt-light
commit luci
EOF
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 d83733ff30..2c0004cbb6 100644
--- a/themes/openwrt.org/htdocs/luci-static/openwrt.org/cascade.css
+++ b/themes/openwrt.org/htdocs/luci-static/openwrt.org/cascade.css
@@ -333,6 +333,15 @@ html #menubar a:visited.warning {
width: 11.5em;
}
+textarea#syslog {
+ width: 98%;
+ height: 450px;
+ border: 3px solid #cccccc;
+ padding: 5px;
+ font-family: monospace;
+ overflow: auto;
+}
+
#maincontent {
clear: both;
width: 80%;
@@ -347,16 +356,22 @@ html #menubar a:visited.warning {
}
#maincontent h2 {
- margin: 0.25em 0 0.5em 0;
font-size: 150%;
- font-weight: normal;
+ font-family: Trebuchet MS, Verdana, sans-serif;
+ font-weight: bold;
+ margin: 0.25em 0 0.7em 0;
+ border-bottom: 1px solid;
+ padding-top: 10px;
+ padding-bottom: 4px;
}
#maincontent h3 {
- margin: 0.5em 0;
- font-size: 120%;
- font-weight: normal;
- text-decoration: underline;
+ margin: 0.5em 0 1.1em 0;
+ font-size: 125%;
+ font-weight: bold;
+ font-style: italic;
+ font-family: Trebuchet MS, Verdana, sans-serif;
+ color: #27408B;
}
#maincontent p {
@@ -455,14 +470,14 @@ input.cbi-input-user {
background: url('../resources/cbi/user.gif') no-repeat scroll 1px center;
background-color: inherit;
color: #000000;
- padding-left: 17px;
+ text-indent: 17px;
}
input.cbi-input-password {
background: url('../resources/cbi/key.gif') no-repeat scroll 1px center;
background-color: inherit;
color: #000000;
- padding-left: 17px;
+ text-indent: 17px;
}
input.cbi-input-find {
diff --git a/themes/openwrt.org/htdocs/luci-static/openwrt.org/ie6.css b/themes/openwrt.org/htdocs/luci-static/openwrt.org/ie6.css
new file mode 100644
index 0000000000..1c951854b5
--- /dev/null
+++ b/themes/openwrt.org/htdocs/luci-static/openwrt.org/ie6.css
@@ -0,0 +1,77 @@
+/* obligatory IE6 Voodoo Code */
+
+* html body {
+ padding-left: 50% !important;
+}
+
+* html div#header {
+ margin-left: -100% !important;
+}
+
+* html div#menubar {
+ margin-left: -100% !important;
+ width: 200% !important;
+}
+
+* html ul.dropdowns li ul {
+ width: 10em;
+}
+
+* html ul.dropdowns li li {
+ clear: both;
+ float: left;
+}
+
+* html ul.dropdowns li li {
+ width: 100%;
+}
+
+* html ul.dropdowns li li a {
+ height: 1%;
+}
+
+* html div#maincontent {
+ margin-left: -80% !important;
+ width: 160% !important;
+}
+
+* html div.cbi-value-description {
+ width: auto !important;
+}
+
+* html div.cbi-value-field {
+ margin-left: 0 !important;
+ width: 100% !important;
+}
+
+* html .cbi-input-text,
+* html .cbi-input-user,
+* html .cbi-input-select,
+* html .cbi-input-password {
+ width: 50% !important;
+}
+
+* html .cbi-input-user,
+* html .cbi-input-password {
+ text-indent: 0 !important;
+ padding-left: 1.5em !important;
+}
+
+* html .cbi-section legend {
+ background-color: #ffffff;
+ color: #555555;
+}
+
+* html table.cbi-section-table td .cbi-input-text,
+* html table.cbi-section-table td .cbi-input-select {
+ width: 100% !important;
+}
+
+* html div.cbi-page-actions {
+ text-align: right !important;
+}
+
+* html div.cbi-value-field input,
+* html div.cbi-value-field select {
+ font-size: 90% !important;
+}
diff --git a/themes/openwrt.org/htdocs/luci-static/openwrt.org/ie7.css b/themes/openwrt.org/htdocs/luci-static/openwrt.org/ie7.css
new file mode 100644
index 0000000000..67ed9fb816
--- /dev/null
+++ b/themes/openwrt.org/htdocs/luci-static/openwrt.org/ie7.css
@@ -0,0 +1,20 @@
+div.cbi-value-field {
+ margin-left: 0 !important;
+}
+
+.cbi-section legend {
+ background-color: #ffffff;
+ color: #555555;
+}
+
+table.cbi-section-table td .cbi-input-text,
+table.cbi-section-table td .cbi-input-select {
+ width: 95% !important;
+}
+
+.cbi-input-user,
+.cbi-input-password {
+ text-indent: 0 !important;
+ padding-left: 1.5em !important;
+ width: 18.5em !important;
+}
diff --git a/themes/openwrt.org/root/etc/uci-defaults/luci-theme-openwrt b/themes/openwrt.org/root/etc/uci-defaults/luci-theme-openwrt
index a8bef6c92d..d8dea0467e 100755
--- a/themes/openwrt.org/root/etc/uci-defaults/luci-theme-openwrt
+++ b/themes/openwrt.org/root/etc/uci-defaults/luci-theme-openwrt
@@ -1,6 +1,6 @@
#!/bin/sh
uci batch <<-EOF
- set luci.themes.OpenWRT=/luci-static/openwrt.org
+ set luci.themes.OpenWrt=/luci-static/openwrt.org
commit luci
EOF