';
+ if(history.length===0){
+ h+='
'+labels[6]+'
';
+ }else{
+ for(var i=history.length-1;i>-1;i--){
+ if(history[i].length===9){
+ if(opts.transparentColor){
+ h+='
';
+ }
+ }else{
+ h+='
';
+ }
+ }
+ }
+ h+='
27){
+ history.shift();
+ }
+ // add to history
+ history.push(c);
+ },
+
+ clear: function(){
+ this.hidePalette().val('');
+ },
+
+ enable: function() {
+ var e=this.element;
+ if(this._isPopup){
+ e.removeAttr('disabled');
+ }else{
+ e.css({
+ 'opacity': '1',
+ 'pointer-events': 'auto'
+ });
+ }
+ if(this.options.showOn!=='focus'){
+ this.element.next().addClass('evo-pointer');
+ }
+ e.removeAttr('aria-disabled');
+ this._enabled=true;
+ return this;
+ },
+
+ disable: function() {
+ var e=this.element;
+ if(this._isPopup){
+ e.attr('disabled', 'disabled');
+ }else{
+ this.hidePalette();
+ e.css({
+ 'opacity': '0.3',
+ 'pointer-events': 'none'
+ });
+ }
+ if(this.options.showOn!=='focus'){
+ this.element.next().removeClass('evo-pointer');
+ }
+ e.attr('aria-disabled','true');
+ this._enabled=false;
+ return this;
+ },
+
+ isDisabled: function() {
+ return !this._enabled;
+ },
+
+ destroy: function() {
+ $(document.body).off('click.'+this._id);
+ if(this._palette){
+ this._palette.off('mouseover click', 'td,.evo-cHist>div,.evo-transparent')
+ .find('.evo-more a').off('click');
+ if(this._isPopup){
+ this._palette.remove();
+ }
+ this._palette=this._cTxt=null;
+ }
+ if(this._isPopup){
+ this.element
+ .next().off('click').remove()
+ .end().off('focus').unwrap();
+ }
+ this.element.removeClass('colorPicker '+this.id).empty();
+ $.Widget.prototype.destroy.call(this);
+ }
+
+});
+
+})(jQuery);
diff --git a/APPL/Localscripts/colorpicker/js/evol.colorpicker.min.js b/APPL/Localscripts/colorpicker/js/evol.colorpicker.min.js
new file mode 100644
index 0000000000..309ba17c54
--- /dev/null
+++ b/APPL/Localscripts/colorpicker/js/evol.colorpicker.min.js
@@ -0,0 +1,6 @@
+/*
+ evol.colorpicker 3.2.4
+ (c) 2016 Olivier Giulieri
+ http://evoluteur.github.io/colorpicker/
+*/
+!function(a){var b=0,c=window.navigator.userAgent,d=c.indexOf("MSIE ")>0,e=d?"-ie":"",f=d?!1:/mozilla/.test(c.toLowerCase())&&!/webkit/.test(c.toLowerCase()),g=[],h=["ffffff","000000","eeece1","1f497d","4f81bd","c0504d","9bbb59","8064a2","4bacc6","f79646"],i=["f2f2f2","7f7f7f","ddd9c3","c6d9f0","dbe5f1","f2dcdb","ebf1dd","e5e0ec","dbeef3","fdeada","d8d8d8","595959","c4bd97","8db3e2","b8cce4","e5b9b7","d7e3bc","ccc1d9","b7dde8","fbd5b5","bfbfbf","3f3f3f","938953","548dd4","95b3d7","d99694","c3d69b","b2a2c7","92cddc","fac08f","a5a5a5","262626","494429","17365d","366092","953734","76923c","5f497a","31859b","e36c09","7f7f7f","0c0c0c","1d1b10","0f243e","244061","632423","4f6128","3f3151","205867","974806"],j=["c00000","ff0000","ffc000","ffff00","92d050","00b050","00b0f0","0070c0","002060","7030a0"],k=[["003366","336699","3366cc","003399","000099","0000cc","000066"],["006666","006699","0099cc","0066cc","0033cc","0000ff","3333ff","333399"],["669999","009999","33cccc","00ccff","0099ff","0066ff","3366ff","3333cc","666699"],["339966","00cc99","00ffcc","00ffff","33ccff","3399ff","6699ff","6666ff","6600ff","6600cc"],["339933","00cc66","00ff99","66ffcc","66ffff","66ccff","99ccff","9999ff","9966ff","9933ff","9900ff"],["006600","00cc00","00ff00","66ff99","99ffcc","ccffff","ccccff","cc99ff","cc66ff","cc33ff","cc00ff","9900cc"],["003300","009933","33cc33","66ff66","99ff99","ccffcc","ffffff","ffccff","ff99ff","ff66ff","ff00ff","cc00cc","660066"],["333300","009900","66ff33","99ff66","ccff99","ffffcc","ffcccc","ff99cc","ff66cc","ff33cc","cc0099","993399"],["336600","669900","99ff33","ccff66","ffff99","ffcc99","ff9999","ff6699","ff3399","cc3399","990099"],["666633","99cc00","ccff33","ffff66","ffcc66","ff9966","ff6666","ff0066","d60094","993366"],["a58800","cccc00","ffff00","ffcc00","ff9933","ff6600","ff0033","cc0066","660033"],["996633","cc9900","ff9900","cc6600","ff3300","ff0000","cc0000","990033"],["663300","996600","cc3300","993300","990000","800000","993333"]],l="#0000ffff",m=function(a){var b=a.toString(16);return 1==b.length&&(b="0"+b),b},n=function(a){return m(Number(a))},o=function(a){var b=m(a);return b+b+b},p=function(a){if(a.length>10){var b=1+a.indexOf("("),c=a.indexOf(")"),d=a.substring(b,c).split(",");return["#",n(d[0]),n(d[1]),n(d[2])].join("")}return a};a.widget("evol.colorpicker",{version:"3.2.1",options:{color:null,showOn:"both",hideButton:!1,displayIndicator:!0,transparentColor:!1,history:!0,defaultPalette:"theme",strings:"Theme Colors,Standard Colors,Web Colors,Theme Colors,Back to Palette,History,No history yet."},_active:!1,_create:function(){var c=this;switch(this._paletteIdx="theme"==this.options.defaultPalette?1:2,this._id="evo-cp"+b++,this._enabled=!0,this.options.showOn=this.options.hideButton?"focus":this.options.showOn,this.element.get(0).tagName){case"INPUT":var g=this.options.color,h=this.element,i=("focus"===this.options.showOn?"":"evo-pointer ")+"evo-colorind"+(f?"-ff":e)+(this.options.hideButton?" evo-hidden-button":""),j="";this._isPopup=!0,this._palette=null;var k=h.val();null!==g?g!=k&&h.val(g).change():""!==k&&(g=this.options.color=k),g===l?i+=" evo-transparent":j=null!==g?"background-color:"+g:"",h.addClass("colorPicker "+this._id).wrap('
').after('
').on("keyup onpaste",function(){var b=a(this).val();b!=c.options.color&&c._setValue(b,!0)});var m=this.options.showOn;("both"===m||"focus"===m)&&h.on("focus",function(){c.showPalette()}),("both"===m||"button"===m)&&h.next().on("click",function(a){return a.stopPropagation(),c.showPalette(),!1});break;default:this._isPopup=!1,this._palette=this.element.html(this._paletteHTML()).attr("aria-haspopup","true"),this._bindColors()}if(this.options.history&&(g&&this._add2History(g),this.options.initialHistory)){var n=this.options.initialHistory;for(var o in n)this._add2History(n[o])}},_paletteHTML:function(){var a=this._paletteIdx=Math.abs(this._paletteIdx),b=this.options,c=b.strings.split(","),d='"+this["_paletteHTML"+a]()+' ",b.displayIndicator&&(d+=this._colorIndHTML(this.options.color)+this._colorIndHTML("")),d+="
',k=''+g+b[0]+"",l=0;10>l;l++)k+=c+h[l]+f;for(k+=" ",d||(k+='',l=0;10>l;l++)k+=c+i[l]+f;for(var m=1;4>m;m++)for(k+=' ',l=0;10>l;l++)k+=c+i[10*m+l]+f;for(k+=' ',l=40;50>l;l++)k+=c+i[l]+f;for(k+=" "+g,a.transparentColor&&(k+='
'),k+=b[1]+"",l=0;10>l;l++)k+=c+j[l]+f;return k+="
"},_paletteHTML2:function(){for(var a,b,c='
',j=0,l=k.length;l>j;j++){i+=g;var m=k[j];for(a=0,b=m.length;b>a;a++)i+=c+m[a]+f;i+=h}i+='
';var n="";for(i+=g,a=255;a>10;a-=10)i+=c+o(a)+f,a-=10,n+=c+o(a)+f;return i+=h+g+n+h+"
';if(0===g.length)i+="
"+h[6]+"
";else for(var j=g.length-1;j>-1;j--)9===g[j].length?f.transparentColor&&(i+='
'):i+='
';i+="
'+field.label+' '+field.defaultvalue+'
'+field.label+' '+labelvalue+'
'
+''+(field.label?field.label+':':'')+' '
- +' '+field.defaultvalue+' '+field.defaultvalue+' '+field.defaultvalue+'
');
+}
+
+function scf_GROUP_START(model, fld, val, params)
+{
+ var field = model.fields[fld];
+
+ scf_RWHIDDENTR(model, fld, val);
+ scf_LABELTR(fld, field, params);
+}
+function scf_GROUP_END()
+{
+}
+function scf_GROUP_CHECK(pgroup, pclass, pvalue, params)
+{
+ var params = params||{};
+ var group_val = pvalue & pgroup.mask;
+ var isreadonly = params.readonly || (mode == "show");
+
+ Response.Write("");
+ Response.Write("");
+ Response.Write("" + (pgroup.label?safe.html(pgroup.label):"") + " ");
+ Response.Write(" ");
+
+ Response.Write("");
+ for (var i=0; i");
+ Response.Write("" + (bit.label ? bit.label :"") + " ");
+ }
+ Response.Write(" ");
+ Response.Write(" ");
+}
+function scf_GROUP_RADIO(pgroup, pclass, pvalue, params)
+{
+ var params = params||{};
+ var group_val = pvalue & pgroup.mask;
+ var isreadonly = params.readonly || (mode == "show");
+
+ Response.Write("");
+ Response.Write("");
+ Response.Write("" + (pgroup.label?safe.html(pgroup.label):"") + " ");
+ Response.Write(" ");
+
+ Response.Write("");
+ for (var i=0; i");
+ Response.Write(" " + safe.html(bit.label) + " ");
+ Response.Write(" ");
+}
+
%>
diff --git a/APPL/SCF/scaffolding_edit.inc b/APPL/SCF/scaffolding_edit.inc
index ccb9e06ebb..9eb24bac7a 100644
--- a/APPL/SCF/scaffolding_edit.inc
+++ b/APPL/SCF/scaffolding_edit.inc
@@ -22,6 +22,8 @@ function scaffolding_edit(model, scf_params)
if (scf_params.edit && "requires" in scf_params.edit)
FCLTHeader.Requires(scf_params.edit.requires);
+ if (model.edit && "requires" in model.edit) // Voor het included model.
+ FCLTHeader.Requires(model.edit.requires);
var transit = "";
if ("transit" in scf_params)
diff --git a/APPL/SCF/scaffolding_list.inc b/APPL/SCF/scaffolding_list.inc
index 818c831515..9ce604f09e 100644
--- a/APPL/SCF/scaffolding_list.inc
+++ b/APPL/SCF/scaffolding_list.inc
@@ -209,6 +209,13 @@ function scaffolding_list(model, scf_params)
return "" + safe.html(plabel) + " ";
}
}
+ function fnfncolFunction(fn)
+ {
+ return function (oRs)
+ {
+ return fn(oRs);
+ }
+ }
function fnfncolInclude(inctable, fld)
{
return function (oRs)
@@ -304,6 +311,10 @@ function scaffolding_list(model, scf_params)
{
coldata.content = fnfncolCheck(fld);
}
+ if (field.listfunction)
+ {
+ coldata.content = fnfncolFunction(field.listfunction);
+ }
// Child tabellen kunnen we inline localizen
if (field.translate && S("multi_language_option") && model.edit.modal)
coldata.content = fnfncolTranslatable(fld);
diff --git a/APPL/Shared/iface.inc b/APPL/Shared/iface.inc
index 083bd3fccf..8853237888 100644
--- a/APPL/Shared/iface.inc
+++ b/APPL/Shared/iface.inc
@@ -414,7 +414,7 @@ function RWCHECKBOXTR(pname, pclass, plabel, pvalue, params)
%><%
}
CHECKBOX(pclass, pname, pvalue, params)
- if (!plabel) { %> <% }
+ if (plabel) { %><% }
} else {
%><% CHECKBOX(pclass, pname, pvalue, params) %><%
if (plabel) {
@@ -428,7 +428,7 @@ function RWCHECKBOXTR(pname, pclass, plabel, pvalue, params)
function CHECKBOXTR(plabel, pclass, pid, pvalue, params) // DEPCRECATED, backward compatible
{
- RWCHECKBOXTR(pid, pclass, plabel, pvalue, params)
+ RWCHECKBOXTR(pid, pclass, plabel, pvalue, params);
};
function ROCHECKBOXTR(pclass, plabel, pvalue, params)