Rev: 4814rev4814

12 files changed, 314 insertions, 103 deletions

diff --git a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/css/intezmeny/tankorTanarHozzarendeles.css b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/css/intezmeny/tankorTanarHozzarendeles.css
index a346f49c..684a4b0b 100644
--- a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/css/intezmeny/tankorTanarHozzarendeles.css
+++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/css/intezmeny/tankorTanarHozzarendeles.css
@@ -74,7 +74,7 @@
     div.tanarTankor table tbody tr th.slctd { background-color: rgba(0,200,0,0.7); }
     div.tanarTankor table tbody tr td:hover input[type="checkbox"] { display:table-cell; }
 
-pre { text-align: left; }
+    pre { text-align: left; }
     div.tankorTanar table#tt thead tr th.szurt { display: none; }
     div.tankorTanar table#tt thead tr td.szurt { display: none; }
     div.tankorTanar table#tt tbody tr td.szurt { display: none; }
@@ -90,5 +90,5 @@ pre { text-align: left; }
         filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=3);
     }
 
-
+    table#tt tr td.checked { background-color: lightgreen !important;}
 
diff --git a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/intezmeny/diak.phtml b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/intezmeny/diak.phtml
index c217bd88..0f754633 100644
--- a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/intezmeny/diak.phtml
+++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/intezmeny/diak.phtml
@@ -409,6 +409,7 @@
 		echo '<td>'."\n";
 		echo '<span class="icon-envelope"></span>';
 		echo '<input type="text" id="email" name="email" value="'.$diakAdat['email'].'" />';
+		echo '<input type="text" id="emailMagan" name="emailMagan" value="'.$diakAdat['emailMagan'].'" />';
 		echo '</td>'."\n";
 	    echo '</tr><tr>';
 		echo '<th>';
diff --git a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/intezmeny/osztaly.phtml b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/intezmeny/osztaly.phtml
index 01a9b0d8..26fbea77 100644
--- a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/intezmeny/osztaly.phtml
+++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/intezmeny/osztaly.phtml
@@ -462,5 +462,67 @@ function putOidEllenor($ADAT) {
 
 }
 
