libs/web: implement "network" cbi datatype

[project/luci.git] / libs / web / htdocs / luci-static / resources / cbi.js

diff --git a/libs/web/htdocs/luci-static/resources/cbi.js b/libs/web/htdocs/luci-static/resources/cbi.js
index 44a5b2a..d1e34d1 100644 (file)
--- a/libs/web/htdocs/luci-static/resources/cbi.js
+++ b/libs/web/htdocs/luci-static/resources/cbi.js
@@ -2,7 +2,7 @@
        LuCI - Lua Configuration Interface
 
        Copyright 2008 Steven Barth <steven@midlink.org>
-       Copyright 2008-2010 Jo-Philipp Wich <xm@subsignal.org>
+       Copyright 2008-2011 Jo-Philipp Wich <xm@subsignal.org>
 
        Licensed under the Apache License, Version 2.0 (the "License");
        you may not use this file except in compliance with the License.
@@ -42,6 +42,11 @@ var cbi_validators = {
                return cbi_validators.ip4addr(v) || cbi_validators.ip6addr(v);
        },
 
+       'neg_ipaddr': function(v)
+       {
+               return cbi_validators.ip4addr(v.replace(/^\s*!/, "")) || cbi_validators.ip6addr(v.replace(/^\s*!/, ""));
+       },
+
        'ip4addr': function(v)
        {
                if( v.match(/^(\d+)\.(\d+)\.(\d+)\.(\d+)(\/(\d+))?$/) )
@@ -57,6 +62,11 @@ var cbi_validators = {
                return false;
        },
 
+       'neg_ip4addr': function(v)
+       {
+               return cbi_validators.ip4addr(v.replace(/^\s*!/, ""));
+       },
+
        'ip6addr': function(v)
        {
                if( v.match(/^([a-fA-F0-9:.]+)(\/(\d+))?$/) )
@@ -142,7 +152,16 @@ var cbi_validators = {
 
        'hostname': function(v)
        {
-               return (v.match(/^[a-zA-Z_][a-zA-Z0-9_\-.]*$/) != null);
+               if (v.length <= 253)
+                       return (v.match(/^[a-zA-Z0-9]+$/) != null ||
+                               v.match(/^[a-zA-Z0-9][a-zA-Z0-9\-.]*[a-zA-Z0-9]$/) != null);
+
+               return false;
+       },
+
+       'network': function(v)
+       {
+               return cbi_validators.uciname(v) || cbi_validators.host(v);
        },
 
        'wpakey': function(v)
@@ -169,6 +188,12 @@ var cbi_validators = {
                return (v.match(/^[a-zA-Z0-9_]+$/) != null);
        },
 
+       'neg_network_ip4addr': function(v)
+       {
+               v = v.replace(/^\s*!/, "");
+               return cbi_validators.uciname(v) || cbi_validators.ip4addr(v);          
+       },
+
        'range': function(v, args)
        {
                var min = parseInt(args[0]);
@@ -179,6 +204,36 @@ var cbi_validators = {
                        return ((val >= min) && (val <= max));
 
                return false;
+       },
+
+       'min': function(v, args)
+       {
+               var min = parseInt(args[0]);
+               var val = parseInt(v);
+
+               if (!isNaN(min) && !isNaN(val))
+                       return (val >= min);
+
+               return false;
+       },
+
+       'max': function(v, args)
+       {
+               var max = parseInt(args[0]);
+               var val = parseInt(v);
+
+               if (!isNaN(max) && !isNaN(val))
+                       return (val <= max);
+
+               return false;
+       },
+
+       'neg': function(v, args)
+       {
+               if (args[0] && typeof cbi_validators[args[0]] == "function")
+                       return cbi_validators[args[0]](v.replace(/^\s*!\s*/, ''));
+
+               return false;
        }
 };
 
@@ -284,7 +339,8 @@ function cbi_d_update() {
        }
 
        if (entry && entry.parent) {
-               cbi_t_update();
+               if (!cbi_t_update())
+                       cbi_tag_last(parent);
        }
 
        if (state) {
@@ -402,6 +458,23 @@ function cbi_filebrowser(id, url, defpath) {
        browser.focus();
 }
 
+function cbi_browser_init(id, respath, url, defpath)
+{
+       function cbi_browser_btnclick(e) {
+               cbi_filebrowser(id, url, defpath);
+               return false;
+       }
+
+       var field = document.getElementById(id);
+
+       var btn = document.createElement('img');
+       btn.className = 'cbi-image-button';
+       btn.src = respath + '/cbi/folder.gif';
+       field.parentNode.insertBefore(btn, field.nextSibling);
+
+       cbi_bind(btn, 'click', cbi_browser_btnclick);
+}
+
 function cbi_dynlist_init(name, respath)
 {
        function cbi_dynlist_renumber(e)
@@ -587,6 +660,7 @@ function cbi_dynlist_init(name, respath)
        for( var i = 0; i < inputs.length; i++ )
        {
                var btn = document.createElement('img');
+                       btn.className = 'cbi-image-button';
                        btn.src = respath + (
                                (i+1) < inputs.length ? '/cbi/remove.gif' : '/cbi/add.gif'
                        );
@@ -653,9 +727,11 @@ function cbi_t_switch(section, tab) {
 
 function cbi_t_update() {
        var hl_tabs = [ ];
+       var updated = false;
 
        for( var sid in cbi_t )
                for( var tid in cbi_t[sid] )
+               {
                        if( cbi_c[cbi_t[sid][tid].cid] == 0 ) {
                                cbi_t[sid][tid].tab.style.display = 'none';
                        }
@@ -667,11 +743,17 @@ function cbi_t_update() {
                                hl_tabs.push(t);
                        }
 
+                       cbi_tag_last(cbi_t[sid][tid].container);
+                       updated = true;
+               }
+
        if( hl_tabs.length > 0 )
                window.setTimeout(function() {
                        for( var i = 0; i < hl_tabs.length; i++ )
                                hl_tabs[i].className = hl_tabs[i].className.replace(/ cbi-tab-highlighted/g, '');
                }, 750);
+
+       return updated;
 }
 
 
@@ -819,6 +901,26 @@ function cbi_row_swap(elem, up, store)
        return false;
 }
 
+function cbi_tag_last(container)
+{
+       var last;
+
+       for (var i = 0; i < container.childNodes.length; i++)
+       {
+               var c = container.childNodes[i];
+               if (c.nodeType == 1 && c.nodeName.toLowerCase() == 'div')
+               {
+                       c.className = c.className.replace(/ cbi-value-last$/, '');
+                       last = c;
+               }
+       }
+
+       if (last)
+       {
+               last.className += ' cbi-value-last';
+       }
+}
+
 if( ! String.serialize )
        String.serialize = function(o)
        {
@@ -889,7 +991,7 @@ if( ! String.format )
 
                var str = arguments[0];
                var out = '';
-               var re = /^(([^%]*)%('.|0|\x20)?(-)?(\d+)?(\.\d+)?(%|b|c|d|u|f|o|s|x|X|q|h|j|t))/;
+               var re = /^(([^%]*)%('.|0|\x20)?(-)?(\d+)?(\.\d+)?(%|b|c|d|u|f|o|s|x|X|q|h|j|t|m))/;
                var a = b = [], numSubstitutions = 0, numMatches = 0;
 
                while( a = re.exec(str) )
@@ -1008,6 +1110,20 @@ if( ! String.format )
                                                                : String.format('%dh %dm %ds', th, tm, ts);
 
                                                        break;
+
+                                               case 'm':
+                                                       var mf = pMinLength ? parseInt(pMinLength) : 1000;
+                                                       var pr = pPrecision ? Math.floor(10*parseFloat('0'+pPrecision)) : 2;
+
+                                                       var i = 0;
+                                                       var val = parseFloat(param || 0);
+                                                       var units = [ '', 'K', 'M', 'G', 'T', 'P', 'E' ];
+
+                                                       for (i = 0; (i < units.length) && (val > mf); i++)
+                                                               val /= mf;
+
+                                                       subst = val.toFixed(pr) + ' ' + units[i];
+                                                       break;
                                        }
                                }
                        }