* CBI update

* Added some configuration pages
* Introduced contact site
* Introduced luci UCI config file

5 files changed, 58 insertions, 16 deletions

diff --git a/contrib/ffluci.uci b/contrib/ffluci.uci
new file mode 100644
index 000000000..ecd72f6ed
--- /dev/null
+++ b/contrib/ffluci.uci
@@ -0,0 +1,20 @@
+config core main
+        option lang de
+        option mediaurlbase /ffluci/media
+        
+
+config public contact
+		option nickname	-
+		option name		-
+		option mail		-
+		option phone	-
+		option location	-
+		option geo		-
+		option note		-
+
+
+config event uci_oncommit
+        option network	"/etc/init.d/network restart"
+        option wireless	"/etc/init.d/network restart"
+        option olsrd	"/etc/init.d/olsrd restart"
+        option dhcp		"/etc/init.d/dhcp restart"
\ No newline at end of file
diff --git a/contrib/media/cascade.css b/contrib/media/cascade.css
index 8b192ba7c..b0131dc58 100644
--- a/contrib/media/cascade.css
+++ b/contrib/media/cascade.css
@@ -9,6 +9,7 @@ h1 {
 	margin: 0%;
 	font-size: 1.4em;
 	font-weight: bold;
+	margin-bottom: 0.5em;
 }
 
 h2 {
@@ -17,6 +18,10 @@ h2 {
 	font-weight: bold;
 }
 
+h3 {
+	margin: 0%;
+}
+
 #header {
 	padding: 0.2em;
 	height: 4.5em;
@@ -156,6 +161,19 @@ h2 {
 	display: none;
 }
 
+.inline {
+	display: inline;
+}
+
+code {
+	display: block;
+	background: #f7f7f7;
+	border: 1px solid #d7d7d7;
+	margin: 1em 1.75em;
+	padding: 1em;
+	overflow: auto;
+	white-space: pre;
+}
 
 .cbi-section {
 	margin-top: 1em;
@@ -166,34 +184,37 @@ h2 {
 }
 
 .cbi-value-title {
-	font-weight: bold;
 	line-height: 1.75em;
 }
 
 .cbi-value-field {
-	text-align: right;
-	vertical-align: center;
+	margin-left: 10em;
+	text-align: center;
 	line-height: 1.75em;
 }
 
+.cbi-value-field input, .cbi-value-field select, .cbi-optionals select, .cbi-optionals input  {
+	font-size: 0.8em;
+}
+
 .cbi-value-description {
-	clear: both;
 	font-style: italic;
 	font-size: 0.8em; 
 }
 
-.cbi-value {
-	margin-bottom: 1em;
-}
-
 .cbi-form-separator {
 	margin-top: 1em;
 }
 
 .cbi-section-node {
-	margin-top: 1em;
-	border: none;
-	background-color: #eeeeee;
+	display: block;
+	background: #f7f7f7;
+	border: 1px solid #d7d7d7;
+	overflow: auto;
+}
+
+.cbi-section-node h3 {
+	margin-bottom: 0.5em;
 }
 
 .cbi-error {
@@ -205,11 +226,6 @@ h2 {
 	margin-top: 2em;
 }
 
-.cbi-optionals select {
-	height: 1.5em;
-	width: 20em;
-}
-
 .cbi-optionals option {
 	font-size: 0.8em;
 }
\ No newline at end of file
diff --git a/contrib/media/css/public_index.css b/contrib/media/css/public_index.css
new file mode 100644
index 000000000..a415537a6
--- /dev/null
+++ b/contrib/media/css/public_index.css
@@ -0,0 +1,3 @@
+.contact th {
+	text-align: left;
+}
\ No newline at end of file
diff --git a/contrib/package/ffluci/Makefile b/contrib/package/ffluci/Makefile
index 9803d3e6b..677c865ce 100644
--- a/contrib/package/ffluci/Makefile
+++ b/contrib/package/ffluci/Makefile
@@ -39,7 +39,9 @@ define Package/ffluci/install
 	$(CP) $(PKG_BUILD_DIR)/contrib/media $(1)/www/ffluci/ -R
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/contrib/ffluci $(1)/www/cgi-bin
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/contrib/index.cgi $(1)/www/cgi-bin
+	$(CP) $(PKG_BUILD_DIR)/contrib/ffluci.uci $(1)/etc/config/luci
 	$(CP) -a ./ipkg/ffluci.postinst $(1)/CONTROL/postinst
+	$(CP) -a ./ipkg/conffiles $(1)/CONTROL/conffiles
 endef
 
 $(eval $(call BuildPackage,ffluci))
diff --git a/contrib/package/ffluci/ipkg/conffiles b/contrib/package/ffluci/ipkg/conffiles
new file mode 100644
index 000000000..5258af4d8
--- /dev/null
+++ b/contrib/package/ffluci/ipkg/conffiles
@@ -0,0 +1 @@
+/etc/config/luci
\ No newline at end of file