diff options
Diffstat (limited to 'mayor-orig/www/skin/classic/module-naplo/javascript')
-rw-r--r-- | mayor-orig/www/skin/classic/module-naplo/javascript/naplo.jquery.min.js | 13 | ||||
-rw-r--r-- | mayor-orig/www/skin/classic/module-naplo/javascript/orarend/orarend.jquery.min.js | 6 |
2 files changed, 15 insertions, 4 deletions
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 += '<li><span>Tanár: ' + adat['oraAdat']['kiCn'] +'</li>'; if (adat['oraAdat']['kitCn']!='') content += '<li>Helyettesítendő: ' + adat['oraAdat']['kitCn'] +'</li>'; content += '<li>Terem: ' + (adat['oraAdat']['teremId']==null?'–':adat['oraAdat']['teremId']) +'</li>'; - content += '<li>Leírás: ' + mayorLeiras(adat['oraAdat']['leiras']) +'</li>'; + content += '<li>Leírás: ' + (adat['oraAdat']['leiras']) +'</li>'; content += '</ul>'; if (adat['oraBeirhato']) content += adat['oraForm']; @@ -854,8 +854,9 @@ processJSONTankorAdat = function(adat) { content += '</ul>'; } - content += '<h3>'+adat['leiras']+'</h3>'; + content += '<h3>'+mayorLeiras(adat['leiras'])+'</h3>'; content += '<ul>'; + content += '<li>megjegyzés: '+adat['cn']+'</li>'; content += '<li>névsor: '+adat['nevsor']+'</li>'; content += '<li>választható: '+adat['felveheto']+' ('+adat['min']+'-'+adat['max']+')</li>'; content += '<li>jelenlét: '+adat['jelenlet']+'</li>'; @@ -916,15 +917,19 @@ processJSONTankorAdat = function(adat) { content += '<span style="display:none" id="mayorsidewindowtype" data-mayorsidewindowtype="tankor"></span>'; if ( $('#updateWindowSide').hasClass('nyitva') ==true && $('#mayorsidewindowtype').data('mayorsidewindowtype')!='tankor' ) { - $('#updateWindowSideSubTitle').html(adat['tankorNev']); +// $('#updateWindowSideSubTitle').html(adat['tankorNev']); + $('#updateWindowSideSubTitle').html('<a href="'+href({'page':'naplo','sub':'intezmeny','f':'tankor','tankorId':adat['tankorId']})+'">'+adat['tankorNev']+'</a>'); $('#updateWindowSideSubContent').html(content); $('#updateWindowSideSub').addClass('nyitva'); } else { - $('#updateWindowSideTitle').html(adat['tankorNev']); +// $('#updateWindowSideTitle').html(adat['tankorNev']); + $('#updateWindowSideTitle').html('<a href="'+href({'page':'naplo','sub':'intezmeny','f':'tankor','tankorId':adat['tankorId']})+'">'+adat['tankorNev']+'</a>'); $('#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(); |