From: Vincent Vanwaelscappel Date: Mon, 21 Nov 2022 15:42:34 +0000 (+0100) Subject: wip #5550 @0.5 X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=b1b7cf199f7a7d5e4972dfb92b4a1f3e6335c869;p=sandvik-apps.git wip #5550 @0.5 --- diff --git a/ScreeningMediaSelection/_doc/translations.xlsx b/ScreeningMediaSelection/_doc/translations.xlsx index 94d7a93..074c909 100644 Binary files a/ScreeningMediaSelection/_doc/translations.xlsx and b/ScreeningMediaSelection/_doc/translations.xlsx differ diff --git a/ScreeningMediaSelection/images/arrow-small.svg b/ScreeningMediaSelection/images/arrow-small.svg new file mode 100644 index 0000000..2b0c8bf --- /dev/null +++ b/ScreeningMediaSelection/images/arrow-small.svg @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + diff --git a/ScreeningMediaSelection/js/script.js b/ScreeningMediaSelection/js/script.js index 702ce45..17bc106 100644 --- a/ScreeningMediaSelection/js/script.js +++ b/ScreeningMediaSelection/js/script.js @@ -731,7 +731,7 @@ function addField(f, value) { if (f.function !== undefined) { c = window[f.function].call(); } else { - var screens = ['FR', 'STS', 'SLS', 'FS']; + var screens = ['FR', 'FS', 'SLS', 'SL', 'STS', 'ST', 'CS', 'CR', 'C']; var col = INPUT.result_concat[INPUT.result_concat.length - 2]; var screen = ''; $.each(screens, function (k, s) { @@ -740,7 +740,7 @@ function addField(f, value) { } }); - c = '

' + INPUT.result_concat.join(' ').replace(/\s,/g, ',') + '
' + INPUT.result_disclaimer + '
'; + c = '

' + INPUT.result_concat.join(' ').replace(/\s,/g, ',') + '
' + INPUT.result_disclaimer + '
'; if (INPUT.result_concat[0].indexOf('WN') === 0) { c += '

' + '

' + '

