modules/freifunk: Make the public index page editable

diff --git a/modules/freifunk/luasrc/controller/freifunk/freifunk.lua b/modules/freifunk/luasrc/controller/freifunk/freifunk.lua
index d4d94130894f7d1d6f9bbadb46073fc1279e5ccb..6df681afdbf12f492233d2f14024677bdf20a929 100644 (file)
--- a/modules/freifunk/luasrc/controller/freifunk/freifunk.lua
+++ b/modules/freifunk/luasrc/controller/freifunk/freifunk.lua
@@ -41,11 +41,9 @@ function index()
        page.target = template("freifunk/contact")
        page.title  = "Kontakt"
 
-       entry({"freifunk", "status"}, alias("freifunk", "status", "status"), "Status", 20)
-
-       local page  = node("freifunk", "status", "status")
+       local page  = node("freifunk", "status")
        page.target = form("freifunk/public_status")
-       page.title  = i18n("Overview")
+       page.title  = i18n("Status")
        page.order  = 20
        page.i18n   = "base"
        page.setuser  = false
@@ -67,6 +65,11 @@ function index()
        page.title  = "Freifunk"
        page.order  = 30
 
+       local page  = node("admin", "freifunk", "Index-Page")
+       page.target = cbi("freifunk/user_index")
+       page.title  = "Index-Page"
+       page.order  = 35
+
        local page  = node("admin", "freifunk", "contact")
        page.target = cbi("freifunk/contact")
        page.title  = "Kontakt"

diff --git a/modules/freifunk/luasrc/model/cbi/freifunk/user_index.lua b/modules/freifunk/luasrc/model/cbi/freifunk/user_index.lua
new file mode 100644 (file)
index 0000000..2b8cef9
--- /dev/null
+++ b/modules/freifunk/luasrc/model/cbi/freifunk/user_index.lua
@@ -0,0 +1,30 @@
+local fs = require "nixio.fs"
+local file = "/www/luci-static/index_user.html"
+
+m = Map("freifunk", translate("Edit index page"), translate("You can display additional content on the public index page by inserting valid XHTML in the form below.<br />Headlines should be enclosed between &lt;h2&gt; and &lt;/h2&gt;."))
+
+s = m:section(NamedSection, "community", "public", "")
+s.anonymous = true
+
+di = s:option(Flag, "DefaultText", translate("Disable default content"), translate("If checked then the default content element is not shown."))
+di.enabled = "disabled"
+di.disabled = "enabled"
+di.rmempty = false
+
+t = s:option(TextValue, "_text")
+t.rmempty = true
+t.rows = 20
+
+function t.cfgvalue()
+        return fs.readfile(file) or ""
+end
+
+function t.write(self, section, value)
+        return fs.writefile(file, value)
+end
+
+function t.remove(self, section)
+        return fs.unlink(file)
+end
+
+return m

diff --git a/modules/freifunk/luasrc/view/freifunk/index.htm b/modules/freifunk/luasrc/view/freifunk/index.htm
index 736cf29da873aae358df318e229fc32985b2f65e..d93dcd8f455e3c1600f74c26677b458476087a58 100644 (file)
--- a/modules/freifunk/luasrc/view/freifunk/index.htm
+++ b/modules/freifunk/luasrc/view/freifunk/index.htm
@@ -13,12 +13,46 @@ $Id$
 
 -%>
 <%+header%>
