diff options
Diffstat (limited to 'mayor-orig/www/skin/classic/module-naplo/html')
5 files changed, 33 insertions, 31 deletions
diff --git a/mayor-orig/www/skin/classic/module-naplo/html/hirnok/cronFutar.phtml b/mayor-orig/www/skin/classic/module-naplo/html/hirnok/cronFutar.phtml index 9c547f84..8dc73ed5 100644 --- a/mayor-orig/www/skin/classic/module-naplo/html/hirnok/cronFutar.phtml +++ b/mayor-orig/www/skin/classic/module-naplo/html/hirnok/cronFutar.phtml @@ -59,7 +59,7 @@ global $aHetNapjai; $nap = kisbetus($aHetNapjai[date('w',strtotime($D['oraAdat']['dt']))-1]); $RETURN_STR .= 'A '.$D['oraAdat']['tankorCn'].' tankör '.$D['oraAdat']['dt'].' '.$nap.'i '.$D['oraAdat']['ora'].'. óra státusza megváltozott. '; - if ($D['oraAdat']['teremId']>0) $RETURN_STR .= 'Terme: '.$D['oraAdat']['teremId'].'. '; + if ($D['oraAdat']['teremId']>0) $RETURN_STR .= 'Terme: '.$D['oraAdat']['teremLeiras'].' ('.$D['oraAdat']['teremId'].') '; $RETURN_STR .= 'Új típusa: <b>'.$D['oraAdat']['tipus'].'</b>! '; if ($D['oraAdat']['ki']>0) $RETURN_STR .= '('.$D['oraAdat']['kiCn'].')'; return $RETURN_STR; diff --git a/mayor-orig/www/skin/classic/module-naplo/html/hirnok/hirnok.phtml b/mayor-orig/www/skin/classic/module-naplo/html/hirnok/hirnok.phtml index fd51c8d8..0ab0693c 100644 --- a/mayor-orig/www/skin/classic/module-naplo/html/hirnok/hirnok.phtml +++ b/mayor-orig/www/skin/classic/module-naplo/html/hirnok/hirnok.phtml @@ -139,7 +139,7 @@ // if ($D['oraAdat']['dt']=='1970-01-01 01:00:00') return false; $nap = kisbetus($aHetNapjai[date('w',strtotime($D['oraAdat']['dt']))-1]); echo 'A '.$D['oraAdat']['tankorCn'].' tankör '.$D['oraAdat']['dt'].' '.$nap.'i '.$D['oraAdat']['ora'].'. óra státusza megváltozott. '; - if ($D['oraAdat']['teremId']>0) echo 'Terme: '.$D['oraAdat']['teremId'].'. '; + if ($D['oraAdat']['teremId']>0) echo 'Terme: '.$D['oraAdat']['teremLeiras'].' ('.$D['oraAdat']['teremId'].') '; echo 'Új típusa: <b>'.$D['oraAdat']['tipus'].'</b>! '; if ($D['oraAdat']['ki']>0) echo '('.$D['oraAdat']['kiCn'].')'; } diff --git a/mayor-orig/www/skin/classic/module-naplo/html/intezmeny/tanar.phtml b/mayor-orig/www/skin/classic/module-naplo/html/intezmeny/tanar.phtml index c1c526fb..563f2bd6 100644 --- a/mayor-orig/www/skin/classic/module-naplo/html/intezmeny/tanar.phtml +++ b/mayor-orig/www/skin/classic/module-naplo/html/intezmeny/tanar.phtml @@ -52,7 +52,7 @@ echo '</td>'."\n"; echo '<th>'."\n"; - echo '<label for="allampolgarsag">'._ALLAMPOLGARSAG.'</lable>'."\n"; + echo '<label for="allampolgarsag">'._ALLAMPOLGARSAG.'</label>'."\n"; echo '</th>'."\n"; echo '<td>'."\n"; echo '<input type="text" id="allampolgarsag" name="allampolgarsag" value="'.$ADAT['tanarAdat']['allampolgarsag'].'" />'; @@ -61,21 +61,21 @@ echo '<tr>'."\n"; echo '<th>'."\n"; - echo '<label for="tajSzam">'._TAJSZAM.'</lable>'."\n"; + echo '<label for="tajSzam">'._TAJSZAM.'</label>'."\n"; echo '</th>'."\n"; echo '<td>'."\n"; echo '<input type="text" size="15" id="tajSzam" name="tajSzam" value="'.$ADAT['tanarAdat']['tajSzam'].'" />'; echo '</td>'."\n"; */ echo '<th>'."\n"; - echo '<label for="oId">'._OID.'</lable>'."\n"; + echo '<label for="oId">'._OID.'</label>'."\n"; echo '</th>'."\n"; echo '<td>'."\n"; echo '<input type="text" size="15" id="oId" name="oId" value="'.$ADAT['tanarAdat']['oId'].'" />'; echo '</td>'."\n"; echo '<th>'."\n"; - echo '<label for="NEKAzonosito">'._NEKAZONOSITO.'</lable>'."\n"; + echo '<label for="NEKAzonosito">'._NEKAZONOSITO.'</label>'."\n"; echo '</th>'."\n"; echo '<td>'."\n"; echo '<input type="text" size="20" id="NEKAzonosito" name="NEKAzonosito" value="'.$ADAT['tanarAdat']['NEKAzonosito'].'" />'; @@ -83,7 +83,7 @@ /* echo '<th>'."\n"; - echo '<label for="diakigazolvanySzam">'._DIAKIGAZOLVANYSZAM.'</lable>'."\n"; + echo '<label for="diakigazolvanySzam">'._DIAKIGAZOLVANYSZAM.'</label>'."\n"; echo '</th>'."\n"; echo '<td>'."\n"; echo '<input type="text" size="15" id="diakigazolvanySzam" name="diakigazolvanySzam" value="'.$ADAT['tanarAdat']['diakigazolvanySzam'].'" />'; @@ -92,14 +92,14 @@ echo '</tr>'."\n"; echo '<tr>'; echo '<th>'."\n"; - echo '<label for="email">'._TITULUS.'</lable>'."\n"; + echo '<label for="email">'._TITULUS.'</label>'."\n"; echo '</th>'."\n"; echo '<td>'."\n"; echo '<input type="text" size="32" id="titulus" name="titulus" value="'.$ADAT['tanarAdat']['titulus'].'" />'; echo '</td>'."\n"; echo '<th>'."\n"; - echo '<label for="email">'._TITULUSROVID.'</lable>'."\n"; + echo '<label for="email">'._TITULUSROVID.'</label>'."\n"; echo '</th>'."\n"; echo '<td>'."\n"; echo '<input type="text" size="10" id="titulusRovid" name="titulusRovid" value="'.$ADAT['tanarAdat']['titulusRovid'].'" />'; @@ -107,12 +107,20 @@ echo '</tr>'; echo '<tr>'; echo '<th>'."\n"; - echo '<label for="email">'._EMAIL.'</lable>'."\n"; + echo '<label for="email">'._EMAIL.'</label>'."\n"; echo '</th>'."\n"; echo '<td colspan="4">'."\n"; echo '<input type="text" size="64" id="email" name="email" value="'.$ADAT['tanarAdat']['email'].'" />'; echo '</td>'."\n"; echo '</tr>'; + echo '<tr>'; + echo '<th>'."\n"; + echo '<label for="">'._KRETANEV.'</label>'."\n"; + echo '</th>'."\n"; + echo '<td colspan="4">'."\n"; + echo '<input type="text" size="64" id="kretaNev" name="kretaNev" value="'.$ADAT['tanarAdat']['kretaNev'].'" />'; + echo '</td>'."\n"; + echo '</tr>'; echo '</table>'."\n"; echo '<input type="submit" />'; @@ -142,14 +150,14 @@ echo '<tr>'."\n"; echo '<th>'."\n"; - echo '<label for="szuletesiHely">'._SZULETESIHELY.'</lable>'."\n"; + echo '<label for="szuletesiHely">'._SZULETESIHELY.'</label>'."\n"; echo '</th>'."\n"; echo '<td>'."\n"; echo '<input type="text" id="szuletesiHely" name="szuletesiHely" value="'.$ADAT['tanarAdat']['szuletesiHely'].'" />'; echo '</td>'."\n"; echo '<th>'."\n"; - echo '<label for="szuletesiIdo">'._SZULETESIIDO.'</lable>'."\n"; + echo '<label for="szuletesiIdo">'._SZULETESIIDO.'</label>'."\n"; echo '</th>'."\n"; echo '<td>'."\n"; echo '<input class="date" type="text" id="szuletesiIdo" name="szuletesiIdo" value="'.$ADAT['tanarAdat']['szuletesiIdo'].'" />'; @@ -347,7 +355,7 @@ echo '</td>'."\n"; echo '<th>'."\n"; - echo '<label for="allampolgarsag">'._ALLAMPOLGARSAG.'</lable>'."\n"; + echo '<label for="allampolgarsag">'._ALLAMPOLGARSAG.'</label>'."\n"; echo '</th>'."\n"; echo '<td>'."\n"; echo '<input type="text" id="allampolgarsag" name="allampolgarsag" value="'.$ADAT['tanarAdat']['allampolgarsag'].'" />'; @@ -356,28 +364,28 @@ echo '<tr>'."\n"; echo '<th>'."\n"; - echo '<label for="tajSzam">'._TAJSZAM.'</lable>'."\n"; + echo '<label for="tajSzam">'._TAJSZAM.'</label>'."\n"; echo '</th>'."\n"; echo '<td>'."\n"; echo '<input type="text" size="15" id="tajSzam" name="tajSzam" value="'.$ADAT['tanarAdat']['tajSzam'].'" />'; echo '</td>'."\n"; */ echo '<th>'."\n"; - echo '<label for="oId">'._OID.'</lable>'."\n"; + echo '<label for="oId">'._OID.'</label>'."\n"; echo '</th>'."\n"; echo '<td>'."\n"; echo '<input type="text" size="15" id="oId" name="oId" value="'.$ADAT['tanarAdat']['oId'].'" />'; echo '</td>'."\n"; echo '<th>'."\n"; - echo '<label for="NEKAzonosito">'._NEKAZONOSITO.'</lable>'."\n"; + echo '<label for="NEKAzonosito">'._NEKAZONOSITO.'</label>'."\n"; echo '</th>'."\n"; echo '<td>'."\n"; echo '<input type="text" size="20" id="NEKAzonosito" name="NEKAzonosito" value="'.$ADAT['tanarAdat']['NEKAzonosito'].'" />'; echo '</td>'."\n"; echo '<th>'."\n"; - echo '<label for="beDt">'._BEDT.'</lable>'."\n"; + echo '<label for="beDt">'._BEDT.'</label>'."\n"; echo '</th>'."\n"; echo '<td>'."\n"; echo '<input type="text" size="15" id="beDt" name="beDt" value="'.date('Y-m-d').'" />'; 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 e34ea785..798c8e85 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 @@ -57,17 +57,11 @@ $T = $ADAT['orarend']['assoc']; if (MAYOR_SOCIAL === true) { - echo '<h2 style="text-align: center; - background-color: #f06; - width: 220px; - margin: auto; - color: #fff; - margin-bottom: 8px; - border-radius: 4px; - padding: 2px;">MaYoR Social Edition</h2>'; + echo '<h2 class="mayorSocialEdition">MaYoR Social Edition</h2>'; formBegin(); echo '<input type="hidden" name="action" value="orarendiOraTeremModosit" />'; echo '<input type="hidden" name="dt" value="'.$ADAT['dt'].'" />'; + echo '<input type="hidden" name="tolDt" value="'.$ADAT['tolDt'].'" />'; echo '<input type="hidden" name="tanarId" value="'.$ADAT['tanarId'].'" />'; echo '<input type="hidden" name="osztalyId" value="'.$ADAT['osztalyId'].'" />'; echo '<input type="hidden" name="teremId" value="'.$ADAT['teremId'].'" />'; @@ -234,7 +228,7 @@ $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']; @@ -281,8 +275,8 @@ $_valosTeremId = (is_null($_ORA['teremId']))? $_T['teremId']:$_ORA['teremId']; } if ($TANKOR_DOLGOZAT[$_T['tankorId']][$dt]>0) echo '<span style="color:orange;" class="icon-idea-alt" title="bejelentett dolgozat dolgozatAdat" data-dolgozatid="'.$TANKOR_DOLGOZAT[$_T['tankorId']][$dt].'"></span>'; if ($TANKOR_JEGYZET[$_T['tankorId']][$dt]>0) echo '<span style="color:lightgreen;" class="icon-file-edit-alt" title="jegyzet"></span>'; -$_teremKiir = ($_T['teremId'] != $_valosTeremId) ? '<del>'.$ADAT['termek'][$_T['teremId']]['leiras'].'</del><ins>'.$ADAT['termek'][$_valosTeremId]['leiras'].'</ins>' : $ADAT['termek'][$_T['teremId']]['leiras']; -$_ferohely = $ADAT['termek'][$_valosTeremId]['ferohely']; + $_teremKiir = ($_T['teremId'] != $_valosTeremId) ? '<del>'.$ADAT['termek'][$_T['teremId']]['leiras'].'</del><ins>'.$ADAT['termek'][$_valosTeremId]['leiras'].'</ins>' : $ADAT['termek'][$_T['teremId']]['leiras']; + $_ferohely = $ADAT['termek'][$_valosTeremId]['ferohely']; $_letszam = $ADAT['tankorLetszamok'][$_T['tankorId']]; if ($_T['tankorId']!='') { echo '<span title="'.$_targyJel.' '.$_osztalyJel.' ('.$ADAT['tankorok'][$_T['tankorId']][0]['tankorId'].') '.$_tankorTipus.'" >'; @@ -298,7 +292,7 @@ $_ferohely = $ADAT['termek'][$_valosTeremId]['ferohely']; if (MAYOR_SOCIAL === true) { // if ($_valosTeremId == 0) { // (`het`,`nap`,`ora`,`tanarId`,`tolDt` = teremId), - $_keyBase = 'OOM+'.$_T['het'].'+'.$nap.'+'.$ora.'+'.$_T['tanarId'].'+'.$_T['tolDt']; + $_keyBase = 'OOM+'.$_T['het'].'+'.$nap.'+'.$ora.'+'.$_T['tanarId'].'+'.$_T['tolDt'].'+'.$_ORA['oraId']; $_hidden = ($_valosTeremId > 0)?' style="display:none" ':''; echo '<select class="teremModosit onChangeSubmit" data-tmpid="'.intval($tmpid).'" name="'.$_keyBase.'" '.$_hidden.'>'; if ($_valosTeremId!=0) diff --git a/mayor-orig/www/skin/classic/module-naplo/html/osztalyozo/diak.phtml b/mayor-orig/www/skin/classic/module-naplo/html/osztalyozo/diak.phtml index 2851b4b5..79c33e0f 100644 --- a/mayor-orig/www/skin/classic/module-naplo/html/osztalyozo/diak.phtml +++ b/mayor-orig/www/skin/classic/module-naplo/html/osztalyozo/diak.phtml @@ -35,12 +35,12 @@ echo '<tr>'."\n"; if (__SHOW_FACES_TF) { echo '<th id="virtualJegyEasterEgg">'; - //putFace($diakId,'diak'); echo '</th>'; $_sub=-1; } else $_sub=0; echo '<th class="nev diakNev" data-diakid="'.$diakId.'" colspan="'.($HO['count']+count($_TANEV['szemeszter'])-1+$_sub).'">'; - echo $diakNev.' '.$_osztalystr; + putFace($diakId,'diak'); + echo ' '.$diakNev.' '.$_osztalystr; echo '</th>'."\n"; if (__ATLAG_MUTATAS !== false) { |