applications/freifunk-widgets: remove order variable, fix html in rss view, fix searc...

[project/luci.git] / applications / luci-freifunk-widgets / luasrc / view / freifunk / widgets / search / main.htm

diff --git a/applications/luci-freifunk-widgets/luasrc/view/freifunk/widgets/search/main.htm b/applications/luci-freifunk-widgets/luasrc/view/freifunk/widgets/search/main.htm
index 97215aa3e9d51d0bbf838338a5704c20b39eacf1..e319f15fbc309fde39a9c7f910414ceca85e3bbb 100644 (file)
--- a/applications/luci-freifunk-widgets/luasrc/view/freifunk/widgets/search/main.htm
+++ b/applications/luci-freifunk-widgets/luasrc/view/freifunk/widgets/search/main.htm
@@ -1,11 +1,33 @@
 <%
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2012 Manuel Munz <freifunk at somakoma dot de>
+
+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
+
+]]--
 local utl = require "luci.util"
 local title = luci.i18n.translate(data.title or "Search")
+local name = data['.name']
 local width = data.width or "100%"
 
 if type(width) == "number" then
         width = width .. "px"
 end
+
+local engines = {}
+if type(data.engine) == "table" then
+               engines = data.engine
+else
+       for k, v in ipairs(string.split(data.engine, " ")) do
+               table.insert(engines, v)
+       end
+end
 %>
 
 <div id="<%=name%>" style="width:<%=width%>;float:left">
@@ -15,7 +37,7 @@ end
                        <input type="text" name="searchterms" style="margin-bottom:15px; width: 90%"><br />
                        <%
                        local checked = " checked"
-                       for k, v in ipairs(data.engine) do
+                       for k, v in ipairs(engines) do
                                local e = utl.split(v, "|")
                                local name = e[1]
                                local url = e[2]