From da50954db7a0a0ff894a191d0b664ccb2b484236 Mon Sep 17 00:00:00 2001
From: Christian Dresel <freifunk@dresel.systems>
Date: Fri, 11 Dec 2020 11:28:18 +0100
Subject: [PATCH] fff-web: Make ssl menu modular

To add new menu items in other packages we need a modular construction:
- Simpel Babelweb
- Layer 3 configuration
and so on

Every menu item needs a file in /www/menu/ssl/ with the content

  link,name

  - link is the name of the html file without extension (.html)
  - name is the text of the link in the webui

While at it, rename "Password" menu item to German "Passwort".

Signed-off-by: Christian Dresel <freifunk@dresel.systems>
[bump PKG_RELEASE, use /www/menu, use script_file for link,
improve use of class_active, commit message adjustments,
improve variable names, keep HTML umlaut, keep Logout]
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
---
 src/packages/fff/fff-web/Makefile             |  2 +-
 .../fff/fff-web/files/www/include/header      | 24 +++++++------------
 .../fff/fff-web/files/www/menu/ssl/05-home    |  1 +
 .../fff-web/files/www/menu/ssl/10-settings    |  1 +
 .../fff/fff-web/files/www/menu/ssl/20-ports   |  1 +
 .../fff-web/files/www/menu/ssl/30-wifiscan    |  1 +
 .../fff/fff-web/files/www/menu/ssl/40-upgrade |  1 +
 .../fff-web/files/www/menu/ssl/50-password    |  1 +
 .../fff/fff-web/files/www/menu/ssl/60-reboot  |  1 +
 .../fff/fff-web/files/www/menu/ssl/70-logout  |  1 +
 10 files changed, 18 insertions(+), 16 deletions(-)
 create mode 100644 src/packages/fff/fff-web/files/www/menu/ssl/05-home
 create mode 100644 src/packages/fff/fff-web/files/www/menu/ssl/10-settings
 create mode 100644 src/packages/fff/fff-web/files/www/menu/ssl/20-ports
 create mode 100644 src/packages/fff/fff-web/files/www/menu/ssl/30-wifiscan
 create mode 100644 src/packages/fff/fff-web/files/www/menu/ssl/40-upgrade
 create mode 100644 src/packages/fff/fff-web/files/www/menu/ssl/50-password
 create mode 100644 src/packages/fff/fff-web/files/www/menu/ssl/60-reboot
 create mode 100644 src/packages/fff/fff-web/files/www/menu/ssl/70-logout

diff --git a/src/packages/fff/fff-web/Makefile b/src/packages/fff/fff-web/Makefile
index 139cd24..55906d1 100644
--- a/src/packages/fff/fff-web/Makefile
+++ b/src/packages/fff/fff-web/Makefile
@@ -1,7 +1,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=fff-web
-PKG_RELEASE:=12
+PKG_RELEASE:=13
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
 
diff --git a/src/packages/fff/fff-web/files/www/include/header b/src/packages/fff/fff-web/files/www/include/header
index 84e259f..0175c3a 100755
--- a/src/packages/fff/fff-web/files/www/include/header
+++ b/src/packages/fff/fff-web/files/www/include/header
@@ -7,13 +7,6 @@
 UPGRADE_PATH="$(getUpgradePath)"
 
 echo -en "Content-Type: text/html\r\n\r\n"
-nav_entry() {
-	script_file="/cgi-bin/$1"
-	if [ "$script_file" = "$REQUEST_URI" ] ; then
-		local class_active=' class="active"'
-	fi
-	echo -ne "\t<li${class_active}><a href=\"${script_file}\">$2</a></li>\n\t\t"
-}
 
 HOSTNAME="$(uci -q get "fff.system.hostname")"
 hood="$(uci -q get "system.@system[0].hood")"
@@ -52,14 +45,15 @@ fi
 	<div id="menu">
 		<ul>
 		<%
