From 8f8fc390374681cd537e4216f0366d6fe8a6c73c Mon Sep 17 00:00:00 2001 From: M.Gergo Date: Fri, 7 Sep 2018 22:27:52 +0200 Subject: Rev: 4358 --- .../module-naplo/css/orarend/orarendModosito.css | 3 +- .../module-naplo/html/intezmeny/tankor.phtml | 20 ++++++--- .../module-naplo/html/intezmeny/terem.phtml | 7 ++- .../module-naplo/html/orarend/orarend.phtml | 51 ++++++++++++++++++++-- .../html/orarend/orarendModosito.phtml | 14 +++--- .../module-naplo/javascript/naplo.jquery.min.js | 13 ++++-- .../javascript/orarend/orarend.jquery.min.js | 6 +++ mayor-orig/www/skin/oldschool/base/html/base.phtml | 2 +- 8 files changed, 93 insertions(+), 23 deletions(-) (limited to 'mayor-orig/www/skin') diff --git a/mayor-orig/www/skin/classic/module-naplo/css/orarend/orarendModosito.css b/mayor-orig/www/skin/classic/module-naplo/css/orarend/orarendModosito.css index 4d2ef3aa..1d9f527b 100644 --- a/mayor-orig/www/skin/classic/module-naplo/css/orarend/orarendModosito.css +++ b/mayor-orig/www/skin/classic/module-naplo/css/orarend/orarendModosito.css @@ -3,7 +3,7 @@ h2 { text-align: center; color: red;} h2.toPrint { display: none; } table.toolBar tr td select, table.toolBar tr td option { - font-size:11px; +font-size:10px; } table.orarend { @@ -45,6 +45,7 @@ table.orarend tr td select { font-size: 10px; background-color:#000011; color: white; + max-width:140px; } div.unfinished { diff --git a/mayor-orig/www/skin/classic/module-naplo/html/intezmeny/tankor.phtml b/mayor-orig/www/skin/classic/module-naplo/html/intezmeny/tankor.phtml index 22e807f5..7517709b 100644 --- a/mayor-orig/www/skin/classic/module-naplo/html/intezmeny/tankor.phtml +++ b/mayor-orig/www/skin/classic/module-naplo/html/intezmeny/tankor.phtml @@ -28,11 +28,6 @@ global $TANKOR_TIPUS; /* $TOPOST['tankoradat'] */ - - $TT=array(); - for ($i=0; $i'._TANKOR.' '; echo $MK['leiras'].'/'.$TARGY['targyNev']; if ($TARGY['targyJelleg']!='') echo ' ('.$TARGY['targyJelleg'].')'; - echo ' '.implode(', ',$TT); + for ($i=0; $i'; + echo $TOPOST['tankortanar'][$i]['tanarNev']; + echo ''; + } echo ''."\n"; - echo ''; + echo ''."\n"; echo ''; echo ''; echo ''; echo ''."\n"; + echo ''; + echo ''; + echo ''."\n"; + echo '
'._ELNEVEZES.''; @@ -98,6 +98,12 @@ echo '
'._TANKORCN.''; + echo ''; + echo '
'; echo '

'._ALTALANOS.'

'."\n"; diff --git a/mayor-orig/www/skin/classic/module-naplo/html/intezmeny/terem.phtml b/mayor-orig/www/skin/classic/module-naplo/html/intezmeny/terem.phtml index 73cbede6..7b95fbc6 100644 --- a/mayor-orig/www/skin/classic/module-naplo/html/intezmeny/terem.phtml +++ b/mayor-orig/www/skin/classic/module-naplo/html/intezmeny/terem.phtml @@ -12,16 +12,21 @@ echo ''._FEROHELY.''; echo ''._TIPUS.''; echo ''._TELEPHELY.''; + echo ''._TEREMALLAPOT.''; echo ''."\n"; echo ''."\n"; echo ''; foreach ($ADAT['teremAdat'] as $teremId => $tAdat) { echo ''; echo ''.$tAdat['teremId'].''; - echo ''.$tAdat['leiras'].''; + echo ''; + echo ' '; + echo $tAdat['leiras']; + echo ''; echo ''.$tAdat['ferohely'].''; echo ''.$tAdat['tipus'].''; echo ''.$ADAT['telephelyAdat'][ $tAdat['telephelyId'] ]['telephelyRovidNev'].''; + echo ''.$tAdat['teremAllapot'].''; echo ''."\n"; } echo ''."\n"; diff --git a/mayor-orig/www/skin/classic/module-naplo/html/orarend/orarend.phtml b/mayor-orig/www/skin/classic/module-naplo/html/orarend/orarend.phtml index 0a0174bb..e34ea785 100644 --- a/mayor-orig/www/skin/classic/module-naplo/html/orarend/orarend.phtml +++ b/mayor-orig/www/skin/classic/module-naplo/html/orarend/orarend.phtml @@ -55,6 +55,25 @@ // if (is_array($ADAT['orarend']['assoc'])) { if (TRUE) { $T = $ADAT['orarend']['assoc']; + + if (MAYOR_SOCIAL === true) { + echo '

MaYoR Social Edition

'; + formBegin(); + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + } echo '

'.$ADAT['toPrint'].'

'; echo ''."\n"; echo ''; @@ -214,7 +233,9 @@ // $het = $_T['het']; $_ORA = $ADAT['haladasi']['orak'][$dt][$ora][$_T['tankorId']]; - $_valosTeremId = (is_null($_ORA['teremId']))? $_T['teremId']:$_ORA['teremId']; + +$_valosTeremId = (is_null($_ORA['teremId']))? $_T['teremId']:$_ORA['teremId']; + $_tankorTipus = $ADAT['tankorok'][$_T['tankorId']][0]['tankorTipus']; $_tankorTipusId = $ADAT['tankorok'][$_T['tankorId']][0]['tankorTipusId']; $_oraMostVan = (in_array($_ORA['oraId'],$ADAT['orakMost'])); @@ -260,8 +281,8 @@ } if ($TANKOR_DOLGOZAT[$_T['tankorId']][$dt]>0) echo ''; if ($TANKOR_JEGYZET[$_T['tankorId']][$dt]>0) echo ''; - $_teremKiir = ($_T['teremId'] != $_valosTeremId) ? ''.$ADAT['termek'][$_T['teremId']]['leiras'].''.$ADAT['termek'][$_valosTeremId]['leiras'].'' : $ADAT['termek'][$_T['teremId']]['leiras']; - $_ferohely = $ADAT['termek'][$_valosTeremId]['ferohely']; +$_teremKiir = ($_T['teremId'] != $_valosTeremId) ? ''.$ADAT['termek'][$_T['teremId']]['leiras'].''.$ADAT['termek'][$_valosTeremId]['leiras'].'' : $ADAT['termek'][$_T['teremId']]['leiras']; +$_ferohely = $ADAT['termek'][$_valosTeremId]['ferohely']; $_letszam = $ADAT['tankorLetszamok'][$_T['tankorId']]; if ($_T['tankorId']!='') { echo ''; @@ -271,7 +292,27 @@ echo "$_targyjel : $_osztalyJel : "; } echo ', '; - echo ''.$_teremKiir.''; + echo ''.$_teremKiir.''; + +// mindenkinek módosítható (social edition) +if (MAYOR_SOCIAL === true) { +// if ($_valosTeremId == 0) { + // (`het`,`nap`,`ora`,`tanarId`,`tolDt` = teremId), + $_keyBase = 'OOM+'.$_T['het'].'+'.$nap.'+'.$ora.'+'.$_T['tanarId'].'+'.$_T['tolDt']; + $_hidden = ($_valosTeremId > 0)?' style="display:none" ':''; + echo ''; +// } +} + echo '
'; if ($_ORA['kit']!='') { echo ''; @@ -340,6 +381,8 @@ echo ''; echo '
'."\n\n\n\n"; + if (MAYOR_SOCIAL === true) formEnd(); + // } // foreach } else { diff --git a/mayor-orig/www/skin/classic/module-naplo/html/orarend/orarendModosito.phtml b/mayor-orig/www/skin/classic/module-naplo/html/orarend/orarendModosito.phtml index bd9b13c1..468d11bf 100644 --- a/mayor-orig/www/skin/classic/module-naplo/html/orarend/orarendModosito.phtml +++ b/mayor-orig/www/skin/classic/module-naplo/html/orarend/orarendModosito.phtml @@ -26,6 +26,7 @@ } echo ''; echo ''; + echo ''; echo ''; echo ''; echo ''; @@ -194,11 +195,11 @@ for ($oi=0; $oi'; - echo $__TANKOR['tankorNev']; - echo "($__tankorId)"; + echo ''."\n"; + echo ''."\n"; } echo ''; echo ''; @@ -272,12 +273,15 @@ for ($oi=0; $oi'; echo ''; echo ''; for ($i=0; $i'.$value.''."\n"; } echo ''; diff --git a/mayor-orig/www/skin/classic/module-naplo/javascript/naplo.jquery.min.js b/mayor-orig/www/skin/classic/module-naplo/javascript/naplo.jquery.min.js index c357f692..80276f20 100644 --- a/mayor-orig/www/skin/classic/module-naplo/javascript/naplo.jquery.min.js +++ b/mayor-orig/www/skin/classic/module-naplo/javascript/naplo.jquery.min.js @@ -673,7 +673,7 @@ processJSONOraAdat = function(adat) { // if (adat['oraAdat']['kiCn']!='') content += '
  • Tanár: ' + adat['oraAdat']['kiCn'] +'
    • '; if (adat['oraAdat']['kitCn']!='') content += '
  • Helyettesítendő: ' + adat['oraAdat']['kitCn'] +'
    • '; content += '
  • Terem: ' + (adat['oraAdat']['teremId']==null?'–':adat['oraAdat']['teremId']) +'
    • '; - content += '
  • Leírás: ' + mayorLeiras(adat['oraAdat']['leiras']) +'
    • '; + content += '
  • Leírás: ' + (adat['oraAdat']['leiras']) +'
    • '; content += ''; if (adat['oraBeirhato']) content += adat['oraForm']; @@ -854,8 +854,9 @@ processJSONTankorAdat = function(adat) { content += ''; } - content += '

    '+adat['leiras']+'

    '; + content += '

    '+mayorLeiras(adat['leiras'])+'

    '; content += '
      '; + content += '
    • megjegyzés: '+adat['cn']+'
      • '; content += '
    • névsor: '+adat['nevsor']+'
      • '; content += '
    • választható: '+adat['felveheto']+' ('+adat['min']+'-'+adat['max']+')
      • '; content += '
    • jelenlét: '+adat['jelenlet']+'
      • '; @@ -916,15 +917,19 @@ processJSONTankorAdat = function(adat) { content += ''; if ( $('#updateWindowSide').hasClass('nyitva') ==true && $('#mayorsidewindowtype').data('mayorsidewindowtype')!='tankor' ) { - $('#updateWindowSideSubTitle').html(adat['tankorNev']); +// $('#updateWindowSideSubTitle').html(adat['tankorNev']); + $('#updateWindowSideSubTitle').html(''+adat['tankorNev']+''); $('#updateWindowSideSubContent').html(content); $('#updateWindowSideSub').addClass('nyitva'); } else { - $('#updateWindowSideTitle').html(adat['tankorNev']); +// $('#updateWindowSideTitle').html(adat['tankorNev']); + $('#updateWindowSideTitle').html(''+adat['tankorNev']+''); $('#updateWindowSideContent').html(content); $('#updateWindowSide').addClass('nyitva'); } + // IDE + } diff --git a/mayor-orig/www/skin/classic/module-naplo/javascript/orarend/orarend.jquery.min.js b/mayor-orig/www/skin/classic/module-naplo/javascript/orarend/orarend.jquery.min.js index 0a0875cb..664bacf1 100644 --- a/mayor-orig/www/skin/classic/module-naplo/javascript/orarend/orarend.jquery.min.js +++ b/mayor-orig/www/skin/classic/module-naplo/javascript/orarend/orarend.jquery.min.js @@ -7,6 +7,12 @@ $(function() { var origHtmlStr = $('table.orarend thead th.het').html(); + $('form span.normalTerem').on('click',function(event) { + var el = $(event.target); + var tmpid = ($(el).data('tmpid')); + $("form select[data-tmpid='"+tmpid+"']").toggle(); + }); + $('table.orarend thead tr th').on('click',function() { // tool kezeles mobilon if ($(this).data('napindex')>0 && isMobile() == true) { $(this).find('table.orarend span.napLeiras').toggle(); diff --git a/mayor-orig/www/skin/oldschool/base/html/base.phtml b/mayor-orig/www/skin/oldschool/base/html/base.phtml index 1775f15f..813ed04e 100644 --- a/mayor-orig/www/skin/oldschool/base/html/base.phtml +++ b/mayor-orig/www/skin/oldschool/base/html/base.phtml @@ -54,7 +54,7 @@ function html_head($page,$sub,$f,$lang,$skin) { echo ''."\n"; echo ''."\n"; echo ''."\n"; - echo ''."\n"; + echo ''."\n"; echo ''."\n"; echo ''."\n"; echo ''."\n"; -- cgit v1.2.3