* CBI: Minor changes

diff --git a/core/src/template.lua b/core/src/template.lua
index 7ac47cbbefe79223e2db14a410fbddee17ee8c79..134e0a6a0118abf08de4a02ff38d7733d7b6b5ec 100644 (file)
--- 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 (file)
index 0000000..6151a3a
--- /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 (file)
index 0000000..062efa2
--- /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 (file)
index 0000000..e65ebb6
--- /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 (file)
index 0000000..b9b26bd
--- /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 (file)
index 6151a3a..0000000
--- 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 (file)
index 062efa2..0000000
--- 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 a7245ae60b886a2cf663b580e70e96d714590b2b..9dc24c3dd3166d7beb1c69b32ff43b01a54a07ff 100644 (file)
--- 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;