-			nav_entry home.html		"Home"
-			nav_entry settings.html		"Einstellungen"
-			nav_entry ports.html		"Anschl&uuml;sse"
-			nav_entry wifiscan.html		"Wifi Scan"
-			nav_entry upgrade.html		"Upgrade"
-			nav_entry password.html		"Password"
-			nav_entry reboot.html		"Neustart"
-			nav_entry logout.html		"Logout"
+		for f in /www/menu/ssl/*; do
+			var=$(cat $f);
+			menu_file=$(echo $var | cut -d "," -f 1)
+			menu_name=$(echo $var | cut -d "," -f 2)
+			menu_link="/cgi-bin/${menu_file}.html";
+			class_active=""
+			[ "$menu_link" = "$REQUEST_URI" ] && class_active=' class="active"'
+			echo -ne "\t<li$class_active><a href=\"${menu_link}\">$menu_name</a></li>\n\t\t";
+		done
 		%>
 		</ul>
 		<div></div>
diff --git a/src/packages/fff/fff-web/files/www/menu/ssl/05-home b/src/packages/fff/fff-web/files/www/menu/ssl/05-home
new file mode 100644
index 0000000..8a84e1f
--- /dev/null
+++ b/src/packages/fff/fff-web/files/www/menu/ssl/05-home
@@ -0,0 +1 @@
+home,Home
diff --git a/src/packages/fff/fff-web/files/www/menu/ssl/10-settings b/src/packages/fff/fff-web/files/www/menu/ssl/10-settings
new file mode 100644
index 0000000..afc4a7a
--- /dev/null
+++ b/src/packages/fff/fff-web/files/www/menu/ssl/10-settings
@@ -0,0 +1 @@
+settings,Einstellungen
diff --git a/src/packages/fff/fff-web/files/www/menu/ssl/20-ports b/src/packages/fff/fff-web/files/www/menu/ssl/20-ports
new file mode 100644
index 0000000..579b1d4
--- /dev/null
+++ b/src/packages/fff/fff-web/files/www/menu/ssl/20-ports
@@ -0,0 +1 @@
+ports,Anschl&uuml;sse
diff --git a/src/packages/fff/fff-web/files/www/menu/ssl/30-wifiscan b/src/packages/fff/fff-web/files/www/menu/ssl/30-wifiscan
new file mode 100644
index 0000000..844faa6
--- /dev/null
+++ b/src/packages/fff/fff-web/files/www/menu/ssl/30-wifiscan
@@ -0,0 +1 @@
+wifiscan,Wifi Scan
diff --git a/src/packages/fff/fff-web/files/www/menu/ssl/40-upgrade b/src/packages/fff/fff-web/files/www/menu/ssl/40-upgrade
new file mode 100644
index 0000000..f31aa1b
--- /dev/null
+++ b/src/packages/fff/fff-web/files/www/menu/ssl/40-upgrade
@@ -0,0 +1 @@
+upgrade,Upgrade
diff --git a/src/packages/fff/fff-web/files/www/menu/ssl/50-password b/src/packages/fff/fff-web/files/www/menu/ssl/50-password
new file mode 100644
index 0000000..16246d6
--- /dev/null
+++ b/src/packages/fff/fff-web/files/www/menu/ssl/50-password
@@ -0,0 +1 @@
+password,Passwort
diff --git a/src/packages/fff/fff-web/files/www/menu/ssl/60-reboot b/src/packages/fff/fff-web/files/www/menu/ssl/60-reboot
new file mode 100644
index 0000000..c910310
--- /dev/null
+++ b/src/packages/fff/fff-web/files/www/menu/ssl/60-reboot
@@ -0,0 +1 @@
+reboot,Neustart
diff --git a/src/packages/fff/fff-web/files/www/menu/ssl/70-logout b/src/packages/fff/fff-web/files/www/menu/ssl/70-logout
new file mode 100644
index 0000000..66b22a8
--- /dev/null
+++ b/src/packages/fff/fff-web/files/www/menu/ssl/70-logout
@@ -0,0 +1 @@
+logout,Logout