From ebe9a992be147bb375dde2901406b33fa790e461 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Schr=C3=B6der?= <martin.schroder@inteno.se>
Date: Fri, 5 Jun 2015 10:23:12 +0200
Subject: [PATCH] Added juci acl lists (whole luciexpress package will be
 removed later)

---
 .../{internet.json => juci-mod-network.json}  |  1 +
 .../{status.json => juci-mod-status.json}     |  1 +
 .../{settings.json => juci-mod-system.json}   |  1 +
 luciexpress/share/menu.d/juci-mod-voice.json  | 42 +++++++++++++++++++
 .../{wifi.json => juci-mod-wireless.json}     |  1 +
 .../share/menu.d/juci-theme-vodafone.json     |  0
 .../share/menu.d/{overview.json => juci.json} |  0
 luciexpress/share/menu.d/status.vodafone.json | 12 ------
 8 files changed, 46 insertions(+), 12 deletions(-)
 rename luciexpress/share/menu.d/{internet.json => juci-mod-network.json} (93%)
 rename luciexpress/share/menu.d/{status.json => juci-mod-status.json} (96%)
 rename luciexpress/share/menu.d/{settings.json => juci-mod-system.json} (94%)
 create mode 100644 luciexpress/share/menu.d/juci-mod-voice.json
 rename luciexpress/share/menu.d/{wifi.json => juci-mod-wireless.json} (95%)
 create mode 100644 luciexpress/share/menu.d/juci-theme-vodafone.json
 rename luciexpress/share/menu.d/{overview.json => juci.json} (100%)
 delete mode 100644 luciexpress/share/menu.d/status.vodafone.json

diff --git a/luciexpress/share/menu.d/internet.json b/luciexpress/share/menu.d/juci-mod-network.json
similarity index 93%
rename from luciexpress/share/menu.d/internet.json
rename to luciexpress/share/menu.d/juci-mod-network.json
index 09c4e7ac4..df7cf6c60 100644
--- a/luciexpress/share/menu.d/internet.json
+++ b/luciexpress/share/menu.d/juci-mod-network.json
@@ -1,6 +1,7 @@
 {
     "internet": {
         "title": "Internet",
+        "redirect": "internet/firewall", 
         "index": 30
     },
     "internet/firewall": {
diff --git a/luciexpress/share/menu.d/status.json b/luciexpress/share/menu.d/juci-mod-status.json
similarity index 96%
rename from luciexpress/share/menu.d/status.json
rename to luciexpress/share/menu.d/juci-mod-status.json
index 60051e6c3..fdeae2891 100644
--- a/luciexpress/share/menu.d/status.json
+++ b/luciexpress/share/menu.d/juci-mod-status.json
@@ -1,6 +1,7 @@
 {
     "status": {
         "title": "Status",
+        "redirect": "status/status", 
         "index": 60
     },
     "status/status": {
diff --git a/luciexpress/share/menu.d/settings.json b/luciexpress/share/menu.d/juci-mod-system.json
similarity index 94%
rename from luciexpress/share/menu.d/settings.json
rename to luciexpress/share/menu.d/juci-mod-system.json
index 3398e6235..7e49f9567 100644
--- a/luciexpress/share/menu.d/settings.json
+++ b/luciexpress/share/menu.d/juci-mod-system.json
@@ -1,6 +1,7 @@
 {
     "settings": {
         "title": "Settings",
+        "redirect": "settings/password", 
         "index": 50
     },
     "settings/password": {
diff --git a/luciexpress/share/menu.d/juci-mod-voice.json b/luciexpress/share/menu.d/juci-mod-voice.json
new file mode 100644
index 000000000..d42c4743d
--- /dev/null
+++ b/luciexpress/share/menu.d/juci-mod-voice.json
@@ -0,0 +1,42 @@
+{
+	"phone": {
+		"title": "Phone", 
+		"redirect": "phone/call_log", 
+		"index": 20
+	}, 
+	"phone/call_log": {
+		"title": "Call Log",
+		"acls": [  ],
+		"index": 10
+	},
+	"phone/number_blocking": {
+		"title": "Number Blocking",
+		"modes": [ "expert" ], 
+		"acls": [  ],
+		"index": 20
+	},
+	"phone/ringing_schedule": {
+		"title": "Ringing Schedule",
+		"modes": [ "expert" ], 
+		"acls": [  ],
+		"index": 30
+	},
+	"phone/numbers": {
+		"title": "Phone Numbers",
+		"modes": [ "expert" ], 
+		"acls": [  ],
+		"index": 40
+	},
+	"phone/lines": {
+		"title": "Phone Lines",
+		"modes": [ "expert" ], 
+		"acls": [  ],
+		"index": 41
+	},
+	"phone/speed_dialing": {
+		"title": "Speed Dialing", 
+		"modes": [ "expert" ], 
+		"acls": [ ], 
+		"index": 50
+	}
+}
diff --git a/luciexpress/share/menu.d/wifi.json b/luciexpress/share/menu.d/juci-mod-wireless.json
similarity index 95%
rename from luciexpress/share/menu.d/wifi.json
rename to luciexpress/share/menu.d/juci-mod-wireless.json
index ea1428cc3..00aafbf13 100644
--- a/luciexpress/share/menu.d/wifi.json
+++ b/luciexpress/share/menu.d/juci-mod-wireless.json
@@ -2,6 +2,7 @@
     "wifi": {
         "title": "WiFi",
         "files": [ "/etc/config/wireless" ], 
+        "redirect": "wifi/general", 
         "index": 40
     },
     "wifi/general": {
diff --git a/luciexpress/share/menu.d/juci-theme-vodafone.json b/luciexpress/share/menu.d/juci-theme-vodafone.json
new file mode 100644
index 000000000..e69de29bb
diff --git a/luciexpress/share/menu.d/overview.json b/luciexpress/share/menu.d/juci.json
similarity index 100%
rename from luciexpress/share/menu.d/overview.json
rename to luciexpress/share/menu.d/juci.json
diff --git a/luciexpress/share/menu.d/status.vodafone.json b/luciexpress/share/menu.d/status.vodafone.json
deleted file mode 100644
index ac98e782f..000000000
--- a/luciexpress/share/menu.d/status.vodafone.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    "status/status/voice": {
-        "title": "Voice",
-        "acls": [ "status" ],
-        "index": 20
-    },
-    "status/status/tv": {
-        "title": "Vodafone TV",
-        "acls": [ "status" ],
-        "index": 30
-    }
-}