revert accidentally committed changes

diff --git a/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/ping/ping.lua b/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/ping/ping.lua
index 48b7e5b..6a3bd5e 100644 (file)
--- a/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/ping/ping.lua
+++ b/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/ping/ping.lua
@@ -21,13 +21,6 @@ function rrdargs( graph, plugin, plugin_instance, dtype )
                data = {
                        sources = {
                                ping = { "ping" }
-                       },
-
-                       options = {
-                               ping__ping = {
-                                       overlay = true,
-                                       noarea  = true
-                               }
                        }
                }
        }

diff --git a/modules/admin-core/luasrc/view/about.htm b/modules/admin-core/luasrc/view/about.htm
new file mode 100644 (file)
index 0000000..15cdf20
--- /dev/null
+++ b/modules/admin-core/luasrc/view/about.htm
@@ -0,0 +1,45 @@
+<%#
+LuCI - Lua Configuration Interface
+Copyright 2008 Steven Barth <steven@midlink.org>
+Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+
+-%>
+<%+header%>
+<h2><a id="content" name="content"><%:About%> LuCI</a></h2>
+<p><%_<abbr title="Lua Configuration Interface">LuCI</abbr> is a collection of free Lua software including an <abbr title="Model-View-Controller">MVC</abbr>-Webframework and webinterface for embedded devices. <abbr title="Lua Configuration Interface">LuCI</abbr> is licensed under the Apache-License.%></p>
+
+<p><strong><%:Project Homepage%>: </strong><a href="http://luci.freifunk-halle.net">luci.freifunk-halle.net</a></p>
+
+<br />
+<h2><%:Lead Development%></h2>
+<ul style="font-weight: bold">
+       <li><a href="mailto:steven-at-midlink-dot-org">Steven "Cyrus" Barth</a> (OpenWrt, Freifunk Halle)</li>
+       <li><a href="mailto:xm-at-leipzig.freifunk-dot-net">Jo-Philipp "Jow" Wich</a> (Freifunk Leipzig)</li>
+       <li><a href="mailto:nbd-at-openwrt-dot-org">Felix "nbd" Fietkau</a> (OpenWrt)</li>
+</ul>
+<br />
+
+<h2><%:Contributing Developers%></h2>
+<ul style="font-weight: bold">
+       <li><a href="mailto:mail-at-antonpopov-dot-de">Anton "xyron" Popov</a></li>
+       <li><a href="mailto:florian-at-openwrt-dot-org">Florian Fainelli</a> (OpenWrt)</li> 
+       <li><a href="mailto:x-alina-at-gmx-dot-net">Alina Friedrichsen</a></li> 
+       <li>Yanira</li> 
+</ul>
+<br />
+
+<h2><%:Thanks To%></h2>
+<ul style="font-weight: bold">
+       <li><a href="mailto:info-at-computerhilfe-halle-dot-de">Mono</a> (Freifunk Halle)</li>
+       <li><a href="mailto:tetzlav-at-leipzig.freifunk-dot-net">tetzlav</a> (Freifunk Leipzig)</li>
+       <li>Mickey Knox (Freifunk Hannover)</li>
+</ul>
+<%+footer%>