From 8b9288d3031cf8dfead6175948affc62e84c1df8 Mon Sep 17 00:00:00 2001 From: Erik Groener Date: Thu, 10 Mar 2016 12:16:01 +0000 Subject: [PATCH] FSN#35338 Alle CodeCharge schermen herschrijven naar gewoon ASP II svn path=/Website/trunk/; revision=28429 --- APPL/API2/api2.inc | 13 +- APPL/API2/model_cad_label.inc | 168 ++++++ APPL/API2/model_cad_legenda.inc | 65 ++ APPL/API2/model_cad_legendawaarde.inc | 132 ++++ APPL/API2/model_cad_thema.inc | 203 +++++++ APPL/Localscripts/colorpicker/.gitattributes | 49 ++ APPL/Localscripts/colorpicker/.gitignore | 5 + APPL/Localscripts/colorpicker/Gruntfile.js | 108 ++++ APPL/Localscripts/colorpicker/LICENSE.md | 23 + APPL/Localscripts/colorpicker/README.md | 266 +++++++++ APPL/Localscripts/colorpicker/bower.json | 23 + .../colorpicker/colorpicker.jquery.json | 33 + .../colorpicker/css/colorpicker.css | 48 ++ .../colorpicker/css/evol.colorpicker.css | 171 ++++++ .../colorpicker/css/evol.colorpicker.min.css | 1 + APPL/Localscripts/colorpicker/index.html | 214 +++++++ .../colorpicker/js/evol.colorpicker.js | 562 ++++++++++++++++++ .../colorpicker/js/evol.colorpicker.min.js | 6 + APPL/Localscripts/colorpicker/less/demo.less | 51 ++ .../colorpicker/less/evol.colorpicker.less | 180 ++++++ APPL/Localscripts/colorpicker/package.json | 36 ++ APPL/Localscripts/colorpicker/screenshot1.png | Bin 0 -> 12286 bytes APPL/Localscripts/colorpicker/screenshot2.png | Bin 0 -> 8567 bytes APPL/MGT/cad_label.asp | 51 ++ APPL/MGT/cad_legenda.asp | 47 ++ APPL/MGT/cad_legendawaarde.js | 68 +++ APPL/MGT/cad_thema.asp | 116 ++++ APPL/SCF/scaffolding.inc | 139 ++++- APPL/SCF/scaffolding_edit.inc | 2 + APPL/SCF/scaffolding_list.inc | 11 + APPL/Shared/iface.inc | 4 +- 31 files changed, 2769 insertions(+), 26 deletions(-) create mode 100644 APPL/API2/model_cad_label.inc create mode 100644 APPL/API2/model_cad_legenda.inc create mode 100644 APPL/API2/model_cad_legendawaarde.inc create mode 100644 APPL/API2/model_cad_thema.inc create mode 100644 APPL/Localscripts/colorpicker/.gitattributes create mode 100644 APPL/Localscripts/colorpicker/.gitignore create mode 100644 APPL/Localscripts/colorpicker/Gruntfile.js create mode 100644 APPL/Localscripts/colorpicker/LICENSE.md create mode 100644 APPL/Localscripts/colorpicker/README.md create mode 100644 APPL/Localscripts/colorpicker/bower.json create mode 100644 APPL/Localscripts/colorpicker/colorpicker.jquery.json create mode 100644 APPL/Localscripts/colorpicker/css/colorpicker.css create mode 100644 APPL/Localscripts/colorpicker/css/evol.colorpicker.css create mode 100644 APPL/Localscripts/colorpicker/css/evol.colorpicker.min.css create mode 100644 APPL/Localscripts/colorpicker/index.html create mode 100644 APPL/Localscripts/colorpicker/js/evol.colorpicker.js create mode 100644 APPL/Localscripts/colorpicker/js/evol.colorpicker.min.js create mode 100644 APPL/Localscripts/colorpicker/less/demo.less create mode 100644 APPL/Localscripts/colorpicker/less/evol.colorpicker.less create mode 100644 APPL/Localscripts/colorpicker/package.json create mode 100644 APPL/Localscripts/colorpicker/screenshot1.png create mode 100644 APPL/Localscripts/colorpicker/screenshot2.png create mode 100644 APPL/MGT/cad_label.asp create mode 100644 APPL/MGT/cad_legenda.asp create mode 100644 APPL/MGT/cad_legendawaarde.js create mode 100644 APPL/MGT/cad_thema.asp diff --git a/APPL/API2/api2.inc b/APPL/API2/api2.inc index 16fe227832..5bd679137c 100644 --- a/APPL/API2/api2.inc +++ b/APPL/API2/api2.inc @@ -56,8 +56,17 @@ api2 = { var bit = fld.bits[b]; if (bit.typ == "check") { - var invert = bit.invert; - val += ((Request.Form(bit.name).count==1)?(invert?0:bit.mask):(invert?bit.mask:0)); + for (var r=0; r < bit.radios.length; r++) + { + var radio = bit.radios[r]; + var invert = radio.invert; + + val += ((Request.Form(radio.name).count==1)?(invert?0:radio.mask):(invert?radio.mask:0)); + } + } + else if (bit.typ == "radio") + { + val += parseInt(Request.Form(bit.name)); } else if (bit.typ == "LOV") { diff --git a/APPL/API2/model_cad_label.inc b/APPL/API2/model_cad_label.inc new file mode 100644 index 0000000000..e133575d4e --- /dev/null +++ b/APPL/API2/model_cad_label.inc @@ -0,0 +1,168 @@ +<% /* + $Revision$ + $Id$ + + File: model_cad_label.inc + + Description: Vanuit CodeCharge gegenereerd model voor cad_label + + Context: + + Notes: +*/ +%> +<% + +function model_cad_label() +{ + this.table = "cad_label"; + this.primary = "cad_label_key"; + this.records_name = "cad_labels"; + this.record_name = "cad_label"; + this.autfunction = "WEB_CADMGT"; + this.record_title = L("cad_label"); + this.records_title = L("cad_label_m"); + + + this.fields = { + "id": { + "dbs": "cad_label_key", + "label": "Key", + "typ": "key", + "required": true, + "filter": "exact", + "seq": "cad_s_cad_label_key" + }, + "name": { + "dbs": "cad_label_omschrijving", + "label": L("cad_label_omschrijving"), + "typ": "varchar", + "translate": true + }, + "view_name": { + "dbs": "cad_label_view", + "label": L("cad_label_view"), + "typ": "varchar" + }, + "size": { + "dbs": "cad_label_size", + "label": L("cad_label_size"), + "typ": "key", + "defaultvalue": "800" + }, + "authorization": { + "dbs": "fac_functie_key", + "label": L("fac_functie_key"), + "typ": "key", + "foreign": { + "tbl": "(SELECT f.fac_functie_key" + + " , f.fac_functie_code || ': ' || f.fac_functie_omschrijving fac_functie_omschrijving" + + " FROM fac_functie f" + + " ORDER BY 2)", + "key": "fac_functie_key", + "desc": "fac_functie_omschrijving" + }, + "LOVinit": "" + }, + "type_place": { + "dbs": "plaats.waar", + "label": L("cad_label_type_waar"), + "typ": "varchar", + "hidden_fld": true, + "LOV": type_place_LOV(), + "filter": "exact" + }, + "type_situation": { + "dbs": "plaats.situatie", + "label": L("cad_label_type_situatie"), + "typ": "varchar", + "hidden_fld": true, + "LOV": type_situation_LOV(), + "filter": "exact" + }, + "label_type": { + "dbs": "cad_label_type", + "label": L("cad_label_type"), + "typ": "number", + "bits": [ + { + "name": "waar", + "label": L("cad_label_type_waar"), + "typ": "radio", + "mask": 27, + "radios": [ + { + "mask": 1, + "label": L("cad_label_type_bi_rui") + }, + { + "mask": 9, + "label": L("cad_label_type_bi_wp") + }, + { + "mask": 17, + "label": L("cad_label_type_bi_obj") + }, + { + "mask": 2, + "label": L("cad_label_type_bu_ts") + }, + { + "mask": 18, + "label": L("cad_label_type_bu_obj") + } + ] + }, + { + "name": "situatie", + "label": L("cad_label_type_situatie"), + "typ": "radio", + "mask": 4, + "radios": [ + { + "mask": 0, + "label": L("cad_label_type_si_act") + }, + { + "mask": 4, + "label": L("cad_label_type_si_sce") + } + ] + } + ] + } + }; + + + var ext_sql = "(SELECT BITAND(cad_label_type, 27) waar" + + " , BITAND(cad_label_type, 4) situatie" + + " , cad_label_key" + + " FROM cad_label) plaats "; + + + this.REST_GET = generic_REST_GET(this, { + "GET": { + "tables": [ext_sql], + "wheres": ["cad_label.cad_label_key = plaats.cad_label_key"] + } + }); + this.REST_POST = generic_REST_POST(this); + this.REST_PUT = generic_REST_PUT(this); + this.REST_DELETE = generic_REST_DELETE(this); + + + function type_place_LOV() + { + return "1;" + L("cad_label_type_bi_rui") + + ";9;" + L("cad_label_type_bi_wp") + + ";17;" + L("cad_label_type_bi_obj") + + ";2;" + L("cad_label_type_bu_ts") + + ";18;" + L("cad_label_type_bu_obj"); + } + function type_situation_LOV() + { + return "0;" + L("cad_label_type_si_act") + + ";4;" + L("cad_label_type_si_sce"); + } +} +%> \ No newline at end of file diff --git a/APPL/API2/model_cad_legenda.inc b/APPL/API2/model_cad_legenda.inc new file mode 100644 index 0000000000..ad2fadcbb3 --- /dev/null +++ b/APPL/API2/model_cad_legenda.inc @@ -0,0 +1,65 @@ +<% /* + $Revision$ + $Id$ + + File: model_cad_legenda.inc + + Description: Vanuit CodeCharge gegenereerd model voor cad_legenda + + Context: + + Notes: +*/ +%> + +<% + +function model_cad_legenda() +{ + this.table = "cad_legenda"; + this.primary = "cad_legenda_key"; + this.records_name = "cad_legendas"; + this.record_name = "cad_legenda"; + this.autfunction = "WEB_CADMGT"; + this.record_title = L("cad_legenda"); + this.records_title = L("cad_legenda_m"); + + + this.fields = { + "id": { + "dbs": "cad_legenda_key", + "label": "Key", + "typ": "key", + "required": true, + "filter": "exact", + "seq": "cad_s_cad_legenda_key" + }, + "name": { + "dbs": "cad_legenda_omschrijving", + "label": L("cad_legenda_omschrijving"), + "typ": "varchar", + "translate": true, + "filter": "like" + }, + "exact": { + "dbs": "cad_legenda_discreet", + "label": L("cad_legenda_discreet"), + "typ": "check", + "defaultvalue": "1" + } + }; + + this.includes = { + "cad_values": { + "model": new model_cad_legendawaarde(), + "joinfield": "legenda" + } + }; + + + this.REST_GET = generic_REST_GET(this); + this.REST_POST = generic_REST_POST(this); + this.REST_PUT = generic_REST_PUT(this); + this.REST_DELETE = generic_REST_DELETE(this); +} +%> \ No newline at end of file diff --git a/APPL/API2/model_cad_legendawaarde.inc b/APPL/API2/model_cad_legendawaarde.inc new file mode 100644 index 0000000000..5f6e41dbc3 --- /dev/null +++ b/APPL/API2/model_cad_legendawaarde.inc @@ -0,0 +1,132 @@ +<% /* + $Revision$ + $Id$ + + File: model_cad_legendawaarde.inc + + Description: Vanuit CodeCharge gegenereerd model voor cad_legendawaarde + + Context: + + Notes: +*/ +%> +<% + +function model_cad_legendawaarde() +{ + this.table = "cad_legendawaarde"; + this.primary = "cad_legendawaarde_key"; + this.records_name = "cad_legendawaardes"; + this.record_name = "cad_legendawaarde"; + this.autfunction = "WEB_CADMGT"; + this.record_title = L("cad_legendawaarde"); + this.records_title = L("cad_legendawaarde_m"); + + + this.fields = { + "id": { + "dbs": "cad_legendawaarde_key", + "label": "Key", + "typ": "key", + "required": true, + "filter": "exact", + "seq": "cad_s_cad_legendawaarde_key" + }, + "legenda": { + "dbs": "cad_legenda_key", + "label": L("cad_legenda"), + "typ": "key", + "foreign": { + "tbl": "cad_legenda", + "key": "cad_legenda_key", + "desc": "cad_legenda_omschrijving" + } + }, + "value_name": { + "dbs": "cad_legendawaarde_value", + "label": L("cad_legendawaarde_value"), + "typ": "varchar", + "translate": true + }, + "value_desc": { + "dbs": "cad_legendawaarde_omschr", + "label": L("cad_legendawaarde_omschr"), + "typ": "varchar", + "translate": true + }, + "value_rgb": { + "dbs": "cad_legendawaarde_rgb", + "label": L("cad_legendawaarde_rgb"), + "typ": "varchar", + "defaultvalue": "FFFFFF", + "listfunction": fnshowcolor + } + }; + + + this.list = { + "columns": [ + "id", + "legenda", + "value_name", + "value_desc", + "value_rgb" + ] + }; + this.search = { + "autosearch": true + }; + this.edit = { + "requires": { + "js": [ + "../localscripts/colorpicker/js/evol.colorpicker.min.js", + "../mgt/cad_legendawaarde.js" + ], + "css": [ + "../localscripts/colorpicker/css/evol.colorpicker.min.css", + "../localscripts/colorpicker/css/colorpicker.css" + ] + }, + "modal": true + }; + + function fnshowcolor(oRs) + { + var kleur = oRs.Fields("value_rgb").Value; + + return "
" + safe.html(kleur) + "
"; + } + + this.hook_pre_edit = function (obj, fld) + { + // Niet-model velden toevoegen. + fld._color = { + "dbs": "", + "label": "", + "typ": "button" + }; + var color_panel_def = '

