luci-0.11: merge outstanding trunk changes

[project/luci.git] / modules / freifunk / luasrc / model / cbi / freifunk / contact.lua

diff --git a/modules/freifunk/luasrc/model/cbi/freifunk/contact.lua b/modules/freifunk/luasrc/model/cbi/freifunk/contact.lua
index 203b1ce6dcf10f8c8524d45edf56155b0c35e4df..f6cdec7fe128a8fb06dd728cb04df07ac726373b 100644 (file)
--- a/modules/freifunk/luasrc/model/cbi/freifunk/contact.lua
+++ b/modules/freifunk/luasrc/model/cbi/freifunk/contact.lua
@@ -2,25 +2,23 @@
 LuCI - Lua Configuration Interface
 
 Copyright 2008 Steven Barth <steven@midlink.org>
+Copyright 2011 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
-
-$Id$
 ]]--
-m = Map("freifunk", translate("contact"), translate("contact1"))
+
+m = Map("freifunk", translate("Contact"), translate("Please fill in your contact details below."))
 
 c = m:section(NamedSection, "contact", "public", "")
 
-c:option(Value, "nickname", translate("nickname"))
-c:option(Value, "name", translate("name"))
-c:option(Value, "mail", translate("mail"), translate("mail1"))
-c:option(Value, "phone", translate("phone"))
-c:option(Value, "location", translate("location"))
-c:option(Value, "geo", translate("coord"), translate("coord1"))
-c:option(Value, "note", translate("note"))
+c:option(Value, "nickname", translate("Nickname"))
+c:option(Value, "name", translate("Realname"))
+c:option(Value, "mail", translate("E-Mail"))
+c:option(Value, "phone", translate("Phone"))
+c:option(TextValue, "note", translate("Notice")).rows = 10
 
-return m
\ No newline at end of file
+return m