diff options
50 files changed, 190 insertions, 108 deletions
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-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/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/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/modules/admin-core/luasrc/view/about.htm b/modules/admin-core/luasrc/view/about.htm index c89e042554..b9b09c0d5b 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..7957b140e5 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 %> 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 bda7b3ed55..f6e0f7a610 100644 --- a/modules/admin-full/luasrc/view/admin_status/syslog.htm +++ b/modules/admin-full/luasrc/view/admin_status/syslog.htm @@ -13,7 +13,7 @@ $Id$ -%> <%+header%> -<h1><%:status%></h1> -<h2><%:syslog%></h2> +<h2><a id="content" name="content"><%:status%></a></h2> +<h3><%:syslog%></h3> <code><%=luci.util.pcdata(syslog)%></code> <%+footer%> 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/fledermaus/htdocs/luci-static/fledermaus/cascade.css b/themes/fledermaus/htdocs/luci-static/fledermaus/cascade.css index 7deeaebeab..c81ff32208 100644 --- a/themes/fledermaus/htdocs/luci-static/fledermaus/cascade.css +++ b/themes/fledermaus/htdocs/luci-static/fledermaus/cascade.css @@ -16,7 +16,7 @@ code { white-space: pre; } -div#content ul { +div#maincontent ul { margin-left: 2em; } @@ -164,7 +164,7 @@ div#content ul { float: right; } -#content { +#maincontent { clear: both; width: 90%; margin: 0 auto; @@ -174,20 +174,20 @@ div#content ul { font-size: 80%; } -#content h1 { +#maincontent h2 { margin: 0.25em 0 0.5em 0; font-size: 150%; font-weight: normal; } -#content h2 { +#maincontent h3 { margin: 0.5em 0; font-size: 120%; font-weight: normal; text-decoration: underline; } -#content p { +#maincontent p { margin-bottom: 1em; } @@ -579,7 +579,7 @@ ul.cbi-apply { width: 200% !important; } -* html div#content { +* html div#maincontent { margin-left: -80% !important; width: 160% !important; } diff --git a/themes/fledermaus/luasrc/view/themes/fledermaus/header.htm b/themes/fledermaus/luasrc/view/themes/fledermaus/header.htm index d93d9aee3b..f31478b6e9 100644 --- a/themes/fledermaus/luasrc/view/themes/fledermaus/header.htm +++ b/themes/fledermaus/luasrc/view/themes/fledermaus/header.htm @@ -177,4 +177,4 @@ end <br class="clear" /> </div> -<div id="content"> +<div id="maincontent"> diff --git a/themes/freifunk-bno/htdocs/luci-static/freifunk-bno/cascade.css b/themes/freifunk-bno/htdocs/luci-static/freifunk-bno/cascade.css index 8f8dc69398..c6f236dfed 100644 --- a/themes/freifunk-bno/htdocs/luci-static/freifunk-bno/cascade.css +++ b/themes/freifunk-bno/htdocs/luci-static/freifunk-bno/cascade.css @@ -60,7 +60,7 @@ a:hover { min-height: 710px; } -div#content ul { +div#maincontent ul { margin-left: 2em; } @@ -260,7 +260,7 @@ background-color: #FFCB05; } -#content { +#maincontent { clear: both; width: 98%; margin: 0 auto; @@ -271,20 +271,20 @@ background-color: #FFCB05; border-top:1px solid #D2A800; } -#content h1 { +#maincontent h2 { margin: 0.25em 0 0.5em 0; font-size: 150%; font-weight: normal; } -#content h2 { +#maincontent h3 { margin: 0.5em 0; font-size: 120%; font-weight: normal; text-decoration: underline; } -#content p { +#maincontent p { margin-bottom: 1em; } @@ -687,7 +687,7 @@ ul.cbi-apply { width: 200% !important; } -* html div#content { +* html div#maincontent { margin-left: -80% !important; width: 160% !important; } diff --git a/themes/freifunk-bno/luasrc/view/themes/freifunk-bno/header.htm b/themes/freifunk-bno/luasrc/view/themes/freifunk-bno/header.htm index 26b67e2453..fb8225000e 100644 --- a/themes/freifunk-bno/luasrc/view/themes/freifunk-bno/header.htm +++ b/themes/freifunk-bno/luasrc/view/themes/freifunk-bno/header.htm @@ -193,4 +193,4 @@ end <br class="clear" /> </div> -<div id="content"> +<div id="maincontent"> diff --git a/themes/freifunk/htdocs/luci-static/freifunk/cascade.css b/themes/freifunk/htdocs/luci-static/freifunk/cascade.css index 8f8dc69398..c6f236dfed 100644 --- a/themes/freifunk/htdocs/luci-static/freifunk/cascade.css +++ b/themes/freifunk/htdocs/luci-static/freifunk/cascade.css @@ -60,7 +60,7 @@ a:hover { min-height: 710px; } -div#content ul { +div#maincontent ul { margin-left: 2em; } @@ -260,7 +260,7 @@ background-color: #FFCB05; } -#content { +#maincontent { clear: both; width: 98%; margin: 0 auto; @@ -271,20 +271,20 @@ background-color: #FFCB05; border-top:1px solid #D2A800; } -#content h1 { +#maincontent h2 { margin: 0.25em 0 0.5em 0; font-size: 150%; font-weight: normal; } -#content h2 { +#maincontent h3 { margin: 0.5em 0; font-size: 120%; font-weight: normal; text-decoration: underline; } -#content p { +#maincontent p { margin-bottom: 1em; } @@ -687,7 +687,7 @@ ul.cbi-apply { width: 200% !important; } -* html div#content { +* html div#maincontent { margin-left: -80% !important; width: 160% !important; } diff --git a/themes/freifunk/luasrc/view/themes/freifunk/header.htm b/themes/freifunk/luasrc/view/themes/freifunk/header.htm index a0f7c6339f..eb6aa7f8db 100644 --- a/themes/freifunk/luasrc/view/themes/freifunk/header.htm +++ b/themes/freifunk/luasrc/view/themes/freifunk/header.htm @@ -193,4 +193,4 @@ end <br class="clear" /> </div> -<div id="content"> +<div id="maincontent"> 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 064b4e63c8..cdc0d4e92a 100644 --- a/themes/openwrt-light/htdocs/luci-static/openwrt-light/cascade.css +++ b/themes/openwrt-light/htdocs/luci-static/openwrt-light/cascade.css @@ -16,7 +16,7 @@ code { white-space: pre; } -div#content ul { +div#maincontent ul { margin-left: 2em; } @@ -146,7 +146,7 @@ div#content ul { float: right; } -#content { +#maincontent { clear: both; width: 80%; margin: 0 auto; @@ -159,20 +159,20 @@ div#content ul { font-size: 80%; } -#content h1 { +#maincontent h2 { margin: 0.25em 0 0.5em 0; font-size: 150%; font-weight: normal; } -#content h2 { +#maincontent h3 { margin: 0.5em 0; font-size: 120%; font-weight: normal; text-decoration: underline; } -#content p { +#maincontent p { margin-bottom: 1em; } @@ -564,7 +564,7 @@ ul.cbi-apply { width: 200% !important; } -* html div#content { +* html div#maincontent { margin-left: -80% !important; width: 160% !important; } 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 31b1ad0175..cbfdba14e0 100644 --- a/themes/openwrt-light/luasrc/view/themes/openwrt-light/header.htm +++ b/themes/openwrt-light/luasrc/view/themes/openwrt-light/header.htm @@ -183,4 +183,4 @@ end <br class="clear" /> </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 8dd709a88e..dbd3a484dd 100644 --- a/themes/openwrt.org/htdocs/luci-static/openwrt.org/cascade.css +++ b/themes/openwrt.org/htdocs/luci-static/openwrt.org/cascade.css @@ -2,6 +2,7 @@ @media all { +html, body { background-color: #4a6b7c; background-image: url(bg.jpg); @@ -9,8 +10,11 @@ body { background-attachment: fixed; background-repeat: repeat-x; color: #ffffff; +} + +body { font-family: Verdana, Arial, sans-serif; - font-size: 100%; + font-size: 101%; line-height: 100%; } @@ -49,6 +53,7 @@ code { .warning { color: red; + background-color: white; font-weight: bold; } @@ -70,6 +75,7 @@ code { .error { color: #ff0000; + background-color: white; } #header { @@ -78,6 +84,7 @@ code { background-repeat: no-repeat; background-position: left center; background-color: #557788; + color: #ffffff; text-align: right; } @@ -197,6 +204,11 @@ ul.dropdowns ul ul ul li:hover ul { color: #ffffff; } +#menubar .warning { + color: red; + background-color: #557788; +} + #menubar ul.dropdowns { min-height: 1.8em; background: #000000; @@ -217,6 +229,7 @@ ul.dropdowns ul ul ul li:hover ul { html #menubar a:link, html #menubar a:visited { + position: relative; display: block; padding: 0.5em; background: #000000; @@ -260,6 +273,21 @@ html #menubar a:visited.warning { font-weight: bold; } +.lang_de #submenu_mini_system { min-width: 13.3em; } +* html .lang_de #submenu_mini_system { width: 13.3em; } + +.lang_pt-br #submenu_mini_network { min-width: 14em; } +* html .lang_pt-br #submenu_mini_network { width: 14em; } + +.lang_pt-br #submenu_mini_system { min-width: 11.5em; } +* html .lang_pt-br #submenu_mini_system { width: 11.5em; } + +.lang_ru #submenu_mini_system { min-width: 18em; } +* html .lang_ru #submenu_mini_system { width: 18em; } + +.lang_pt-br #submenu_admin_index { min-width: 11em; } +* html .lang_pt-br #submenu_admin_index { width: 11em; } + .lang_ru #submenu_admin_index { min-width: 15.5em; } * html .lang_ru #submenu_admin_index { width: 15.5em; } @@ -272,12 +300,18 @@ html #menubar a:visited.warning { .lang_fr #submenu_admin_system { min-width: 14.5em; } * html .lang_fr #submenu_admin_system { width: 14.5em; } +.lang_pt-br #submenu_admin_system { min-width: 11.5em; } +* html .lang_pt-br #submenu_admin_system { width: 11.5em; } + .lang_ru #submenu_admin_system { min-width: 18em; } * html .lang_ru #submenu_admin_system { width: 18em; } #submenu_admin_services_chillispot { min-width: 15.5em; } * html #submenu_admin_services_chillispot { width: 15.5em; } +#submenu_admin_services_coovachilli { min-width: 15em; } +* html #submenu_admin_services_coovachilli { width: 15em; } + .lang_ru #submenu_admin_network_routes { min-width: 15.3em; } * html .lang_ru #submenu_admin_network_routes { width: 15.3em; } @@ -287,6 +321,9 @@ html #menubar a:visited.warning { .lang_de #submenu_admin_network_firewall { min-width: 16.5em; } * html .lang_de #submenu_admin_network_firewall { width: 16.5em; } +.lang_pt-br #submenu_admin_network_firewall { min-width: 15em; } +* html .lang_pt-br #submenu_admin_network_firewall { width: 15em; } + #modemenu { width: auto; background: #000000; @@ -326,13 +363,13 @@ html #menubar a:visited.warning { font-size: 80%; } -#maincontent h1 { +#maincontent h2 { margin: 0.25em 0 0.5em 0; font-size: 150%; font-weight: normal; } -#maincontent h2 { +#maincontent h3 { margin: 0.5em 0; font-size: 120%; font-weight: normal; @@ -348,6 +385,7 @@ html #menubar a:visited.warning { padding: 0.5em 1em; border: 1px dotted #555555; background-color: #ffffff; + color: #000000; } .cbi-section legend { @@ -355,6 +393,17 @@ html #menubar a:visited.warning { font-weight: bold; height: 1em; padding: 0 0.25em; + background-color: transparent; + color: #555555; +} + +*+html .cbi-section legend { + background-color: #ffffff; + color: #555555; +} + +* html .cbi-section legend { + background-color: #ffffff; color: #555555; } @@ -365,6 +414,7 @@ html #menubar a:visited.warning { .cbi-section h3 { height: 1.5em; font-size: 90%; + background-color: #ffffff; color: #555555; } @@ -387,8 +437,7 @@ ul.cbi-apply { input[type=submit], input[type=reset], -input[type=image], -label { +input[type=image] { cursor: pointer; } @@ -413,6 +462,7 @@ select:hover, textarea:focus, textarea:hover { background-color: #ffffff; + color: #000000; } select, @@ -430,24 +480,28 @@ td input[type=password] { input.cbi-input-user { background: url('../resources/cbi/user.gif') no-repeat scroll 1px center; background-color: inherit; + color: #000000; padding-left: 17px; } input.cbi-input-key { background: url('../resources/cbi/key.gif') no-repeat scroll 1px center; background-color: inherit; + color: #000000; padding-left: 17px; } input.cbi-input-find { background: url('../resources/cbi/find.gif') no-repeat scroll 1px center; background-color: inherit; + color: #000000; padding-left: 17px; } input.cbi-input-reload { background: url('../resources/cbi/reload.gif') no-repeat scroll 1px center; background-color: inherit; + color: #000000; padding-left: 17px; } @@ -455,6 +509,7 @@ input.cbi-input-add, input.cbi-button-add { background: url('../resources/cbi/add.gif') no-repeat scroll 1px center; background-color: inherit; + color: #000000; padding-left: 17px; padding-right: 1px; } @@ -463,6 +518,7 @@ input.cbi-input-fieldadd, input.cbi-button-fieldadd { background: url(../resources/cbi/fieldadd.gif) no-repeat scroll 1px center; background-color: inherit; + color: #000000; padding-left: 17px; padding-right: 1px; } @@ -471,6 +527,7 @@ input.cbi-input-reset, input.cbi-button-reset { background: url('../resources/cbi/reset.gif') no-repeat scroll 1px center; background-color: inherit; + color: #000000; padding-left: 17px; padding-right: 1px; } @@ -479,6 +536,7 @@ input.cbi-input-save, input.cbi-button-save { background: url('../resources/cbi/save.gif') no-repeat scroll 1px center; background-color: inherit; + color: #000000; padding-left: 17px; padding-right: 1px; } @@ -487,6 +545,7 @@ input.cbi-input-apply, input.cbi-button-apply { background: url('../resources/cbi/apply.gif') no-repeat scroll 1px center; background-color: inherit; + color: #000000; padding-left: 17px; padding-right: 1px; } @@ -495,6 +554,7 @@ input.cbi-input-remove, div.cbi-section-remove input { background: url('../resources/cbi/remove.gif') no-repeat scroll 1px center; background-color: inherit; + color: #000000; padding-left: 17px; padding-right: 1px; } @@ -516,6 +576,7 @@ form > div > input[type=reset] { table.smalltext { background: #f5f5f5; + color: #000000; border-top: 1px solid #666666; border-right: 1px solid #666666; border-bottom: 1px solid #666666; @@ -528,6 +589,7 @@ table.smalltext { table.smalltext tr:hover td { background-color: #bbddee; + color: #000000; } table.smalltext tr th { @@ -542,12 +604,18 @@ table.smalltext tr td { border-left: 1px solid #666666; } -.cbi-rowstyle-1 { +table.cbi-section-table .cbi-rowstyle-1, +table.cbi-section-table .cbi-rowstyle-1 * { background-color: #eeeeff; + color: #000000; } -.cbi-rowstyle-2 { +.cbi-section .cbi-rowstyle-1 h3 { + background-color: #eeeeff; + color: #555555; +} +.cbi-rowstyle-2 { } div.cbi-value { @@ -559,10 +627,7 @@ div.cbi-value { div.cbi-value:hover { background: #f8f8f8; -} - -div.cbi-value:last-child { - border: none; + color: #000000; } .cbi-value-title { @@ -572,7 +637,8 @@ div.cbi-value:last-child { div.cbi-value-field { width: 58%; - margin: 0.25em 0 0.25em 40%; + margin-left: 40%; + padding: 0.25em 0; } div.cbi-value-description { @@ -590,8 +656,8 @@ div.cbi-map-descr { } div.cbi-optionals { - margin: 0.5em 0; - padding: 0 0.25em; + padding: 0.25em; + border-bottom: 1px dotted #bbbbbb; } div.cbi-section-remove { @@ -600,10 +666,18 @@ div.cbi-section-remove { .cbi-section-node { clear: both; - border: 1px dotted #bbbbbb; + border-top: 1px dotted #bbbbbb; + border-left: 1px dotted #bbbbbb; + border-right: 1px dotted #bbbbbb; + border-bottom: none; padding-bottom: 0; } +.cbi-section-node table div { + padding-bottom: 0; + border-bottom: none; +} + .cbi-section-node div.cbi-section-table-row { margin: 0.25em; } @@ -635,21 +709,23 @@ td.cbi-section-table-optionals { div.cbi-error { font-size: 95%; font-weight: bold; - color: #FF0000; + color: #ff0000; + background-color: #ffffff; } td.cbi-value-error { - border-color: red !important; + border-color: red; } .cbi-value-error input, .cbi-value-error select { - color: red !important; - background-color: #FFCCCC; + color: red; + background-color: #ffcccc; } .cbi-section-error { color: red; + background-color: white; font-size: 95%; border: 1px dotted red; margin: 3px; @@ -669,6 +745,7 @@ td.cbi-value-error { .luci a:link, .luci a:visited { + background-color: transparent; color: #666666; text-decoration: none; font-size: 70%; @@ -680,34 +757,39 @@ td.cbi-value-error { .error500 { white-space: normal; - border: 1px dotted #FF0000; - background-color: #FFFFFF; + border: 1px dotted #ff0000; + background-color: #ffffff; + color: #000000; padding: 0.5em; } #memorybar { - width:200px; - height:8px; - border:1px solid #bbb; - background-color:red + width: 200px; + height: 8px; + border: 1px solid #bbb; + color: black; + background-color: red; } #memfree, #membuffers, #memcached { - float:right; - border:1px solid #bbb; - height:6px; + float: right; + border: 1px solid #bbb; + height: 6px; } #memfree { background-color: green; + color: black; } #membuffers { background-color: yellow; + color: black; } #memcached { - background-color: orange; + background-color: #ffa500; + color: black; } diff --git a/themes/openwrt.org/luasrc/view/themes/openwrt.org/header.htm b/themes/openwrt.org/luasrc/view/themes/openwrt.org/header.htm index 72240cd3f7..3bb47f1788 100644 --- a/themes/openwrt.org/luasrc/view/themes/openwrt.org/header.htm +++ b/themes/openwrt.org/luasrc/view/themes/openwrt.org/header.htm @@ -49,7 +49,7 @@ require("luci.http").prepare_content("application/xhtml+xml") <script type="text/javascript" src="<%=media%>/Dropdowns.js"></script> <title><%=striptags( hostname .. ( (node and node.title) and ' - ' .. node.title or '')) %> - LuCI</title> </head> -<body class="lang_<%=luci.config.main.lang%>"> +<body class="lang_<%=luci.i18n.context.lang%>"> <p class="skiplink"> <span id="skiplink1"><a href="#navigation"><%:skiplink1 Skip to navigation%></a></span> |