diff options
author | M.Gergo | 2019-11-19 00:13:36 +0100 |
---|---|---|
committer | M.Gergo | 2019-11-19 00:13:36 +0100 |
commit | 0e8de1ea03765f564bc1757504e0d8c14334b79e (patch) | |
tree | 36566f0012e84ca1ed69c5acd79b2d7f9c6b4497 /mayor-orig | |
parent | 4047b31240ac0927ee7cc575f272549f445a5b96 (diff) | |
download | mayor-0e8de1ea03765f564bc1757504e0d8c14334b79e.tar.gz mayor-0e8de1ea03765f564bc1757504e0d8c14334b79e.zip |
Rev: 4572rev4572
Diffstat (limited to 'mayor-orig')
26 files changed, 132 insertions, 55 deletions
diff --git a/mayor-orig/mayor-base/log/mayor-base.rev b/mayor-orig/mayor-base/log/mayor-base.rev index cc8a8a9f..6dc04883 100644 --- a/mayor-orig/mayor-base/log/mayor-base.rev +++ b/mayor-orig/mayor-base/log/mayor-base.rev @@ -1 +1 @@ -4569 +4572 diff --git a/mayor-orig/mayor-base/www/skin/classic/base/css/base.css b/mayor-orig/mayor-base/www/skin/classic/base/css/base.css index fa27e58f..e2d5559b 100644 --- a/mayor-orig/mayor-base/www/skin/classic/base/css/base.css +++ b/mayor-orig/mayor-base/www/skin/classic/base/css/base.css @@ -71,6 +71,7 @@ #mayorSearch a { display: block; color: cornflowerblue; padding: 2px; font-size: 13px; } #mayorSearch a:before { content:' \25AB '; } #mayorSearch a:hover { text-decoration: underline; } + #mayorSearch a:focus { text-decoration: underline; } #mayorSearch a.aktiv { outline: solid 2px cornflower; } #mayorSearch a.aktiv:before, #mayorSearch a:hover:before { content:' \25AA '; } diff --git a/mayor-orig/mayor-base/www/skin/classic/base/html/base.phtml b/mayor-orig/mayor-base/www/skin/classic/base/html/base.phtml index 5ae07424..cb843d14 100644 --- a/mayor-orig/mayor-base/www/skin/classic/base/html/base.phtml +++ b/mayor-orig/mayor-base/www/skin/classic/base/html/base.phtml @@ -395,7 +395,7 @@ function html_mayor_head($sessionID,$page,$sub,$f,$lang,$MENU,$skin = _DEFAULT_S if (in_array('vakbarat',$SKINSSHOW)) echo '<span id="skin-vakbarat" class="icon-braille" title="'._ICON_VAKBARAT.'"></span>'; if (in_array('oldschool',$SKINSSHOW)) echo '<span id="skin-oldschool" class="icon-view-mode" title="'._ICON_OLDSCHOOL.'"></span>'; // echo '<span id="nav2fullmenu" class="icon-list"></span>'; - echo '<span id="mayorMenuSearchIcon" class="icon-search" title="'._ICON_SEARCH.'"></span>'; + echo '<span id="mayorMenuSearchIcon" class="icon-search mayorSearchIcon" title="'._ICON_SEARCH.'"></span>'; echo '<span id="mayorErrorSign" class="icon-exclamation-sign" style="display:none"></span>'; // echo '<div class="g-signin2" data-onsuccess="onSignIn"></div>'; echo '</div>'; diff --git a/mayor-orig/mayor-base/www/skin/classic/base/javascript/base.jquery.min.js b/mayor-orig/mayor-base/www/skin/classic/base/javascript/base.jquery.min.js index 92101d6c..54cc16da 100644 --- a/mayor-orig/mayor-base/www/skin/classic/base/javascript/base.jquery.min.js +++ b/mayor-orig/mayor-base/www/skin/classic/base/javascript/base.jquery.min.js @@ -932,7 +932,7 @@ var hideUpdateWindowSideSub = function() {}; var processJSON; $(document).ready(function() { // még több click eseménykezelő! - $('#mayorMenuSearchIcon').on('click',function(event) { + $('.mayorSearchIcon').on('click',function(event) { $('#mayorSearch').show(); event.preventDefault(); event.stopImmediatePropagation(); // STOP mayorClick diff --git a/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev b/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev index cc8a8a9f..6dc04883 100644 --- a/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev +++ b/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev @@ -1 +1 @@ -4569 +4572 diff --git a/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev b/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev index cc8a8a9f..6dc04883 100644 --- a/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev +++ b/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev @@ -1 +1 @@ -4569 +4572 diff --git a/mayor-orig/mayor-installer-orig/log/mayor-installer.rev b/mayor-orig/mayor-installer-orig/log/mayor-installer.rev index cc8a8a9f..6dc04883 100644 --- a/mayor-orig/mayor-installer-orig/log/mayor-installer.rev +++ b/mayor-orig/mayor-installer-orig/log/mayor-installer.rev @@ -1 +1 @@ -4569 +4572 diff --git a/mayor-orig/mayor-installer-sulix/log/mayor-installer-sulix.rev b/mayor-orig/mayor-installer-sulix/log/mayor-installer-sulix.rev index cc8a8a9f..6dc04883 100644 --- a/mayor-orig/mayor-installer-sulix/log/mayor-installer-sulix.rev +++ b/mayor-orig/mayor-installer-sulix/log/mayor-installer-sulix.rev @@ -1 +1 @@ -4569 +4572 diff --git a/mayor-orig/mayor-jatek/log/mayor-jatek.rev b/mayor-orig/mayor-jatek/log/mayor-jatek.rev index cc8a8a9f..6dc04883 100644 --- a/mayor-orig/mayor-jatek/log/mayor-jatek.rev +++ b/mayor-orig/mayor-jatek/log/mayor-jatek.rev @@ -1 +1 @@ -4569 +4572 diff --git a/mayor-orig/mayor-locales-de_DE/log/mayor-locales-de_DE.rev b/mayor-orig/mayor-locales-de_DE/log/mayor-locales-de_DE.rev index cc8a8a9f..6dc04883 100644 --- a/mayor-orig/mayor-locales-de_DE/log/mayor-locales-de_DE.rev +++ b/mayor-orig/mayor-locales-de_DE/log/mayor-locales-de_DE.rev @@ -1 +1 @@ -4569 +4572 diff --git a/mayor-orig/mayor-locales-en_US/log/mayor-locales-en_US.rev b/mayor-orig/mayor-locales-en_US/log/mayor-locales-en_US.rev index cc8a8a9f..6dc04883 100644 --- a/mayor-orig/mayor-locales-en_US/log/mayor-locales-en_US.rev +++ b/mayor-orig/mayor-locales-en_US/log/mayor-locales-en_US.rev @@ -1 +1 @@ -4569 +4572 diff --git a/mayor-orig/mayor-locales-jp_JP/log/mayor-locales-jp_JP.rev b/mayor-orig/mayor-locales-jp_JP/log/mayor-locales-jp_JP.rev index cc8a8a9f..6dc04883 100644 --- a/mayor-orig/mayor-locales-jp_JP/log/mayor-locales-jp_JP.rev +++ b/mayor-orig/mayor-locales-jp_JP/log/mayor-locales-jp_JP.rev @@ -1 +1 @@ -4569 +4572 diff --git a/mayor-orig/mayor-naplo/log/mayor-naplo.rev b/mayor-orig/mayor-naplo/log/mayor-naplo.rev index cc8a8a9f..6dc04883 100644 --- a/mayor-orig/mayor-naplo/log/mayor-naplo.rev +++ b/mayor-orig/mayor-naplo/log/mayor-naplo.rev @@ -1 +1 @@ -4569 +4572 diff --git a/mayor-orig/mayor-naplo/www/include/modules/naplo/haladasi/haladasi.php b/mayor-orig/mayor-naplo/www/include/modules/naplo/haladasi/haladasi.php index 9c46b400..e5090c18 100644 --- a/mayor-orig/mayor-naplo/www/include/modules/naplo/haladasi/haladasi.php +++ b/mayor-orig/mayor-naplo/www/include/modules/naplo/haladasi/haladasi.php @@ -39,15 +39,17 @@ // Az érintett tankörök id-inek listája $tankorIds = $tankorAdat = array(); if (is_array($Tankorok) && ($count = count($Tankorok)) > 0) { - $tankorFeltetel = 'tankorId IN (' . $Tankorok[0]['tankorId']; - $tankorIds[] = $Tankorok[0]['tankorId']; - $Tankorok[0]['tanar'] = getTankorTanaraiByInterval($Tankorok[0]['tankorId'], array('tanev' => __TANEV, 'tolDt' => _SHOW_DAYS_FROM, 'igDt' => _SHOW_DAYS_TO, 'result' => 'nevsor')); - $tankorAdat[$Tankorok[0]['tankorId']] = $Tankorok[0]; + $_tankorId = intval($Tankorok[0]['tankorId']); + $tankorFeltetel = 'tankorId IN (' . $_tankorId; + $tankorIds[] = $_tankorId; + $Tankorok[0]['tanar'] = getTankorTanaraiByInterval($_tankorId, array('tanev' => __TANEV, 'tolDt' => _SHOW_DAYS_FROM, 'igDt' => _SHOW_DAYS_TO, 'result' => 'nevsor')); + $tankorAdat[$_tankorId] = $Tankorok[0]; for ($i = 1; $i < $count; $i++) { - $tankorFeltetel .= ', '.$Tankorok[$i]['tankorId']; - $tankorIds[] = $Tankorok[$i]['tankorId']; - $Tankorok[$i]['tanar'] = getTankorTanaraiByInterval($Tankorok[$i]['tankorId'], array('tanev' => __TANEV, 'tolDt' => _SHOW_DAYS_FROM, 'igDt' => _SHOW_DAYS_TO, 'result' => 'nevsor')); - $tankorAdat[$Tankorok[$i]['tankorId']] = $Tankorok[$i]; + $_tankorId = intval($Tankorok[$i]['tankorId']); + $tankorFeltetel .= ', '.$_tankorId; + $tankorIds[] = $_tankorId; + $Tankorok[$i]['tanar'] = getTankorTanaraiByInterval($_tankorId, array('tanev' => __TANEV, 'tolDt' => _SHOW_DAYS_FROM, 'igDt' => _SHOW_DAYS_TO, 'result' => 'nevsor')); + $tankorAdat[$_tankorId] = $Tankorok[$i]; } $tankorFeltetel .= ')'; } diff --git a/mayor-orig/mayor-naplo/www/policy/private/naplo/orarend/orarendModosito-pre.php b/mayor-orig/mayor-naplo/www/policy/private/naplo/orarend/orarendModosito-pre.php index 17acc6ff..e0fe07db 100644 --- a/mayor-orig/mayor-naplo/www/policy/private/naplo/orarend/orarendModosito-pre.php +++ b/mayor-orig/mayor-naplo/www/policy/private/naplo/orarend/orarendModosito-pre.php @@ -33,7 +33,14 @@ $refTolDt = readVariable($_POST['refTolDt'],'date'); $refIgDt = readVariable($_POST['refIgDt'],'date'); - if ($refTolDt=='' || $refIgDt=='') $_SESSION['alert'][] = 'info:nincs_intervallum'; + if ($refTolDt=='' || $refIgDt=='') { + //$_SESSION['alert'][] = 'info:nincs_intervallum'; + $refTolIgNincsKitoltve = true; + } + if ($tanarId=='' && $osztalyId =='') { + $missingTanarOsztaly = true; + } + $ADAT['telephelyek'] = getTelephelyek(); $ADAT['haladasiModositando'] = readVariable($_POST['haladasiModositando'], 'bool'); @@ -67,9 +74,18 @@ // itt ellenőrizzük, hogy a dt (referenciadátum) beleesik-e a tolIg be! if (isset($tolDt) && isset($refTolDt) && isset($refIgDt)) { - if (strtotime($tolDt)<strtotime($refTolDt)) $_SESSION['alert'][] = 'message:wrong_data:hibás referenciadátum!'; - if (strtotime($tolDt)>strtotime($refIgDt)) $_SESSION['alert'][] = 'message:wrong_data:hibás referenciadátum!'; - if (strtotime($refTolDt)>strtotime($refIgDt)) $_SESSION['alert'][] = 'message:wrong_data:hibás referenciadátum!'; + if (strtotime($tolDt)<strtotime($refTolDt)) { + // $_SESSION['alert'][] = 'message:wrong_data:hibás referenciadátum!'; + $refDtHibas = true; + } + if (strtotime($tolDt)>strtotime($refIgDt)) { + // $_SESSION['alert'][] = 'message:wrong_data:hibás referenciadátum!'; + $refDtHibas = true; + } + if (strtotime($refTolDt)>strtotime($refIgDt)) { + // $_SESSION['alert'][] = 'message:wrong_data:hibás referenciadátum!'; + $refDtHibas = true; + } } if ($action==='do') { $HOT = readVariable($_POST['HALADASIORATOROL'],'id'); @@ -262,6 +278,9 @@ 'tolDt' => date('Y-m-d', strtotime('last Monday', strtotime($_TANEV['kezdesDt']))), // 'tolDt' => $_TANEV['elozoZarasDt'], 'igDt' => $_TANEV['kovetkezoKezdesDt'], + 'kotelezo' => true, + 'hianyzik' => $refTolIgNincsKitoltve, + 'hibas' => $refDtHibas ); $TOOL['datumTolIgSelect'] = array( 'tipus' => 'sor', 'title' => 'REFDT', @@ -272,18 +291,28 @@ 'override' => true, 'tolDt' => date('Y-m-d', strtotime('last Monday', strtotime($_TANEV['kezdesDt']))), 'igDt' => $_TANEV['zarasDt'], + 'kotelezo' => true, + 'hianyzik' => $refTolIgNincsKitoltve, + 'hibas' => $refDtHibas ); + //$TOOL['orarendiHetSelect'] = array('tipus'=>'cella' , 'paramName' => 'het', 'post'=>array('targyId','tankorId','osztalyId','tanarId'), 'disabled'=>true); // if ($osztalyId!='' || $diakId!='') { // $TOOL['diakSelect'] = array('tipus'=>'sor','paramName'=>'diakId', 'post'=>array('refTolDt','refIgDt','tolDt','osztalyId','telephely')); // } else // $TOOL['munkakozossegSelect'] = array('tipus'=>'sor', 'paramName'=>'mkId', 'post'=>array('refTolDt','refIgDt','tolDt','telephely')); - $TOOL['tanarSelect'] = array('tipus'=>'cella', 'paramName'=>'tanarId', 'post'=>array('refTolDt','refIgDt','tolDt','telephely')); - $TOOL['osztalySelect']= array('tipus'=>'cella', 'paramName'=>'osztalyId', 'post'=>array('refTolDt','refIgDt','tolDt')); + $TOOL['tanarSelect'] = array('tipus'=>'cella', 'paramName'=>'tanarId', 'post'=>array('refTolDt','refIgDt','tolDt','telephely'), + 'kotelezo'=>true, + 'hianyzik'=>$missingTanarOsztaly + ); + $TOOL['osztalySelect']= array('tipus'=>'cella', 'paramName'=>'osztalyId', 'post'=>array('refTolDt','refIgDt','tolDt'), + 'kotelezo'=>true, + 'hianyzik'=>$missingTanarOsztaly + ); // $TOOL['telephelySelect'] = array('tipus'=>'cella', 'paramName'=>'telephely', 'post'=>array('refTolDt','refIgDt','tolDt','mkId','tanarId')); // $TOOL['teremSelect'] = array('tipus'=>'cella', 'paramName'=>'teremId', 'telephely'=>$telephely, 'post'=>array('refTolDt','refIgDt','tolDt','telephely')); - if ($osztalyId!='' || $tanarId!='' || $diakId!='' || $mkId!='') $TOOL['tankorSelect'] = array('tipus'=>'sor','paramName'=>'tankorId', 'post'=>array('refTolDt','refIgDt','tolDt','osztalyId','targyId','tanarId','diakId','telephely')); +// if ($osztalyId!='' || $tanarId!='' || $diakId!='' || $mkId!='') $TOOL['tankorSelect'] = array('tipus'=>'sor','paramName'=>'tankorId', 'post'=>array('refTolDt','refIgDt','tolDt','osztalyId','targyId','tanarId','diakId','telephely')); getToolParameters(); ?> diff --git a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/css/naplo.css b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/css/naplo.css index 539cd4ea..849a5afe 100644 --- a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/css/naplo.css +++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/css/naplo.css @@ -31,7 +31,6 @@ table.toolBar form { margin: 0px; padding: 0px;} -/* TH */ table.toolBar th { background-color: rgb(90,133,184); @@ -45,6 +44,12 @@ border-width: 1px 1px 1px 1px; border-style: solid; } + + table.toolBar tr.kotelezo.hianyzo td.toolBarTool table , + table.toolBar td.toolBarTool.kotelezo.hianyzo { background-color: orange } + table.toolBar tr.kotelezo.hibas td.toolBarTool table , + table.toolBar td.toolBarTool.kotelezo.hibas { background-color: red; } + table.toolBar th button.toolBarClear { float:right; border: none; background-color: #5A85B8; height:10px;font-size:9px; color:inherit; padding:0px 2px; color: rgba(255,255,255,0.5);} table.toolBar th button.toolBarClear:hover { color: rgba(255,255,255,1);} @@ -61,7 +66,6 @@ table.toolBar tr td.csoport:hover { color: rgba(255,255,255,1);} -/* TD */ table.toolBar td {padding: 0px;} table.toolBar td form td {padding: 1px;} table.toolBar td.gap { width: 50%; border-spacing: 0px; } @@ -161,6 +165,8 @@ table.toolBar input { font-size: 10px; } + table.toolbar tr.kotelezo table th.toolBarTool { background-color: orange !important; } + table.toolBar #toolBarHamburgerVezerlo { color:rgb(170, 170, 170); } table.toolBar #toolBarHamburgerVezerlo:hover { color:white; } diff --git a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/css/orarend/orarendModosito.css b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/css/orarend/orarendModosito.css index c25f4328..8e20186a 100644 --- a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/css/orarend/orarendModosito.css +++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/css/orarend/orarendModosito.css @@ -121,9 +121,11 @@ div.unfinished { div.orarendModositoToolbox { background-color: #444; border: solid 1px #ccc; padding:0.5em; color:white; width:80%; margin:auto; border-radius: 4px; colow: white;} div.orarendModositoToolbox table.tanarTankor {font-size: smaller; position:fixed; top:2px ; right: 2px; background-color: #444; z-index:1000; } + + div.oraKartya {border-radius: 2px; margin: 2px 1px;} div.oraKartya.highlight { outline: solid 1px yellow } div.oraKartya span.highlight { background-color:yellow; } - div.orarendModositoToolbox button#tankorHelper { float:right; } + div.orarendModositoToolbox button#tankorHelper { } } diff --git a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/base.phtml b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/base.phtml index 805e57dc..cd9ec7cc 100644 --- a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/base.phtml +++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/base.phtml @@ -44,7 +44,12 @@ echo '</th>'; $colspan++; } - + if (_POLICY=='private') { + echo '<th style="width:32px;">'; + echo '<button type="submit" class="toolBarLeft icon-search mayorSearchIcon"></button>'; + echo '</th>'; + $colspan++; + } echo '<td class="toolBarTitle" id="toolBarTitle" colspan="3">'; if (defined('__PAGETITLE')) echo __PAGETITLE.'<br/>'; else echo 'MaYoR elektronikus napló'.'<br/>'; @@ -57,12 +62,18 @@ echo '</td>'."\n"; reset($TOOL); foreach ( $TOOL as $tool => $params ) { + // if ( function_exists( $func = "put$tool" ) && $params['tipus']=='cella') { if ( isset($params['tipus']) && $params['tipus']=='cella') { if (isset($params['title'])) $title = '__'.$params['title']; else $title = '__'.nagybetus($tool).'TITLE'; - echo '<td class="toolBarTool cella" style="position:; vertical-align:top">'; + $_kotelezoClass = ($params['kotelezo'] === true) ? 'kotelezo':''; + $_hianyzoClass = ($params['hianyzik'] === true) ? 'hianyzo':''; + $_hibasClass = ($params['hibas'] === true) ? 'hibas':''; + + echo '<td class="toolBarTool cella '.$_kotelezoClass.' '.$_hianyzoClass.' '.$_hibasClass.'" style="position:; vertical-align:top">'; + echo '<table style="/*border-bottom:solid 1px #558;*/" >'."\n"; if (defined($title)) { echo '<tr><th>'; @@ -138,8 +149,11 @@ reset($TOOL); foreach ( $TOOL as $tool => $params ) { if ( function_exists( $func = "put$tool" ) && $params['tipus']=='sor') { - echo '<tr><td colspan="'.($colspan).'">'; - + $_kotelezoClass = ($params['kotelezo'] === true) ? 'kotelezo':''; + $_hianyzoClass = ($params['hianyzik'] === true) ? 'hianyzo':''; + $_hibasClass = ($params['hibas'] === true) ? 'hibas':''; + echo '<tr class="'.$_kotelezoClass.' '.$_hianyzoClass.' '.$_hibasClass.'">'; + echo '<td colspan="'.($colspan).'">'; echo '<table align="center" cellspacing="0"><tr>'; if (isset($params['title'])) $title = '__'.$params['title']; else $title = '__'.nagybetus($tool).'TITLE'; diff --git a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/orarend/orarendModosito.phtml b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/orarend/orarendModosito.phtml index 38fa3a5a..160c2be7 100644 --- a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/orarend/orarendModosito.phtml +++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/orarend/orarendModosito.phtml @@ -2,10 +2,14 @@ function putOrarend($ADAT) { + global $aHetNapjai; + echo '<div id="infoBox1"></div>'; echo '<div id="infoBox2"></div>'; - global $aHetNapjai; + // jó lenne tudni, hogy milyen tipikus dátumbeállítások vannak + // az orarendiHet beállítás is jól jönne itt + $TANKOROK = $ADAT['felvehetoTankorok']; $BLOKKOK = $ADAT['felvehetoBlokkok']; if (is_array($ADAT['felvehetoTankorok']) && count($ADAT['felvehetoTankorok']) > 0) { @@ -59,8 +63,14 @@ $_th_class = ($ADAT['vanHaladasi'][$dt]['db']>0) ? 'spec': ''; echo '<th class="'.$_th_class.'">'; if (count($ADAT['vanHaladasi'][$dt]['db'])>0) echo '<span class="icon-record" style="color: #E91E63" title="Már van betöltve haladási napló!"></span> '; - echo '<span>'.str_replace('-','.',$ADAT['orarend']['napok'][$nap]['dt']).'. ('.$ADAT['orarend']['napok'][$nap]['het'].')</span> '; + echo '<span>'.str_replace('-','.',$ADAT['orarend']['napok'][$nap]['dt']).'.'; + echo '</span> '; + echo ($ADAT['orarend']['napok'][$nap]['megjegyzes']=='') ? $aHetNapjai[($nap-1)] : $ADAT['orarend']['napok'][$nap]['megjegyzes']; + echo '<br/>Órarendi hét: <select>'; + echo '<option>'.$ADAT['orarend']['napok'][$nap]['het'].'</option>'; + echo '</select> '; + echo '</th>'; } echo '</tr>'; diff --git a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/osztalyozo/diak.phtml b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/osztalyozo/diak.phtml index 79c33e0f..81a60f0e 100644 --- a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/osztalyozo/diak.phtml +++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/osztalyozo/diak.phtml @@ -110,8 +110,12 @@ echo '<th class="t" title="'.$_title.'">'; if (count($ADAT['targyTankor'][$targyId]) == 1) { echo '<a href="'.href('index.php?page=naplo&sub=osztalyozo&f=tankor&tankorId='.$ADAT['targyTankor'][$targyId][0]['tankorId']).'">'.$targyNev.'</a>'; - } else - echo $targyNev; + } else { + echo $targyNev; + for ($i=0; $i<count($ADAT['targyTankor'][$targyId]); $i++) { + echo '<a style="background-color:#aaa; border-radius:2px; color: #666; margin: 0px 4px; padding: 0px 2px;" href="'.href('index.php?page=naplo&sub=osztalyozo&f=tankor&tankorId='.$ADAT['targyTankor'][$targyId][$i]['tankorId']).'">'.($i+1).'</a>'; + } + } /* VIRTUAL */ echo ' <select class="eeHidden" style="display:none"><option value="1">kis</option><option value="2">normál</option><option value="3">dolgozat</option><option value="4">témazáró</option><option value="5">vizsga</option></select>'; putJegySelect(array( diff --git a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/javascript/naplo.jquery.min.js b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/javascript/naplo.jquery.min.js index d35c38c7..c57e142e 100644 --- a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/javascript/naplo.jquery.min.js +++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/javascript/naplo.jquery.min.js @@ -907,7 +907,7 @@ processJSONTankorAdat = function(adat) { content += '<h3>Tankörcsoport ('+adat.tankorCsoport.length+')</h3>'; content += '<ul>'; for (i=0; i<adat.tankorCsoport.length; i++) { - content += '<li>'+adat.tankorCsoport[i].csoportNev+'</li>'; + content += '<li class="tankorCsoportAdat" data-tankorcsoportid="'+adat.tankorCsoport[i].csoportId+'">'+adat.tankorCsoport[i].csoportNev+'</li>'; } content += '</ul>'; } diff --git a/mayor-orig/mayor-portal/log/mayor-portal.rev b/mayor-orig/mayor-portal/log/mayor-portal.rev index cc8a8a9f..6dc04883 100644 --- a/mayor-orig/mayor-portal/log/mayor-portal.rev +++ b/mayor-orig/mayor-portal/log/mayor-portal.rev @@ -1 +1 @@ -4569 +4572 diff --git a/mayor-orig/mayor-portal/www/skin/classic/module-portal/javascript/portal.jquery.min.js b/mayor-orig/mayor-portal/www/skin/classic/module-portal/javascript/portal.jquery.min.js new file mode 100644 index 00000000..6b424e74 --- /dev/null +++ b/mayor-orig/mayor-portal/www/skin/classic/module-portal/javascript/portal.jquery.min.js @@ -0,0 +1,9 @@ +$(function() { + + $('#mayorbody a[href*="index.php?page"]:not([href*="sessionID"])').each(function( index ) { + l = $(this); + href = l.attr('href'); + l.attr('href',href+'&sessionID='+$('body').data('sessionid')); + }); + +}); diff --git a/mayor-orig/mayor-wiki/log/mayor-wiki.rev b/mayor-orig/mayor-wiki/log/mayor-wiki.rev index cc8a8a9f..6dc04883 100644 --- a/mayor-orig/mayor-wiki/log/mayor-wiki.rev +++ b/mayor-orig/mayor-wiki/log/mayor-wiki.rev @@ -1 +1 @@ -4569 +4572 diff --git a/mayor-orig/md5sum b/mayor-orig/md5sum index a5d2c092..c63dd0bc 100644 --- a/mayor-orig/md5sum +++ b/mayor-orig/md5sum @@ -1,13 +1,13 @@ -Revision 4569 -bdde4c45d90d432f6fb22e7209bcc7cb mayor-fenntarto-rev4569.tgz -a84e74ba199289b153729cbda96712f9 mayor-installer-sulix-rev4569.tgz -dac9f7baf454fa1b5e01846d17eaa6d6 mayor-wiki-rev4569.tgz -c0846b3aec36df99d24c62ae4d30b8bf mayor-installer-rev4569.tgz -d6a1e685b1a8e8794f33702868c8a79f mayor-portal-rev4569.tgz -1b34a03357d998af4a6926ffaaa7e360 mayor-felveteli-rev4569.tgz -4bc88ad46b2e7cfec96441d10a6eaee9 mayor-jatek-rev4569.tgz -441f466ed1be9dda880055969fd03dc9 mayor-locales-jp_JP-rev4569.tgz -1e0afe4b06a0dc3b4d5b8061cb0a88ef mayor-locales-de_DE-rev4569.tgz -e35c35164af3171c893a02080d360b23 mayor-locales-en_US-rev4569.tgz -131862b590976d536642ceefac37127d mayor-naplo-rev4569.tgz -f27169073d4fde6310b24320c793ef03 mayor-base-rev4569.tgz +Revision 4572 +692c13c72d5df37d8d70b9ae5661835d mayor-fenntarto-rev4572.tgz +0f0c2adac919cb499957260caa0e338a mayor-installer-sulix-rev4572.tgz +552b324cdf8db7b7b06e8e5fdfd8411c mayor-wiki-rev4572.tgz +5b8666552d2b7d410069a92616592750 mayor-installer-rev4572.tgz +3a0235ef57324e2dc3c2a160c5df0c30 mayor-portal-rev4572.tgz +0a5615bb34bab124ec03639983a9b43d mayor-felveteli-rev4572.tgz +2a1c2b27ddeca5bc60d0a4e80aff2dba mayor-jatek-rev4572.tgz +f1284f03c3d766dedfe1a3cd1d02820a mayor-locales-jp_JP-rev4572.tgz +4f317d3a0e42452e594ffc4327bd166f mayor-locales-de_DE-rev4572.tgz +429a896cbddb4a4969a3816231146e7b mayor-locales-en_US-rev4572.tgz +08575ea7aa3a03e86d0f30a021fb6850 mayor-naplo-rev4572.tgz +7f2954fa516e49e5600f04b19f8b86a4 mayor-base-rev4572.tgz diff --git a/mayor-orig/rev.txt b/mayor-orig/rev.txt index cc8a8a9f..6dc04883 100644 --- a/mayor-orig/rev.txt +++ b/mayor-orig/rev.txt @@ -1 +1 @@ -4569 +4572 |