From: Hannu Nyman <hannu.nyman@iki.fi>
Date: Thu, 17 Sep 2015 08:36:43 +0000 (+0300)
Subject: Merge pull request #478 from LuttyYang/master
X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fluci.git;a=commitdiff_plain;h=c207016774d6dade6d3fbcbbc44ac30e08acc12e;hp=c332c660318f9d7916daa6855ebdc63504d02b07

Merge pull request #478 from LuttyYang/master

Merge new theme 'material' / luci-theme-material

Material is a clean HTML5 theme for LuCI.
It is based on luci-theme-bootstrap and MUI.
---

diff --git a/applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua b/applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua
index 46b374440..6c90476f8 100644
--- a/applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua
+++ b/applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua
@@ -60,7 +60,7 @@ s:tab("advanced", translate("Advanced Settings"))
 name = s:taboption("general", Value, "name", translate("Name"))
 name.optional = false
 name.forcewrite = true
-name.datatype = "uciname"
+name.datatype = "and(uciname,maxlength(14))"
 
 function name.write(self, section, value)
 	if zone:name() ~= value then
@@ -76,15 +76,6 @@ function name.write(self, section, value)
 	}
 end
 
-function name.validate(self, value)
-	-- fw3 defines 14 as the maximum length of zone name
-	if #value > 14 then
-		return nil, translate("Zone name is too long")
-	else
-		return value
-	end
-end
-
 p = {
 	s:taboption("general", ListValue, "input", translate("Input")),
 	s:taboption("general", ListValue, "output", translate("Output")),
diff --git a/documentation/SubmitPatchesHowTo:.md b/documentation/SubmitPatchesHowTo:.md
deleted file mode 100644
index cdd15524a..000000000
--- a/documentation/SubmitPatchesHowTo:.md
+++ /dev/null
@@ -1,33 +0,0 @@
-# Checkout svn
-	
-	svn co http://svn.luci.subsignal.org/luci/trunk
-	
-and change to that directory:
-	
-	cd trunk
-	
-# Make your changes
-
-Edit the files you want to change. If you add some new files you need to add them to the svn tree:
-	
-	svn add <dir/files>
-	
-Where <dir/files> are the directories/files you have added. Its possible to specify multiple files/directories here.
-
-# Use svn diff to generate a patch with your changes
-
-To check if your changes look ok first do:
-	
-	svn diff <dir/files>
-	
-and check the output. Again you can specify multiple dirs/directories here.
-
-If everything looks like expected save the patch:
-	
-	svn diff <dir/files> > ./mypatch.patch
-	
-
-# Submit patches
-
-Use the [Ticket system](http://luci.subsignal.org/trac/newticket) to submit your patch.
-