Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

luci-0.10: Merge r6850

Browse source
This commit is contained in:
Manuel Munz 2011-02-10 15:02:09 +00:00
parent 480b5ff1bb
commit 9796ac0572
5 changed files with 25 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
applications/luci-olsr-services/Makefile Normal file
View file

@ -0,0 +1,4 @@
PO =
include ../../build/config.mk
include ../../build/module.mk

17
applications/luci-olsr-services/luasrc/controller/services.lua Normal file
View file

@ -0,0 +1,17 @@
module "luci.controller.services"
function index()
local uci = require "luci.model.uci".cursor()
local i18n = luci.i18n.translate
uci:foreach("olsrd", "LoadPlugin", function(s)
if s.library == "olsrd_nameservice.so.0.3" then
has_serv = true
end
end)
if has_serv then
entry({"freifunk", "services"}, template("freifunk-services/services"), i18n("Services"), 60)
end
end

0
modules/freifunk/luasrc/view/freifunk-services/services.htm → applications/luci-olsr-services/luasrc/view/freifunk-services/services.htm
View file

5
contrib/package/luci/Makefile
View file

@ -228,7 +228,7 @@ define Package/luci-mod-freifunk-community
+PACKAGE_luci-mod-freifunk-community:olsrd +PACKAGE_luci-mod-freifunk-community:olsrd-mod-dyn-gw-plain \ +PACKAGE_luci-mod-freifunk-community:olsrd +PACKAGE_luci-mod-freifunk-community:olsrd-mod-dyn-gw-plain \
+PACKAGE_luci-mod-freifunk-community:olsrd-mod-txtinfo +PACKAGE_luci-mod-freifunk-community:olsrd-mod-nameservice \ +PACKAGE_luci-mod-freifunk-community:olsrd-mod-txtinfo +PACKAGE_luci-mod-freifunk-community:olsrd-mod-nameservice \
+PACKAGE_luci-mod-freifunk-community:olsrd-mod-watchdog +PACKAGE_luci-mod-freifunk-community:kmod-tun \ +PACKAGE_luci-mod-freifunk-community:olsrd-mod-watchdog +PACKAGE_luci-mod-freifunk-community:kmod-tun \
+PACKAGE_luci-mod-freifunk-community:ip +PACKAGE_luci-mod-freifunk-community:freifunk-watchdog +luci-app-olsr +PACKAGE_luci-mod-freifunk-community:ip +PACKAGE_luci-mod-freifunk-community:freifunk-watchdog +luci-app-olsr +luci-app-olsr-services
endef endef
define Package/luci-mod-freifunk-community/install define Package/luci-mod-freifunk-community/install
@ -337,6 +337,9 @@ $(eval $(call application,olsr,OLSR configuration and status module,\
$(eval $(call application,olsr-viz,OLSR Visualisation,\ $(eval $(call application,olsr-viz,OLSR Visualisation,\
+PACKAGE_luci-app-olsr-viz:luci-app-olsr +PACKAGE_luci-app-olsr-viz:olsrd-mod-txtinfo)) +PACKAGE_luci-app-olsr-viz:luci-app-olsr +PACKAGE_luci-app-olsr-viz:olsrd-mod-txtinfo))
$(eval $(call application,olsr-services,Show services announced with the nameservice plugin,\
+PACKAGE_luci-app-olsr-services:olsrd-mod-nameservice +luci-mod-freifunk +PACKAGE_luci-app-olsr-services:luci-app-olsr))
$(eval $(call application,qos,Quality of Service configuration module,\ $(eval $(call application,qos,Quality of Service configuration module,\
+PACKAGE_luci-app-qos:qos-scripts)) +PACKAGE_luci-app-qos:qos-scripts))

9
modules/freifunk/luasrc/controller/freifunk/freifunk.lua
View file

@ -98,15 +98,6 @@ function index()
entry({"freifunk", "map"}, template("freifunk-map/frame"), i18n("Karte"), 50) entry({"freifunk", "map"}, template("freifunk-map/frame"), i18n("Karte"), 50)
entry({"freifunk", "map", "content"}, template("freifunk-map/map"), nil, 51) entry({"freifunk", "map", "content"}, template("freifunk-map/map"), nil, 51)
uci:foreach("olsrd", "LoadPlugin", function(s)
if s.library == "olsrd_nameservice.so.0.3" then
has_serv = true
end
end)
if has_serv then
entry({"freifunk", "services"}, template("freifunk-services/services"), i18n("Services"), 60)
end
end end
local function fetch_olsrd() local function fetch_olsrd()