From b49c904552d26352f188816bfcf404b1301371b2 Mon Sep 17 00:00:00 2001
From: Jo-Philipp Wich <jow@openwrt.org>
Date: Sun, 5 Dec 2010 16:42:36 +0000
Subject: [PATCH] applications/luci-polipo: add a simple status frame

---
 .../luci-polipo/luasrc/controller/polipo.lua   | 14 +++++++-------
 .../luci-polipo/luasrc/view/polipo_status.htm  | 18 ++++++++++++++++++
 2 files changed, 25 insertions(+), 7 deletions(-)
 create mode 100644 applications/luci-polipo/luasrc/view/polipo_status.htm

diff --git a/applications/luci-polipo/luasrc/controller/polipo.lua b/applications/luci-polipo/luasrc/controller/polipo.lua
index aa8c9bf8a3..1ee67e2381 100644
--- a/applications/luci-polipo/luasrc/controller/polipo.lua
+++ b/applications/luci-polipo/luasrc/controller/polipo.lua
@@ -17,12 +17,12 @@ function index()
 	if not nixio.fs.access("/etc/config/polipo") then
 		return
 	end
-	
-	require("luci.i18n")
-	luci.i18n.loadc("polipo")
+
+	require("luci.i18n").loadc("polipo")
 	local i18n = luci.i18n.translate
-	
-	local p = entry({"admin", "services", "polipo"}, cbi("polipo"), i18n("Polipo"))
-	p.dependent = true
-	p.i18n = "polipo"
+
+	entry({"admin", "services", "polipo"}, alias("admin", "services", "polipo", "config"), "Polipo").i18n = "polipo"
+	entry({"admin", "services", "polipo", "status"}, template("polipo_status"), i18n("Status"))
+	entry({"admin", "services", "polipo", "config"}, cbi("polipo"), i18n("Configuration"))
 end
+
diff --git a/applications/luci-polipo/luasrc/view/polipo_status.htm b/applications/luci-polipo/luasrc/view/polipo_status.htm
new file mode 100644
index 0000000000..c2695ca82b
--- /dev/null
+++ b/applications/luci-polipo/luasrc/view/polipo_status.htm
@@ -0,0 +1,18 @@
+<%
+
+local uci = require "luci.model.uci".cursor()
+local addr = "127.0.0.1"
+local port = uci:get("polipo", "general", "proxyPort") or "8123"
+
+-%>
+
+<%+header%>
+
+<div class="cbi-map">
+	<h2><a id="content" name="content"><%:Polipo Status%></a></h2>
+	<div class="cbi-section">
+		<iframe id="sf" src="http://<%=luci.http.getenv('SERVER_NAME')%>:<%=port%>/polipo/" style="width:100%; height:350px; border:none"></iframe>
+	</div>
+</div>
+
+<%+footer%>
-- 
2.30.2