From 178da94019721cd9386f415a8f002ae714057e88 Mon Sep 17 00:00:00 2001
From: Steven Barth <steven@midlink.org>
Date: Wed, 14 May 2008 09:09:03 +0000
Subject: * CBI: Minor changes

---
 core/src/template.lua                               |  2 +-
 core/src/view/cbi/full_valuefooter.htm              |  8 ++++++++
 core/src/view/cbi/full_valueheader.htm              |  3 +++
 core/src/view/cbi/tiny_valuefooter.htm              |  6 ++++++
 core/src/view/cbi/tiny_valueheader.htm              |  1 +
 core/src/view/cbi/valuefooter.htm                   |  8 --------
 core/src/view/cbi/valueheader.htm                   |  3 ---
 themes/fledermaus/root/www/ffluci/media/cascade.css | 12 ++++++++++++
 8 files changed, 31 insertions(+), 12 deletions(-)
 create mode 100644 core/src/view/cbi/full_valuefooter.htm
 create mode 100644 core/src/view/cbi/full_valueheader.htm
 create mode 100644 core/src/view/cbi/tiny_valuefooter.htm
 create mode 100644 core/src/view/cbi/tiny_valueheader.htm
 delete mode 100644 core/src/view/cbi/valuefooter.htm
 delete mode 100644 core/src/view/cbi/valueheader.htm

diff --git a/core/src/template.lua b/core/src/template.lua
index 7ac47cbbe..134e0a6a0 100644
--- a/core/src/template.lua
+++ b/core/src/template.lua
@@ -52,7 +52,7 @@ compiler_enable_bytecode = false
 viewns = {
 	translate  = function(...) return require("ffluci.i18n").translate(...) end,
 	config     = function(...) return require("ffluci.model.uci").get(...) or "" end,
-	controller = ffluci.http.env.SCRIPT_NAME,
+	controller = ffluci.http.env.SCRIPT_NAME or "",
 	media      = ffluci.config.main.mediaurlbase,
 	write      = io.write,
 	include    = function(name) Template(name):render(getfenv(2)) end,	
diff --git a/core/src/view/cbi/full_valuefooter.htm b/core/src/view/cbi/full_valuefooter.htm
new file mode 100644
index 000000000..6151a3a66
--- /dev/null
+++ b/core/src/view/cbi/full_valuefooter.htm
@@ -0,0 +1,8 @@
+								<div class="cbi-value-description"><%=self.description%>&nbsp;</div>
+							</div>
+							<% if self.tag_invalid[section] then %><div class="cbi-error"><%:cbi_invalid Fehler: Ungültige Eingabe%></div><% end %>
+						</div>
+						<% if #self.deps > 0 then %><script type="text/javascript">
+							<% for j, d in ipairs(self.deps) do %>cbi_d_add("cbi-<%=self.config.."-"..section.."-"..self.option%>", "cbid.<%=self.config.."."..section.."."..d.field%>", "<%=d.value%>");
+							<% end %>
+						</script><% end %>
\ No newline at end of file
diff --git a/core/src/view/cbi/full_valueheader.htm b/core/src/view/cbi/full_valueheader.htm
new file mode 100644
index 000000000..062efa2dd
--- /dev/null
+++ b/core/src/view/cbi/full_valueheader.htm
@@ -0,0 +1,3 @@
+						<div class="cbi-value" id="cbi-<%=self.config.."-"..section.."-"..self.option%>">
+							<div class="cbi-value-title"><%=self.title%></div>
+							<div class="cbi-value-field">
\ No newline at end of file
diff --git a/core/src/view/cbi/tiny_valuefooter.htm b/core/src/view/cbi/tiny_valuefooter.htm
new file mode 100644
index 000000000..e65ebb6c0
--- /dev/null
+++ b/core/src/view/cbi/tiny_valuefooter.htm
@@ -0,0 +1,6 @@
+								<% if self.tag_invalid[section] then %><div class="cbi-error"><%:cbi_invalid Fehler: Ungültige Eingabe%></div><% end %>
+						</div>
+						<% if #self.deps > 0 then %><script type="text/javascript">
+							<% for j, d in ipairs(self.deps) do %>cbi_d_add("cbi-<%=self.config.."-"..section.."-"..self.option%>", "cbid.<%=self.config.."."..section.."."..d.field%>", "<%=d.value%>");
+							<% end %>
+						</script><% end %>
\ No newline at end of file
diff --git a/core/src/view/cbi/tiny_valueheader.htm b/core/src/view/cbi/tiny_valueheader.htm
new file mode 100644
index 000000000..b9b26bd6a
--- /dev/null
+++ b/core/src/view/cbi/tiny_valueheader.htm
@@ -0,0 +1 @@
+						<div class="cbi-value-field" id="cbi-<%=self.config.."-"..section.."-"..self.option%>">
diff --git a/core/src/view/cbi/valuefooter.htm b/core/src/view/cbi/valuefooter.htm
deleted file mode 100644
index 6151a3a66..000000000
--- a/core/src/view/cbi/valuefooter.htm
+++ /dev/null
@@ -1,8 +0,0 @@
-								<div class="cbi-value-description"><%=self.description%>&nbsp;</div>
-							</div>
-							<% if self.tag_invalid[section] then %><div class="cbi-error"><%:cbi_invalid Fehler: Ungültige Eingabe%></div><% end %>
-						</div>
-						<% if #self.deps > 0 then %><script type="text/javascript">
-							<% for j, d in ipairs(self.deps) do %>cbi_d_add("cbi-<%=self.config.."-"..section.."-"..self.option%>", "cbid.<%=self.config.."."..section.."."..d.field%>", "<%=d.value%>");
-							<% end %>
-						</script><% end %>
\ No newline at end of file
diff --git a/core/src/view/cbi/valueheader.htm b/core/src/view/cbi/valueheader.htm
deleted file mode 100644
index 062efa2dd..000000000
--- a/core/src/view/cbi/valueheader.htm
+++ /dev/null
@@ -1,3 +0,0 @@
-						<div class="cbi-value" id="cbi-<%=self.config.."-"..section.."-"..self.option%>">
-							<div class="cbi-value-title"><%=self.title%></div>
-							<div class="cbi-value-field">
\ No newline at end of file
diff --git a/themes/fledermaus/root/www/ffluci/media/cascade.css b/themes/fledermaus/root/www/ffluci/media/cascade.css
index a7245ae60..9dc24c3dd 100644
--- a/themes/fledermaus/root/www/ffluci/media/cascade.css
+++ b/themes/fledermaus/root/www/ffluci/media/cascade.css
@@ -165,6 +165,18 @@ h3 {
 	display: inline;
 }
 
+.table {
+	display: table;
+}
+
+.table-cell {
+	display: table-cell;
+}
+
+.table-row {
+	display: table-row;
+}
+
 .code {
 	background: #f7f7f7;
 	border: 1px solid #d7d7d7;
-- 
cgit v1.2.3