wizard: allgemeine Uplink-parameter am Seitenanfang

Es ist sinnvoller die allgemeinen Parameter für den geteilten Internetzugang am Seitenanfang zu haben und dann erst die verbindungsspezifischen.
freifunk-berlin · Feb 24, 2018 · cb20306 · cb20306
1 parent 58cc1ad
commit cb20306
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 18 deletions.
diff --git a/utils/luci-app-ffwizard-berlin/Makefile b/utils/luci-app-ffwizard-berlin/Makefile
@@ -3,7 +3,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=luci-app-ffwizard-berlin
-PKG_VERSION:=0.0.11
+PKG_VERSION:=0.0.12
 PKG_RELEASE:=1
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)

diff --git a/utils/luci-app-ffwizard-berlin/luasrc/model/cbi/freifunk/assistent/shareInternet.lua b/utils/luci-app-ffwizard-berlin/luasrc/model/cbi/freifunk/assistent/shareInternet.lua
@@ -10,6 +10,23 @@ f.reset = false
 css = f:field(DummyValue, "css", "")
 css.template = "freifunk/assistent/snippets/css"
 
+shareBandwidth = f:field(DummyValue, "shareBandwidthfo", "")
+shareBandwidth.template = "freifunk/assistent/snippets/shareBandwidth"
+
+local usersBandwidthDown = f:field(Value, "usersBandwidthDown", "Download-Bandbreite in Mbit/s")
+usersBandwidthDown.datatype = "float"
+usersBandwidthDown.rmempty = false
+function usersBandwidthDown.cfgvalue(self, section)
+  return uci:get("ffwizard", "settings", "usersBandwidthDown")
+end
+
+local usersBandwidthUp = f:field(Value, "usersBandwidthUp", "Upload-Bandbreite in Mbit/s")
+usersBandwidthUp.datatype = "float"
+usersBandwidthUp.rmempty = false
+function usersBandwidthUp.cfgvalue(self, section)
+  return uci:get("ffwizard", "settings", "usersBandwidthUp")
+end
+
 if uci.get("ffberlin-uplink", "uplink", "auth") == "x509" then
   vpninfo = f:field(DummyValue, "vpninfo", "")
   vpninfo.template = "freifunk/assistent/snippets/vpninfo"
@@ -34,23 +51,6 @@ if uci.get("ffberlin-uplink", "uplink", "auth") == "x509" then
   end
 end
 
-shareBandwidth = f:field(DummyValue, "shareBandwidthfo", "")
-shareBandwidth.template = "freifunk/assistent/snippets/shareBandwidth"
-
-local usersBandwidthDown = f:field(Value, "usersBandwidthDown", "Download-Bandbreite in Mbit/s")
-usersBandwidthDown.datatype = "float"
-usersBandwidthDown.rmempty = false
-function usersBandwidthDown.cfgvalue(self, section)
-  return uci:get("ffwizard", "settings", "usersBandwidthDown")
-end
-
-local usersBandwidthUp = f:field(Value, "usersBandwidthUp", "Upload-Bandbreite in Mbit/s")
-usersBandwidthUp.datatype = "float"
-usersBandwidthUp.rmempty = false
-function usersBandwidthUp.cfgvalue(self, section)
-  return uci:get("ffwizard", "settings", "usersBandwidthUp")
-end
-
 main = f:field(DummyValue, "openvpnconfig", "", "")
 main.forcewrite = true