diff --git a/metadata/dbms/editrecord.js b/metadata/dbms/editrecord.js index f45640a..4ada59d 100644 --- a/metadata/dbms/editrecord.js +++ b/metadata/dbms/editrecord.js @@ -264,8 +264,8 @@ class EdtRec { rpos++; tr = document.createElement('tr'); - if (rpos%2==0) bgColor=g_rowColor1; else bgColor=g_rowColor2; - tr.setAttribute("bgColor",bgColor); + if (rpos%2==0) bgColor='var(--row-color-1)'; else bgColor='var(--row-color-2)'; + tr.style.backgroundColor=bgColor; if(nodeProp.getAttribute("visible")=='0') tr.style.display='none'; td1 = document.createElement('td'); td2 = document.createElement('td'); diff --git a/metadata/dbms/showrecord.js b/metadata/dbms/showrecord.js index 8f25602..a7f1a93 100644 --- a/metadata/dbms/showrecord.js +++ b/metadata/dbms/showrecord.js @@ -81,7 +81,7 @@ class SRec if(this.rwin!=null) { this.rwin.hideProgressBar(); - this.rwin.setContent('
'+trt('Download_report')+': "'+this.win.getCaption().innerHTML+'".
'); + this.rwin.setContent('
'+trt('Download_report')+': "'+this.win.getCaption().innerHTML+'".
'); } }else alert2(trt('Alert'),"Unknown function! fn=\""+fn+"\"" ); @@ -149,7 +149,7 @@ class SRec let str='\
\
\ - \ +
\ \
\
\ @@ -342,7 +342,7 @@ class SRec }else if(count>1) //The item selection window is displayed. { - let htmlString=''; + let htmlString='
'; nodeProp=nodeType.firstChild i=0; while (nodeProp!=null) @@ -1071,7 +1071,7 @@ class SRec th.appendChild( document.createTextNode(trt('Del'))); th.title = trt('Invert_selection'); th.style.cssText='width: 1%; cursor: pointer; text-decoration: underline;'; - th.onmouseover=function(){ this.style.backgroundColor=g_rowColor2; }; + th.onmouseover=function(){ this.style.backgroundColor='var(--row-color-2)'; }; th.onmouseout=function(){ this.style.backgroundColor='var(--header-color)'; }; th.onclick= ()=>{ for(let i=0;i=0) //Color from Result - { bgColorT=findNodeOnNum(nodeRecord,"#cdata-section",nColor).nodeValue; + { + let bgColorT=findNodeOnNum(nodeRecord,"#cdata-section",nColor).nodeValue; if(bgColorT!="") bgColor=bgColorT; } let id=nodeRecord.getAttribute("id"); @@ -1208,7 +1209,8 @@ class SRec tr.onmouseover=function(){ this.style.backgroundColor="var(--btn-color2)"; }; tr.onmouseout=function(val1,val2){return function(){val1.style.backgroundColor=val2;}}(tr,bgColor); tr.setAttribute("id",id+'_'+this.uid); - tr.setAttribute("bgColor",bgColor); + tr.style.backgroundColor=bgColor; + //sequential record number let td = document.createElement('td'); td.appendChild( document.createTextNode( i+100*this.pagepos ) ); @@ -1480,7 +1482,7 @@ class SRec this.rwin.setParent(this.win); this.rwin.setSize(280,130); this.rwin.setCaption(trt('Report')); - this.rwin.setContent('
'+trt('Preparing_of_report')+'
'); + this.rwin.setContent('
'+trt('Preparing_of_report')+'
'); this.appendFilter(); //Call data from server diff --git a/metadata/dbms/tabs.js b/metadata/dbms/tabs.js index da7f65b..1e23e5b 100644 --- a/metadata/dbms/tabs.js +++ b/metadata/dbms/tabs.js @@ -15,7 +15,7 @@ class tcTabs tr.style.cssText='display: table-row; height: 1%; padding: 0px; margin: 0px; border: 0px solid #0000ff;' this.btt=document.createElement('div'); - this.btt.style.cssText='display: table-cell; width :100%; height: 1%; padding: 0px; margin: 0px; border: 0px solid #0000ff;background-color: '+g_backColor2+';color:'+g_textColor1+';'; + this.btt.style.cssText='display: table-cell; width :100%; height: 1%; padding: 0px; margin: 0px; border: 0px solid #0000ff;background-color:var(--back-color-2);color:var(--text-color-1);'; tr.appendChild(this.btt); this.wra.appendChild(tr); @@ -91,11 +91,11 @@ class tcTab //Сам таб на который нажимаем (ушко) this.div=document.createElement('div') this.div.style.cssText='position: relative; top: 1px; cursor: pointer; float: '+config.float+'; border: 1px solid #b3b3b3; border-radius: 5px 5px 0px 0px; padding: 1px; padding-right: 4px; padding-left: 4px; margin-left: 2px; margin-right: 2px;' - this.div.style.background = g_backColor1; + this.div.style.background = 'var(--back-color-1)'; this.div.innerHTML=config.caption; - this.div.onmouseover=function(obj){return function(){ if(!obj.sel) obj.div.style.background = g_rowColor1; }}(this); - this.div.onmouseout=function(obj){return function(){ if(!obj.sel) obj.div.style.background = g_backColor1; }}(this); + this.div.onmouseover=function(obj){return function(){ if(!obj.sel) obj.div.style.background = 'var(--row-color-1)'; }}(this); + this.div.onmouseout=function(obj){return function(){ if(!obj.sel) obj.div.style.background = 'var(--back-color-1)'; }}(this); this.div.onclick=function(obj){return function(){ obj.setSel(); if(obj.href!='') goToURL(obj.href); }}(this) } @@ -124,12 +124,12 @@ class tcTab setSel() { for(let i=0;i