+function putOsztalyGrid($ADAT) {
+    echo '<style type="text/css">
+div.osztalyGrid {
+  width:100%;
+  display: flex;
+  flex-wrap: wrap;
+  flex-direction: row;
+  justify-content: center;
+  align-items: auto;
+  align-content: start
+}
+div.osztalyGrid .item {
+  flex: 0 0 auto;
+  margin: 10px;
+  width: 160px;
+  background-color: #eee;
+  text-align:center;
+  padding:4px 4px;
+  border-radius:2px;
+}
+
+h1.osztaly,h2.osztalyfonok,h3.kepzes { text-align:center; }
+div.osztalyGrid span.diakNev {display: inline-block; width:100%; background-color:white;   border-radius:2px;}
+
+div.osztalyGrid .item:hover {
+  background-color: #ddd;
+}
+
+img.arckep {height:230px; margin-bottom: 2px; border: solid 1px #ccc;}
+h2.osztalyfonok { font-size: 14px; }
+
+</style>';
+
+    echo '<h1 class="osztaly">'.$ADAT['osztalyAdat']['osztalyJel'].'</h1>';
+    echo '<h2 class="osztalyfonok">';
+	for ($i=0; $i<count($ADAT['osztalyAdat']['osztalyfonokok']); $i++) {
+	    echo '<div class="item">';
+	    echo '<img src="'.getFaceURI($ADAT['osztalyAdat']['osztalyfonokok'][$i]['tanarId'],'tanar').'" class="arckep"><br/>';
+	    echo $ADAT['osztalyAdat']['osztalyfonokok'][$i]['tanarNev'];
+	    echo '<br/><i>osztályfőnök</i>';
+	    echo '</div>';
+	}
+	// echo $ADAT['osztalyAdat']['osztalyfonokNev'];
+    echo '</h2>';
+    if (count($ADAT['osztalyAdat']['kepzes'])>0) {
+	echo '<h3 class="kepzes">';
+	for ($i=0; $i<count($ADAT['osztalyAdat']['kepzes']); $i++) {
+	    echo $ADAT['osztalyAdat']['kepzes'][$i]['kepzesNev'];
+	    if ($i+1<count($ADAT['osztalyAdat']['kepzes'])) echo ', ';
+	}
+	echo '</h3>';
+    }
+    echo '<div class="osztalyGrid">';
+	for ($i=0; $i<count($ADAT['diakok']); $i++) {
+	    $_D = $ADAT['diakok'][$i];
+	    echo '<div class="item diakNev" data-diakid="'.$_D['diakId'].'">'; // class="diakNev" -- jogosultságok!
+	    echo '<img src="'.getFaceURI($_D['diakId'],'diak').'" class="arckep" style="min-height:200px; min-width:100%"><br/>';
+	    echo '<span class="diakNev">'.$_D['diakNev'].'</span>';
+	    echo '</div>';
+	}
+    echo '</div>';
+}
 
 ?>
\ No newline at end of file
diff --git a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/intezmeny/tanarok.phtml b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/intezmeny/tanarok.phtml
index 40ee0453..e01375dc 100644
--- a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/intezmeny/tanarok.phtml
+++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/intezmeny/tanarok.phtml
@@ -8,8 +8,17 @@ function putTanarLista($ADAT) {
     echo '<tr>';
     for($i=0; $i<count($ADAT['tanarok']); $i++) {
 	$T = $ADAT['tanarok'][$i];
-	echo '<td>';
-	    putFace($T['tanarId'],'tanar',0);
+	echo '<td style="text-align:center">';
+
+	    if (($_img = getFaceURI($T['tanarId'],'tanar')) != '') {
+		echo '<img src="'.$_img.'" style="height:200px">';
+            } else {
+                echo '<div class="arckepPlaceholder" style="display:flex; flex-direction: column">';
+                echo '<div class="icon-adult" style="font-size:120px; color:#eee;"></div>';
+                echo '</div>';
+            }
+
+	    //putFace($T['tanarId'],'tanar',0);
 	echo '</td><td>';
 	    echo '<span class="tanarNev" data-tanarid="'.$T['tanarId'].'">'.$T['tanarNev'].'</span>';
 	    if ($T['titulus']!='') echo '<div class="titulus">'.$T['titulus'].'</div>';
@@ -18,7 +27,7 @@ function putTanarLista($ADAT) {
 	    elseif ($T['besorolas']=='Mesterpedagógus') echo '<div class="titulus">'.lcfirst($T['besorolas']).'</div>';
 	    elseif ($T['besorolas']=='Pedagógus I.') echo '<div class="titulus">'.lcfirst($T['besorolas']).'</div>';
 	    elseif ($T['besorolas']=='Pedagógus II.') echo '<div class="titulus">'.lcfirst($T['besorolas']).'</div>';
-//	    else echo '<div class="titulus">'.lcfirst($T['besorolas']).'</div>'."\n";
+	    else echo '<div class="titulus">'.lcfirst($T['besorolas']).'</div>'."\n";
 
 	    $osztalyai = ($ADAT[$T['tanarId']]['osztalyfonok']);
 	    for ($j=0; $j<count($osztalyai); $j++) {
@@ -49,15 +58,18 @@ function putTanarLista($ADAT) {
 		echo '</div>';
 	    }
 
+	    
 	    $munkakozossegei = ($ADAT[$T['tanarId']]['munkakozosseg']);
-	    echo '<div class="munkakozossegVezeto">';
-	    $_MKNEV = array();
-	    for ($j=0; $j<count($munkakozossegei); $j++) {
-		$_mkId = $munkakozossegei[$j];
-		$_MKNEV[] = $munkakozossegei[$j]['munkakozossegNev'];
+	    if (count($munkakozossegei)>0) {
+		echo '<div class="munkakozossegVezeto">';
+		// $_MKNEV = array();
+		// for ($j=0; $j<count($munkakozossegei); $j++) {
+		//     $_mkId = $munkakozossegei[$j];
+		//     $_MKNEV[] = $munkakozossegei[$j]['munkakozossegNev'];
+		// }
+		// echo implode(', ',$_MKNEV).' munkaközösségi tag';
+		echo '</div>';
 	    }
-	    echo implode(', ',$_MKNEV).' munkaközösségi tag';
-	    echo '</div>';
 
 	    if ($T['elerhetoseg']!='') echo '<div class="elerhetoseg"><span class="icon-phone" style="padding-right:0.4em"></span>'.$T['elerhetoseg'].'</div>';
 	    if ($T['email']!='') echo '<div class="email"><span class="icon-envelope"    style="padding-right:0.4em"></span>'.$T['email'].'</div>';
@@ -69,55 +81,101 @@ function putTanarLista($ADAT) {
     echo '</table>';
 }
 
-/*
-function putIntezmenyValaszto($Intezmenyek) {
-
-	formBegin();
 
-	echo '<input type="hidden" name="action" value="intezmenyValasztas" />'."\n";
+function putTanarLista_large($ADAT) {
 
-	echo '<select name="intezmeny">'."\n";
-	$SEL = array(__INTEZMENY => ' selected="selected"');
+    echo '<style type="text/css">
 
-	for ($i = 0; $i < count($Intezmenyek); $i++) {
+div.tanarGrid {
+  width:100%;
+  display: flex;
+  flex-wrap: wrap;
+  flex-direction: row;
+  justify-content: center;
+  align-items: auto;
+  align-content: start
+}
+div.tanarGrid .item {
+  flex: 0 0 auto;
+  margin: 10px;
+  width: 300px;
+  background-color: #eee;
+  text-align:center;
+  padding:4px 4px;
+  border-radius:2px;
+}
 
-		$rovidnev = $Intezmenyek[$i]['rovidNev'];
-		if ($Intezmenyek[$i]['alapertelmezett'] == 1)
-		echo '<option value="'.$rovidnev.'" class="default"'.$SEL[$rovidnev].'>';
-		else
-		echo '<option value="'.$rovidnev.'"'.$SEL[$rovidnev].'>';
+h1.osztaly,h2.osztalyfonok,h3.kepzes { text-align:center; }
 
-		echo $Intezmenyek[$i]['nev'].' ('.$Intezmenyek[$i]['OMKod'].')';
-		echo '</option>'."\n";
+div.tanarGrid .item:hover { background-color: #ddd; }
 
-	}
+img.arckep {min-height:300px; height:300px; margin-bottom: 2px; border: solid 1px #ddd;   filter: grayscale(100%); }
+div.tanarGrid .item:hover img.arckep { filter: none; }
 
-	echo '</select>'."\n";
+div.arckepPlaceholder {min-height:300px; min-width:100%; height:300px; margin-bottom: 2px; border: solid 1px #fff;}
+h2.osztalyfonok { font-size: 14px; }
+div.titulus {padding-bottom:4px;}
+div.besorolas { font-size:x-small; color: #aaa;}
 
-	echo '<input type="submit" value="'._OK.'" />'."\n";
+    </style>';
 
-	formEnd();
+    echo '<div class="tanarGrid">';
+    for($i=0; $i<count($ADAT['tanarok']); $i++) {
+    $T = $ADAT['tanarok'][$i];
 
-}
+            echo '<div class="item tanarNev" data-tanarid="'.$T['tanarId'].'">';
+            if (($_img = getFaceURI($T['tanarId'],'tanar')) != '') echo '<img src="'.$_img.'" class="arckep">';
+        else {
+	echo '<div class="arckepPlaceholder" style="display:flex; flex-direction: column">';
+	// echo '<div class="icon-adult" style="font-size:120px; color:#eee;"></div>';
+	echo '</div>';
+        }
 
-function putTanevValaszto($Tanevek) {
+        echo '<br/>';
 
-	formBegin();
+        echo '<div style="font-size: 14px; padding:6px 4px 2px 4px;">'.$T['tanarNev'].'</div>';
 
-	echo '<input type="hidden" name="action" value="tanevValasztas" />'."\n";
+        if ($T['titulus']!='') echo '<div class="titulus">'.$T['titulus'].'</div>';
+        if ($T['statusz']=='külső óraadó') echo '<div class="titulus">'.$T['statusz'].'</div>';
 
-	echo '<select name="tanev">'."\n";
-	$SEL = array(__TANEV => ' selected="selected"');
-	for ($i = 0; $i < count($Tanevek); $i++) {
-		echo '<option value="'.$Tanevek[$i].'"'.$SEL[$Tanevek[$i]].'>';
-		echo $Tanevek[$i];
-		echo '</option>'."\n";
+        $osztalyai = ($ADAT['tanarOsztaly'][$T['tanarId']]);
+        for ($j=0; $j<count($osztalyai); $j++) {
+	$_osztalyId = $osztalyai[$j];
+	if ($ADAT['osztalyok'][$_osztalyId]['osztalyJel']!='') {
+	    echo '<div class="osztalyfonok osztalyAdat" data-osztalyid="'.$_osztalyId.'" style="color:#aaa; font-size:smaller">osztályfőnök '.$ADAT['osztalyok'][$_osztalyId]['osztalyJel'];
+	    if ($ADAT['osztalyok'][$_osztalyId]['leiras']!='') echo ' ('.$ADAT['osztalyok'][$_osztalyId]['leiras'].')';
+	    echo '</div>';
+	}
+        }
+
+        $munkakozossegei = ($ADAT['tanarMunkakozosseg'][$T['tanarId']]); // vezetett
+        for ($j=0; $j<count($munkakozossegei); $j++) {
+	$_mkId = $munkakozossegei[$j];
+	echo '<div class="munkakozossegVezeto" style="color:#aaa; font-size:smaller">';
+	    //echo $munkakozossegei[$j]['munkakozossegNev']. ' munkaközösség-vezető';
+	    echo 'munkaközösség-vezető';
+	echo '</div>';
+        }
+
+        if (count($T['kepesites'])>0) {
+	echo '<div class="" style="color:#aaa; font-size:smaller">';
+	for ($j=0; $j<count($T['kepesites']); $j++) {
+	    $_kepesites = $T['kepesites'][$j];
+	    echo ($_kepesites['kepesitesNev']);
+	    echo '<br/>';
 	}
-	echo '</select>'."\n";
+	echo '</div>';
+        }
 
-	echo '<input type="submit" value="'._OK.'" />'."\n";
+        echo '<div class="besorolas">'.kisbetus($T['besorolas']).'</div>';
 
-	formEnd();
+        if ($T['email']!='') echo '<div class="email" style="margin-top:0.4em; font-size:x-small; color:#888;"><span class="icon-envelope"></span> '.$T['email'].'</div>';
+
+            echo '</div>';
+
+    }
+    echo '</div>';
 }
-*/
+
+
 ?>
diff --git a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/intezmeny/tankorTanarHozzarendeles.phtml b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/intezmeny/tankorTanarHozzarendeles.phtml
index aa9747fc..fa705502 100644
--- a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/intezmeny/tankorTanarHozzarendeles.phtml
+++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/intezmeny/tankorTanarHozzarendeles.phtml
@@ -122,9 +122,11 @@
 		    else { $class='tantan'; }
 		    $class .= ' col-'.$_tankorAdat['tankorId'].' row-'.$_tanarAdat['tanarId'];
 		    if (in_array($_tankorAdat['targyId'], $_tanarAdat['targyIds'])) {
+			$_CHK = in_array($_tanarAdat['tanarId'],$_tankorAdat['tanarIds']) ? ' checked="checked" ':'';
+			$_RO  = (__NAPLOADMIN===true || __VEZETOSEG===true) ? '':' disabled="disabled" readonly="readonly" ';
+			$class .= in_array($_tanarAdat['tanarId'],$_tankorAdat['tanarIds']) ? ' checked ':'';
 			echo '<td id="cell_'.$_tanarAdat['tanarId'].'_'.$_tankorAdat['tankorId'].'" class="'.$class.'">';
-			$_CHK = in_array($_tanarAdat['tanarId'],$_tankorAdat['tanarIds']) ? 'checked="checked" ':'';
-			echo '<input type="checkbox" class="chkTT" name="tanarTankor[]" value="'.$_tanarAdat['tanarId'].'_'.$_tankorAdat['tankorId'].'" '.$_CHK.'/>';
+			echo '<input type="checkbox" class="chkTT" name="tanarTankor[]" value="'.$_tanarAdat['tanarId'].'_'.$_tankorAdat['tankorId'].'" '.$_CHK.$_RO.'/>';
 			echo '</td>';
 		    } else {
 			echo '<td class="disable '. $class.'"></td>';
diff --git a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/intezmeny/terem.phtml b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/intezmeny/terem.phtml
index 68c826f9..470c57f8 100644
--- a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/intezmeny/terem.phtml
+++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/intezmeny/terem.phtml
@@ -68,9 +68,13 @@
 
 	echo '<div style="background-color: #eeeeee; text-align:left;">';
 
-	echo '<label for="teremId">'._TEREMID.'</label>'."\n";
-	echo '<span id="teremId">'.$ADAT['teremId'].'</span><br />';
-
+	if ($ADAT['teremId']>0) {
+	    // echo '<label for="teremId">'._TEREMID.'</label>'."\n";
+	    // echo '<span id="teremId">'.$ADAT['teremId'].'</span><br/>';
+	    echo '<label for="teremIdMod">'._TEREMID.' változtatás:</label>'."\n";
+	    echo $ADAT['teremId'].'&rarr;';
+	    echo '<input type="text" id="teremIdMod" name="teremIdMod" value='.$ADAT['teremId'].'><br />';
+	}
 	echo '<label for="leiras">'._LEIRAS.'</label>'."\n";
 	echo '<input type="text" size="64" name="leiras" id="leiras" value="'.$tAdat['leiras'].'" /><br />'."\n";
 
diff --git a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/intezmeny/valtas.phtml b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/intezmeny/valtas.phtml
index 6811b588..0a2e7fde 100644
--- a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/intezmeny/valtas.phtml
+++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/intezmeny/valtas.phtml
@@ -1,5 +1,102 @@
 <?php
 
+function putTanarLista_large($ADAT) {
+
+    echo '<style type="text/css">
+
+div.tanarGrid {
+  width:100%;
+  display: flex;
+  flex-wrap: wrap;
+  flex-direction: row;
+  justify-content: center;
+  align-items: auto;
+  align-content: start
+}
+div.tanarGrid .item {
+  flex: 0 0 auto;
+  margin: 10px;
+  width: 300px;
+  background-color: #eee;
+  text-align:center;
+  padding:4px 4px;
+  border-radius:2px;
+}
+
+h1.osztaly,h2.osztalyfonok,h3.kepzes { text-align:center; }
+
+div.tanarGrid .item:hover {
+  background-color: #ddd;
+}
+
+img.arckep {min-height:300px; height:300px; margin-bottom: 2px; border: solid 1px #ddd;}
+div.arckepPlaceholder {min-height:300px; min-width:100%; height:300px; margin-bottom: 2px; border: solid 1px #fff;}
+h2.osztalyfonok { font-size: 14px; }
+div.titulus {padding-bottom:4px;}
+div.besorolas { font-size:x-small; color: #aaa;}
+
+    </style>';
+
+    echo '<div class="tanarGrid">';
+    for($i=0; $i<count($ADAT['tanarok']); $i++) {
+	$T = $ADAT['tanarok'][$i];
+
+            echo '<div class="item tanarNev" data-tanarid="'.$T['tanarId'].'">';
+            if (($_img = getFaceURI($T['tanarId'],'tanar')) != '') echo '<img src="'.$_img.'" class="arckep">';
+	    else {
+		echo '<div class="arckepPlaceholder" style="display:flex; flex-direction: column">';
+		// echo '<div class="icon-adult" style="font-size:120px; color:#eee;"></div>';
+		echo '</div>';
+	    }
+
+	    echo '<br/>';
+
+	    echo '<div style="font-size: 14px; padding:6px 4px 2px 4px;">'.$T['tanarNev'].'</div>';
+
+	    if ($T['titulus']!='') echo '<div class="titulus">'.$T['titulus'].'</div>';
+	    if ($T['statusz']=='külső óraadó') echo '<div class="titulus">'.$T['statusz'].'</div>';
+
+	    $osztalyai = ($ADAT['tanarOsztaly'][$T['tanarId']]);
+	    for ($j=0; $j<count($osztalyai); $j++) {
+		$_osztalyId = $osztalyai[$j];
+		if ($ADAT['osztalyok'][$_osztalyId]['osztalyJel']!='') {
+		    echo '<div class="osztalyfonok osztalyAdat" data-osztalyid="'.$_osztalyId.'" style="color:#aaa; font-size:smaller">osztályfőnök '.$ADAT['osztalyok'][$_osztalyId]['osztalyJel'];
+		    if ($ADAT['osztalyok'][$_osztalyId]['leiras']!='') echo ' ('.$ADAT['osztalyok'][$_osztalyId]['leiras'].')';
+		    echo '</div>';
+		}
+	    }
+
+	    $munkakozossegei = ($ADAT['tanarMunkakozosseg'][$T['tanarId']]); // vezetett
+	    for ($j=0; $j<count($munkakozossegei); $j++) {
+		$_mkId = $munkakozossegei[$j];
+		echo '<div class="munkakozossegVezeto" style="color:#aaa; font-size:smaller">';
+		    echo $munkakozossegei[$j]['munkakozossegNev']. ' munkaközösség-vezető';
+		echo '</div>';
+	    }
+
+	    if (count($T['kepesites'])>0) {
+		echo '<div class="" style="color:#aaa; font-size:smaller">';
+		for ($j=0; $j<count($T['kepesites']); $j++) {
+		    $_kepesites = $T['kepesites'][$j];
+		    echo ($_kepesites['kepesitesNev']);
+		    echo '<br/>';
+		}
+		echo '</div>';
+	    }
+
+	    echo '<div class="besorolas">'.kisbetus($T['besorolas']).'</div>';
+
+	    // dump($T);
+	    if ($T['email']!='') echo '<div class="email" style="margin-top:0.4em; font-size:x-small; color:#888;"><span class="icon-envelope"></span> '.$T['email'].'</div>';
+
+            echo '</div>';
+
+    }
+    echo '</div>';
+}
+
+
+
 function putTanarLista($ADAT) {
 
     echo '<table class="tanarLista" align="center" cellpadding="1" cellspacing="1">';
@@ -48,55 +145,5 @@ function putTanarLista($ADAT) {
     echo '</table>';
 }
 
-/*
-function putIntezmenyValaszto($Intezmenyek) {
-
-	formBegin();
-
-	echo '<input type="hidden" name="action" value="intezmenyValasztas" />'."\n";
-
-	echo '<select name="intezmeny">'."\n";
-	$SEL = array(__INTEZMENY => ' selected="selected"');
 
-	for ($i = 0; $i < count($Intezmenyek); $i++) {
-
-		$rovidnev = $Intezmenyek[$i]['rovidNev'];
-		if ($Intezmenyek[$i]['alapertelmezett'] == 1)
-		echo '<option value="'.$rovidnev.'" class="default"'.$SEL[$rovidnev].'>';
-		else
-		echo '<option value="'.$rovidnev.'"'.$SEL[$rovidnev].'>';
-
-		echo $Intezmenyek[$i]['nev'].' ('.$Intezmenyek[$i]['OMKod'].')';
-		echo '</option>'."\n";
-
-	}
-
-	echo '</select>'."\n";
-
-	echo '<input type="submit" value="'._OK.'" />'."\n";
-
-	formEnd();
-
-}
-
-function putTanevValaszto($Tanevek) {
-
-	formBegin();
-
-	echo '<input type="hidden" name="action" value="tanevValasztas" />'."\n";
-
-	echo '<select name="tanev">'."\n";
-	$SEL = array(__TANEV => ' selected="selected"');
-	for ($i = 0; $i < count($Tanevek); $i++) {
-		echo '<option value="'.$Tanevek[$i].'"'.$SEL[$Tanevek[$i]].'>';
-		echo $Tanevek[$i];
-		echo '</option>'."\n";
-	}
-	echo '</select>'."\n";
-
-	echo '<input type="submit" value="'._OK.'" />'."\n";
-
-	formEnd();
-}
-*/
 ?>
diff --git a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/orarend/orarendBetolto.phtml b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/orarend/orarendBetolto.phtml
index d6f037b0..cadb9520 100644
--- a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/orarend/orarendBetolto.phtml
+++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/orarend/orarendBetolto.phtml
@@ -2,8 +2,7 @@
 
     function putFileValaszto($ADAT) {
 
-	formBegin(array('class'=>'file'));
-
+	echo formBegin(array('class'=>'file','enctype'=>'multipart/form-data'));
 	echo '<input type="hidden" name="action" value="fileBetoltes" />'."\n";
 	echo '<input type="hidden" name="tanev" value="'.$ADAT['tanev'].'" />'."\n";
 	echo '<input type="hidden" name="tolDt" value="'.$ADAT['tolDt'].'" />'."\n";
@@ -12,6 +11,11 @@
 
 	echo '<label for="fileName">'._FILENAME.'</label>'."\n";
 	echo '<input type="text" id="fileName" name="fileName" value="'.$ADAT['fileName'].'" /><br />';
+
+	echo '<br/>';
+	echo '<input type="file" name="upfile"  /> (maximum méret: '.human_filesize(file_upload_max_size()).')';
+	echo '<br/>';
+
 	echo '<input type="checkbox" checked="checked" name="lezaras" value="true" id="lezaras" /><label for="lezaras">'._LEZARAS.'</label><br />';
 	echo '<select name="conv">'."\n";
 	    echo '<option value=""> - </option>'."\n";
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 160c2be7..60095e83 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
@@ -12,6 +12,11 @@
 
 	$TANKOROK = $ADAT['felvehetoTankorok'];
 	$BLOKKOK = $ADAT['felvehetoBlokkok'];
+
+	if (!is_array($ADAT['felvehetoTankorok']) || count($ADAT['felvehetoTankorok'])==0) {
+	    echo "nincs felvehető tankör!";
+	}
+
 	if (is_array($ADAT['felvehetoTankorok']) && count($ADAT['felvehetoTankorok']) > 0) {
 
 		$T = $ADAT['orarend']['assoc'];
@@ -306,6 +311,10 @@ for ($oi=0; $oi<count($ADAT['orarendioraTankor']['orarendiOra'][$het][$nap][$ora
     function putOrarendPlain($ADAT) {
     }
 
+    function putOrarendLebego($ADAT) {
+	// dump($ADAT['orarendiOra']);
+    }
+
     function _putPluszOra($het,$nap,$ora,$TANKOROK,$BLOKKOK, $tankorIdHelper = null) {
 
 
diff --git a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/share/face.phtml b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/share/face.phtml
index 7f8119e2..3d053a3b 100644
--- a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/share/face.phtml
+++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/share/face.phtml
@@ -1,4 +1,25 @@
 <?php
+    function getFaceURI($Id,$tipus) {
+	if (in_array($tipus,array('diak','diák'))) {
+	    $subdir=__TANEV;
+	} elseif (in_array($tipus,array('tanar','tanár'))) {
+	    $subdir=ekezettelen($tipus);
+	} else {
+	    $subdir='';
+	}
+
+	if ($subdir!='') {
+    	    foreach (array('jpg') as $ext) {
+        	$img = $Id.'.'.$ext;
+        	if (file_exists(_DOWNLOADDIR.'/'._POLICY.'/naplo/face/'.$subdir.'/'.$img)) {
+        	    $file = 'index.php?policy='._POLICY.'&sessionID='._SESSIONID.'&page=session&f=download&download='.sha1($Id).'&dir=naplo/face/'.$subdir.'&file='.$img;
+		    return $file;
+    		}
+	    }
+	}
+	return '';
+    }
+
     function putFace($Id,$tipus,$height='50',$return=true) {
 
 	$ICON = array(
diff --git a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/tanev/targyBontas.phtml b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/tanev/targyBontas.phtml
index 07f83e8a..f5bc8f47 100644
--- a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/tanev/targyBontas.phtml
+++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/tanev/targyBontas.phtml
@@ -198,7 +198,7 @@ $stat['ko']++;
 		echo '<ul>';
 		foreach ($ADAT['oratervenKivuliTankorok'] as $idx => $okAdat) {
 		    if ($idx<30) {
-			echo '<li>';
+			echo '<li class="tankorAdat" data-tankorid="'.$okAdat['tankorId'].'">';
 			echo $okAdat['tankorNev'].' ('.$okAdat['tankorId'].') <span class="diff">['.(is_null($okAdat['diff'])?'-':$okAdat['diff']).']</span>';
 		        echo '</li>';
 		    }
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 ece36953..e779ccd4 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
@@ -667,6 +667,9 @@ processJSONTanarAdat = function( adat ) {
 
 	    content += '<h3>Egyéb adatok</h3>';
 	    content += '<ul>';
+	    if (adat['email']!='') content += '<li>Email: '+adat['email']+'</li>';
+	    if (adat['titulus']!=null) content += '<li>Titulus: '+adat['titulus']+'</li>';
+	    if (adat['oId']!='') content += '<li>Oktatási azonosító: '+adat['oId']+'</li>';
 	    if (adat['beDt']!='') content += '<li>Munkaviszony: '+adat['beDt']+ (adat['kiDt']==null?'':' – '+adat['kiDt']) +'</li>';
 	    if (adat['hetiMunkaora']!='') content += '<li>Heti munkaóra: '+adat['hetiMunkaora']+'</li>';
 	    if (adat['hetiKotelezoOraszam']!='') content += '<li>Heti kötelező óraszám: '+adat['hetiKotelezoOraszam']+'</li>';