From 84cd05de4eaba22c158f88564b7941d5f4d70069 Mon Sep 17 00:00:00 2001 From: M.Gergo Date: Fri, 27 Mar 2020 17:10:04 +0100 Subject: Rev: 4641 --- .../skin/classic/module-naplo/css/haladasi/haladasi.css | 7 +++++++ .../www/skin/classic/module-naplo/css/orarend/orarend.css | 9 +++++++++ .../classic/module-naplo/html/haladasi/haladasi.phtml | 15 ++++++++++----- .../skin/classic/module-naplo/html/orarend/orarend.phtml | 5 +++++ 4 files changed, 31 insertions(+), 5 deletions(-) (limited to 'mayor-orig/mayor-naplo/www/skin') diff --git a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/css/haladasi/haladasi.css b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/css/haladasi/haladasi.css index 4477f75c..b4449090 100644 --- a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/css/haladasi/haladasi.css +++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/css/haladasi/haladasi.css @@ -316,6 +316,13 @@ td.cimke { text-align:center; white-space: wrap; background-color: rgba(255,255,255,0.3);} td.cimke span.cimke {background-color: orange; color:white; font-size:x-small; padding:0px 2px; border-radius: 2px; margin:2px;} + td.cimke span.cimke_0 { background-color: #4caf50; } + td.cimke span.cimke_1 { background-color: red; } + td.cimke span.cimke_2 { background-color: orange; } + td.cimke span.cimke_3 { background-color: #3f51b5; } + td.cimke span.cimke_4 { background-color: #673ab7; } + + } @media print { table.haladasiBejegyzesek thead tr th { border-bottom: solid 1px black;} diff --git a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/css/orarend/orarend.css b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/css/orarend/orarend.css index fab07933..836e0ee2 100644 --- a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/css/orarend/orarend.css +++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/css/orarend/orarend.css @@ -207,6 +207,15 @@ div.unfinished { table.orarend div.orarendTools span.dolgozat:hover { color: orange;} table.orarend div.orarendTools span.bezar:hover { color: #f06; } + table.orarend span.cimke { margin:0px 1px; border-radius: 2px; font-size:xx-small; color:white; padding: 0px 2px 0px 2px; background-color:#ddd; } + table.orarend span.cimke_0 { background-color: #4caf50; } + table.orarend span.cimke_1 { background-color: red; } + table.orarend span.cimke_2 { background-color: orange; } + table.orarend span.cimke_3 { background-color: #3f51b5; } + table.orarend span.cimke_4 { background-color: #673ab7; } + + + h2.mayorSocialEdition { text-align: center; background-color: #f06; diff --git a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/haladasi/haladasi.phtml b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/haladasi/haladasi.phtml index ce15cd4d..fa46ad2c 100644 --- a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/haladasi/haladasi.phtml +++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/haladasi/haladasi.phtml @@ -53,7 +53,7 @@ echo ($ADAT['oraTerheles'][$ADAT['tanarId']]['ossz']['heti']); } echo ''; - echo ''; + echo ''; if ($tanarId!='') { echo ''.$title.''; if ($ADAT['csakUres']==true) { @@ -106,7 +106,7 @@ echo ($ADAT['oraTerheles'][$ADAT['tanarId']]['ossz']['heti']); } echo ''; - echo ''; + echo ''; // if (_SHOW_DAYS_FROM > $_TANEV['kezdesDt']) echo ''."\n"; if (_SHOW_DAYS_FROM > $_TANEV['kezdesDt']) echo ''; @@ -197,7 +197,7 @@ if (__PLUSZBEIRHAT===true && !$jovoDt) echo '
'; echo ''."\n"; // Az első cella a dátum/nap - echo ''; + echo ''; echo str_replace('-','.',$dt) .'. '; echo ''.$aHetNapjai[(date('w',$time)+6)%7].''; if ($napInfo2['napszam']!='' || $napInfo['orarendiHet'] != 0) { @@ -237,7 +237,7 @@ if (__PLUSZBEIRHAT===true) putUjOra(array('dt'=>$dt, 'ora'=>$j)); } } else { - echo ''._NINCS_ORAJA.''; + echo ''._NINCS_ORAJA.''; // if ($tanitasiNap && strtotime(date('Y-m-d'))>=strtotime($dt)) { // if ( // (strtotime(date('Y-m-d'))>=strtotime($dt) @@ -523,9 +523,14 @@ for ($c = 0; $c0) echo ''.implode(' ',$_C).''; + if (count($_C)>0) { // vigyázz, csak egy címke engedélyezett! (egyelőre, különben sérül a getHaladasi) + $_cimkeId = $dOra['cimke'][0]; + echo ''.implode(' ',$_C).''; + } } } + echo ''; + echo ''; echo ''; diff --git a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/orarend/orarend.phtml b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/orarend/orarend.phtml index 5c75bfb6..77ad0bce 100644 --- a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/orarend/orarend.phtml +++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/orarend/orarend.phtml @@ -274,6 +274,11 @@ echo ''; } + if ($_ORA['cimkeLeiras']!='') { + $_cimkeMod = intval($_ORA['cimkeId']) % 5; + echo ''.$_ORA['cimkeLeiras'].''; + } + if (is_array($_hianyzasAdat)) { echo ''; if ($_hianyzasAdat['hTipus']=='hiányzás') -- cgit v1.2.3