' + + '
' + + '' + + '' + + '
'; + fld.color_panel = { + "dbs": "", + "label": "", + "typ": "div", + "defaultvalue": color_panel_def, + "hidden": true + }; + + var kleur = ' ' + + ' ' + L("cad_legendawaarde_select"); + fld._color.defaultvalue = kleur; + } + + this.REST_GET = generic_REST_GET(this); + this.REST_POST = generic_REST_POST(this); + this.REST_PUT = generic_REST_PUT(this); + this.REST_DELETE = generic_REST_DELETE(this); +} +%> \ No newline at end of file diff --git a/APPL/API2/model_cad_thema.inc b/APPL/API2/model_cad_thema.inc new file mode 100644 index 0000000000..9bbc424897 --- /dev/null +++ b/APPL/API2/model_cad_thema.inc @@ -0,0 +1,203 @@ +<% /* + $Revision$ + $Id$ + + File: model_cad_thema.inc + + Description: Vanuit CodeCharge gegenereerd model voor cad_thema + + Context: + + Notes: TODO: JGL: Ik ben er nog niet helemaal uit hoe de bitjes netjes op te lossen +*/ +%> +<% + +function model_cad_thema() +{ + this.table = "cad_thema"; + this.primary = "cad_thema_key"; + this.records_name = "cad_themas"; + this.record_name = "cad_thema"; + this.autfunction = "WEB_CADMGT"; + this.record_title = L("cad_thema"); + this.records_title = L("cad_thema_m"); + + + this.fields = { + "id": { + "dbs": "cad_thema_key", + "label": "Key", + "typ": "key", + "required": true, + "filter": "exact", + "seq": "cad_s_cad_thema_key" + }, + "name": { + "dbs": "cad_thema_omschrijving", + "label": L("cad_thema_omschrijving"), + "typ": "varchar", + "translate": true, + "filter": "like" + }, + "view_name": { + "dbs": "cad_thema_view", + "label": L("cad_label_view"), + "typ": "varchar", + "filter": "like" + }, + "legenda": { + "dbs": "cad_legenda_key", + "label": L("cad_legenda"), + "typ": "key", + "foreign": { + "tbl": "cad_legenda", + "key": "cad_legenda_key", + "desc": "cad_legenda_omschrijving" + }, + "filter": "exact" + }, + "authorization": { + "dbs": "fac_functie_key", + "label": L("fac_functie_key"), + "typ": "key", + "foreign": { + "tbl": "(SELECT f.fac_functie_key" + + " , f.fac_functie_code || ': ' || f.fac_functie_omschrijving fac_functie_omschrijving" + + " FROM fac_functie f" + + " ORDER BY 2)", + "key": "fac_functie_key", + "desc": "fac_functie_omschrijving" + }, + "LOVinit": "" + }, + "type_place": { + "dbs": "plaats.waar", + "label": L("cad_label_type_waar"), + "typ": "varchar", + "hidden_fld": true, + "LOV": type_place_LOV(), + "filter": "exact" + }, + "type_situation": { + "dbs": "plaats.situatie", + "label": L("cad_label_type_situatie"), + "typ": "varchar", + "hidden_fld": true, + "LOV": type_situation_LOV(), + "filter": "exact" + }, + "thema_type": { + "dbs": "cad_thema_type", + "label": L("cad_label_type"), + "typ": "number", + "bits": [ + { + "name": "waar", + "label": L("cad_label_type_waar"), + "typ": "radio", + "mask": 27, + "radios": [ + { + "mask": 1, + "label": L("cad_label_type_bi_rui") + }, + { + "mask": 9, + "label": L("cad_label_type_bi_wp") + }, + { + "mask": 17, + "label": L("cad_label_type_bi_obj") + }, + { + "mask": 2, + "label": L("cad_label_type_bu_ts") + }, + { + "mask": 18, + "label": L("cad_label_type_bu_obj") + } + ] + }, + { + "name": "situatie", + "label": L("cad_label_type_situatie"), + "typ": "radio", + "mask": 4, + "radios": [ + { + "mask": 0, + "label": L("cad_label_type_si_act") + }, + { + "mask": 4, + "label": L("cad_label_type_si_sce") + } + ] + }, + { + "name": "", + "label": "", + "typ": "check", + "mask": 128, + "radios": [ + { + "name": "sleepbaar", + "label": "Sleepbaar", + "mask": 128 + } + ] + } + ] + }, + "thema_url": { + "dbs": "cad_thema_onclick_url", + "label": L("cad_thema_onclick_url"), + "typ": "varchar" + }, + "_generate": { + "dbs": "dual.dummy", + "label": "Genereer legenda", + "typ": "check", + "hidden": true + }, + "_update": { + "dbs": "dual.dummy", + "label": "Bijwerken legenda", + "typ": "check", + "hidden": true + } + }; + + + var ext_sql = "(SELECT BITAND(cad_thema_type, 27) waar" + + " , BITAND(cad_thema_type, 4) situatie" + + " , cad_thema_key" + + " FROM cad_thema) plaats "; + this.REST_GET = generic_REST_GET(this, { + "GET": { + "tables": [ext_sql], + "wheres": ["cad_thema.cad_thema_key = plaats.cad_thema_key"] + } + }); + this.REST_POST = generic_REST_POST(this); + this.REST_PUT = generic_REST_PUT(this); + this.REST_DELETE = generic_REST_DELETE(this); + + + function type_place_LOV() + { + return "1;" + L("cad_label_type_bi_rui") + + ";9;" + L("cad_label_type_bi_wp") + + ";17;" + L("cad_label_type_bi_obj") + + ";2;" + L("cad_label_type_bu_ts") + + ";18;" + L("cad_label_type_bu_obj"); + } + function type_situation_LOV() + { + return "0;" + L("cad_label_type_si_act") + + ";4;" + L("cad_label_type_si_sce"); + } +} +%> \ No newline at end of file diff --git a/APPL/Localscripts/colorpicker/.gitattributes b/APPL/Localscripts/colorpicker/.gitattributes new file mode 100644 index 0000000000..a664be3a85 --- /dev/null +++ b/APPL/Localscripts/colorpicker/.gitattributes @@ -0,0 +1,49 @@ +*.doc diff=astextplain +*.DOC diff=astextplain +*.docx diff=astextplain +*.DOCX diff=astextplain +*.dot diff=astextplain +*.DOT diff=astextplain +*.pdf diff=astextplain +*.PDF diff=astextplain +*.rtf diff=astextplain +*.RTF diff=astextplain + +*.jpg binary +*.png binary +*.gif binary + +*.cs text=auto diff=csharp +*.vb text=auto +*.c text=auto +*.cpp text=auto +*.cxx text=auto +*.h text=auto +*.hxx text=auto +*.py text=auto +*.rb text=auto +*.java text=auto +*.html text=auto +*.htm text=auto +*.css text=auto +*.scss text=auto +*.sass text=auto +*.less text=auto +*.js text=auto +*.lisp text=auto +*.clj text=auto +*.sql text=auto +*.php text=auto +*.lua text=auto +*.m text=auto +*.asm text=auto +*.erl text=auto +*.fs text=auto +*.fsx text=auto +*.hs text=auto + +*.csproj text=auto merge=union +*.vbproj text=auto merge=union +*.fsproj text=auto merge=union +*.dbproj text=auto merge=union +*.sln text=auto eol=crlf merge=union diff --git a/APPL/Localscripts/colorpicker/.gitignore b/APPL/Localscripts/colorpicker/.gitignore new file mode 100644 index 0000000000..6dd5977e3f --- /dev/null +++ b/APPL/Localscripts/colorpicker/.gitignore @@ -0,0 +1,5 @@ +node_modules/ +Thumbs.db +Desktop.ini +.DS_Store +.idea diff --git a/APPL/Localscripts/colorpicker/Gruntfile.js b/APPL/Localscripts/colorpicker/Gruntfile.js new file mode 100644 index 0000000000..d3f8adc074 --- /dev/null +++ b/APPL/Localscripts/colorpicker/Gruntfile.js @@ -0,0 +1,108 @@ + +/* + _ _ _ + ___ ___ | | ___ _ __ _ __ (_) ___| | _____ _ __ + / __/ _ \| |/ _ \| '__| '_ \| |/ __| |/ / _ \ '__| +| (_| (_) | | (_) | | | |_) | | (__| < __/ | + \___\___/|_|\___/|_| | .__/|_|\___|_|\_\___|_| + |_| + +*/ + +module.exports = function (grunt) { + grunt.initConfig({ + + // ************************************************************************************* + // CONFIG OPTIONS + // ************************************************************************************* + + pkg: grunt.file.readJSON('package.json'), + + banner : '/*\n <%= pkg.name %> <%= pkg.version %>\n <%= pkg.copyright %>\n <%= pkg.homepage %>\n*/\n', + + // ************************************************************************************* + // JSHINT options + // ************************************************************************************* + jshint: { + all: [ + 'Gruntfile.js', + 'package.json', + 'js/evol.colorpicker.js' + ] + }, + + // ************************************************************************************* + // UGLIFY options + // ************************************************************************************* + uglify: { + options: { + banner: '<%= banner %>', + mangle: true + }, + js: { + files: { + 'js/evol.colorpicker.min.js': ['js/evol.colorpicker.js'] + } + } + }, + + // ************************************************************************************* + // LESS + // ************************************************************************************* + less: { + dev: { + options: { + banner: '<%= banner %>' + }, + files: { + "css/evol.colorpicker.css": "less/evol.colorpicker.less", + "css/demo.css": "less/demo.less" + } + }, + prod: { + options: { + banner: '<%= banner %>', + compress: true + }, + files: { + "css/evol.colorpicker.min.css": "less/evol.colorpicker.less" + } + } + } + + }); + +// Load the plugin that provides the tasks. + grunt.loadNpmTasks('grunt-contrib-jshint'); + grunt.loadNpmTasks('grunt-contrib-uglify'); + grunt.loadNpmTasks('grunt-contrib-less'); + +// Custom tasks + + grunt.registerTask('header', 'evol.colorpicker version', function(arg1) { + var pkg=grunt.file.readJSON('package.json'); + console.log( + (new Date()).toString() + '\n' + +' _ _ _\n'+ +' ___ ___ | | ___ _ __ _ __ (_) ___| | _____ _ __\n'+ +' / __/ _ \\| |/ _ \\| \'__| \'_ \\| |/ __| |/ / _ \\ \'__|\n'+ +' | (_| (_) | | (_) | | | |_) | | (__| < __/ |\n'+ +' \\___\\___/|_|\\___/|_| | .__/|_|\\___|_|\\_\\___|_| \n'+ +' |_| '+ + arg1 + ' '+ pkg.version + ); + }); + // ************************************************************************************* + // BUILD TASKS : dev prod + // ************************************************************************************* + // Default task(s). + grunt.registerTask('default', ['prod']); + + // Dev only task(s). + grunt.registerTask('dev', ['header:dev', 'jshint', 'less:dev']); + + // Prod task(s). + grunt.registerTask('prod', ['header:prod', 'jshint', 'uglify', 'less']); + +}; + diff --git a/APPL/Localscripts/colorpicker/LICENSE.md b/APPL/Localscripts/colorpicker/LICENSE.md new file mode 100644 index 0000000000..8d0ea381d4 --- /dev/null +++ b/APPL/Localscripts/colorpicker/LICENSE.md @@ -0,0 +1,23 @@ +# evol.colorpicker + +Released under the [MIT License](http://en.wikipedia.org/wiki/MIT_License) + +Copyright (c) 2016 by Olivier Giulieri + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. \ No newline at end of file diff --git a/APPL/Localscripts/colorpicker/README.md b/APPL/Localscripts/colorpicker/README.md new file mode 100644 index 0000000000..681d1aa785 --- /dev/null +++ b/APPL/Localscripts/colorpicker/README.md @@ -0,0 +1,266 @@ +# evol.colorpicker + +evol.colorpicker is a web color picker which looks like the one in Microsoft Office 2010. +It can be used inline or as a popup bound to a text box. +It comes with several color palettes, can track selection history and supports "transparent" color. +It is a full jQuery UI widget, supporting various configurations and themes. + +## Demo + +![screenshot 1](https://raw.github.com/evoluteur/colorpicker/master/screenshot1.png)   ![screenshot 2](https://raw.github.com/evoluteur/colorpicker/master/screenshot2.png) + +Check the [demo](http://evoluteur.github.com/colorpicker/index.html) for several examples. + + +## Usage + +First, load [jQuery](http://jquery.com/) (v1.7 or greater), [jQuery UI](http://jqueryui.com/) (v1.8 or greater), and the plugin: + +```html + + + +``` + +The widget requires a jQuery UI theme to be present, as well as its own included base CSS file ([evol.colorpicker.css](http://github.com/evoluteur/colorpicker/raw/master/css/evol.colorpicker.css)). Here we use the "ui-lightness" theme as an example: + +```html + + +``` + +Now, let's attach it to an existing `` tag: + +```html + + + +``` + +This will wrap it into a "holder" `
` and add another `
` beside it for the color box: + +```html +
+ +
+
+``` + +Using the same syntax, the widget can also be instanciated on a `
` or a `` tag to show inline. In that case the generated HTML is the full palette. + + +## Theming + +evol.colorpicker is as easily themeable as any jQuery UI widget, using one of the [jQuery UI themes](http://jqueryui.com/themeroller/#themeGallery) or your own custom theme made with [Themeroller](http://jqueryui.com/themeroller/). + + +## Options + +evol.colorpicker provides several options to customize its behaviour: + +### color (String) + +Used to set the color value. + +```javascript +$("#mycolor").colorpicker({ + color: "#ffffff" +}); +``` + +Defaults to *null*. + +### defaultPalette (String) + +Used to set the default color palette. Possible values are "theme" or "web". + +```javascript +$("#mycolor").colorpicker({ + defaultPalette: 'web' +}); +``` + +Defaults to *theme*. + +### displayIndicator (Boolean) + +Used to show color value on hover and click inside the palette. + +```javascript +$("#mycolor").colorpicker({ + displayIndicator: false +}); +``` + +Defaults to *true*. + +### hideButton (Boolean) + +When binding the colorpicker to a textbox, a colored button will be added to the right of the textbox unless hideButton is set to true. +This option doens't have any effect if the colorpicker is bound to a DIV. + +```javascript +$("#mycolor").colorpicker({ + hideButton: true +}); +``` + +Defaults to *false*. + +### history (Boolean) + +Used to track selection history (shared among all instances of the colorpicker). The history keeps the last 28 colors selections. + +```javascript +$("#mycolor").colorpicker({ + history: false +}); +``` + +Defaults to *true*. + +### initialHistory (Array strings) + +Used to provide a color selection history. Colors are provided as strings of hexadecimal color values. + +```javascript +$("#mycolor").colorpicker({ + initialHistory: ["#ff0000", "#00ff00", "#0000ff"] +}); +``` + +Defaults to *null*. + +### showOn (String) + +Have the colorpicker appear automatically when the field receives focus ("focus"), appear only when a button is clicked ("button"), or appear when either event takes place ("both"). +This option only takes effect when the color picker is instanciated on a textbox. + +```javascript +$("#mycolor").colorpicker({ + showOn: "button" +}); +``` + +Defaults to *"both"*. + +### strings (String) + +Used to translate the widget. It is a coma separated list of all labels used in the UI. + +```javascript +$("#mycolor").colorpicker({ + strings: "Couleurs de themes,Couleurs de base,Plus de couleurs,Moins de couleurs,Palette,Historique,Pas encore d'historique." +}); +``` + +Defaults to *"Theme Colors,Standard Colors,Web Colors,Theme Colors,Back to Palette,History,No history yet."*. + +### transparentColor (Boolean) + +Allow for selection of the "transparent color". The hexadecimal value for the transparent color is "#0000ffff". + +```javascript +$("#mycolor").colorpicker({ + transparentColor: true +}); +``` + +Defaults to *false*. + + +## Methods + +### clear() +Clears the color value (and close the popup palette if opened). + +```javascript +$("#mycolor").colorpicker("clear"); +``` + +### enable() +Get the currently selected color value (returned as a string). + +```javascript +$("#mycolor").colorpicker("enable"); +``` + +### disable() +Get the currently selected color value (returned as a string). + +```javascript +$("#mycolor").colorpicker("disable"); +``` + +### isDisabled() +Get the currently selected color value (returned as a string). + +```javascript +$("#mycolor").colorpicker("isDisabled"); +``` + +### val([color]) +Get or set the currently selected color value (as a string, ie. "#d0d0d0"). + +```javascript +var colorValue = $("#mycolor").colorpicker("val"); + +$("#mycolor").colorpicker("val", "#d0d0d0"); +``` + +### showPalette() +Show the palette (when using the widget as a popup). + +```javascript +$("#mycolor").colorpicker("showPalette"); +``` + +### hidePalette() +Hide the palette (when using the widget as a popup). + +```javascript +$("#mycolor").colorpicker("hidePalette"); +``` + +## Events + +### change.color + +This event is triggered when a color is selected. + +```javascript +$("#mycolor").on("change.color", function(event, color){ + $('#title').css('background-color', color); +}); +``` + +### mouseover.color + +This event is triggered when the mouse moves over a color box on the palette. + +```javascript +$("#mycolor").on("mouseover.color", function(event, color){ + $('#title').css('background-color', color); +}); +``` + +## Browser Support + +evol.colorpicker.js has been tested for the following browsers: + + - Internet Explorer 7+ + - Firefox 9+ + - Chrome 21+ + - Safari 5+ + + +## License + +Copyright (c) 2016 Olivier Giulieri. + +evol.colorpicker is released under the [MIT license](http://github.com/evoluteur/colorpicker/raw/master/LICENSE.md). + diff --git a/APPL/Localscripts/colorpicker/bower.json b/APPL/Localscripts/colorpicker/bower.json new file mode 100644 index 0000000000..a8a6fb2608 --- /dev/null +++ b/APPL/Localscripts/colorpicker/bower.json @@ -0,0 +1,23 @@ +{ + "name": "evol.colorpicker", + "version": "3.2.4", + "description": "jQuery UI widget for web color picking which looks like the one in Microsoft Office 2010.", + "homepage": "http://evoluteur.github.io/colorpicker/", + "main": [ + "js/evol.colorpicker.min.js", + "css/evol.colorpicker.min.css" + ], + "authors": [ + { "name": "Olivier Giulieri", "homepage": "https://github.com/evoluteur" } + ], + "license": "MIT", + "keywords": [ + "colorpicker", + "color", + "jquery", + "jquery-ui", + "widget", + "ui", + "web" + ] +} diff --git a/APPL/Localscripts/colorpicker/colorpicker.jquery.json b/APPL/Localscripts/colorpicker/colorpicker.jquery.json new file mode 100644 index 0000000000..c6d04a12ab --- /dev/null +++ b/APPL/Localscripts/colorpicker/colorpicker.jquery.json @@ -0,0 +1,33 @@ +{ + "name": "colorpicker", + "title": "Evol ColorPicker", + "version": "3.2.4", + "copyright": "(c) 2016 Olivier Giulieri", + "description": "A jQuery UI widget for color picking (similar to the one in Microsoft Office 2010).", + "keywords": [ + "colorpicker", + "color", + "input", + "form", + "picker", + "palette", + "ui", + "widget" + ], + "author": { + "name": "Olivier Giulieri", + "url": "http://github.com/evoluteur" + }, + "licenses": [{ + "type": "MIT", + "url": "https://github.com/evoluteur/colorpicker/blob/master/LICENSE.md" + }], + "dependencies": { + "jquery": ">=1.7", + "jquery-ui": ">=1.8" + }, + "homepage": "https://github.com/evoluteur/colorpicker", + "docs": "https://github.com/evoluteur/colorpicker#readme", + "demo": "http://evoluteur.github.io/colorpicker/index.html", + "bugs": "https://github.com/evoluteur/colorpicker/issues" +} diff --git a/APPL/Localscripts/colorpicker/css/colorpicker.css b/APPL/Localscripts/colorpicker/css/colorpicker.css new file mode 100644 index 0000000000..162f123cf1 --- /dev/null +++ b/APPL/Localscripts/colorpicker/css/colorpicker.css @@ -0,0 +1,48 @@ +/* demo page CSS for evol.colorpicker */ +/* https://github.com/evoluteur/colorpicker */ +body { + padding: 10px 20px; + font-size: 11pt; + font-family: "Century Gothic", arial; + color: #777; + font-weight: 300; +} +a { + color: #39C; + font-weight: 400; +} +a:hover { + color: #FF9900; +} +a.sel { + color: #000; + text-decoration: none; +} +#github { + position: absolute; + right: 30px; + top: 7px; +} +@media only screen and (max-width: 465px) { + #github { + display: none; + } +} +.colorPanel { + float: left; + border: 2px solid #A7C8E2; + margin: 4px 3px; + padding: 10px; + width: 212px; + border-radius: 10px; + -moz-border-radius: 10px; + -webkit-border-radius: 10px; +} +.colorPanel input { + width: 100px; +} +.footer { + text-align: center; + font-size: smaller; + color: Gray; +} diff --git a/APPL/Localscripts/colorpicker/css/evol.colorpicker.css b/APPL/Localscripts/colorpicker/css/evol.colorpicker.css new file mode 100644 index 0000000000..0bc9f34809 --- /dev/null +++ b/APPL/Localscripts/colorpicker/css/evol.colorpicker.css @@ -0,0 +1,171 @@ +/* + evol.colorpicker 3.2.4 + (c) 2016 Olivier Giulieri + http://evoluteur.github.io/colorpicker/ +*/ +.evo-pop { + z-index: 10000; + width: 204px; + padding: 3px 3px 0; +} +.evo-pop-ie { + z-index: 10000; + width: 212px; + padding: 3px; +} +.evo-palette td { + font-size: 1px; + border: solid 1px #c0c0c0; + padding: 7px; + cursor: pointer; +} +.evo-palette tr.top > td { + border-bottom: 0; +} +.evo-palette tr.in > td { + border-top: 0; + border-bottom: 0; +} +.evo-palette tr.bottom > td { + border-top: 0; +} +.evo-palette div.sep { + height: 3px; +} +.evo-palette, +.evo-palette-ie { + border-collapse: separate; + border-spacing: 4px 0px; + *border-collapse: expression('separate', cellSpacing='2px'); +} +.evo-palette th, +.evo-palette-ie th { + border: 0; + padding: 5px 3px; + text-align: left; + font-weight: normal; + background: transparent !important; +} +.evo-palette-ie td { + font-size: 1px; + border: solid 1px #c0c0c0; + padding: 7px; + cursor: pointer; +} +.evo-palette2, +.evo-palette2-ie { + margin: auto; + border-collapse: collapse; +} +.evo-palette2 td, +.evo-palette2-ie td { + font-size: 1px; + cursor: pointer; +} +.evo-palette2 td { + padding: 6px 7px; +} +.evo-palette2-ie td { + padding: 5px; +} +.evo-palcenter { + padding: 5px; + text-align: center; +} +.evo-colorind, +.evo-colorind-ie, +.evo-colorind-ff { + border: solid 1px #c3c3c3; + width: 18px; + height: 18px; + float: right; +} +.evo-colorind-ie { + position: relative; + top: -23px; +} +.evo-colorbox-ie { + font-size: 8px; + padding: 3px 9px !important; +} +/* +.evo-colortxt-ie { + position:relative; + top:-6px; +}*/ +.evo-pop:after, +.evo-pop-ie:after, +.evo-colorind:after, +.evo-colorind-ie:after, +.evo-colorind-ff:after, +.evo-color span:after, +.evo-cHist:after { + content: "."; + display: block; + height: 0; + clear: both; + visibility: hidden; + font-size: 0; +} +.evo-color { + width: 94px; + padding: 1px 3px 0 4px; +} +.evo-color div { + border: solid 1px #808080; + border-right: solid 1px #c0c0c0; + border-bottom: solid 1px #c0c0c0; + padding: 3px; + margin-bottom: 5px; + width: 10px; + height: 10px; + float: left; +} +.evo-color span { + font-size: 15px; + margin: 1px 0 4px 3px; + float: left; +} +.evo-sep { + height: 10px; + font-size: 0; +} +.evo-more { + padding: 4px 5px 4px; + font-size: smaller; +} +.evo-cHist { + padding: 3px; +} +.evo-cHist div { + cursor: pointer; + border: solid 1px #c0c0c0; + padding: 3px; + margin: 5px; + width: 10px; + height: 10px; + float: left; +} +.evo-transparent { + background-image: repeating-linear-gradient(135deg, #000000, #000000 1px, #ffffff 1px, #ffffff 3px); +} +.evo-tr-box { + cursor: pointer; + border: solid 1px #c0c0c0; + padding: 3px; + width: 7px; + height: 7px; + float: right; + position: relative; + right: -3px; + top: 2px; +} +a.evo-hist { + margin-left: 6px; +} +.evo-pointer { + cursor: pointer; +} +.evo-hidden-button { + display: none; +} diff --git a/APPL/Localscripts/colorpicker/css/evol.colorpicker.min.css b/APPL/Localscripts/colorpicker/css/evol.colorpicker.min.css new file mode 100644 index 0000000000..322ac704aa --- /dev/null +++ b/APPL/Localscripts/colorpicker/css/evol.colorpicker.min.css @@ -0,0 +1 @@ +.evo-pop{z-index:10000;width:204px;padding:3px 3px 0}.evo-pop-ie{z-index:10000;width:212px;padding:3px}.evo-palette td{font-size:1px;border:solid 1px #c0c0c0;padding:7px;cursor:pointer}.evo-palette tr.top>td{border-bottom:0}.evo-palette tr.in>td{border-top:0;border-bottom:0}.evo-palette tr.bottom>td{border-top:0}.evo-palette div.sep{height:3px}.evo-palette,.evo-palette-ie{border-collapse:separate;border-spacing:4px 0px;*border-collapse:expression('separate', cellSpacing='2px')}.evo-palette th,.evo-palette-ie th{border:0;padding:5px 3px;text-align:left;font-weight:normal;background:transparent !important}.evo-palette-ie td{font-size:1px;border:solid 1px #c0c0c0;padding:7px;cursor:pointer}.evo-palette2,.evo-palette2-ie{margin:auto;border-collapse:collapse}.evo-palette2 td,.evo-palette2-ie td{font-size:1px;cursor:pointer}.evo-palette2 td{padding:6px 7px}.evo-palette2-ie td{padding:5px}.evo-palcenter{padding:5px;text-align:center}.evo-colorind,.evo-colorind-ie,.evo-colorind-ff{border:solid 1px #c3c3c3;width:18px;height:18px;float:right}.evo-colorind-ie{position:relative;top:-23px}.evo-colorbox-ie{font-size:8px;padding:3px 9px !important}.evo-pop:after,.evo-pop-ie:after,.evo-colorind:after,.evo-colorind-ie:after,.evo-colorind-ff:after,.evo-color span:after,.evo-cHist:after{content:".";display:block;height:0;clear:both;visibility:hidden;font-size:0}.evo-color{width:94px;padding:1px 3px 0 4px}.evo-color div{border:solid 1px #808080;border-right:solid 1px #c0c0c0;border-bottom:solid 1px #c0c0c0;padding:3px;margin-bottom:5px;width:10px;height:10px;float:left}.evo-color span{font-size:15px;margin:1px 0 4px 3px;float:left}.evo-sep{height:10px;font-size:0}.evo-more{padding:4px 5px 4px;font-size:smaller}.evo-cHist{padding:3px}.evo-cHist div{cursor:pointer;border:solid 1px #c0c0c0;padding:3px;margin:5px;width:10px;height:10px;float:left}.evo-transparent{background-image:repeating-linear-gradient(135deg, #000, #000 1px, #fff 1px, #fff 3px)}.evo-tr-box{cursor:pointer;border:solid 1px #c0c0c0;padding:3px;width:7px;height:7px;float:right;position:relative;right:-3px;top:2px}a.evo-hist{margin-left:6px}.evo-pointer{cursor:pointer}.evo-hidden-button{display:none} \ No newline at end of file diff --git a/APPL/Localscripts/colorpicker/index.html b/APPL/Localscripts/colorpicker/index.html new file mode 100644 index 0000000000..410f7a1a34 --- /dev/null +++ b/APPL/Localscripts/colorpicker/index.html @@ -0,0 +1,214 @@ + + +evol.colorpicker + + + + + + + + + + + +

evol.colorpicker demo

+ +

+ GitHub +

+ +

evol.colorpicker (currently v3.2.4) is a web color picker which looks like the one in Microsoft Office 2010. + It can be used inline or as a popup bound to a text box. + It is a full jQuery UI widget, supporting various configurations and themes. +

+ +
+ +

Themes: + ui-lightness - + ui-darkness - + redmond - + sunny - + le-frog +

+ +
+ Inline (using a DIV tag):

+
+
+
+ Get Value + Set Value
+ Enable + Disable + Destroy

+
+
+ +
+ Inline with "web" default palette:

+
+
+ +
+ Using "showOn" option:

+ button + + focus + + both + + link + +
+ +
+ Event binding:
+ change.color and mouseover.color

+
+ +
+ +
+ With transparent color:
+
+
+
+ +
+ Using "hideButton" option:
+
+
+
+ +
+ No color indicator on the palette:
+
+
+
+ +
+ In French:
+
+
+ Using the "strings" option you can translate the colorpicker.
+
+
+ +
+ + + +


Download, documentation, and source code are available at GitHub under the MIT license.

+ +

+
© 2016 Olivier Giulieri
+ + + + \ No newline at end of file diff --git a/APPL/Localscripts/colorpicker/js/evol.colorpicker.js b/APPL/Localscripts/colorpicker/js/evol.colorpicker.js new file mode 100644 index 0000000000..a165faf094 --- /dev/null +++ b/APPL/Localscripts/colorpicker/js/evol.colorpicker.js @@ -0,0 +1,562 @@ +/* + evol.colorpicker 3.2.4 + ColorPicker widget for jQuery UI + + https://github.com/evoluteur/colorpicker + (c) 2016 Olivier Giulieri + + * Depends: + * jquery.ui.core.js + * jquery.ui.widget.js + */ + +(function( $, undefined ) { + +var _idx=0, + ua=window.navigator.userAgent, + isIE=ua.indexOf("MSIE ")>0, + _ie=isIE?'-ie':'', + isMoz=isIE?false:/mozilla/.test(ua.toLowerCase()) && !/webkit/.test(ua.toLowerCase()), + history=[], + baseThemeColors=['ffffff','000000','eeece1','1f497d','4f81bd','c0504d','9bbb59','8064a2','4bacc6','f79646'], + subThemeColors=['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'], + standardColors=['c00000','ff0000','ffc000','ffff00','92d050','00b050','00b0f0','0070c0','002060','7030a0'], + webColors=[ + ['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'] + ], + transColor='#0000ffff', + int2Hex=function(i){ + var h=i.toString(16); + if(h.length==1){ + h='0'+h; + } + return h; + }, + st2Hex=function(s){ + return int2Hex(Number(s)); + }, + int2Hex3=function(i){ + var h=int2Hex(i); + return h+h+h; + }, + toHex3=function(c){ + if(c.length>10){ // IE9 + var p1=1+c.indexOf('('), + p2=c.indexOf(')'), + cs=c.substring(p1,p2).split(','); + return ['#',st2Hex(cs[0]),st2Hex(cs[1]),st2Hex(cs[2])].join(''); + }else{ + return c; + } + }; + +$.widget( "evol.colorpicker", { + + version: '3.2.1', + + options: { + color: null, // example:'#31859B' + showOn: 'both', // possible values: 'focus','button','both' + hideButton: false, + displayIndicator: true, + transparentColor: false, + history: true, + defaultPalette: 'theme', // possible values: 'theme', 'web' + strings: 'Theme Colors,Standard Colors,Web Colors,Theme Colors,Back to Palette,History,No history yet.' + }, + + // this is only true while showing the palette until color is chosen + _active: false, + + _create: function() { + var that=this; + this._paletteIdx=this.options.defaultPalette=='theme'?1:2; + this._id='evo-cp'+_idx++; + this._enabled=true; + this.options.showOn=this.options.hideButton?'focus':this.options.showOn; + switch(this.element.get(0).tagName){ + case 'INPUT': + var color=this.options.color, + e=this.element, + css=((this.options.showOn==='focus')?'':'evo-pointer ')+'evo-colorind'+(isMoz?'-ff':_ie)+(this.options.hideButton?' evo-hidden-button':''), + style=''; + this._isPopup=true; + this._palette=null; + var v=e.val(); + if(color!==null){ + if (color != v) e.val(color).change(); + }else{ + if(v!==''){ + color=this.options.color=v; + } + } + if(color===transColor){ + css+=' evo-transparent'; + }else{ + style=(color!==null)?('background-color:'+color):''; + } + e.addClass('colorPicker '+this._id) + .wrap('
') + .after('
') + .on('keyup onpaste', function(evt){ + var c=$(this).val(); + if(c!=that.options.color){ + that._setValue(c, true); + } + }); + var showOn=this.options.showOn; + if(showOn==='both' || showOn==='focus'){ + e.on('focus', function(){ + that.showPalette(); + }); + } + if(showOn==='both' || showOn==='button'){ + e.next().on('click', function(evt){ + evt.stopPropagation(); + that.showPalette(); + return false; + }); + } + break; + default: + this._isPopup=false; + this._palette=this.element.html(this._paletteHTML()) + .attr('aria-haspopup','true'); + this._bindColors(); + } + if(this.options.history){ + if(color){ + this._add2History(color); + } + if (this.options.initialHistory) { + var c = this.options.initialHistory; + for (var i in c){ + this._add2History(c[i]); + } + } + } + }, + + _paletteHTML: function() { + var pIdx=this._paletteIdx=Math.abs(this._paletteIdx), + opts=this.options, + labels=opts.strings.split(','); + + var h='
'+ + // palette + ''+this['_paletteHTML'+pIdx]()+''+ + // links + '
'+labels[1+pIdx]+''; + if(opts.history){ + h+=''+labels[5]+''; + } + h+='
'; + // indicator + if(opts.displayIndicator){ + h+=this._colorIndHTML(this.options.color)+this._colorIndHTML(''); + } + h+='
'; + return h; + }, + + _colorIndHTML: function(c) { + var css=isIE?'evo-colorbox-ie ':'', + style=''; + + if(c){ + if(c===transColor){ + css+='evo-transparent'; + }else{ + style='background-color:'+c; + } + }else{ + style='display:none'; + } + return '
'+ + '
'+ // class="evo-colortxt-ie" + (c?c:'')+'
'; + }, + + _paletteHTML1: function() { + var opts=this.options, + labels=opts.strings.split(','), + oTD='
':'">', + oTRTH=''; + + // base theme colors + var h=''+oTRTH+labels[0]+''; + for(var i=0;i<10;i++){ + h+=oTD+baseThemeColors[i]+cTD; + } + h+=''; + if(!isIE){ + h+=''; + } + h+=''; + // theme colors + for(i=0;i<10;i++){ + h+=oTD+subThemeColors[i]+cTD; + } + for(var r=1;r<4;r++){ + h+=''; + for(i=0;i<10;i++){ + h+=oTD+subThemeColors[r*10+i]+cTD; + } + } + h+=''; + for(i=40;i<50;i++){ + h+=oTD+subThemeColors[i]+cTD; + } + h+=''+oTRTH; + // transparent color + if(opts.transparentColor){ + h+='
'; + } + h+=labels[1]+''; + // standard colors + for(i=0;i<10;i++){ + h+=oTD+standardColors[i]+cTD; + } + h+='
'; + return h; + }, + + _paletteHTML2: function() { + var i, iMax, + oTD='
':'">', + oTableTR='', + cTableTR='
'; + + var h='
'; + // hexagon colors + for(var r=0,rMax=webColors.length;r10;i-=10){ + h+=oTD+int2Hex3(i)+cTD; + i-=10; + h2+=oTD+int2Hex3(i)+cTD; + } + h+=cTableTR+oTableTR+h2+cTableTR+'
'; + return h; + }, + + _switchPalette: function(link) { + if(this._enabled){ + var idx, + content, + label, + opts=this.options, + labels=opts.strings.split(','); + if($(link).hasClass('evo-hist')){ + // history + var h='
'+ + labels[5]+'
'+ + '
'; + 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+='
'; + idx=-this._paletteIdx; + content=h; + label=labels[4]; + }else{ + // palette + if(this._paletteIdx<0){ + idx=-this._paletteIdx; + this._palette.find('.evo-hist').show(); + }else{ + idx=(this._paletteIdx==2)?1:2; + } + content=this['_paletteHTML'+idx](); + label=labels[idx+1]; + this._paletteIdx=idx; + } + this._paletteIdx=idx; + var e=this._palette.find('.evo-more') + .prev().html(content).end() + .children().eq(0).html(label); + if(idx<0){ + e.next().hide(); + } + } + }, + + _downOrUpPositioning: function() { + var el = this.element, + i = 0; + while (el !== null && i < 100) { + // Look up the first parent with non-visibile overflow and compute the relative position + if (el.css('overflow') != 'visible') { + var bott = this._palette.offset().top + this._palette.height(), + pBott = el.offset().top + el.height(), + top = this._palette.offset().top - this._palette.height() - this.element.outerHeight(), + pTop = el.offset().top, + openUp = bott > pBott && top > pTop; + if (openUp) { + this._palette.css({ bottom: this.element.outerHeight()+'px' }); + } else { + this._palette.css({ bottom: 'auto' }); + } + break; + } + if (el[0].tagName == 'HTML') break; + else el = el.offsetParent(); + i++; + } + }, + + showPalette: function() { + if(this._enabled){ + this._active=true; + $('.colorPicker').not('.'+this._id).colorpicker('hidePalette'); + if(this._palette===null){ + this._palette=this.element.next() + .after(this._paletteHTML()).next() + .on('click',function(evt){ + evt.stopPropagation(); + return false; + }); + this._bindColors(); + var that=this; + if(this._isPopup){ + this._downOrUpPositioning(); + $(document.body).on('click.'+that._id, function(evt){ + if(evt.target!=that.element.get(0)){ + that.hidePalette(); + } + }).on('keyup.'+that._id, function(evt){ + if(evt.keyCode===27){ + that.hidePalette(); + } + }); + } + } + } + return this; + }, + + hidePalette: function() { + if(this._isPopup && this._palette){ + $(document.body).off('click.'+this._id); + var that=this; + this._palette.off('mouseover click', 'td,.evo-transparent') + .fadeOut(function(){ + that._palette.remove(); + that._palette=that._cTxt=null; + }) + .find('.evo-more a').off('click'); + } + return this; + }, + + _bindColors: function() { + var that=this, + opts=this.options, + es=this._palette.find('div.evo-color'), + sel=opts.history?'td,.evo-cHist>div':'td'; + + if(opts.transparentColor){ + sel+=',.evo-transparent'; + } + this._cTxt1=es.eq(0).children().eq(0); + this._cTxt2=es.eq(1).children().eq(0); + this._palette + .on('click', sel, function(evt){ + if(that._enabled){ + var $this=$(this); + that._setValue($this.hasClass('evo-transparent')?transColor:toHex3($this.attr('style').substring(17))); + that._active=false; + } + }) + .on('mouseover', sel, function(evt){ + if(that._enabled){ + var $this=$(this), + c=$this.hasClass('evo-transparent')?transColor:toHex3($this.attr('style').substring(17)); + if(that.options.displayIndicator){ + that._setColorInd(c,2); + } + if(that._active){ + that.element.trigger('mouseover.color', c); + } + } + }) + .find('.evo-more a').on('click', function(){ + that._switchPalette(this); + }); + }, + + val: function(value) { + if (typeof value=='undefined') { + return this.options.color; + }else{ + this._setValue(value); + return this; + } + }, + + _setValue: function(c, noHide) { + c = c.replace(/ /g,''); + this.options.color=c; + if(this._isPopup){ + if(!noHide){ + this.hidePalette(); + } + this._setBoxColor(this.element.val(c).change().next(), c); + }else{ + this._setColorInd(c,1); + } + if(this.options.history && this._paletteIdx>0){ + this._add2History(c); + } + this.element.trigger('change.color', c); + }, + + _setColorInd: function(c, idx) { + var $box=this['_cTxt'+idx]; + this._setBoxColor($box, c); + $box.next().html(c); + }, + + _setBoxColor: function($box, c) { + if(c===transColor){ + $box.addClass('evo-transparent') + .removeAttr('style'); + }else{ + $box.removeClass('evo-transparent') + .attr('style','background-color:'+c); + } + }, + + _setOption: function(key, value) { + if(key=='color'){ + this._setValue(value, true); + }else{ + this.options[key]=value; + } + }, + + _add2History: function(c) { + var iMax=history.length; + // skip color if already in history + for(var i=0;i27){ + 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]()+'
'+c[1+a]+"";return b.history&&(d+=''+c[5]+""),d+="
",b.displayIndicator&&(d+=this._colorIndHTML(this.options.color)+this._colorIndHTML("")),d+="
"},_colorIndHTML:function(a){var b=d?"evo-colorbox-ie ":"",c="";return a?a===l?b+="evo-transparent":c="background-color:"+a:c="display:none",'
'+(a?a:"")+"
"},_paletteHTML1:function(){for(var a=this.options,b=a.strings.split(","),c='
':'">',g='',k=''+g+b[0]+"",l=0;10>l;l++)k+=c+h[l]+f;for(k+="",d||(k+=''),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='
':'">',g='',h="
",i='
',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+"
"},_switchPalette:function(b){if(this._enabled){var c,d,e,f=this.options,h=f.strings.split(",");if(a(b).hasClass("evo-hist")){var i='
'+h[5]+'
';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+="
",c=-this._paletteIdx,d=i,e=h[4]}else this._paletteIdx<0?(c=-this._paletteIdx,this._palette.find(".evo-hist").show()):c=2==this._paletteIdx?1:2,d=this["_paletteHTML"+c](),e=h[c+1],this._paletteIdx=c;this._paletteIdx=c;var k=this._palette.find(".evo-more").prev().html(d).end().children().eq(0).html(e);0>c&&k.next().hide()}},_downOrUpPositioning:function(){for(var a=this.element,b=0;null!==a&&100>b;){if("visible"!=a.css("overflow")){var c=this._palette.offset().top+this._palette.height(),d=a.offset().top+a.height(),e=this._palette.offset().top-this._palette.height()-this.element.outerHeight(),f=a.offset().top,g=c>d&&e>f;this._palette.css(g?{bottom:this.element.outerHeight()+"px"}:{bottom:"auto"});break}if("HTML"==a[0].tagName)break;a=a.offsetParent(),b++}},showPalette:function(){if(this._enabled&&(this._active=!0,a(".colorPicker").not("."+this._id).colorpicker("hidePalette"),null===this._palette)){this._palette=this.element.next().after(this._paletteHTML()).next().on("click",function(a){return a.stopPropagation(),!1}),this._bindColors();var b=this;this._isPopup&&(this._downOrUpPositioning(),a(document.body).on("click."+b._id,function(a){a.target!=b.element.get(0)&&b.hidePalette()}).on("keyup."+b._id,function(a){27===a.keyCode&&b.hidePalette()}))}return this},hidePalette:function(){if(this._isPopup&&this._palette){a(document.body).off("click."+this._id);var b=this;this._palette.off("mouseover click","td,.evo-transparent").fadeOut(function(){b._palette.remove(),b._palette=b._cTxt=null}).find(".evo-more a").off("click")}return this},_bindColors:function(){var b=this,c=this.options,d=this._palette.find("div.evo-color"),e=c.history?"td,.evo-cHist>div":"td";c.transparentColor&&(e+=",.evo-transparent"),this._cTxt1=d.eq(0).children().eq(0),this._cTxt2=d.eq(1).children().eq(0),this._palette.on("click",e,function(){if(b._enabled){var c=a(this);b._setValue(c.hasClass("evo-transparent")?l:p(c.attr("style").substring(17))),b._active=!1}}).on("mouseover",e,function(){if(b._enabled){var c=a(this),d=c.hasClass("evo-transparent")?l:p(c.attr("style").substring(17));b.options.displayIndicator&&b._setColorInd(d,2),b._active&&b.element.trigger("mouseover.color",d)}}).find(".evo-more a").on("click",function(){b._switchPalette(this)})},val:function(a){return"undefined"==typeof a?this.options.color:(this._setValue(a),this)},_setValue:function(a,b){a=a.replace(/ /g,""),this.options.color=a,this._isPopup?(b||this.hidePalette(),this._setBoxColor(this.element.val(a).change().next(),a)):this._setColorInd(a,1),this.options.history&&this._paletteIdx>0&&this._add2History(a),this.element.trigger("change.color",a)},_setColorInd:function(a,b){var c=this["_cTxt"+b];this._setBoxColor(c,a),c.next().html(a)},_setBoxColor:function(a,b){b===l?a.addClass("evo-transparent").removeAttr("style"):a.removeClass("evo-transparent").attr("style","background-color:"+b)},_setOption:function(a,b){"color"==a?this._setValue(b,!0):this.options[a]=b},_add2History:function(a){for(var b=g.length,c=0;b>c;c++)if(a==g[c])return;b>27&&g.shift(),g.push(a)},clear:function(){this.hidePalette().val("")},enable:function(){var a=this.element;return this._isPopup?a.removeAttr("disabled"):a.css({opacity:"1","pointer-events":"auto"}),"focus"!==this.options.showOn&&this.element.next().addClass("evo-pointer"),a.removeAttr("aria-disabled"),this._enabled=!0,this},disable:function(){var a=this.element;return this._isPopup?a.attr("disabled","disabled"):(this.hidePalette(),a.css({opacity:"0.3","pointer-events":"none"})),"focus"!==this.options.showOn&&this.element.next().removeClass("evo-pointer"),a.attr("aria-disabled","true"),this._enabled=!1,this},isDisabled:function(){return!this._enabled},destroy:function(){a(document.body).off("click."+this._id),this._palette&&(this._palette.off("mouseover click","td,.evo-cHist>div,.evo-transparent").find(".evo-more a").off("click"),this._isPopup&&this._palette.remove(),this._palette=this._cTxt=null),this._isPopup&&this.element.next().off("click").remove().end().off("focus").unwrap(),this.element.removeClass("colorPicker "+this.id).empty(),a.Widget.prototype.destroy.call(this)}})}(jQuery); \ No newline at end of file diff --git a/APPL/Localscripts/colorpicker/less/demo.less b/APPL/Localscripts/colorpicker/less/demo.less new file mode 100644 index 0000000000..ee563e2ec9 --- /dev/null +++ b/APPL/Localscripts/colorpicker/less/demo.less @@ -0,0 +1,51 @@ +// CSS for evol.colorpicker demo page + +body{ + padding: 10px 20px; + font-size: 11pt; + font-family: "Century Gothic",arial; + color: #777; + font-weight: 300; +} +a { + color: #39C; + font-weight: 400; + + &:hover { + color: #FF9900; + } + + &.sel{ + color: #000; + text-decoration: none; + } + +} +#github{ + position:absolute; + right:30px; + top: 7px; + @media only screen and (max-width: 465px) { + display: none; + } +} +.demoPanel{ + float:left; + border: 2px solid #A7C8E2; + margin: 4px 3px; + padding: 10px; + width:212px; + border-radius: 10px; + -moz-border-radius: 10px; + -webkit-border-radius: 10px; + + input{ + width:100px; + } + +} + .footer{ + text-align: center; + font-size:smaller; + color:Gray; +} diff --git a/APPL/Localscripts/colorpicker/less/evol.colorpicker.less b/APPL/Localscripts/colorpicker/less/evol.colorpicker.less new file mode 100644 index 0000000000..e9879e24e5 --- /dev/null +++ b/APPL/Localscripts/colorpicker/less/evol.colorpicker.less @@ -0,0 +1,180 @@ +// evol.colorpicker = ColorPicker widget for jQuery UI +// (c) 2016 Olivier Giulieri + +.evo-pop { + z-index:10000; + width:204px; + padding:3px 3px 0; +} +.evo-pop-ie { + z-index:10000; + width:212px; + padding:3px; +} + +.evo-palette { + td { + font-size:1px; + border:solid 1px #c0c0c0; + padding:7px; + cursor:pointer; + } + tr.top > td { + border-bottom:0; + } + tr.in > td { + border-top:0; + border-bottom:0; + } + tr.bottom > td { + border-top:0; + } + div.sep { + height:3px; + } + +} +.evo-palette, +.evo-palette-ie { + border-collapse: separate; + border-spacing: 4px 0px; + *border-collapse: expression('separate', cellSpacing = '2px'); + + th { + border:0; + padding:5px 3px; + text-align:left; + font-weight:normal; + background:transparent !important; + } + +} + +.evo-palette-ie td { + font-size:1px; + border:solid 1px #c0c0c0; + padding:7px; + cursor:pointer; +} + +.evo-palette2, +.evo-palette2-ie { + margin:auto; + border-collapse:collapse; + + td { + font-size:1px; + cursor:pointer; + } +} +.evo-palette2 td { + padding:6px 7px; +} +.evo-palette2-ie td { + padding:5px; +} +.evo-palcenter { + padding:5px; + text-align:center; +} + +.evo-colorind, +.evo-colorind-ie, +.evo-colorind-ff { + border:solid 1px #c3c3c3; + width:18px; + height:18px; + float:right; +} +.evo-colorind-ie { + position:relative; + top:-23px; +} +.evo-colorbox-ie { + font-size:8px; + padding:3px 9px !important; +}/* +.evo-colortxt-ie { + position:relative; + top:-6px; +}*/ +.evo-pop:after, +.evo-pop-ie:after, +.evo-colorind:after, +.evo-colorind-ie:after, +.evo-colorind-ff:after, +.evo-color span:after, +.evo-cHist:after { + content: "."; + display: block; + height: 0; + clear: both; + visibility: hidden; + font-size: 0; +} +.evo-color { + width:94px; + padding: 1px 3px 0 4px; + + div { + border:solid 1px #808080; + border-right:solid 1px #c0c0c0; + border-bottom:solid 1px #c0c0c0; + padding:3px; + margin-bottom:5px; + width:10px; + height:10px; + float:left; + } + span { + font-size:15px; + margin: 1px 0 4px 3px; + float:left; + } +} + +.evo-sep { + height:10px; + font-size:0; +} +.evo-more { + padding:4px 5px 4px; + font-size:smaller; +} +.evo-cHist { + padding:3px; + div { + cursor: pointer; + border:solid 1px #c0c0c0; + padding:3px; + margin:5px; + width:10px; + height:10px; + float:left; + } +} +.evo-transparent{ + background-image: repeating-linear-gradient( + 135deg, black, black 1px, white 1px, white 3px + ); +} +.evo-tr-box{ + cursor: pointer; + border:solid 1px #c0c0c0; + padding:3px; + width:7px; + height:7px; + float:right; + position: relative; + right: -3px; + top: 2px; +} +a.evo-hist { + margin-left:6px; +} +.evo-pointer { + cursor:pointer; +} +.evo-hidden-button { + display: none; +} diff --git a/APPL/Localscripts/colorpicker/package.json b/APPL/Localscripts/colorpicker/package.json new file mode 100644 index 0000000000..edc529ed22 --- /dev/null +++ b/APPL/Localscripts/colorpicker/package.json @@ -0,0 +1,36 @@ +{ + "name": "evol.colorpicker", + "version": "3.2.4", + "description": "jQuery UI widget for web color picking which looks like the one in Microsoft Office 2010.", + "copyright": "(c) 2016 Olivier Giulieri", + "homepage": "http://evoluteur.github.io/colorpicker/", + "author": { + "name": "Olivier Giulieri", + "url": "https://github.com/evoluteur" + }, + "license": "MIT", + "repository": { + "type": "git", + "url": "git://github.com/evoluteur/colorpicker.git" + }, + "bugs": "https://github.com/evoluteur/colorpicker/issues", + "dependencies": { + "jquery": "~1.7.0", + "jquery-ui": "~1.8.0" + }, + "devDependencies": { + "grunt": "~0.4.5", + "grunt-contrib-jshint": "~0.11.0", + "grunt-contrib-uglify": "~0.7.0", + "grunt-contrib-less": "~1.0.0" + }, + "keywords": [ + "color", + "picker", + "colorpicker", + "input", + "widget", + "jquery", + "jquery-ui" + ] +} diff --git a/APPL/Localscripts/colorpicker/screenshot1.png b/APPL/Localscripts/colorpicker/screenshot1.png new file mode 100644 index 0000000000000000000000000000000000000000..9d748c233fe0ee1a592628c07453c7e71e5a46bf GIT binary patch literal 12286 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 literal 0 HcmV?d00001 diff --git a/APPL/Localscripts/colorpicker/screenshot2.png b/APPL/Localscripts/colorpicker/screenshot2.png new file mode 100644 index 0000000000000000000000000000000000000000..cc11a8e5cb47ef4cd948a2ba5b0ac36bc8282600 GIT binary patch literal 8567 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 +<% /* + $Revision$ + $Id$ + + File: cad_label.asp + + Description: fac_management aanroep van model_cad_label + + Context: + + Notes: +*/ +%> + + +<% +var this_model = new model_cad_label(); + +this_model.hook_pre_edit = function (obj, fld) +{ + var labeltype = obj.cad_label_type; + var situatie = (labeltype & 4 ? "scenario" : "actueel"); + +%> + +<% +} + +scaffolding(this_model, + { + "search": { + "autosearch": true, + "filters": [ + "view_name", + "type_place", + "type_situation" + ] + }, + "list": { + "columns": [ + "name", + "view_name", + "type_place", + "type_situation" + ] + } + }); +%> \ No newline at end of file diff --git a/APPL/MGT/cad_legenda.asp b/APPL/MGT/cad_legenda.asp new file mode 100644 index 0000000000..a2c2a580f5 --- /dev/null +++ b/APPL/MGT/cad_legenda.asp @@ -0,0 +1,47 @@ +<%@language = "javascript" %> +<% /* + $Revision$ + $Id$ + + File: cad_legenda.asp + + Description: fac_management aanroep van model_cad_legenda + + Context: + + Notes: +*/ +%> + + +<% +var this_model = new model_cad_legenda(); + +scaffolding(this_model, + { + "search": { + "autosearch": true, + "filters": [ + "name" + ] + }, + "list": { + "columns": [ + "id", + "name" + ] + }, + "show": { + "js": [ + "./mgt_tools.js" + ], + "buttons": [ + { + "title": "lcl_lcl_terminologie", + "action": "edit_terminologie", + "icon": "doc_text_image.png" + } + ] + } + }); +%> diff --git a/APPL/MGT/cad_legendawaarde.js b/APPL/MGT/cad_legendawaarde.js new file mode 100644 index 0000000000..f26f7d414b --- /dev/null +++ b/APPL/MGT/cad_legendawaarde.js @@ -0,0 +1,68 @@ +/* + $Revision$ + $Id$ +*/ + +$(document).ready(function () { + setTimeout("init_cad_legendawaarde()", 100); + }); + + +function init_cad_legendawaarde() +{ + var kleur = "#" + $("#value_rgb").val(); + + $("#value_rgb").on("change", function() { change_value_rgb(); }); + $("#_color").on("click", function() { showColor(); }); + $("#btn_cp_accept").on("click", function() { acceptColor(); }); + $("#btn_cp_hide").on("click", function() { hideColor(); }); + + $("#color_panel").addClass("colorPanel"); + $("#color_panel").hide(); + + $("#color_select").colorpicker( + { + defaultPalette: "web", + history: false, + displayIndicator: true, + color: kleur, + hideButton: true, + showOn: "button" + }); + FcltMgr.resized(); +} + +function showColor() +{ + $("#color_panel").show(); + FcltMgr.resized(); +} + +function acceptColor() +{ + var kleur = $("#color_select").colorpicker("val"); + var rgb = kleur.replace("#",""); + + $("#value_rgb").val(rgb); + $("#_color span").css("background-color", kleur); + $("#color_panel").hide(); + FcltMgr.resized(); +} + +function hideColor() +{ + $("#color_panel").hide(); + FcltMgr.resized(); +} + +function change_value_rgb() +{ + var rgb = $("#value_rgb").val(); + + $("#_color span").css("background-color", "#"+rgb); +} + +//function pre_submit() +//{ +// return true; +//} \ No newline at end of file diff --git a/APPL/MGT/cad_thema.asp b/APPL/MGT/cad_thema.asp new file mode 100644 index 0000000000..cdf8215170 --- /dev/null +++ b/APPL/MGT/cad_thema.asp @@ -0,0 +1,116 @@ +<%@language = "javascript" %> +<% /* + $Revision$ + $Id$ + + File: cad_thema.asp + + Description: fac_management aanroep van model_cad_thema + + Context: + + Notes: +*/ +%> + + +<% +var this_model = model_cad_thema; + +this_model.hook_pre_put = function(params, jsondata, key) +{ // update + refresh_legenda(jsondata); +} +this_model.hook_pre_post = function(params, jsondata) +{ // insert + refresh_legenda(jsondata); +} + +scaffolding(this_model, + { + "search": { + "autosearch": true, + "filters": [ + "name", + "legenda", + "type_place", + "type_situation" + ] + }, + "list": { + "columns": [ + "id", + "name", + "legenda", + "type_place", + "type_situation" + ] + } + }); + + + function refresh_legenda(data) + { + if (data._generate == 1) + GenerateLegenda(data); + if (data._update == 1) + UpdateLegenda(data); + } + + function GenerateLegenda(data) + { // Genereer een legenda aan de hand van voorkomende waarden. + // + var rndSQL = "to_char(dbms_utility.get_hash_value(WAARDE,0,power(2,24)), '0XXXXX')"; + var legendaName = "Legenda_" + Date.parse(new Date()); + var sql = "INSERT INTO cad_legenda" + + " (cad_legenda_omschrijving, cad_legenda_discreet)" + + " VALUES" + + "(" + safe.quoted_sql(legendaName) + + ", 1)"; + Oracle.Execute(sql); + + sql = "SELECT cad_legenda_key" + + " FROM cad_legenda" + + " WHERE cad_legenda_omschrijving = " + safe.quoted_sql(legendaName) + var oRs = Oracle.Execute(sql); + var legenda_key = oRs("cad_legenda_key").Value; + + sql = "INSERT INTO cad_legendawaarde" + + " ( cad_legenda_key" + + " , cad_legendawaarde_value" + + " , cad_legendawaarde_rgb" + + " , cad_legendawaarde_omschr" + + " ) SELECT DISTINCT " + legenda_key + + " , waarde" + + " , " + rndSQL + + " , waarde" + + " FROM " + data.view_name + + Oracle.Execute(sql); + + data.legenda = legenda_key; + } + + function UpdateLegenda(data) + { // Breid een legenda uit aan de hand van voorkomende nieuwe waarden. + var rndSQL = "to_char(dbms_utility.get_hash_value(WAARDE,0,power(2,24)), '0XXXXX')"; + + var sql = "INSERT INTO cad_legendawaarde" + + " ( cad_legenda_key" + + " , cad_legendawaarde_value" + + " , cad_legendawaarde_rgb" + + " , cad_legendawaarde_omschr" + + " ) SELECT DISTINCT " + data.legenda + + " , waarde" + + " , " + rndSQL + + " , waarde" + + " FROM " + data.view_name + " thv" + + " WHERE waarde IS NOT NULL " + + " AND NOT EXISTS (SELECT cl.cad_legendawaarde_value" + + " FROM cad_legendawaarde cl" + + " WHERE cl.cad_legendawaarde_value = thv.waarde" + + " AND cl.cad_legenda_key = " + data.legenda + + " )"; + Oracle.Execute(sql); + } +%> diff --git a/APPL/SCF/scaffolding.inc b/APPL/SCF/scaffolding.inc index 361b5dbe16..3e69ed0bd6 100644 --- a/APPL/SCF/scaffolding.inc +++ b/APPL/SCF/scaffolding.inc @@ -137,12 +137,16 @@ function scf_ROFIELDTR(model, fld, val, key, params) { // Vanuit scaffolding_search field = model.fields[fld.replace(/^(start_|end_)/,"")]; } - var txt = val; if (txt === null || typeof txt === "undefined") { if (field.typ == "check") txt = 0; + else if (field.typ == "label") + { + scf_LABELTR(fld, field, params); + return; + } else return; // Altijd suppressEmpty } @@ -174,13 +178,21 @@ function scf_ROFIELDTR(model, fld, val, key, params) if (field.bits) { + var params_bits = params; + scf_GROUP_START(model, fld, val, params_bits); + for (var i=0; i < field.bits.length; i++) { var bit = field.bits[i]; if (bit.typ == "check") { - var data = (val & bit.mask); - ROCHECKBOXTR("fldtxt", bit.label, data, params); + params_bits.readonly = true; + scf_GROUP_CHECK(bit, "bit_group", val, params_bits); + } + if (bit.typ == "radio") + { + params_bits.readonly = true; + scf_GROUP_RADIO(bit, "bit_group", val, params_bits); } else if (bit.typ == "LOV") { @@ -188,6 +200,7 @@ function scf_ROFIELDTR(model, fld, val, key, params) ROFIELDTR("fldtxt", bit.label, data, params); } } + scf_GROUP_END(); } else if (field.typ == "check" || field.typ == "check0") ROCHECKBOXTR("fldtxt", field.label, txt, params); @@ -335,31 +348,21 @@ function scf_RWFIELDTR(model, fld, val, key, params) } } } - else if (field.BITS) - { - for (var bit in field.BITS) - { - var bits = field.BITS[bit]; - var data = (val.id & bits.mask); - var sql = api2.splitLOV2sql(bits.LOV); - FCLTselector(fld, sql, { label: bits.label, - initKey: params.search?"":data - // geen empty gedoe: de eerste is altijd de default - }); - } - } else if (field.bits) { var params_bits = params; - params_bits.hidden_fld = true; - RWFIELDTR(fld, "fld", field.label, val, params_bits); + scf_GROUP_START(model, fld, val, params_bits); + for (var i=0; i < field.bits.length; i++) { var bit = field.bits[i]; if (bit.typ == "check") { - var data = (val & bit.mask); - RWCHECKBOXTR(bit.name, "fldcheck", bit.label, data); + scf_GROUP_CHECK(bit, "bit_group", val, params_bits); + } + else if (bit.typ == "radio") + { + scf_GROUP_RADIO(bit, "bit_group", val, params_bits); } else if (bit.typ == "LOV") { @@ -372,6 +375,7 @@ function scf_RWFIELDTR(model, fld, val, key, params) }); } } + scf_GROUP_END(); } else if (field.LOV) { @@ -437,6 +441,10 @@ function scf_RWFIELDTR(model, fld, val, key, params) { scf_BUTTONTR(fld, field, params); } + else if (field.typ == "div") + { + scf_DIV(fld, field, params); + } else if (field.flexmodule) { FCLTflexfileselector(fld, @@ -488,13 +496,100 @@ function scf_RWHIDDENTR(model, fld, val) function scf_LABELTR(fld, field, params) { -Response.Write('
'+field.label+''+field.defaultvalue+'
'); +var labelname = (field.label ? field.label : (field.defaultvalue ? "" : field.label)); +var labelvalue = (field.label ? (field.defaultvalue ? field.defaultvalue : "") : field.defaultvalue); +Response.Write('
'+field.label+''+labelvalue+'
'); } function scf_BUTTONTR(fld, field, params) { Response.Write('
' +'' - +'
'); + +'

'); } + +function scf_DIV(fld, field, params) +{ +Response.Write('
'+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(""); + Response.Write(""); + + Response.Write(""); + for (var i=0; i"); + Response.Write(""); + if (bit.label) + { + Response.Write(""); + } + Response.Write("
"); + } + 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(""); + Response.Write(""); + + Response.Write(""); + for (var i=0; i"); + Response.Write(" " + safe.html(bit.label) + "
"); + } + } + Response.Write(""); + 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)