-<% local ff = luci.model.uci.cursor():get_all("freifunk") %>
-<h2><a id="content" name="content"><%:Hello and welcome in the network of%> <%=ff.community.name or 'Freifunk Deutschland'%>!</a></h2>
-<p><%:We are an initiative to establish a free, independent and open wireless mesh network.%><br />
-<%:This is the access point%> <%=luci.sys.hostname()%>. <%:It is operated by%>
-<a href="<%=luci.dispatcher.build_url("freifunk", "index", "contact")%>"> <%=ff.contact.nickname%></a>.</p>
-<p><%:You can find further information about the global Freifunk initiative at%> <a href="http://freifunk.net">Freifunk.net</a>.<br />
-<%:If you are interested in our project then contact the local community%> <a href="<%=ff.community.homepage or 'http//freifunk.net'%>"><%=ff.community.name or 'Freifunk'%></a>.</p>
-<p><strong><%:Notice%></strong>: <%:Internet access depends on technical and organisational conditions and may or may not work for you.%></p>
+<% 
+local ff = luci.model.uci.cursor():get_all("freifunk")
+require("luci.fs")
+local usertext = luci.fs.readfile("/www/luci-static/index_user.html")
+
+if (ff.community.DefaultText or "") ~= "disabled" then
+
+       defaulttext = '<h2><a id="content" name="content">'..
+       (translate("Hello and welcome in the network of"))..
+       ' '..
+       (ff.community.name or "Freifunk Deutschland")..
+       '!</a></h2><p>'..
+       translate("We are an initiative to establish a free, independent and open wireless mesh network.")..
+       '<br />'..
+       translate("This is the access point")..
+       ' '..
+       luci.sys.hostname()..
+       '. '..
+       translate("It is operated by")..
+       '<a href="'..
+       luci.dispatcher.build_url("freifunk", "index", "contact")..
+       '"> '..
+       (ff.contact.nickname or "Anonymous")..
+       '</a>.</p><p>'..
+       translate("You can find further information about the global Freifunk initiative at")..
+       ' <a href="http://freifunk.net">Freifunk.net</a>.<br />'..
+       translate("If you are interested in our project then contact the local community")..
+       ' <a href="'..
+       (ff.community.homepage or "http//freifunk.net")..
+       '">'..
+       (ff.community.name or "Freifunk")..
+       '</a>.</p><p><strong>'..
+       translate("Notice")..
+       '</strong>: '..
+       translate("Internet access depends on technical and organisational conditions and may or may not work for you.")..
+       '</p>'
+end
+%>
+
+<%=defaulttext%>
+<%=usertext%>
+
 <%+footer%>

diff --git a/po/de/freifunk.po b/po/de/freifunk.po
index bc7ae94fbee73754d560894c75d1416c13d9afe0..f9724d01826b11041898a9ad4dda9118e230a7fa 100644 (file)
--- a/po/de/freifunk.po
+++ b/po/de/freifunk.po
@@ -3,7 +3,7 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: \n"
-"PO-Revision-Date: 2010-11-18 00:10+0100\n"
+"PO-Revision-Date: 2010-11-18 00:59+0100\n"
 "Last-Translator: Manuel Munz <freifunk@somakoma.de>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"
@@ -312,3 +312,25 @@ msgstr "Heruntergeladene Images verifizieren"
 #, fuzzy
 msgid "Confirm Upgrade"
 msgstr "Updatevorgang starten"
+
+#. Edit index page
+msgid "Edit index page"
+msgstr "Indexseite bearbeiten"
+
+#. You can display additional content on the public index page by inserting valid XHTML in the form below.<br />Headlines should be enclosed between &lt;h2&gt; and &lt;/h2&gt;.
+msgid ""
+"You can display additional content on the public index page by inserting "
+"valid XHTML in the form below.<br />Headlines should be enclosed between &lt;"
+"h2&gt; and &lt;/h2&gt;."
+msgstr ""
+"Hier kann der Indexseite weiterer Inhalt hinzugefügt werden. Dazu muss "
+"gültiges XHTML verwendet werden.<br />Überschriften sollten zwischen den "
+"Tags &lt;h2&gt; und &lt;/h2&gt; eingeschlossen werden."
+
+#. Disable default content
+msgid "Disable default content"
+msgstr "Standardtext deaktivieren"
+
+#. If checked then the default content element is not shown.
+msgid "If checked then the default content element is not shown."
+msgstr "Aktivieren um den Standardtext auf der Indexseite nicht anzuzeigen."

diff --git a/po/templates/freifunk.pot b/po/templates/freifunk.pot
index d5a8b212c750dafba7f1ce50b9cedd3426332013..22a44bb93b1fb169bd8965d1c132121b7faf1443 100644 (file)
--- a/po/templates/freifunk.pot
+++ b/po/templates/freifunk.pot
@@ -136,7 +136,7 @@ msgstr ""
 #. Decline
 msgid "Decline"
 msgstr ""
-+
+
 #. Services error
 msgid ""
 "No services can be shown, because olsrd is not running or the olsrd-"
@@ -284,3 +284,22 @@ msgstr ""
 #. Confirm Upgrade
 msgid "Confirm Upgrade"
 msgstr ""
+
+#. Edit index page
+msgid "Edit index page"
+msgstr ""
+
+#. You can display additional content on the public index page by inserting valid XHTML in the form below.<br />Headlines should be enclosed between &lt;h2&gt; and &lt;/h2&gt;.
+msgid ""
+"You can display additional content on the public index page by inserting "
+"valid XHTML in the form below.<br />Headlines should be enclosed between &lt;"
+"h2&gt; and &lt;/h2&gt;."
+msgstr ""
+
+#. Disable default content
+msgid "Disable default content"
+msgstr ""
+
+#. If checked then the default content element is not shown.
+msgid "If checked then the default content element is not shown."
+msgstr ""