'; } else { diff --git a/ScreeningMediaSelection/style/style.css b/ScreeningMediaSelection/style/style.css index 5c276c2..e9eb47b 100644 --- a/ScreeningMediaSelection/style/style.css +++ b/ScreeningMediaSelection/style/style.css @@ -414,10 +414,20 @@ section.visible { margin: 0 auto; padding: 2rem; } -#fields .field .result img { +#fields .field .result .screenimage { + display: inline-block; width: 120px; vertical-align: middle; } +#fields .field .result .screenimage span { + font-size: 12px; + text-transform: uppercase; + display: block; + margin-top: 15px; +} +#fields .field .result .screenimage img { + display: block; +} #fields .field .result .product_model { font-size: 90%; text-align: center; diff --git a/ScreeningMediaSelection/style/style.css.map b/ScreeningMediaSelection/style/style.css.map index 994c094..48001ee 100644 --- a/ScreeningMediaSelection/style/style.css.map +++ b/ScreeningMediaSelection/style/style.css.map @@ -1 +1 @@ -{"version":3,"sources":["style.less"],"names":[],"mappings":"QAkWQ;QACA;AAhWR;EACE,aAAa,eAAb;EACA,gBAAA;EACA,SAAS,+BAAT;;AAGF;EACE,aAAa,eAAb;EACA,gBAAA;EACA,SAAS,+BAAT;;AAUF;EACE,eAAA;;AAEA,IAAC;EACC,cAAA;;AAGF;EAAA;IACE,cAAA;;;AAGF;EAAA;IACE,cAAA;;;AAGF;EAAA;IACE,cAAA;;;AAEF;EAAA;IACE,cAAA;;;AAEF;EAAA;IACE,cAAA;;;AAEF;EAAA;IACE,cAAA;;;AAIJ;EACE,aAAA;;AAIF;AAAS;EACP,aAAA;EACA,iBAAA;EAOA,aAAA;EACA,WAAA;EACA,cAAA;EACA,aApEY,6CAoEZ;;AATA;EAAA;EAAA;IACE,aAAA;;;AAEF;EAAA;EAAA;IACE,aAAA;;;AAQJ;EACE,cAAA;EACA,kBAAA;EAEA,aAAA;;AAJF,QAME;EACE,iBAAA;EACA,gBAAA;;AARJ,QAME,SAIE;EACE,cAAA;;AAEA,QAPJ,SAIE,EAGG;EACC,gBAAA;EACA,iBAAA;EACA,kBAAA;;AAhBR,QAME,SAcE;EACE,gBAAA;;AArBN,QAME,SAkBE;EACE,UAAA;EACA,qBAAA;EACA,gBAAA;EACA,mBAAA;EACA,gBAAA;EACA,eAAA;;AA9BN,QAME,SA+BE;EACE,UAAA;;AAtCN,QAME,SAmCE;EACE,yBAAA;;AAKN,CAAC;EACC,iBAAA;EACA,gBAAA;EACA,yBAAA;EACA,yBAAA;EACA,WAAA;EACA,SAAA;EACA,kBAAA;EACA,kBAAA;EACA,mBAAA;EACA,qBAAA;EACA,qBAAA;;AAGF;EACE,aArIY,6CAqIZ;EACA,UAAA;EACA,SAAA;EACA,yBAAA;EACA,WAAA;;AAGF;EACE,kBAAA;EACA,MAAA;EACA,OAAA;EACA,aAAA;EACA,yBAAA;EACA,WAAA;EACA,WAAA;EACA,eAAA;;AAGF;EACE,kBAAA;EACA,OAAA;EACA,SAAA;EACA,YAAA;EACA,WAAA;;AAGF;EACE,kBAAA;EACA,SAAA;EACA,UAAA;EACA,yBAAA;EACA,eAAA;EACA,aAAA;;AANF,YAQE;EAcE,WAAA;;AAbA,YADF,EACG;EACC,SAAS,EAAT;EACA,qBAAA;EACA,aAAA;EACA,cAAA;EACA,oBAAA;EAGA,sBAAsB,wBAAtB;EACA,wBAAA;EACA,0BAAA;;AAQN;EACE,UAAA;EACA,SAAA;EACA,sBAAA;EACA,gBAAA;EACA,aA/LY,6CA+LZ;EACA,qBAAA;;AAKF;EACE,yBAAA;EACA,eAAA;EACA,qBAAA;EACA,iBAAA;EACA,kBAAA;;AAGF;EACE,eAAA;EACA,kBAAA;EACA,kBAAA;EACA,gBAAA;;AAIF;EACE,cAAA;EACA,WAAA;EACA,mBAAA;EACA,kBAAA;EACA,WAAA;EACA,kBAAA;;AANF,KAQE;EACE,YAAA;;AAIJ;EACE,kBAAA;EACA,WAAA;EACA,SAAA;;AAHF,2BAKE;EACE,cAAA;;AANJ,2BASE;EACE,qBAAA;;AAVJ,2BAaE;EACE,aAAA;;AAdJ,2BAiBE;EACE,yBAAA;EACA,cAAA;EACA,qBAAA;EACA,qBAAA;EACA,eAAA;EACA,mBAAA;EACA,mBAAA;EACA,gBAAA;EACA,gBAAA;;AAIJ,OAAO;EACL,UAAA;EACA,oBAAA;EACA,yBAAA;EACA,cAAA;EACA,eAAA;EACA,MAAA;EACA,OAAA;EACA,WAAA;EACA,YAAA;EACA,WAAA;EACA,yBAAA;EACA,UAAA;EACA,gBAAA;EACA,cAAA;EAYA,UAAA;EACA,aAAA;;AAXA,OAhBK,OAgBJ;EACC,aAAA;;AAGF,OApBK,OAoBJ;EACC,cAAA;EACA,UAAA;EACA,oBAAA;;AAvBJ,OAAO,OA6BL;EACE,kBAAA;;AA9BJ,OAAO,OA6BL,GAGE;EACE,kBAAA;EACA,yBAAA;EACA,iBAAA;EACA,6BAAA;EACA,eAAA;EACA,gBAAA;EACA,eAAA;;AAEA,OAzCC,OA6BL,GAGE,GASG;AAAQ,OAzCR,OA6BL,GAGE,GASY;EACR,0CAAA;;AAMR;EACE,kBAAA;EACA,UAAA;EACA,oBAAA;EACA,yBAAA;EACA,cAAA;;AAEA,OAAC;EACC,aAAA;;AAGF,OAAC;EACC,UAAA;EACA,oBAAA;;AAIJ,QACE;EACE,kBAAA;EACA,kBAAA;;AAHJ,QACE,OAIE;EACE,YAAA;EACA,YAAA;EACA,sBAAA;EACA,aAAA;EACA,iBAAA;EACA,kBAAA;EACA,qBAAA;;AAEA;EAAA,QAbJ,OAIE;IAUI,cAAA;IACA,WAAA;;;AAhBR,QACE,OAIE,MAcE;EACE,YAAA;;AApBR,QACE,OAIE,MAkBE;EACE,gBAAA;EACA,eAAA;;AAWR;EACE,UAAA;EACA,kBAAA;EACA,eAAA;;AAEA;EAAA;IACE,UAAA;;;AAGF;EAAA;IACE,UAAA;;;AAGF;EAAA;IACE,UAAA;;;AAdJ,OAkBE;EACE,WAAA;EACA,kBAAA;EACA,gBAAA;;AArBJ,OAwBE;EACE,kBAAA;EACA,mBAAA;;AA1BJ,OAwBE,OAIE;EACE,cAAA;;AAGF,OARF,OAQG;EACC,aAAA;;AAIA,OAbJ,OAYG,oBACE;AAAD,OAbJ,OAYyB,iBACpB;EAEC,cAAA;EACA,SAAS,EAAT;EACA,kBAAA;EACA,WAAA;EACA,YAAA;EACA,WAAA;EACA,cAAA;EACA,sBAAsB,6BAAtB;EACA,0BAAA;EACA,4BAAA;EACA,uBAAA;EACA,oBAAA;EACA,oBAAA;EACA,oBAAA;;AApDR,OAwBE,OAgCE,iBACE;EACE,kBAAA;EACA,cAAA;EACA,kBAAA;;AA5DR,OAwBE,OAgCE,iBAOE,MAAK;EACH,YAAA;;AAEA,OA1CN,OAgCE,iBAOE,MAAK,mBAGF;EACC,WAAA;EACA,UAAA;;AApEV,OAwBE,OAiDE;AAzEJ,OAwBE,OAiDU;AAzEZ,OAwBE,OAiDiB;AAzEnB,OAwBE,OAiDqC;EACjC,yBAAA;EACA,iCAAA;EACA,sBAAA;EACA,WAAA;EACA,cAAA;EACA,aAAA;EACA,qBAAA;EACA,WAAA;EACA,gBAAA;EACA,gBAAA;EACA,2BAAA;EACA,iBAAA;EACA,qBAAA;EACA,wBAAA;EACA,oBAAA;EACA,gBAAA;;AAzFN,OAwBE,OAiDE,OAkBE;AA3FN,OAwBE,OAiDU,MAkBN;AA3FN,OAwBE,OAiDiB,mBAkBb;AA3FN,OAwBE,OAiDqC,iBAkBjC;EACE,kBAAA;;AA5FR,OAwBE,OAwEE;EACE,WAAA;EACA,kBAAA;;AAlGN,OAwBE,OA8EE;AAtGJ,OAwBE,OA8ES;EACL,iBAAA;EACA,kBAAA;;AAxGN,OAwBE,OAmFE;EACE,gBAAA;EACA,kBAAA;;AA7GN,OAwBE,OAmFE,QAIE;EACE,yBAAA;;AAhHR,OAwBE,OAmFE,QAQE;EACE,sBAAA;EACA,UAAA;EACA,cAAA;EACA,aAAA;;AAvHR,OAwBE,OAmFE,QAeE;EACE,YAAA;EACA,sBAAA;;AA5HR,OAwBE,OAmFE,QAqBE;EACE,cAAA;EACA,kBAAA;EACA,kBAAA;EACA,yBAAA;EACA,qBAAA;EACA,sBAAA;EACA,kBAAA;;AAvIR,OAwBE,OAmFE,QA+BE;EACE,eAAA;EACA,gBAAA;EACA,gBAAA;;AA7IR,OAwBE,OAmFE,QA+BE,KAKE;EACE,WAAA;;AAhJV,OAwBE,OAmFE,QA+BE,KASE;EACE,gBAAA;EACA,cAAA;;AArJV,OAwBE,OAmFE,QA8CE;EACE,cAAA;EACA,iBAAA;;AA3JR,OAwBE,OAmFE,QA8CE,YAIE;EACE,WAAA;EACA,0BAAA;;AA/JV,OAwBE,OA4IE,MAAK;AApKT,OAwBE,OA6IE,MAAK;;EAEH,wBAAA;EACA,SAAA;;;AAxKN,OAwBE,OAmJE,MAAK;EACH,0BAAA;;;AAON;EACE,cAAA;EACA,eAAA;EACA,gBAAA;;AAEA,wBAAC;EACC,yBAAA;EACA,WAAA","file":"style.css"} \ No newline at end of file +{"version":3,"sources":["style.less"],"names":[],"mappings":"QAkWQ;QACA;AAhWR;EACE,aAAa,eAAb;EACA,gBAAA;EACA,SAAS,+BAAT;;AAGF;EACE,aAAa,eAAb;EACA,gBAAA;EACA,SAAS,+BAAT;;AAUF;EACE,eAAA;;AAEA,IAAC;EACC,cAAA;;AAGF;EAAA;IACE,cAAA;;;AAGF;EAAA;IACE,cAAA;;;AAGF;EAAA;IACE,cAAA;;;AAEF;EAAA;IACE,cAAA;;;AAEF;EAAA;IACE,cAAA;;;AAEF;EAAA;IACE,cAAA;;;AAIJ;EACE,aAAA;;AAIF;AAAS;EACP,aAAA;EACA,iBAAA;EAOA,aAAA;EACA,WAAA;EACA,cAAA;EACA,aApEY,6CAoEZ;;AATA;EAAA;EAAA;IACE,aAAA;;;AAEF;EAAA;EAAA;IACE,aAAA;;;AAQJ;EACE,cAAA;EACA,kBAAA;EAEA,aAAA;;AAJF,QAME;EACE,iBAAA;EACA,gBAAA;;AARJ,QAME,SAIE;EACE,cAAA;;AAEA,QAPJ,SAIE,EAGG;EACC,gBAAA;EACA,iBAAA;EACA,kBAAA;;AAhBR,QAME,SAcE;EACE,gBAAA;;AArBN,QAME,SAkBE;EACE,UAAA;EACA,qBAAA;EACA,gBAAA;EACA,mBAAA;EACA,gBAAA;EACA,eAAA;;AA9BN,QAME,SA+BE;EACE,UAAA;;AAtCN,QAME,SAmCE;EACE,yBAAA;;AAKN,CAAC;EACC,iBAAA;EACA,gBAAA;EACA,yBAAA;EACA,yBAAA;EACA,WAAA;EACA,SAAA;EACA,kBAAA;EACA,kBAAA;EACA,mBAAA;EACA,qBAAA;EACA,qBAAA;;AAGF;EACE,aArIY,6CAqIZ;EACA,UAAA;EACA,SAAA;EACA,yBAAA;EACA,WAAA;;AAGF;EACE,kBAAA;EACA,MAAA;EACA,OAAA;EACA,aAAA;EACA,yBAAA;EACA,WAAA;EACA,WAAA;EACA,eAAA;;AAGF;EACE,kBAAA;EACA,OAAA;EACA,SAAA;EACA,YAAA;EACA,WAAA;;AAGF;EACE,kBAAA;EACA,SAAA;EACA,UAAA;EACA,yBAAA;EACA,eAAA;EACA,aAAA;;AANF,YAQE;EAcE,WAAA;;AAbA,YADF,EACG;EACC,SAAS,EAAT;EACA,qBAAA;EACA,aAAA;EACA,cAAA;EACA,oBAAA;EAGA,sBAAsB,wBAAtB;EACA,wBAAA;EACA,0BAAA;;AAQN;EACE,UAAA;EACA,SAAA;EACA,sBAAA;EACA,gBAAA;EACA,aA/LY,6CA+LZ;EACA,qBAAA;;AAKF;EACE,yBAAA;EACA,eAAA;EACA,qBAAA;EACA,iBAAA;EACA,kBAAA;;AAGF;EACE,eAAA;EACA,kBAAA;EACA,kBAAA;EACA,gBAAA;;AAIF;EACE,cAAA;EACA,WAAA;EACA,mBAAA;EACA,kBAAA;EACA,WAAA;EACA,kBAAA;;AANF,KAQE;EACE,YAAA;;AAIJ;EACE,kBAAA;EACA,WAAA;EACA,SAAA;;AAHF,2BAKE;EACE,cAAA;;AANJ,2BASE;EACE,qBAAA;;AAVJ,2BAaE;EACE,aAAA;;AAdJ,2BAiBE;EACE,yBAAA;EACA,cAAA;EACA,qBAAA;EACA,qBAAA;EACA,eAAA;EACA,mBAAA;EACA,mBAAA;EACA,gBAAA;EACA,gBAAA;;AAIJ,OAAO;EACL,UAAA;EACA,oBAAA;EACA,yBAAA;EACA,cAAA;EACA,eAAA;EACA,MAAA;EACA,OAAA;EACA,WAAA;EACA,YAAA;EACA,WAAA;EACA,yBAAA;EACA,UAAA;EACA,gBAAA;EACA,cAAA;EAYA,UAAA;EACA,aAAA;;AAXA,OAhBK,OAgBJ;EACC,aAAA;;AAGF,OApBK,OAoBJ;EACC,cAAA;EACA,UAAA;EACA,oBAAA;;AAvBJ,OAAO,OA6BL;EACE,kBAAA;;AA9BJ,OAAO,OA6BL,GAGE;EACE,kBAAA;EACA,yBAAA;EACA,iBAAA;EACA,6BAAA;EACA,eAAA;EACA,gBAAA;EACA,eAAA;;AAEA,OAzCC,OA6BL,GAGE,GASG;AAAQ,OAzCR,OA6BL,GAGE,GASY;EACR,0CAAA;;AAMR;EACE,kBAAA;EACA,UAAA;EACA,oBAAA;EACA,yBAAA;EACA,cAAA;;AAEA,OAAC;EACC,aAAA;;AAGF,OAAC;EACC,UAAA;EACA,oBAAA;;AAIJ,QACE;EACE,kBAAA;EACA,kBAAA;;AAHJ,QACE,OAIE;EACE,YAAA;EACA,YAAA;EACA,sBAAA;EACA,aAAA;EACA,iBAAA;EACA,kBAAA;EACA,qBAAA;;AAEA;EAAA,QAbJ,OAIE;IAUI,cAAA;IACA,WAAA;;;AAhBR,QACE,OAIE,MAcE;EACE,YAAA;;AApBR,QACE,OAIE,MAkBE;EACE,gBAAA;EACA,eAAA;;AAWR;EACE,UAAA;EACA,kBAAA;EACA,eAAA;;AAEA;EAAA;IACE,UAAA;;;AAGF;EAAA;IACE,UAAA;;;AAGF;EAAA;IACE,UAAA;;;AAdJ,OAkBE;EACE,WAAA;EACA,kBAAA;EACA,gBAAA;;AArBJ,OAwBE;EACE,kBAAA;EACA,mBAAA;;AA1BJ,OAwBE,OAIE;EACE,cAAA;;AAGF,OARF,OAQG;EACC,aAAA;;AAIA,OAbJ,OAYG,oBACE;AAAD,OAbJ,OAYyB,iBACpB;EAEC,cAAA;EACA,SAAS,EAAT;EACA,kBAAA;EACA,WAAA;EACA,YAAA;EACA,WAAA;EACA,cAAA;EACA,sBAAsB,6BAAtB;EACA,0BAAA;EACA,4BAAA;EACA,uBAAA;EACA,oBAAA;EACA,oBAAA;EACA,oBAAA;;AApDR,OAwBE,OAgCE,iBACE;EACE,kBAAA;EACA,cAAA;EACA,kBAAA;;AA5DR,OAwBE,OAgCE,iBAOE,MAAK;EACH,YAAA;;AAEA,OA1CN,OAgCE,iBAOE,MAAK,mBAGF;EACC,WAAA;EACA,UAAA;;AApEV,OAwBE,OAiDE;AAzEJ,OAwBE,OAiDU;AAzEZ,OAwBE,OAiDiB;AAzEnB,OAwBE,OAiDqC;EACjC,yBAAA;EACA,iCAAA;EACA,sBAAA;EACA,WAAA;EACA,cAAA;EACA,aAAA;EACA,qBAAA;EACA,WAAA;EACA,gBAAA;EACA,gBAAA;EACA,2BAAA;EACA,iBAAA;EACA,qBAAA;EACA,wBAAA;EACA,oBAAA;EACA,gBAAA;;AAzFN,OAwBE,OAiDE,OAkBE;AA3FN,OAwBE,OAiDU,MAkBN;AA3FN,OAwBE,OAiDiB,mBAkBb;AA3FN,OAwBE,OAiDqC,iBAkBjC;EACE,kBAAA;;AA5FR,OAwBE,OAwEE;EACE,WAAA;EACA,kBAAA;;AAlGN,OAwBE,OA8EE;AAtGJ,OAwBE,OA8ES;EACL,iBAAA;EACA,kBAAA;;AAxGN,OAwBE,OAmFE;EACE,gBAAA;EACA,kBAAA;;AA7GN,OAwBE,OAmFE,QAIE;EACE,yBAAA;;AAhHR,OAwBE,OAmFE,QAQE;EACE,sBAAA;EACA,UAAA;EACA,cAAA;EACA,aAAA;;AAvHR,OAwBE,OAmFE,QAeE;EACE,qBAAA;EACA,YAAA;EACA,sBAAA;;AA7HR,OAwBE,OAmFE,QAeE,aAKE;EACE,eAAA;EACA,yBAAA;EACA,cAAA;EACA,gBAAA;;AAnIV,OAwBE,OAmFE,QAeE,aAYE;EACE,cAAA;;AAvIV,OAwBE,OAmFE,QAkCE;EACE,cAAA;EACA,kBAAA;EACA,kBAAA;EACA,yBAAA;EACA,qBAAA;EACA,sBAAA;EACA,kBAAA;;AApJR,OAwBE,OAmFE,QA4CE;EACE,eAAA;EACA,gBAAA;EACA,gBAAA;;AA1JR,OAwBE,OAmFE,QA4CE,KAKE;EACE,WAAA;;AA7JV,OAwBE,OAmFE,QA4CE,KASE;EACE,gBAAA;EACA,cAAA;;AAlKV,OAwBE,OAmFE,QA2DE;EACE,cAAA;EACA,iBAAA;;AAxKR,OAwBE,OAmFE,QA2DE,YAIE;EACE,WAAA;EACA,0BAAA;;AA5KV,OAwBE,OAyJE,MAAK;AAjLT,OAwBE,OA0JE,MAAK;;EAEH,wBAAA;EACA,SAAA;;;AArLN,OAwBE,OAgKE,MAAK;EACH,0BAAA;;;AAON;EACE,cAAA;EACA,eAAA;EACA,gBAAA;;AAEA,wBAAC;EACC,yBAAA;EACA,WAAA","file":"style.css"} \ No newline at end of file diff --git a/ScreeningMediaSelection/style/style.less b/ScreeningMediaSelection/style/style.less index 538ddc4..698a840 100644 --- a/ScreeningMediaSelection/style/style.less +++ b/ScreeningMediaSelection/style/style.less @@ -477,9 +477,22 @@ section { padding: 2rem; } - img { + .screenimage { + display: inline-block; width: 120px; vertical-align: middle; + + span { + font-size: 12px; + text-transform: uppercase; + display: block; + margin-top: 15px; + } + + img { + display: block; + } + }