* Added configuration pages for Dropbear, HTTPd, Mount Points

* Reorganized menu structure
* Prepare firmware upgrade mechanism

13 files changed, 101 insertions, 10 deletions

diff --git a/src/ffluci/controller/admin/mesh.lua b/src/ffluci/controller/admin/mesh.lua
deleted file mode 100644
index 3dbe98cbb6..0000000000
--- a/src/ffluci/controller/admin/mesh.lua
+++ /dev/null
@@ -1 +0,0 @@
-module("ffluci.controller.admin.mesh", package.seeall)
\ No newline at end of file
diff --git a/src/ffluci/controller/admin/services.lua b/src/ffluci/controller/admin/services.lua
new file mode 100644
index 0000000000..42181212bd
--- /dev/null
+++ b/src/ffluci/controller/admin/services.lua
@@ -0,0 +1 @@
+module("ffluci.controller.admin.services", package.seeall)
\ No newline at end of file
diff --git a/src/ffluci/controller/admin/system.lua b/src/ffluci/controller/admin/system.lua
index fc31ea22b5..102ce99b8d 100644
--- a/src/ffluci/controller/admin/system.lua
+++ b/src/ffluci/controller/admin/system.lua
@@ -173,4 +173,8 @@ function action_sshkeys()
 	end
 	
 	ffluci.template.render("admin_system/sshkeys", {cnt=cnt, msg=err})	
+end
+
+function action_upgrade()
+	-- To be implemented
 end
\ No newline at end of file
diff --git a/src/ffluci/menu.lua b/src/ffluci/menu.lua
index 5a5f421e9d..0a1aad5d1f 100644
--- a/src/ffluci/menu.lua
+++ b/src/ffluci/menu.lua
@@ -47,7 +47,7 @@ local menuc = {}
 
 -- Adds a menu category to the current menu and selects it
 function add(cat, controller, title, order)
-	order = order or 50
+	order = order or 100
 	if not menu[cat] then
 		menu[cat] = {}
 	end
diff --git a/src/ffluci/model/cbi/admin_index/luci.lua b/src/ffluci/model/cbi/admin_index/luci.lua
index ec6c2228b9..eed626c5b7 100644
--- a/src/ffluci/model/cbi/admin_index/luci.lua
+++ b/src/ffluci/model/cbi/admin_index/luci.lua
@@ -5,6 +5,9 @@ c = m:section(NamedSection, "main", "core", "Allgemein")
 c:option(Value, "lang", "Sprache")
 c:option(Value, "mediaurlbase", "Mediaverzeichnis")
 
+f = m:section(NamedSection, "flash", "extern", "Firmwareupgrade")
+f:option(Value, "keep", "Übernehme Dateien").size = 64
+
 p = m:section(NamedSection, "category_privileges", "core", "Kategorieprivilegien")
 p.dynamic = true
 
diff --git a/src/ffluci/model/cbi/admin_services/dropbear.lua b/src/ffluci/model/cbi/admin_services/dropbear.lua
new file mode 100644
index 0000000000..b8fcb9e6b2
--- /dev/null
+++ b/src/ffluci/model/cbi/admin_services/dropbear.lua
@@ -0,0 +1,14 @@
+-- ToDo: Translate, Add descriptions
+m = Map("dropbear", "SSH-Server")
+
+s = m:section(TypedSection, "dropbear")
+s.anonymous = true
+
+port = s:option(Value, "Port", "Port")
+port.isinteger = true
+
+pwauth = s:option(Flag, "PasswordAuth", "Passwortanmeldung")
+pwauth.enabled = 'on'
+pwauth.disabled = 'off'
+
+return m
\ No newline at end of file
diff --git a/src/ffluci/model/cbi/admin_services/httpd.lua b/src/ffluci/model/cbi/admin_services/httpd.lua
new file mode 100644
index 0000000000..f89dbb7aeb
--- /dev/null
+++ b/src/ffluci/model/cbi/admin_services/httpd.lua
@@ -0,0 +1,18 @@
+-- ToDo: Translate, Add descriptions
+m = Map("httpd", "HTTP-Server")
+
+s = m:section(TypedSection, "httpd")
+s.anonymous = true
+
+port = s:option(Value, "port", "Port")
+port.isinteger = true
+
+s:option(Value, "home", "Wurzelverzeichnis")
+
+config = s:option(Value, "c_file", "Konfigurationsdatei", "/etc/httpd.conf wenn leer")
+config.rmempty = true
+
+realm = s:option(Value, "realm", "Anmeldeaufforderung")
+realm.rmempty = true
+
+return m
\ No newline at end of file
diff --git a/src/ffluci/model/cbi/admin_mesh/olsrd.lua b/src/ffluci/model/cbi/admin_services/olsrd.lua
index 430b786874..430b786874 100644
--- a/src/ffluci/model/cbi/admin_mesh/olsrd.lua
+++ b/src/ffluci/model/cbi/admin_services/olsrd.lua
diff --git a/src/ffluci/model/cbi/admin_system/fstab.lua b/src/ffluci/model/cbi/admin_system/fstab.lua
new file mode 100644
index 0000000000..cf9a483d78
--- /dev/null
+++ b/src/ffluci/model/cbi/admin_system/fstab.lua
@@ -0,0 +1,21 @@
+m = Map("fstab", "Einhängepunkte")
+
+mount = m:section(TypedSection, "mount", "Einhängepunkte")
+mount.anonymous = true
+mount.addremove = true
+
+mount:option(Flag, "enabled", "aktivieren")
+mount:option(Value, "device", "Gerät")
+mount:option(Value, "target", "Einhängepunkt")
+mount:option(Value, "fstype", "Dateisystem")
+mount:option(Value, "options", "Optionen")
+
+
+swap = m:section(TypedSection, "swap", "SWAP")
+swap.anonymous = true
+swap.addremove = true
+
+swap:option(Flag, "enabled", "aktivieren")
+swap:option(Value, "device", "Gerät")
+
+return m
diff --git a/src/ffluci/model/menu/00main.lua b/src/ffluci/model/menu/00main.lua
index e0bd403c19..d1c535f769 100644
--- a/src/ffluci/model/menu/00main.lua
+++ b/src/ffluci/model/menu/00main.lua
@@ -4,17 +4,22 @@ act("contact", "Kontakt")
 
 
 add("admin", "index", "Übersicht", 10)
