diff --git a/html/26.php b/html/26.php index b2eedc0be27de2cb35243ef446ba2fe738f6272d..33c12d96d417752d408352f28167cc369e5b947f 100644 --- a/html/26.php +++ b/html/26.php @@ -5,6 +5,7 @@ date: '2021-10-11' ligaspieltag: 17 step: 1 finals_step: 2 +finalteams: 4 startliste: - - bw diff --git a/html/27.php b/html/27.php index 4dc8ff8c4cade7b0ce56c795f4f830f74e3f7012..82957c99cf861dcee4773a608f17101017fb9907 100644 --- a/html/27.php +++ b/html/27.php @@ -5,6 +5,7 @@ date: '2021-11-16' ligaspieltag: 18 step: 1 finals_step: 2 +finalteams: 4 startliste: - - bw diff --git a/html/28.php b/html/28.php index 631c2b480f51d0f0443ad9b75ba5015b13b27677..a404d878e1141c404dccbb54c0f30fd93f480fc3 100644 --- a/html/28.php +++ b/html/28.php @@ -5,6 +5,7 @@ date: '2021-12-11' ligaspieltag: 8 step: 1 finals_step: 2 +finalteams: 4 startliste: - - cz diff --git a/html/29.php b/html/29.php index 191959a4516e300afc2ac7a7d9f5ac05d4b7cee5..6358d30b0dcf1c3da62efe3d43ffb102eb6fea3c 100644 --- a/html/29.php +++ b/html/29.php @@ -5,7 +5,7 @@ date: '2022-01-15' ligaspieltag: 8 step: 1 finals_step: 2 -finalteams: 8 +finalteams: 4 startliste: - - co diff --git a/html/30.php b/html/30.php index 9bbd91c7107b9061b1a37c4b634df759281797a0..d768438ab3b840fb85b811a42567a4580f383758 100644 --- a/html/30.php +++ b/html/30.php @@ -5,6 +5,7 @@ date: '2022-02-19' ligaspieltag: 8 step: 1 finals_step: 2 +finalteams: 4 startliste: - - is diff --git a/html/31.php b/html/31.php index 85c28e274721518251d41c684a4bfaf71de43987..9ca9dda29a736c0f50a9399d8e4ecacc814ccfe7 100644 --- a/html/31.php +++ b/html/31.php @@ -5,6 +5,7 @@ date: '2022-03-26' ligaspieltag: 8 step: 1 finals_step: 2 +finalteams: 4 startliste: - - se diff --git a/html/_layouts/default.php b/html/_layouts/default.php index eafb46ad72324e95798daf0d82bbd2d1d0fc00c0..c2cf3b1969abba3e4af30665383941b2679a6bd8 100644 --- a/html/_layouts/default.php +++ b/html/_layouts/default.php @@ -54,7 +54,7 @@ if( !empty($csv) ){ <body> <script> - + var SAISON_SETTINGS={{ site.pages | where_exp: 'item','item.saison>25' | sort: 'saison' | map: 'finalteams' | jsonify }}; var DATA={{ site.data | jsonify }}; var SAISON='{{ page.saison }}'; var SAISON_NOW='{{ site.data.global.saison_now }}'; diff --git a/html/assets/css/custom.scss b/html/assets/css/custom.scss index ddcbe6cf3c1a524533136c0e72ea87379cd9acfa..2c4f5b48b6a0e17ff3a7b23f48f619ac50ad2732 100644 --- a/html/assets/css/custom.scss +++ b/html/assets/css/custom.scss @@ -296,7 +296,11 @@ td.n { color: firebrick; } } } &:nth-child(4) td { - border-bottom: 1px dashed blue; + } } } + +.dashed { + border-bottom: 1px dashed blue; +} diff --git a/html/assets/js/script.js b/html/assets/js/script.js index 85af1caed077aa1ae6141d299a2c2a8d13c9200c..80ab8b8fe179af7172d3490dc418c236ccbf9f86 100644 --- a/html/assets/js/script.js +++ b/html/assets/js/script.js @@ -420,7 +420,7 @@ function calculatePunktestand(saison,runde,show=true){ var t=v[saison].Tr.map( (a) => ( a != 'X' ) ? 1 : 0 ); if( t.length == 0 ) t.push(0); tmp+='<td>'+t.reduce( (a,b) => a+b )+'</td>'; - tmp+='<td><img class="flags" src="./images/flags/'+v.nt.toLowerCase()+'.svg"> <a href="javascript:calculateTeam('+((saison == 0) ? SAISON_NOW : saison)+',\''+v.nt+'\')">'+v.name.replace(/\(NL\)/g,'<sup>'+v.nt.toUpperCase()+'</sup></a>')+' <a href="'+v.link+'" target="ultrasoccer"><i class="fas fa-link"></i></a></td>'; + tmp+='<td><img class="flags" src="./images/flags/'+(( v.flag ) ? v.flag : v.nt.toLowerCase())+'.svg"> <a href="javascript:calculateTeam('+((saison == 0) ? SAISON_NOW : saison)+',\''+v.nt+'\')">'+v.name.replace(/\(NL\)/g,'<sup>'+v.nt.toUpperCase()+'</sup></a>')+' <a href="'+v.link+'" target="ultrasoccer"><i class="fas fa-link"></i></a></td>'; tmp+='<td>'+ v[saison].Tr.map( (a) => ( ( a == 'S') ? 1 : 0 ) ).reduce( (a,b) => a+b )+'/'+ v[saison].Tr.map( (a) => ( ( a == 'U') ? 1 : 0 ) ).reduce( (a,b) => a+b )+'/'+ @@ -445,7 +445,7 @@ function calculateTore(saison){ var team_flag='<img class="flags" src="./images/flags/xx.svg" title="n/a">'; var team_name=''; } else { - var team_flag='<img class="flags" src="./images/flags/'+team[0].nt+'.svg" title="'+team[0].name.split('(NL)')[0].trim()+'">'; + var team_flag='<img class="flags" src="./images/flags/'+(( team[0].flag ) ? team[0].flag : team[0].nt.toLowerCase())+'.svg" title="'+team[0].name.split('(NL)')[0].trim()+'">'; var team_name='<a href="javascript:calculateTeam('+saison+',\''+team[0].nt+'\')">'+team[0].name.replace(/\(NL\)/g,'<sup>'+team[0].nt.toUpperCase()+'</sup></a>')+' <a href="'+team[0].link+'" target="ultrasoccer"><i class="fas fa-link"></i></a>'; } @@ -472,7 +472,7 @@ function calculateAssists(saison){ var team_flag='<img class="flags" src="./images/flags/xx.svg" title="n/a">'; var team_name=''; } else { - var team_flag='<img class="flags" src="./images/flags/'+team[0].nt+'.svg" title="'+team[0].name.split('(NL)')[0].trim()+'">'; + var team_flag='<img class="flags" src="./images/flags/'+(( team[0].flag ) ? team[0].flag : team[0].nt.toLowerCase())+'.svg" title="'+team[0].name.split('(NL)')[0].trim()+'">'; var team_name='<a href="javascript:calculateTeam('+saison+',\''+team[0].nt+'\')">'+team[0].name.replace(/\(NL\)/g,'<sup>'+team[0].nt.toUpperCase()+'</sup></a>')+' <a href="'+team[0].link+'" target="ultrasoccer"><i class="fas fa-link"></i></a>'; } @@ -499,7 +499,7 @@ function calculateZwk(saison){ var team_flag='<img class="flags" src="./images/flags/xx.svg" title="n/a">'; var team_name=''; } else { - var team_flag='<img class="flags" src="./images/flags/'+team[0].nt+'.svg" title="'+team[0].name.split('(NL)')[0].trim()+'">'; + var team_flag='<img class="flags" src="./images/flags/'+(( team[0].flag ) ? team[0].flag : team[0].nt.toLowerCase())+'.svg" title="'+team[0].name.split('(NL)')[0].trim()+'">'; var team_name='<a href="javascript:calculateTeam('+saison+',\''+team[0].nt+'\')">'+team[0].name.replace(/\(NL\)/g,'<sup>'+team[0].nt.toUpperCase()+'</sup></a>')+' <a href="'+team[0].link+'" target="ultrasoccer"><i class="fas fa-link"></i></a>'; } @@ -582,7 +582,7 @@ function calculateHistorie(){ tmp+='<tr><td>'+(p+1)+'</td>'; for( var i=0; i<=SAISON_NOW-26; i++){ var nt=T[i][p] != undefined ? T[i][p].nt : undefined; - tmp+='<td'+(( masters[i] == nt && nt != undefined ) ? ' class="master"' : '')+'>'+(( nt != undefined ) ? '<img class="flags" title="'+T[i][p].name+'" src="./images/flags/'+nt+'.svg">' : '')+'</td>'; + tmp+='<td class="'+(( masters[i] == nt && nt != undefined ) ? 'master ' : '')+(( SAISON_SETTINGS[i] == p+1 ) ? 'dashed ' : '')+'">'+(( nt != undefined ) ? '<img class="flags" title="'+T[i][p].name+'" src="./images/flags/'+(( T[i][p].flag ) ? T[i][p].flag : T[i][p].nt.toLowerCase())+'.svg">' : '')+'</td>'; } tmp+='</tr>'; }