-act("luci", "FFLuCI")
 act("contact", "Kontakt")
+act("luci", "FFLuCI")
 
 add("admin", "system", "System", 20)
 act("packages", "Paketverwaltung")
 act("passwd", "Passwort ändern")
 act("sshkeys", "SSH-Schlüssel")
-act("ipkg", "IPKG-Konfiguration")
+act("fstab", "Einhängepunkte")
 act("reboot", "Neu starten")
 
-add("admin", "network", "Netzwerk", 30)
+add("admin", "services", "Dienste", 30)
+act("olsrd", "OLSR")
+act("httpd", "HTTP-Server")
+act("dropbear", "SSH-Server")
+
+add("admin", "network", "Netzwerk", 40)
 act("vlan", "Switch")
 act("ifaces", "Schnittstellen")
 act("ptp", "PPPoE / PPTP")
@@ -22,9 +27,6 @@ act("routes", "Statische Routen")
 act("portfw", "Portweiterleitung")
 act("firewall", "Firewall")
 
-add("admin", "wifi", "Drahtlos", 40)
+add("admin", "wifi", "Drahtlos", 50)
 act("devices", "Geräte")
-act("networks", "Netze")
-
-add("admin", "mesh", "Mesh", 50)
-act("olsrd", "OLSR")
\ No newline at end of file
+act("networks", "Netze")
\ No newline at end of file
diff --git a/src/ffluci/view/admin_services/index.htm b/src/ffluci/view/admin_services/index.htm
new file mode 100644
index 0000000000..75aa026582
--- /dev/null
+++ b/src/ffluci/view/admin_services/index.htm
@@ -0,0 +1,2 @@
+<%+header%>
+<%+footer%>
\ No newline at end of file
diff --git a/src/ffluci/view/admin_system/packages.htm b/src/ffluci/view/admin_system/packages.htm
index ef27f369ab..d9cdb4dd0e 100644
--- a/src/ffluci/view/admin_system/packages.htm
+++ b/src/ffluci/view/admin_system/packages.htm
@@ -23,6 +23,7 @@
 <% end %>
 
 <div>
+<a href="<%=controller%>/admin/system/ipkg"><%:packages_ipkg Paketlisten und Installationsziele bearbeiten%></a><br />
 <a href="<%=controller%>/admin/system/packages?update=1"><%:packages_updatelist Paketlisten aktualisieren%></a><br />
 <a href="<%=controller%>/admin/system/packages?upgrade=1"><%:packages_upgrade Installierte Pakete aktualisieren%></a>
 </div>
diff --git a/src/ffluci/view/admin_system/upgrade.htm b/src/ffluci/view/admin_system/upgrade.htm
new file mode 100644
index 0000000000..e7a8f2f686
--- /dev/null
+++ b/src/ffluci/view/admin_system/upgrade.htm
@@ -0,0 +1,26 @@
+<%+header%>
+<h1><%:system System%></h1>
+<h2><%:upgrade Upgrade%></h2>
+<br />
+<% if sysupgrade then %>
+<form method="post" action="<%=controller%>-upload/admin/system/upgrade" enctype="multipart/form-data">
+	<fieldset class="cbi-section-node">
+		<div class="cbi-value clear">
+			<div class="cbi-value-title left"><%:fwimage Firmwareimage%></div>
+			<div class="cbi-value-field"><input type="file" size="30" name="image" /></div>
+		</div>
+		<br />
+		<div class="cbi-value clear">
+			<input type="checkbox" name="keepcfg" value="1" checked="checked" />
+			<span class="bold"><%:keepcfg Konfigurationsdateien übernehmen%></span>
+		</div>
+		<br />
+		<div>
+			<input type="submit" value="<%:fwupgrade Firmware aktualisieren%>" />
+		</div>
+	</fieldset>
+</form>
+<% else %>
+<div class="error"><%:notimplemented Diese Funktion ist leider (noch) nicht eingebaut.%></div>
+<% end %>
+<%+footer%>
\ No newline at end of file