2018/Feb/28 -i állapot hozzáadva, mint a módosítások kiindulási állapota

11 files changed, 1592 insertions, 0 deletions

diff --git a/mayor-orig/www/skin/vakbarat/base/css/base.css b/mayor-orig/www/skin/vakbarat/base/css/base.css
new file mode 100644
index 00000000..9bd3ce5f
--- /dev/null
+++ b/mayor-orig/www/skin/vakbarat/base/css/base.css
@@ -0,0 +1,175 @@
+/* Új menü */
+
+    ul#pagemenu {
+	padding: 5px;
+	text-align: left;
+	background-color: #040562;
+	list-style-type: none;
+	margin:0px;
+    }
+    ul#pagemenu li {
+	display: inline;
+	border-width: 0px 1px 0px 0px;
+	border-color: #8485a2;
+	border-style: dotted;
+	padding: 0px;
+	margin:10px 0px 10px 0px;
+    }
+    ul#pagemenu li a {
+	color: rgb(255,255,255);
+	text-decoration: none;
+	padding: 3px 10px;
+	margin: 0px;
+    }
+    ul#pagemenu li a:hover {
+	background-color: yellow;
+	text-decoration: underline;
+	color: black;
+    }
+    ul#pagemenu li.active a {
+	background-color: yellow;
+	color: black;
+    }
+    ul#pagemenu li.active a:hover {
+	background-color: white;
+	color: black;
+
+    }
+
+/* SUB */
+
+    ul#submenu {
+	padding: 5px;
+	text-align: left;
+	background-color: #040582;
+	list-style-type: none;
+	border-top: solid 1px #666666;
+	margin:0px;
+    }
+    ul#submenu li {
+	display: inline;
+	border-width: 0px 0px 0px 1px;
+	border-color: #8485a2;
+	border-style: dotted;
+	padding: 0px 0px;
+    }
+    ul#submenu li a {
+	color: rgb(255,255,255);
+	text-decoration: none;
+	padding: 3px 10px;
+	margin: 0px;
+    }
+    ul#submenu li a:hover {
+	background-color: yellow;
+	color: black;
+	text-decoration: underline;
+    }
+    ul#submenu li.active a {
+	background-color: yellow;
+	color: black;
+	padding:3px;
+    }
+    ul#submenu li.active a:hover {
+	background-color: white;
+	color: black;
+
+    }
+
+/* f */
+
+    ul#fmenu {
+	padding: 5px;
+	text-align: left;
+	background-color: #0405a2;
+	list-style-type: none;
+	margin:0px;
+	border-top: solid 1px #666666;
+    }
+    ul#fmenu li {
+	display: inline;
+	border-width: 0px 0px 0px 1px;
+	border-color: #8485a2;
+	border-style: dotted;
+    }
+    ul#fmenu li a {
+	color: rgb(255,255,255);
+	text-decoration: none;
+	padding: 3px 10px;
+    }
+    ul#fmenu li a:hover {
+	background-color: rgb(100,100,140);
+	text-decoration: underline;
+    }
+    ul#fmenu li.active a {
+	background-color: yellow;
+	color: black;
+	padding:3px;
+    }
+    ul#fmenu li.active a:hover {
+	background-color: white;
+	color: black;
+    }
+
+    #changeSkin {
+	display: inline;
+    }
+    #changeSkin .onChangeSubmit {
+	background-color: #eeeeee;
+	font-size:14px;
+    }
+
+    html body {
+	font-family: Verdana, sans-serif;
+	font-size: 12px;
+	margin:0px;
+	padding:0px;
+	background-color: white;
+    }
+
+    /* set default layout! */
+    table { font-size: 12px; }
+
+    form { margin: 0px; }
+    
+    div.mayorbody {
+    
+	padding: 0px; 
+    
+    }
+
+    div.mayorfoot {
+	text-align: center;
+	font-size:  10px;
+	width:100%;
+    }
+/* - Alert - */
+
+    form.mayorAlert { margin: 0px; padding: 0px; }
+    form.mayorAlert input { display: none; }
+    div.errorMsg {
+	margin: 20px 20%;
+	background-color: #eeffd0;
+	border: solid 2px #ff0000;
+	padding: 15px;
+    }
+    div.errorMsg span {
+	font-style: italic;
+    }
+
+    div.infoMsg {
+	margin: 20px 20%;
+	background-color: #eeffd0;
+	border: solid 2px #0000ff;
+	padding: 15px;
+    }
+    div.infoMsg span {
+	font-style: italic;
+    }
+
+    span.alertParam {
+	color: green;
+    }
+
+    h1#menu { text-align: left; }
+    h1#tartalom { text-align: left; }
+    h1#lablec { text-align: left; }
diff --git a/mayor-orig/www/skin/vakbarat/base/html/base.phtml b/mayor-orig/www/skin/vakbarat/base/html/base.phtml
new file mode 100644
index 00000000..62f6f4bb
--- /dev/null
+++ b/mayor-orig/www/skin/vakbarat/base/html/base.phtml
@@ -0,0 +1,231 @@
+<?php
+// -------------------------------------------------------------------
+// html_base() : a html oldal szerkezete
+// -------------------------------------------------------------------
+
+function html_base($sessionID,$policy,$page,$sub,$f,$lang,$skin,$MENU) {
+
+    _httpheader();
+
+    html_head($page,$sub,$f,$lang,$skin);
+    html_mayor_head($sessionID,$page,$sub,$f,$lang,$MENU,$skin);
+
+    _debugLayer();
+
+    echo '<div class="mayorbody">';
+    page($page,$sub,$f,$lang,$skin,$policy);
+    echo '</div>';
+    html_mayor_foot();
+}
+
+// -------------------------------------------------------------------
+// html_head() : html fejlec kiirasa            
+// -------------------------------------------------------------------
+
+function html_head($page,$sub,$f,$lang,$skin) {
+
+    global $INCLUDES, $SSSHH;
+
+    if ($f == '') $f = $page;
+    ## ----------------------------------------------
+    ## Note http://hixie.ch/advocacy/xhtml
+    ## But this is crazy! Using Doctype sniffing instead...
+    ## Also read: http://www.mozilla.org/docs/web-developer/faq.html
+    ## header('Content-type: application/xhtml+xml');
+    ## -----------------------------------------------
+    echo '<?xml version="1.0" encoding="utf-8"?>'."\n";
+    echo '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "DTD/xhtml1-transitional.dtd">'."\n";
+    echo '<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="hu">'."\n";
+    echo '<head>'."\n";
+    echo '<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />'."\n";
+    echo '<title>';
+	if (defined('_SITE')) echo ' - '._SITE.' - Vakbarát ';
+	echo _MAIN_TITLE;
+	echo '.';
+	echo _MAYORREV;
+    echo '</title>'."\n";
+    includeCSS($page,$sub,$f,$skin);
+    //includeCSS($page,$sub,$f,$skin,'handheld'); // install css for handheld devices
+    //includeJS($page,$sub,$f,$skin);
+    if ($SSSHH!=null && $SSSHH!='') echo $SSSHH;
+
+    if (is_array(@$INCLUDES['html_head']['global'])) foreach ($INCLUDES['html_head']['global'] as $key => $include) {
+	if (file_exists("skin/$skin/$include")) {
+	    include("skin/$skin/$include");
+	} elseif (file_exists('skin/'._DEFAULT_SKIN.'/'.$include)) {
+	    include('skin/'._DEFAULT_SKIN.'/'.$include);
+	}
+    }
+    if (is_array(@$INCLUDES['html_head'][$page])) foreach ($INCLUDES['html_head'][$page] as $key => $include) {
+	if (file_exists("skin/$skin/$include")) {
+	    include("skin/$skin/$include");
+	} elseif (file_exists('skin/'._DEFAULT_SKIN.'/'.$include)) {
+	    include('skin/'._DEFAULT_SKIN.'/'.$include);
+	}
+    }
+    echo '<link rel="shortcut icon" href="/skin/classic/base/img/favicon.ico" />'."\n";
+    echo "</head>\n<body>\n";
+		    
+}
+
+// -------------------------------------------------------------------
+// mayor_menu(): a menü kiiratása
+// -------------------------------------------------------------------
+
+function mayor_menu($MENU,$sessionID,$lang = _DEFAULT_LANG,$skin = _DEFAULT_SKIN) {
+
+    global $page, $sub, $f;
+
+    echo '<ul id="pagemenu">';
+	// --------------------------------------------------------
+    if (is_array($MENU)) {
+	foreach ($MENU as $aModule => $items) {
+	    if ($aModule != 'modules') {
+		for ($i = 0; $i < count($items); $i++) {
+
+		    if ($page == $aModule and
+			(!isset($items[$i]['url']) or strpos($_SERVER["REQUEST_URI"],$items[$i]['url']) !== false)
+		    ) echo '<li class="active">';
+		    else echo '<li>';
+
+		    if (isset($items[$i]['url']) && $items[$i]['url'] != '') {
+			if ($items[$i]['url'][0] == '&') $href = href("index.php?page=$aModule".$items[$i]['url']);
+			elseif (substr($items[$i]['url'],0,4) == 'http') $href = href($items[$i]['url'], array());
+			elseif (isset($items[$i]['get']) && is_array($items[$i]['get'])) $href = href($items[$i]['url'], $items[$i]['get']);
+			else $href = href($items[$i]['url']);
+		    } else {
+			$href = href("index.php?page=$aModule");
+		    }
+		    //echo '<a accesskey="m" href="'.$href.'"'.((isset($items[$i]['target']))?' target="'.$items[$i]['target'].'" ':'').'>'.$items[$i]['txt'].'</a>';
+		    echo '<a accesskey="'.$items[$i]['txt'][0].'" href="'.$href.'"'.((isset($items[$i]['target']))?' target="'.$items[$i]['target'].'" ':'').'>'.$items[$i]['txt'].'</a>';
+
+		    echo '</li>';
+		}
+	    }
+	}
+    }
+	// ---------------------------------------------------
+    echo '</ul>';
+
+    // II: SZINT
+    @$pageArray = $MENU['modules'][$page];
+    $aPage = $page;
+
+    	if (is_array($pageArray)) {
+	    echo '<ul id="submenu">';
+	    foreach ($pageArray as $anF => $items) {
+		if ($anF != 'sub') {
+		    for ($i=0;$i<count($items);$i++) {
+			if (
+			    $page == $aPage and 
+			    (
+				(
+				    !isset($items[$i]['url']) 
+    				    and $f == $anF
+				)
+				or
+				(
+				    isset($items[$i]['url']) and
+				    strpos($_SERVER["REQUEST_URI"],$items[$i]['url']) !== false
+				)
+			    )
+			) echo '<li class="active">';
+			else echo '<li>';
+
+			    if (isset($items[$i]['url']) && $items[$i]['url'] != '') {
+				if ($items[$i]['url'][0] == '&') $href = href("index.php?page=$aPage&f=$anF".$items[$i]['url']);
+				elseif (substr($items[$i]['url'],0,4) == 'http') $href = href($items[$i]['url'], array());
+				elseif (isset($items[$i]['get']) && is_array($items[$i]['get'])) $href = href($items[$i]['url'], $items[$i]['get']);
+				else $href = href($items[$i]['url']);
+			    } else {
+				$href = href("index.php?page=$aPage&f=$anF",array('policy','sessionID','lang','skin'));
+			    }
+			    //echo '<a accesskey="n" href="'.$href.'"'.((isset($items[$i]['target']))?' target="'.$items[$i]['target'].'" ':'').'>'.$items[$i]['txt'].'</a>';
+			    echo '<a accesskey="'.$items[$i]['txt'][0].'" href="'.$href.'"'.((isset($items[$i]['target']))?' target="'.$items[$i]['target'].'" ':'').'>'.$items[$i]['txt'].'</a>';
+
+			echo '</li>';
+		    }
+		}
+	    }
+	    echo '</ul>'."\n";
+	}
+
+    // III: SZINT
+    @$subArray = $MENU['modules'][$page]['sub'][$sub];
+    $aSub = $sub;
+    
+	if (is_array($subArray)) {
+	    echo '<ul id="fmenu">';
+
+	    foreach ($subArray as $anF => $items) {
+		for ($i=0;$i<count($items);$i++) {
+		    if ($aPage == $page and
+			$aSub == $sub and
+			$anF == $f and
+			(!isset($items[$i]['url']) or strpos($_SERVER["REQUEST_URI"],$items[$i]['url']) !== false)
+		    ) echo '<li class="active">';
+		    else echo '<li>';
+
+		    if (isset($items[$i]['url']) && $items[$i]['url'] != '') {
+			if ($items[$i]['url'][0] == '&') $href = href("index.php?page=$aPage&sub=$aSub&f=$anF".$items[$i]['url']);
+			elseif (substr($items[$i]['url'],0,4) == 'http') $href = href($items[$i]['url'], array());
+			elseif (isset($items[$i]['get']) && is_array($items[$i]['get'])) $href = href($items[$i]['url'], $items[$i]['get']);
+			else $href = href($items[$i]['url']);
+		    } else {
+			$href = href("index.php?page=$aPage&sub=$aSub&f=$anF");
+		    }
+		    //echo '<a accesskey="b" href="'.$href.'"'.((isset($items[$i]['target']))?' target="'.$items[$i]['target'].'" ':'').'> '.$items[$i]['txt'].' </a>';
+		    echo '<a accesskey="'.$items[$i]['txt'][0].'" href="'.$href.'"'.((isset($items[$i]['target']))?' target="'.$items[$i]['target'].'" ':'').'> '.$items[$i]['txt'].' </a>';
+
+		    echo '</li>';
+		}
+	    }
+
+	    echo '</ul>'."\n";
+	}
+
+}
+
+// -------------------------------------------------------------------
+// html_mayor_head() : fejlec kiirasa (logo+menu+lastupdated)            
+// -------------------------------------------------------------------
+    
+function html_mayor_head($sessionID,$page,$sub,$f,$lang,$MENU,$skin = _DEFAULT_SKIN) {
+
+    global $INCLUDES, $INSTALLED_MODULES, $LANGUAGES, $SKINS, $SKINSSHOW, $policy;
+
+    _updateWindow();
+    _keyHelp();
+    
+    if (date('m')==12) $imgextra = '-santa'; else $imgextra = '';
+
+    if (!file_exists($HOME_LOGO = 'skin/'.$skin.'/base/img/mayor_small_ssl'.$imgextra.'.png'))
+		     $HOME_LOGO = 'skin/'._DEFAULT_SKIN.'/base/img/mayor_small_ssl'.$imgextra.'.png';
+    //if (!file_exists($HOME_LOGO = 'skin/'.$skin.'/base/img/mayor_small_ssl.gif'))
+    //		     $HOME_LOGO = 'skin/'._DEFAULT_SKIN.'/base/img/mayor_small_ssl.gif';
+    if (!file_exists($HELP_LOGO = 'skin/'.$skin.'/module-help/img/help_small.jpg'))
+		     $HELP_LOGO = 'skin/'._DEFAULT_SKIN.'/module-help/img/help_small.jpg';
+
+    ## Név, Oldal info, Policy
+//    echo '<div class="namepolicy">'."\n";
+	    echo '<a href="#tartalom">Ugrás a tartalomhoz</a><br />';
+	    echo '<a href="'.href('index.php').'" accesskey="h" class="nev">'._HOME.(_USERCN!='' ? ' ('._USERCN.')' : '').'</a>';
+//    echo '</div>'."\n";
+    ## ------------------------
+    echo '<h1 id="menu">Menü</h1>';
+    mayor_menu($MENU,$sessionID,$lang,$skin);
+    echo '<h1 id="tartalom">Tartalom</h1>'."\n";
+}
+
+// -------------------------------------------------------------------
+// html_mayor_foot() : lablec kiirasa (                     )            
+// -------------------------------------------------------------------
+
+function html_mayor_foot() {
+    echo '<h1 id="lablec">Lábléc</h1>'."\n";
+    echo '<a href="'.href('index.php?skin=classic',array('sessionID','lang','policy')).'">'._SWITCH_TO_CLASSIC_SKIN.'</a>';
+    echo '<div class="mayorfoot">'._MAIN_FOOTER.'</div>';
+    echo "</body>\n</html>";
+}
+
+?>
diff --git a/mayor-orig/www/skin/vakbarat/module-auth/css/login.css b/mayor-orig/www/skin/vakbarat/module-auth/css/login.css
new file mode 100644
index 00000000..b94c93d3
--- /dev/null
+++ b/mayor-orig/www/skin/vakbarat/module-auth/css/login.css
@@ -0,0 +1,9 @@
+img 	{ border-width: 0px; } 	
+h1	{text-align: center; margin: 10px; font-size:20px; } 	
+h2	{text-align: center; margin: 10px; font-size: 15px; }
+h3	{text-align: center; margin: 10px; font-size: 12px; }
+form#login	{ margin: 30px;padding: 0px; text-align: center; } 	
+input	{ font-size: 12px; font-family:Verdana,Arial; background-color: #fffff0; border: solid 1px #666690;} 
+select.pp {  	    padding: 0px; margin: 0px; 	    border: none 0px #778890; 	    font-size: 12px;  	    background-color: #eeeee0; 	   font-family: Verdana,Arial;  	    } 	
+select.pp>option { border: none 0px black; } 	
+input.submit 	{ border: solid 1px #776650; } 	
diff --git a/mayor-orig/www/skin/vakbarat/module-auth/html/login.phtml b/mayor-orig/www/skin/vakbarat/module-auth/html/login.phtml
new file mode 100644
index 00000000..c7c54cfa
--- /dev/null
+++ b/mayor-orig/www/skin/vakbarat/module-auth/html/login.phtml
@@ -0,0 +1,55 @@
+<?php
+
+    function putLoginForm($userAccount,$toPolicy,$toPSF='',$toSkin='') {
+
+	global $POLICIES, $AUTH, $sessionID;
+	echo '<h1>'._SITE.'</h1>'."\n";
+	echo '<h2>'._GREETING.'</h2>'."\n";
+
+	formBegin(array('method'=>'post', 
+	    'action'=>'index.php?policy=public&page=auth&f=login&toPolicy='.$toPolicy.'&sessionID='.$sessionID ,
+	    'name'=>"loginablak", 'id'=>'login'));
+
+	echo '<input type="hidden" name="action" value="login" />';
+	echo '<input type="hidden" name="toPSF" value="'.$toPSF.'" />';
+
+	echo '<h3>'."\n";
+    	    echo _LOGIN;
+    	echo '</h3>'."\n";
+
+    	echo '<label for="focus">'._USERNAME.'</label>';
+    	echo '<input id="focus" type="text" accesskey="u" tabindex="1" name="userAccount" value="" maxlength="32" />'."<br />\n";
+
+        echo '<select class="pp" name="toPolicy">'."\n";
+		    $SEL = array($toPolicy => ' selected="selected" ');
+		    for ($i=0; $i<count($POLICIES); $i++) {
+			$_policy = $POLICIES[$i];
+			if ($AUTH[$_policy]['authentication'] != 'none') {
+                	    echo '<option value="'.$_policy.'" '.$SEL[$_policy].'>';
+			    echo constant('_'.strtoupper($_policy).'_PASSWORD');
+			    echo '</option>'."\n";
+			}
+		    }
+        echo '</select>'."\n";
+
+	echo '<input id="userPassword" type="password" accesskey="p" tabindex="2" name="userPassword" value="" />'."<br />\n";
+
+        echo '<input accesskey="l" type="submit" tabindex="3" name="button" value=" '. _LOGIN .' "
+			onclick="document.loginablak.button.disabled=true;
+				document.loginablak.button.value=\' Várj... \';
+				document.loginablak.submit()" class="submit" />'."\n";
+
+	formEnd();
+
+/*
+	echo '<table style="width: 100%" align="center">'."\n";
+	    echo '<tr>'."\n";
+    		echo '<td class="co">'."\n";
+    		echo _MAYOR_DESC."\n";
+    		echo '</td>'."\n";
+	    echo '</tr>'."\n";
+	echo '</table>'."\n";
+*/
+    }
+
+?>
diff --git a/mayor-orig/www/skin/vakbarat/module-naplo/css/haladasi/haladasi.css b/mayor-orig/www/skin/vakbarat/module-naplo/css/haladasi/haladasi.css
new file mode 100644
index 00000000..efe8d51a
--- /dev/null
+++ b/mayor-orig/www/skin/vakbarat/module-naplo/css/haladasi/haladasi.css
@@ -0,0 +1,187 @@
+
+	table.haladasiBejegyzesek {
+    	    background-color: rgb(50,60,80);
+	    margin-top: 30px;
+	    width: 98%;
+	}	
+	table.haladasiBejegyzesek tbody tr:hover td {
+	    background-color: white;
+        }
+	table.haladasiBejegyzesek tbody tr td input:focus {
+	    background-color: white !important;
+        }
+	table.haladasiBejegyzesek tbody tr td input.gomb:focus {
+	    background-color: red;
+        }
+
+	table.haladasiBejegyzesek tbody.parosNap {
+    	    background-color: #cccccc;
+	}
+	table.haladasiBejegyzesek tbody.paratlanNap {
+    	    background-color: #eeeeee;
+	}
+	table.haladasiBejegyzesek tbody td.ora {
+	    text-align: center;
+	}
+
+/* TBODY TH */
+
+	table.haladasiBejegyzesek tbody th.nincsOra {
+	    background-color: rgb(200,200,200);
+	    color: rgb(100,100,100);
+	    text-align: center;
+	    border: none;
+	    font-weight: normal;
+	}
+	table.haladasiBejegyzesek tbody th.nap {
+	    text-align: center;
+    	    background-color: #666688;
+	    color: white;
+	    border: none;
+	}
+	table.haladasiBejegyzesek tbody.szunet th.nap {
+    	    background-color: #778877;
+	}
+	table.haladasiBejegyzesek tbody.tanitasNelkul th.nap {
+    	    background-color: #aaaa44;
+	}
+
+/* --- */
+
+	table.haladasiBejegyzesek tbody td.dolgozat {
+    	    background-color: #ffaa44;
+	    padding-left: 20px;
+	}
+	table.haladasiBejegyzesek tbody td.dolgozat a {
+	    text-decoration: none;
+	    color: black;
+	}
+
+	table.haladasiBejegyzesek tbody td.nincsBeirva {
+	    font-style:italic;
+	}
+
+	table.haladasiBejegyzesek th {
+		border-style: none none solid none;
+		border-width: 0 0 2px 0;
+		border-color: #556677;
+	        background-color: rgb(50,60,80);
+		color: rgb(210,215,220);
+		border-style: solid;
+		border-width: 1px;
+	}
+	table.haladasiBejegyzesek th.fejlec8 {
+	    height: 30px;
+	    text-align: center
+	}
+	table.haladasiBejegyzesek th.fejlec8 a { color: white }
+
+
+	table.haladasiBejegyzesek td.osztaly { text-align: center; }
+	table.haladasiBejegyzesek select {
+	    font-family: Verdana,Arial;
+	    background-color: rgb(50,60,80);
+	    color: rgb(210,215,220);
+	    border-style: solid;
+	    border-width: 1px;
+	}
+
+	input { font-family: Verdana,Arial; color: inherit; }
+	input.data { border-style: none none solid none;
+			 border-width: 1px;
+			 border-color: #dddddd;
+			width:85%;
+	}
+	input.data:hover { border-bottom: solid 1px #556677; background-color: white }
+	table.haladasiBejegyzesek tbody.parosNap input.data { border-left: solid 2px #cccccc; }
+	table.haladasiBejegyzesek tbody.paratlanNap input.data { border-left: solid 2px #eeeeee; }
+	table.haladasiBejegyzesek tbody.parosNap input.beirva { background-color: #cccccc; }
+	table.haladasiBejegyzesek tbody.paratlanNap input.beirva { background-color: #eeeeee; }
+
+	table.haladasiBejegyzesek tbody.parosNap input.data.ajaxRequest,
+	table.haladasiBejegyzesek tbody.paratlanNap input.data.ajaxRequest { border-left: solid 2px orange; }
+	table.haladasiBejegyzesek tbody.parosNap input.gomb.ajaxRequest,
+	table.haladasiBejegyzesek tbody.paratlanNap input.gomb.ajaxRequest { background-color: orange; }
+	table.haladasiBejegyzesek tbody select option.ajaxRequestDone,
+	table.haladasiBejegyzesek tbody.parosNap input.ajaxRequestDone,
+	table.haladasiBejegyzesek tbody.paratlanNap input.ajaxRequestDone { border-left: solid 2px green; }
+
+	table.haladasiBejegyzesek tbody.parosNap tr.helyettesit td { background-color: #ccccaa; }
+	table.haladasiBejegyzesek tbody.paratlanNap tr.helyettesit td { background-color: #eeeecc; }
+	table.haladasiBejegyzesek tbody.parosNap tr.helyettesit input.beirva { background-color: #ccccaa; }
+	table.haladasiBejegyzesek tbody.paratlanNap tr.helyettesit input.beirva { background-color: #eeeecc; }
+
+	input.gomb {
+		border: outset 1px #777777; padding: 0px; margin: 0px;
+		background-color: #009900;
+		color: white;
+	}
+
+	input.rejtettGomb { border: none; background-color: rgb(50,60,80); }
+
+	table.haladasiBejegyzesek a.gomb {
+		padding: 1px;
+		background-color: #dddddd;
+		border: outset 1px #556677; 
+		margin: 2px;
+		text-decoration: none;
+	}
+	table.haladasiBejegyzesek a.gomb:hover  {
+		padding: 1px;
+		background-color: #556677;
+		border: outset 1px #dddddd; 
+		margin: 2px;
+		text-decoration: none;
+		color: white;
+	}
+
+	table.haladasiBejegyzesek a {
+	    display: block;
+	    text-align: center;
+	    color: black;
+	    text-decoration: none;
+	}
+	table.haladasiBejegyzesek a:hover  {
+	    color: green;
+	    text-decoration: underline;
+	}
+	
+	table.haladasiBejegyzesek tr.dolgozat td {
+	    padding: 0px 10px;
+	    background-color: rgb(160,100,120);
+	}
+
+	table.haladasiBejegyzesek tr.dolgozat td a {
+	    color: white;
+	    text-decoration: none;
+	}
+
+	table.haladasiBejegyzesek tr.dolgozat td a:hover {
+	    color: rgb(260,200,220);
+	}
+
+	table.haladasiBejegyzesek tbody tr td.mg {
+		text-align: center;
+	}
+
+	table.haladasiBejegyzesek tr td.mg span.latogatott {
+	    background-color: rgb(100,150,100);
+	    color: white;
+	    text-decoration: none;
+	    padding-left:5px;
+	    padding-right:5px;
+	    border-bottom: solid 1px green;
+	    margin:0px;
+	}
+
+
+	form.hetes { 
+	    border: solid 1px #008800;
+	    background-color: rgb(100,200,100); text-align: center; color: white; margin: 15px 13px; font-weight: bold; 
+	}
+	form.hetes input { color: black; border: none; margin: 4px; border: solid 1px #008800; }
+	form.hetes span { padding-right:2em; }
+	form.hetes select option {
+	    background-color:# white;
+	    border: solix 1px #00aa00;
+	}
diff --git a/mayor-orig/www/skin/vakbarat/module-naplo/css/hianyzas/ora.css b/mayor-orig/www/skin/vakbarat/module-naplo/css/hianyzas/ora.css
new file mode 100644
index 00000000..0b920c4b
--- /dev/null
+++ b/mayor-orig/www/skin/vakbarat/module-naplo/css/hianyzas/ora.css
@@ -0,0 +1,106 @@
+
+    table.csoportNevsorHianyzok {
+	background-color: #eeeeee;
+	color: white;
+    }
+    table.csoportNevsorHianyzok thead { background-color: #440055; }
+    table.csoportNevsorHianyzok thead a { color: white; text-decoration: none }
+    table.csoportNevsorHianyzok thead a:hover { color: white; text-decoration: underline; }
+
+    table.csoportNevsorHianyzok thead.oraAdat table.oraAdat {
+	width:100%;
+	background-color: #eeeeee;
+    }
+    table.csoportNevsorHianyzok thead.oraAdat table.oraAdat td { font-weight: normal; }
+
+    table.csoportNevsorHianyzok tfoot { background-color: #440055; }
+    table.csoportNevsorHianyzok tfoot input { background-color: #eeeeee; }
+
+    table.csoportNevsorHianyzok tbody {
+	color: black
+    }
+    table.csoportNevsorHianyzok tbody a { color: black; text-decoration: none }
+    table.csoportNevsorHianyzok tbody a:hover { color: black; text-decoration: underline; }
+
+    table.csoportNevsorHianyzok tbody th {
+	/* background-color: rgb(80,100,120); */
+    }
+    
+    table.csoportNevsorHianyzok td { text-align: left; }
+    table.csoportNevsorHianyzok td.késés { text-align: center; }
+    table.csoportNevsorHianyzok tbody tr:hover { background-color: #ffffff;}
+    table.csoportNevsorHianyzok td a { color: inherit; }
+
+    table.csoportNevsorHianyzok    select { border: solid 1px #888888; background-color: #eeeeee; } 
+    table.csoportNevsorHianyzok    select.igazolatlan { color: red }
+    table.csoportNevsorHianyzok    select.igazolt { color: green }
+    table.csoportNevsorHianyzok    td.igazolatlan { color: red }
+    table.csoportNevsorHianyzok    td.igazolt { color: green }
+    table.csoportNevsorHianyzok    th.radio { width: 28px; }
+
+    table.csoportNevsorHianyzok    tr td input.perc  {
+	vertical-align: top;
+	border: solid 1px #aabb99;
+	text-align: right;
+	width:1.5em;
+    }
+
+
+    .jelen {
+        border-color: rgb(100,200,100);
+        border-width: 0px 1px 3px 1px;
+        border-style: solid;
+    }
+
+    .hianyzas, .hiányzás {
+        border-color: rgb(200,100,100);
+        border-width: 0px 1px 3px 1px;
+        border-style: solid;
+    }
+
+    .keses, .késés {
+        border-color: rgb(200,200,100);
+        border-width: 0px 1px 3px 1px;
+        border-style: solid;
+    }
+    span.perc {
+        border-color: rgb(200,200,100);
+        border-width: 1px 1px 1px 1px;
+        border-style: solid;
+	background-color: rgb(230,210,130);
+	color: rgb(100,80,0);
+    }
+
+    .felszereles_hiany {
+	color: white;
+	background-color:blue;
+    }
+
+    .felmentes {
+	background-color: #eeeeee;
+	color: purple;
+    }
+    .fbetus {
+        border-color: rgb(100,100,200);
+        border-width: 0px 1px 3px 1px;
+        border-style: solid;
+    }
+
+    .igazolt { background-color: #008800; }
+    .igazolatlan { background-color: #880000; }
+
+
+
+
+    table.hianyzasNaptar {
+	background-color: #778890;
+    }
+
+    table.hianyzasNaptar {background-color: #778877; }
+    table.hianyzasNaptar th {background-color: #889988; }
+    table.hianyzasNaptar a { color: #eeeee0; text-decoration: none }
+    table.hianyzasNaptar a:hover { background-color: #667766; }
+    table.hianyzasNaptar td.felszerelesHiany { background-color: rgb(100,100,200); }
+
+    form.vissza { background-color: white; width: 570px; margin: 0px auto; }
+    form.vissza input { border: none; background-color: white; cursor: pointer; } 
diff --git a/mayor-orig/www/skin/vakbarat/module-naplo/css/naplo.css b/mayor-orig/www/skin/vakbarat/module-naplo/css/naplo.css
new file mode 100644
index 00000000..64f55ecd
--- /dev/null
+++ b/mayor-orig/www/skin/vakbarat/module-naplo/css/naplo.css
@@ -0,0 +1,71 @@
+
+    table.toolBar { width: 95%;	border-spacing: 0px; margin: 1em auto; }
+    table.toolBar form { margin: 0px; padding: 0px; }
+    table.toolBar tr.first td.toolBarTitle, table.toolBar tr.first td.toolBarTool { border: solid 1px #333333; }
+    table.toolBar td.gap { width: 50%; border-spacing: 0px; }
+    table.toolBar td.toolBarTitle {
+	background-color: white;
+	width: 100%;
+	font-size: 18px;
+	font-weight: bold;
+    }
+    #toolBarIntezmeny, #toolBarHelpButton {
+	display:none;
+    }
+
+    table.toolBar td.toolBarTool {
+	border: solid 1px #666699;
+	background-color: #666699;
+	margin: 0px;
+	padding: 0px;
+    }
+    table.toolBar td.toolBarTool table { border-spacing: 0px; width: 100%; }
+    table.toolBar td.toolBarTool table th {
+	background-color: rgb(90,133,184);
+	text-align: left;
+	color: white;
+
+        padding: 0px 0px 0px 4px;
+	border-color: rgb(21,71,123);
+	border-width: 1px 0px;
+	border-style: solid;
+    }
+    table.toolBar input.toolSubmit { vertical-align: middle; border: 0px none; }
+    table.toolBar td.toolBarTool select { border: 0px; }
+    table.toolBar th {
+	background-color: rgb(90,133,184);
+	text-align: center;
+	color: white;
+        padding: 0px 0px 0px 4px;
+
+	border-color: rgb(21,71,123);
+	border-width: 1px 0px 1px 1px;
+	border-style: solid;
+    }
+    table.toolBar img { border: none; }
+
+    table.toolBar table.hianyzasOsszegzo { width:100%;  }
+    table.toolBar table.hianyzasOsszegzo th {
+            text-align: center !important;
+            border-style: none none solid none;
+            border-color: #888888;
+            border-width: 0px 0px 1px 0px;
+            }
+    table.toolBar     table.hianyzasOsszegzo td { width: 18%; border-bottom: solid 1px rgb(60,80,100); background-color: #dddddd; text-align: center; }
+
+    form.lapozo input {	border: solid 1px #555555; }
+
+    table.flipper input {height: 38px; width: 16px; color: white; 
+	border-top: solid 1px black;
+	border-bottom: solid 1px black;
+	border-left: none;
+	border-right: none;
+	background-color: rgb(90,133,184); 
+    }
+    table.flipper input.step { background-color: rgb(100,100,60); }
+
+    div.beirasAdatok { text-align: center; }
+    div.beirasAdatok span { font-weight: bold; font-size: 20pt; vertical-align: middle; }
+    div.beirasAdatok img { vertical-align: middle; }
+
+    table.toolBar input {  }
diff --git a/mayor-orig/www/skin/vakbarat/module-naplo/css/osztalyozo/diak.css b/mayor-orig/www/skin/vakbarat/module-naplo/css/osztalyozo/diak.css
new file mode 100644
index 00000000..4028dad7
--- /dev/null
+++ b/mayor-orig/www/skin/vakbarat/module-naplo/css/osztalyozo/diak.css
@@ -0,0 +1,24 @@
+
+    table.osztalyozo { background-color: rgb(220,220,220); color: white; }
+    table.osztalyozo a { color: white; text-decoration:none }
+    table.osztalyozo a:hover { color: white; text-decoration:underline }	
+    table.osztalyozo thead th {	background-color: #660077; padding: 2px 4px 2px 4px; }
+    table.osztalyozo thead th.nev { background-color: #660077; height:30px; }
+    table.osztalyozo thead td {	background-color: #440055; text-align: center; padding: 0px 4px 0px 4px; }
+    table.osztalyozo thead th.biz { background-color: #224433; }
+
+    table.osztalyozo tfoot th {	background-color: rgb(100,120,120); padding: 2px; vertical-align: center; }
+    table.osztalyozo tfoot th span { padding: 1px 10px; font-weight: normal; background-color: rgb(220,220,220); }
+
+    table.osztalyozo tbody th {	background-color: rgb(130,140,150); font-weight: normal; padding: 4px 4px 4px 4px; }
+    table.osztalyozo tbody th a { color: white; text-decoration: none; }
+    table.osztalyozo tbody th.atlag { background-color: rgb(100,100,130); padding: 0px 4px 0px 4px; }
+    table.osztalyozo tbody td {	background-color: #eeeeee; }
+    table.osztalyozo tbody td.biz { background-color: #446655; text-align: center; padding-right:3px; padding-left:3px; }
+    table.osztalyozo tbody td a { text-decoration: none; }
+    
+    table.osztalyozo tbody td a.jegy1, table.osztalyozo tfoot th span.jegy1 { color: blue; }
+    table.osztalyozo tbody td a.jegy2, table.osztalyozo tfoot th span.jegy2 { color: black; }
+    table.osztalyozo tbody td a.jegy3, table.osztalyozo tfoot th span.jegy3 { color: green; }
+    table.osztalyozo tbody td a.jegy4, table.osztalyozo tfoot th span.jegy4 { color: red; }
+    table.osztalyozo tbody td a.jegy5, table.osztalyozo tfoot th span.jegy5 { color: purple; }
diff --git a/mayor-orig/www/skin/vakbarat/module-naplo/css/uzeno/uzeno.css b/mayor-orig/www/skin/vakbarat/module-naplo/css/uzeno/uzeno.css
new file mode 100644
index 00000000..ab1e9cf6
--- /dev/null
+++ b/mayor-orig/www/skin/vakbarat/module-naplo/css/uzeno/uzeno.css
@@ -0,0 +1,79 @@
+
+
+    table.uzeno, table.ujUzenet,    table.egyUzenet  {
+	width:90%;
+	background-color: rgb(50,50,100);
+	margin-top:1em;
+	margin-bottom:1em;
+	font-size:large;
+    }
+    table.uzeno thead tr th, table.ujUzenet tr th { color: white; border-bottom: solid 1px #ffffff; background-color: rgb(100,100,150); padding:0.5em; }
+
+    table.ujUzenet select   { border: solid 1px #888888; }
+    table.ujUzenet tr td { text-align: center }
+    table.ujUzenet textarea { width:98%; height: 100px; border: solid 1px rgb(100,100,90); background-color:#eeeeee; }
+
+    table.ujUzenet tr.admin td textarea { background-color: green; color: white; }
+
+    table.uzeno thead tr th.dt { width:180px; }
+    table.uzeno thead tr th.cimzett { width:200px; }
+
+    table.uzeno tfoot tr th, table.uzeno tfoot tr th a { color:white; }
+
+    table.uzeno tbody tr td { padding-left:4px; background-color: #dddddd; }
+    table.uzeno tbody tr th { padding-left:4px; text-align:left; font-weight: normal; }
+    
+    table.uzeno tbody tr td.content { padding:10px; background-color:#eeeeee; }
+    table.uzeno tbody tr.uj td { background-color: #eeeeee; }
+    table.uzeno tbody tr.olvasott td { background-color: #bbbbbb;}
+
+    table.uzeno tbody tr td.face { width:1%; }
+
+    tr.diak th { background-color: #998899;}
+    tr.tanar th { background-color: #88ccff;}
+    tr.szulo th { background-color: #ccaabb;}
+
+    tr.diak.asterix th { background-color: #aaaaff;}
+    tr.tanar.asterix th { background-color: #aaaaff;}
+    tr.szulo.asterix th { background-color: #aaaaff;}
+
+    tr.munkakozosseg th { background-color: #99aacc;}
+    tr.tankor th { background-color: #aaccaa; }
+    tr.tankorSzulo th { background-color: #aacccc; }
+
+    tr.osztaly th { background-color: #bbcc99; }
+    tr.osztalySzulo th { background-color: #bbcccc; }
+    tr.osztalyTanar th { background-color: rgb(140,200,100); }
+
+    table.uzeno a { color: black; text-decoration: none;}
+    table.uzeno a:hover { text-decoration: underline; }
+
+    span.dt { color: #888888; }
+    a.more { 
+	color: black !important;
+	background-color: #eeeeee; 
+	text-decoration: none; 
+	border: solid 1px #999999; margin:1px; padding:1px;
+	height:10px;
+    }
+    a.more img { vertical-align: bottom;  }
+    a.more:hover { background-color: white; } 
+
+    a.more.uj { background-color: #ffeeaa; } 
+    a.more.olvasott { background-color: #bbcc99; } 
+
+    a.del { 
+	color: red !important;
+	background-color: #880000;
+	text-decoration: none; 
+	border: solid 1px black; margin:1px; padding:1px;
+    }
+
+      table.lapozo { width: 80%; }
+        table.lapozo table { background-color: #cccccc; border: solid 1px #778890; }
+        table.lapozo table th.title { background-color: navy; color: white; padding-left: 4px; padding-right:4px;}
+        table.lapozo table td { text-align: center; background-color: #eeeeee; }
+        table.lapozo table td.aktiv { background-color: #ffffff; font-weight: bold; }
+        table.lapozo table td.nav { background-color: #aaaaaa; }
+        table.lapozo a {color:black; text-decoration: none; }
+
diff --git a/mayor-orig/www/skin/vakbarat/module-naplo/html/haladasi/haladasi.phtml b/mayor-orig/www/skin/vakbarat/module-naplo/html/haladasi/haladasi.phtml
new file mode 100644
index 00000000..5800afb9
--- /dev/null
+++ b/mayor-orig/www/skin/vakbarat/module-naplo/html/haladasi/haladasi.phtml
@@ -0,0 +1,457 @@
+<?php
+/*
+    module:	naplo
+
+    todo: függvény paraméterezések tisztítása (2010)
+
+    függőségek:
+
+    function putHaladasiBejegyzesek($data, $tankorId, $osztalyId, $tanarId, $title, $diakId, $order, $ADAT)
+	|- function putNap($dt, $dNap, $napInfo, $doga, $napInfo2)
+	    |-function putHaladasiDolgozat
+	    |-function putOra($dOra)
+	|- function putTankorNap($dt, $dNap, $doga, $order)
+	    |-function putHaladasiDolgozat($dt,$doga)
+	    |-function putTankorOra($dOra)
+    function putHetesForm($ADAT)
+
+*/
+##
+# Haladási naplo megjelenítése
+##
+
+    function putHaladasiBejegyzesek($ADAT) {
+
+	global $_TANEV;
+
+	// kompatibilitás miatt -- átnevezhetők
+	$title = $ADAT['title'];
+	$data  = $ADAT['haladasi'];
+	$order = $ADAT['order'];
+	//..
+	$tankorId = $ADAT['tankorId'];
+	$osztalyId = $ADAT['osztalyId'];
+	$tanarId = $ADAT['tanarId'];
+	$diakId = $ADAT['diakId'];
+	// ---
+
+	// tanmenet
+        echo '<div style="display: none;" id="infodiv">
+        <div id="infodivheader"><span id="infodivclose">X</span>'._TANMENET_RESZLETEI.'</div>';
+    	    formBegin(array('action'=>href('index.php?page=naplo&sub=tanmenet&f=tanmenetInfo'), 'class'=>"onSubmitUpdate", 'id'=>"inform"));
+            echo '<input type="hidden" name="tanmenetId" id="informTanmenetId" value="" />'."\n";
+	    formEnd();
+        echo '</div>'."\n";
+
+	// tankör haladási
+        echo '<div style="display: none;" id="haladdiv">
+        <div id="haladdivheader"><span id="haladdivclose">X</span>'._TANKOR_HALADASI.'</div>';
+    	    formBegin(array('action'=>href('index.php?page=naplo&sub=haladasi&f=haladasi'), 'class'=>"onSubmitUpdate", 'id'=>"haladform"));
+            echo '<input type="hidden" name="tankorId" id="haladformTankorId" value="" />'."\n";
+	    formEnd();
+        echo '</div>'."\n";
+
+
+	if ($ADAT['title']=='') return;
+
+	$FORM = array('action'=>href('index.php?page=naplo&sub=haladasi&f=haladasi'), 'name'=>'haladasiOrabeiras', 'class'=>'');
+	formBegin($FORM);
+	    echo '<input type="hidden" name="igDt" value="'._SHOW_DAYS_TO.'" />'."\n";
+	    echo '<input type="hidden" name="osztalyId" value="'.$osztalyId.'" />'."\n";
+	    echo '<input type="hidden" name="diakId" value="'.$diakId.'" />'."\n";
+	    echo '<input type="hidden" name="tanarId" value="'.$tanarId.'" />'."\n";
+	    echo '<input type="hidden" name="order" value="'.$order.'" />'."\n";
+	    echo '<input type="hidden" name="action" value="haladasiNaploBeiras" />'."\n";
+	    if ($tankorId != '') echo '<input type="hidden" name="tankorId" value="'.$tankorId.'" />'."\n";
+
+            if (_SHOW_DAYS_FROM > $_TANEV['kezdesDt']) echo '<input class="gomb" type="submit" name="lapoz" value="<<" tabindex="5" />'."\n";
+            echo ' '._IDOSZAK.': '.str_replace('-','.',_SHOW_DAYS_FROM) . '. - '. str_replace('-','.', _SHOW_DAYS_TO) .'. '."\n";
+            if (_SHOW_DAYS_TO < date('Y-m-d'))  echo '<input class="gomb" type="submit" name="lapoz" value=">>" tabindex="6" />'."\n";
+	    echo '<br />';
+	
+	// -------------------------------
+	$toTime = strtotime(_SHOW_DAYS_TO);
+	$fromTime = strtotime(_SHOW_DAYS_FROM);
+
+	if ($order == 'ASC') {
+	    for ($time = $fromTime; $time <= $toTime; $time = strtotime('1 day',$time)) {
+
+		$dt = date('Y-m-d',$time);
+		$count = count($data[$dt]);
+		if ($tankorId == '') {
+		    putNap($dt, $data[$dt], $data['napok'][$dt], $data['dolgozatok'], $ADAT['tanitasiNap'][$dt]);
+		} elseif ($count > 0) {
+		    putTankorNap($dt, $data[$dt], $data['dolgozatok'], $order);
+		} // kirakjuk-e a napot
+
+	    } // for $dt
+	} else {
+	    for ($time = $toTime; $time >= $fromTime; $time = strtotime('-1 day',$time)) {
+
+		$dt = date('Y-m-d',$time);
+		$count = count($data[$dt]);
+		if ($tankorId == '') {
+		    putNap($dt, $data[$dt], $data['napok'][$dt], $data['dolgozatok'], $ADAT['tanitasiNap'][$dt]);
+		} elseif ($count > 0) {
+		    putTankorNap($dt, $data[$dt], $data['dolgozatok'], $order);
+		} // kirakjuk-e a napot
+
+	    } // for $dt
+	}
+	// ---------------------------------
+
+	formEnd();
+
+    }
+
+
+    function putNap($dt, $dNap, $napInfos, $doga, $napInfo2) {
+
+        global $aHetNapjai,$ADAT;
+
+	$time = strtotime($dt);
+	$count = count($dNap);
+
+	$tipus = $orarendiHet = $megjegyzes = array();
+	if (is_array($napInfos)) foreach ($napInfos as $ni) {	
+	    if (!in_array($ni['tipus'], $tipus)) $tipus[] = $ni['tipus']; 
+	    if ($ni['orarendiHet'] != 0 && !in_array($ni['orarendiHet'], $orarendiHet)) $orarendiHet[] = $ni['orarendiHet']; 
+	    if ($ni['megjegyzes'] != '' && !in_array($ni['megjegyzes'], $megjegyzes)) $megjegyzes[] = $ni['megjegyzes']; 
+	}
+	$tanitasiNap = false;
+	if (in_array('tanítási nap', $tipus) || in_array('speciális tanítási nap', $tipus)) {
+	    $tanitasiNap = true;
+	}
+
+
+	    echo '<h2>';
+		echo str_replace('-','.',$dt) .'. '. $aHetNapjai[date('w',$time)-1];
+		if ($napInfo2['napszam']!='' || $napInfo['orarendiHet'] != 0) echo ' (';
+		    if ($tanitasiNap) {
+			echo $napInfo2['napszam'] . '. ' . _TANITASI_NAP;
+			if ($napInfo['orarendiHet'] != 0) echo '/';
+		    }
+		    if (count($orarendiHet) > 0) echo ' - '.implode('./',$orarendiHet).'. '._HET;
+		    if (count($megjegyzes) > 0) echo ' - '.implode('/', $megjegyzes);
+		if ($napInfo2['napszam']!='' || $napInfo['orarendiHet'] != 0) echo ')';
+	    echo '</h2>';
+
+	putHaladasiDolgozat($dt,$doga);
+
+	$o = 0;
+	$_UJORA = array();
+	if ($count > 0) {
+	    for ($i=0; $i<$count; $i++) {
+                while ($o < $dNap[$i]['ora']) {
+                    if (__PLUSZBEIRHAT===true) $_UJORA[] = array('dt'=>$dt, 'ora'=>intval($o));
+                    $o++;
+                }
+                $o=$dNap[$i]['ora']+1;
+		putOra($dNap[$i]);
+	    } // órák kiírása
+            for($j=$dNap[$i-1]['ora']+1; $j<=$ADAT['maxOra']; $j++) {
+                if (__PLUSZBEIRHAT===true) $_UJORA[] =array('dt'=>$dt, 'ora'=>$j);
+            }
+	} else {
+	    echo _NINCS_ORAJA.'<br />';
+	    for($j=1; $j<=$ADAT['maxOra']; $j++) {
+                    if (__PLUSZBEIRHAT===true) $_UJORA[] = array('dt'=>$dt, 'ora'=>$j);
+            }
+	}
+	echo '<h3>'._PLUSZ_FELADATOK.'</h3>';
+	echo '<ul>';
+		for($i=0; $i<count($_UJORA); $i++) putUjOra($_UJORA[$i]);
+	echo '</ul>';
+    }
+
+
+    function putTankorNap($dt, $dNap, $doga, $order) {
+
+	$time = strtotime($dt);
+	$count = count($dNap);
+	
+	putHaladasiDolgozat($dt,$doga);
+
+	for ($i=0; $i<$count; $i++) {
+	    if ($order == 'DESC') putTankorOra($dNap[$count-$i-1]);
+	    else  putTankorOra($dNap[$i]);
+	} // órák kiírása
+
+    }
+
+
+    function putHaladasiDolgozat($dt,$doga) {
+
+	for ($i=0;$i<count($doga['tervezett'][$dt]);$i++) {
+	    $did = $doga['tervezett'][$dt][$i];
+	    echo '<p class="dolgozat">';
+		$href = href('index.php?page=naplo&sub=osztalyozo&f=dolgozat&dolgozatId='.$did);
+		echo '<a href="'.$href.'">';
+	    	echo _BEJELENTETT_DOLGOZAT . ': '. $doga[$did]['dolgozatNev'];
+		echo ' (' ;
+		for ($j=0;$j<count($doga[$did]['tankor']);$j++) {
+		    if ($j != 0) echo ', ';
+		    echo $doga[$did]['tankor'][$j]['tankorNev'];
+		}
+		echo ')';
+		echo '</a>';
+	    echo '</p>';
+	}
+
+    }
+
+    function putOra($dOra) {
+
+	global $ADAT; // --FIXME
+	$modosithatoOra = modosithatoOra($dOra);
+	if (!in_array($dOra['tipus'],array('normál','normál máskor'))) {
+	    if ($dOra['tipus'] == 'összevonás') $tipus = 'Ö';
+	    else $tipus = nagybetus(substr($dOra['tipus'],0,1));
+	    $tr_class = ' class="helyettesit"';
+	} else {
+	    $tipus = '';
+	    $tr_class = '';
+	}
+	echo '<div'.$tr_class.'>';
+
+	    // ----- óra ----------------------------------
+	    echo $dOra['ora'].'. '._ORA.': ';
+
+	    // ----- Tankör -------------------------------
+		// -------------------------------------------------------------------------
+		// Csoportok kezelése - Váltható tankörök (egy csoportba és egy tanárhoz tartozó tankörök
+		// -------------------------------------------------------------------------
+			if (
+				in_array($dOra['tipus'],array('normál','normál máskor')) // helyettesített óra esetén ne lehessen váltani - bár kirakná a selectet jól...
+				&& is_array($dOra['csoport']) && count($dOra['csoport'])>1
+				&& $modosithatoOra
+			) {
+
+				echo '<select title="'._TANKOR.'" name="M_'.$dOra['oraId'].'">';
+				for ($t = 0; $t < count($dOra['csoport']); $t++) {
+				    if ($dOra['tankorId'] == $dOra['csoport'][$t]['tankorId']) $__SEL = ' selected="selected" ';
+				    else $__SEL = '';
+				    echo '<option value="'.$dOra['csoportId'].':'.$dOra['csoport'][$t]['tankorId'].'" '.$__SEL.'>';
+					echo $dOra['csoport'][$t]['tankorNev'];
+				    echo '</option>';
+				}
+				// Ha egy másik tanár helyettesít, akinek vannak órái ugyanabból a tankör csoportból - akkor a jelenlegi tankorId nincs a select-ben még!
+				if ($__SEL == '') echo '<option value="'.$dOra['csoportId'].':'.$dOra['tankorId'].' selected="selected">'.$dOra['tankorNev'].'</option>';
+				echo '</select>';
+			} else { // nincs választási lehetőség, vagy a módosítási határidő lejárt
+			    echo $dOra['tankorNev'];
+			}
+			echo '<input type="hidden" name="tanmenetIdContainer[]" value="'.$ADAT['tankorTanmenet'][ $dOra['tankorId'] ].'" />'."\n";
+			echo '<input type="hidden" name="tankorIdContainer[]" value="'.$dOra['tankorId'].'" />'."\n";
+		// -------------------------------------------------------------------------	
+			
+	    // ----- Tanár(ok) -------------------------------
+		// Ha egy normál órának több tanára is van, és módosítható az óra, akkor lehet választani a tanárok közül
+/*
+		if (count($dOra['tanar']) > 1 && in_array($dOra['tipus'],array('normál','normál máskor')) && $modosithatoOra) {
+		    $_SEL = array($dOra['ki'] => 'selected="selected" ');
+		    echo '<select title="'._TANAR.'" name="K_'.$dOra['oraId'].'">'."\n";
+		    for ($t = 0; $t < count($dOra['tanar']); $t++) {
+			echo '<option value="'.$dOra['tanar'][$t]['tanarId'].'" '.$_SEL[$dOra['tanar'][$t]['tanarId']].'>';
+			echo $dOra['tanar'][$t]['tanarNev'];
+			echo '</option>'."\n";
+		    }
+		    echo '</select>';
+		} else {
+		    echo $dOra['kiCn'];
+		}
+*/
+		echo ' - '.$dOra['oraszam'].'. '._ORA.'<br />';
+
+	    // ----- Leírás ---------------------------------
+		if ($modosithatoOra) {
+		    if ($dOra['leiras']!='') { // beírva
+			echo '<input type="text" tabindex="1" name="L_'.($dOra['oraId']).'" class="data beirva" size="30" value="'.htmlspecialchars($dOra['leiras']).'" />';
+			echo '<input type="submit" class="gomb" value="'._MODOSIT.'" tabindex="1" />';
+		    } else {
+			echo '<input type="text" tabindex="1" name="L_'.($dOra['oraId']).'" class="data" size="30" value="'.htmlspecialchars($dOra['leiras']).'" />';
+			echo '<input type="submit" class="gomb" value="'._ROGZIT.'" tabindex="1" />';
+		    }
+		    echo '<input type="hidden" name="oraId[]" value="'.$dOra['oraId'].'" />';
+		} else {
+		    if ($dOra['leiras']!='') {
+    			echo $dOra['leiras'];
+		    } else {
+			echo _NINCS_BEIRVA;
+		    }
+		}
+		echo '<br />';
+	    // ----- Hiányzók -------------------------------
+		if ( __DIAK) {
+		    $href = href('index.php?page=naplo&sub=hianyzas&f=diak&dt='.$dOra['dt'].'&diakId='.$diakId);
+		} else {
+		    $href = href('index.php?page=naplo&sub=hianyzas&f=ora&oraId='.$dOra['oraId']);				
+		}
+		echo '<a href="'.$href.'" tabindex="200">';
+		    echo _HIANYZOK;
+		echo '</a>';
+	echo '</div>';
+    }
+
+
+    function putTankorOra($dOra) {
+
+        global $aHetNapjai;
+
+	$modosithatoOra = modosithatoOra($dOra);
+		
+	if (!in_array($dOra['tipus'],array('normál','normál máskor'))) {
+//	if (substr($dOra['tipus'],0,6) != 'normál') {
+	    $tipus = nagybetus(substr($dOra['tipus'],0,1));
+	    $tr_class = ' class="helyettesit"';
+	} else {
+	    $tipus = '';
+	    $tr_class = '';
+	}
+
+	echo '<div'.$tr_class.'>';
+
+	    // ----- óra ----------------------------------
+		echo str_replace('-','.',$dOra['dt']) .'. '. $aHetNapjai[date('w',strtotime($dOra['dt']))-1].' ';
+		echo $dOra['ora'].'. '._ORA.': ';
+
+	    // ----- Tankör -------------------------------
+		// -------------------------------------------------------------------------
+		// Csoportok kezelése - Váltható tankörök (egy csoportba és egy tanárhoz tartozó tankörök
+		// -------------------------------------------------------------------------
+			if (
+				in_array($dOra['tipus'],array('normál','normál máskor')) // helyettesített óra esetén ne lehessen váltani - bár kirakná a selectet jól...
+				&& is_array($dOra['csoport']) && count($dOra['csoport']) > 1
+				&& $modosithatoOra
+			) {
+				echo '<select name="M_'.$dOra['oraId'].'">';
+				for ($t = 0; $t < count($dOra['csoport']); $t++) {
+				    if ($dOra['tankorId'] == $dOra['csoport'][$t]['tankorId']) $__SEL = ' selected="selected" ';
+				    else $__SEL = '';
+				    // !?! A másik függvényben a csoportId-t is átadjuk - nem hiba???
+				    echo '<option value="'.$dOra['csoport'][$t]['tankorId'].'" '.$__SEL.'>';
+					echo $dOra['csoport'][$t]['tankorNev'];
+				    echo '</option>';
+				}
+				echo '</select>';
+				// Ha egy másik tanár helyettesít, akinek vannak órái ugyanabból a tankör csoportból - akkor a jelenlegi tankorId nincs a select-ben még!
+				// !?! A másik függvényben a csoportId-t is átadjuk - nem hiba???
+				if ($__SEL == '') echo '<option value="'.$dOra['tankorId'].' selected="selected">'.$dOra['tankorNev'].'</option>';
+			} else { // nincs választási lehetőség, vagy a módosítási határidő lejárt
+			    echo $dOra['tankorNev'];
+			}
+		// -------------------------------------------------------------------------	
+
+/*
+	    // ----- Tanár(ok) -------------------------------
+		// Ha egy normál órának több tanára is van, és módosítható az óra, akkor lehet választani a tanárok közül
+		if (count($dOra['tanár']['id']) > 1 and $modosithatoOra) {
+		    $_SEL = array($dOra['kiId'] => 'selected="selected" ');
+		    echo '<select name="K_'.$dOra['oraId'].'">'."\n";
+		    for ($t=0;$t<count($dOra['tanár']['id']);$t++) {
+			echo '<option value="'.$dOra['tanár']['id'][$t].'" '.$_SEL[$dOra['tanár']['id'][$t]].'>';
+			echo $dOra['tanár'][$dOra['tanár']['id'][$t]]['cn'];
+			echo '</option>'."\n";
+		    }
+		    echo '</select>';
+		} else {
+		    echo $dOra['kiCn'];
+		}
+*/
+		echo ' - '.$dOra['oraszam'].'. '._ORA.'<br />';
+
+	    // ----- Leíráás ---------------------------------
+		if ($modosithatoOra) {
+		    if ($dOra['leiras']!='') { // beírva
+			echo '<input type="text" tabindex="1" name="L_'.($dOra['oraId']).'" class="data beirva" size="30" value="'.htmlspecialchars($dOra['leiras']).'" />';
+			echo '<input type="submit" class="gomb DOA" value="'._MODOSIT.'" />';
+		    } else {
+			echo '<input type="text" tabindex="1" name="L_'.($dOra['oraId']).'" class="data" size="30" value="'.htmlspecialchars($dOra['leiras']).'" />';
+			echo '<input type="submit" class="gomb DOA" value="'._ROGZIT.'"  />';
+		    }
+		    echo '<input type="hidden" name="oraId[]" value="'.$dOra['oraId'].'" />';
+		} else {
+		    if ($dOra['leiras']!='') {
+			echo $dOra['leiras'];
+		    } else {
+			echo _NINCS_BEIRVA;
+		    }
+		}
+	    echo '<br />'."\n";
+
+	    // ----- Hiányzók -------------------------------
+		if ( __DIAK) {
+		    $href = href('index.php?page=naplo&sub=hianyzas&f=diak&dt='.$dOra['dt'].'&diakId='.$diakId);
+		} else {
+		    $href = href('index.php?page=naplo&sub=hianyzas&f=ora&oraId='.$dOra['oraId']);				
+		}
+		echo '<a href="'.$href.'">';
+		    echo _HIANYZOK;
+		echo '</a>';
+
+	echo '</div>'."\n";
+
+
+    }
+
+    function putHetesForm($ADAT) {
+
+	formBegin(array('class'=>'hetes'));
+	    echo '<input type="hidden" name="igDt" value="'._SHOW_DAYS_TO.'" />'."\n";
+	    echo '<input type="hidden" name="osztalyId" value="'.$ADAT['osztalyId'].'" />'."\n";
+	    echo '<input type="hidden" name="dt" value="'._SHOW_DAYS_FROM.'" />'."\n";
+	    echo '<input type="hidden" name="action" value="hetesFelvetel" />'."\n";
+
+	    echo '<span>'._HETESEK.'</span>';
+	    for ($k = 1; $k < 3; $k++) {
+		$SEL = array($ADAT['hetesek'][$k]['diakId'] => ' selected="selected" ');
+		echo '<select name="hetes'.$k.'">'."\n";
+		    echo '<option value=""> - </option>'."\n";
+		for ($i = 0; $i < count($ADAT['diakok']); $i++) {
+		    echo '<option value="'.$ADAT['diakok'][$i]['diakId'].'"'.$SEL[ $ADAT['diakok'][$i]['diakId'] ].'>'.$ADAT['diakok'][$i]['diakNev'].'</option>'."\n";
+		}
+		echo '</select>'."\n";
+	    }
+
+	    echo '<input type="submit" value="'._OK.'" />'."\n";
+
+	formEnd();
+
+    }
+
+    function putUjOra($dOra) {
+
+        global $ADAT; // --FIXME
+
+        if (__TANAR !==true && __VEZETOSEG!==true && __NAPLOADMIN !== true) return false;
+        if (__NAPLOADMIN ===true || __VEZETOSEG===true) {
+            $_eredet='órarend';
+            if (__PLUSZBEIRHAT!==true
+                || strtotime($dOra['dt'])>strtotime("+1week")
+                || (__TANAR ===true && strtotime(_HALADASI_HATARIDO)>strtotime($dOra['dt']))
+            ) return false;
+        } else {
+            $_eredet='plusz';
+            if (__PLUSZBEIRHAT!==true
+                || strtotime($dOra['dt'])>time()
+                || (__TANAR ===true && strtotime(_HALADASI_HATARIDO)>strtotime($dOra['dt']))
+            ) return false;
+        }
+       $_tipus='egyéb';
+
+            echo '<li class="ora">';
+                echo $dOra['ora'].'.';
+                echo '<select class="DOA" name="UJORA[]" tabindex="1" >';
+                echo '<option value="">'._FELADAT_TIPUS.'</option>';
+                if (is_array($ADAT['feladatTipus'])) foreach($ADAT['feladatTipus'] as $feladatTipusId=>$_D) {
+                    echo '<option value="'.$dOra['dt'].'_'.$dOra['ora'].'_'.$_tipus.'_'.$_D['feladatTipusId'].'">'.$_D['feladatTipusLeiras'].' ('.$_D['feladatTipusId'].')</option>';
+                }
+                echo '</select>';
+                //echo $ADAT['feladatTipus'][$dOra['feladatTipusId']]['feladatTipusLeiras'].' ('.$dOra['eredet'].')';
+                echo '<br/>';
+		echo '<input type="text" tabindex="1" name="LE_'.($dOra['dt'].'_'.$dOra['ora']).'" class="data"  value="'.htmlspecialchars($dOra['leiras']).'" />';
+		echo '<input type="submit" value="'._ROGZIT.'" class="gomb DOA" tabindex="1" />';
+	    echo '</li>';
+    }
+
+?>
diff --git a/mayor-orig/www/skin/vakbarat/module-naplo/html/orarend/orarend.phtml b/mayor-orig/www/skin/vakbarat/module-naplo/html/orarend/orarend.phtml
new file mode 100644
index 00000000..53e08d09
--- /dev/null
+++ b/mayor-orig/www/skin/vakbarat/module-naplo/html/orarend/orarend.phtml
@@ -0,0 +1,198 @@
+<?php
+/*
+    function _egyOraMod() {
+	echo '<input type="text" value="test" />';
+    }
+    function _putOrarendHead($D) {
+	for ($i=0; $i<count($D); $i++) {
+            echo $D[$i]['str'].'<br/>';
+	}
+    }
+    function _putOrarendFoot($D) {
+	for ($i=0; $i<count($D); $i++) {
+            echo $D[$i]['str'].'<br/>';
+	}
+    }
+
+*/
+
+    function putOrarend($ADAT) {
+	global $aHetNapjai;
+
+
+//echo '<pre>';
+//var_dump($ADAT['orarend']['assoc']);
+//echo '</pre>';
+
+
+	if (is_array($ADAT['orarend']['assoc'])) {
+
+		$T = $ADAT['orarend']['assoc'];
+/*		echo '<h2 class="toPrint">'.$ADAT['toPrint'].'</h2>';
+		echo '<table class="orarend" align="center">'."\n";
+		echo '<thead>';
+		echo '<tr><th></th>';
+			for ($nap=1; $nap<=$ADAT['hetiMaxNap']; $nap++) {
+			$_th_class = ($ADAT['orarend']['napok'][$nap]['megjegyzes']=='') ? '': 'spec';
+			    echo '<th class="'.$_th_class.'">';
+				echo '<span title="'.$ADAT['orarend']['napok'][$nap]['dt'].'/'.$ADAT['orarend']['napok'][$nap]['het'].'">';
+				echo ($ADAT['orarend']['napok'][$nap]['megjegyzes']=='') ? $aHetNapjai[($nap-1)] : $ADAT['orarend']['napok'][$nap]['megjegyzes'];
+			    echo '</th>';
+			}		
+    		echo '</tr>';
+		echo '</thead>'."\n";
+
+		echo '<tbody>'."\n";
+//*/
+//		echo '<caption>'.$het.'. heti órarend</caption>';
+
+
+		// napok
+		for ($nap=1; $nap<=$ADAT['hetiMaxNap']; $nap++) {
+
+			$dt = $ADAT['orarend']['napok'][$nap]['dt'];
+			echo '<h1>'.$aHetNapjai[($nap-1)].' ('.$dt.') '.$ADAT['orarend']['napok'][$nap]['megjegyzes'].'</h1>';
+
+			echo '<ul title="órak">';
+			for($ora=$ADAT['napiMinOra']; $ora<=$ADAT['napiMaxOra']; $ora++) { 
+
+			    /* ha kell kiírni */
+			    if ( count($T[$nap][$ora]['orak'])>0 || is_array($ADAT['haladasi']['orak'][$dt][$ora])) {
+				echo '<li>'.$ora.'. óra'.'</li>';
+			    }
+
+				$het = 0;			    
+				$ORARENDI = array();
+				for($i=0; $i<count($T[$nap][$ora]['orak']); $i++) {
+				    $_T = $T[$nap][$ora]['orak'][$i];
+				    $ORARENDI[] = $_T['tankorId'];
+				    //
+				    $het = $_T['het'];
+				    $_ORA = $ADAT['haladasi']['orak'][$dt][$ora][$_T['tankorId']]; 
+				    $_valosTeremId = (is_null($_ORA['teremId']))? $_T['teremId']:$_ORA['teremId'];
+				    $_tankorTipus = $ADAT['tankorok'][$_T['tankorId']][0]['tankorTipus'];
+				    // Az órarendből a jelek:
+				    $_targyJel = $_T['targyJel'];
+				    $_osztalyJel = $_T['osztalyJel'];
+				    // figyelem, itt jön a kiírás, a _putOra fv helyett:
+				    $_tipusClass = str_replace(' ','_',$_ORA['tipus']);
+				    
+				    echo '<div class="'.$_tipusClass.'" title="'.$_ORA['tipus'].'" >';
+					$_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.'" >';
+					    echo $ADAT['tankorok'][$_T['tankorId']][0]['tankorNev'];
+					    echo '</span>';
+					} else {
+					    echo "$_targyjel : $_osztalyJel : ";
+					}
+					echo ', ';
+					echo '<span title="'.$_ferohely.'/'.$_letszam.'" class="t'.( ($_ferohely!=0 && $_ferohely<$_letszam) ? 0 : 1).'">'.$_teremKiir.'</span>';
+					echo '<br/>';
+					if ($_ORA['kit']!='') {
+					    echo '<span class="helyett">';
+					    echo $ADAT['tanarok'][$_T['tanarId']]['tanarNev'];
+					    echo '</span>';
+					    if ($_ORA['ki']!='') echo ' '.$ADAT['tanarok'][$_ORA['ki']]['tanarNev'];
+					} else {
+					    echo $ADAT['tanarok'][$_T['tanarId']]['tanarNev'];
+					}
+				    if ($_ORA['tipus']!='normál') echo ' '.$_ORA['tipus'];
+				    if (isset($_ORA['oo'])) echo ' &deg;'; // else tervezett
+				    if (in_array($_tankorTipus,array('délutáni','tanórán kívüli'))) echo ' &sup1';
+
+				    echo '</div>';
+				    if (count($T[$nap][$ora]['orak'])>$i+1) echo '<hr/>';
+				}
+				/* és ide jönnek a pluszok */
+				$j=0;
+				if (is_array($ADAT['haladasi']['orak'][$dt][$ora])) foreach ($ADAT['haladasi']['orak'][$dt][$ora] as $_tankorId => $__T) {
+				    if (!is_array($ORARENDI) || !in_array($_tankorId,$ORARENDI)) {
+					if ($j!=0) echo '<hr/>'; $j++;
+					$_ORA = $ADAT['haladasi']['orak'][$dt][$ora];
+					_putOra($_ORA,$_tankorId);
+				    }
+				}
+
+
+
+
+
+
+
+
+
+
+			} // $ora++
+			echo '</ul>';
+		} // $nap++
+
+
+
+
+	} else {
+	    putOrarendPlain($ADAT);
+	}
+
+
+    }
+
+    function putOrarendPlain($ADAT) {
+	if (is_array($ADAT['orarend']['orarendiOra'])) {
+	    foreach($ADAT['orarend']['orarendiOra'] as $het => $T) {
+		echo '<table class="orarend" align="center">'."\n";
+		echo '<caption>'.$het.'. heti órarend</caption>';
+		for($ora=$ADAT['napiMinOra']; $ora<=$ADAT['napiMaxOra']; $ora++) { // FIXME (getMinOra, getMaxOra konstansok!???)
+		    echo '<tr>';
+			echo '<th>'.$ora.'</th>';
+			for ($nap=1; $nap<=$ADAT['hetiMaxNap']; $nap++) { // FIXME (getMaxNap)
+			    echo '<td>';			    
+				    $X = $ADAT['orarend']['orarendiOra'][$het][$nap][$ora];
+				    
+				    for ($i=0; $i<count($X); $i++) {
+					echo '<div class="unfinished">';
+					echo $X[$i]['targyJel'].' : ';
+					echo $X[$i]['osztalyJel'].' : ';
+					echo $X[$i]['teremId'];
+					echo '</div>';
+				    }
+			    echo '</td>'."\n";
+			}
+		    echo '</tr>'."\n";
+		}
+		echo '</table>'."\n\n<!-- EOT -->\n\n";
+	    }
+	}
+    }
+
+    function _putOra($ORA,$_tankorId) {
+	    global $ADAT;
+	    if ($_tankorId=='') return false;
+	    $_ORA = $ORA[$_tankorId];
+	    $_tipusClass = str_replace(' ','_',$_ORA['tipus']);
+	    $_eredetClass = $_ORA['eredet'];
+	    echo '<div class="'.$_tipusClass.' '.$_eredetClass.'" title="'.$_ORA['tipus'].'" >';
+
+			echo '<span title="'.$_targyJel.' '.$_osztalyJel.' ('.$ADAT['tankorok'][$_T['tankorId']][0]['tankorId'].')" >';
+			echo $ADAT['tankorok'][$_ORA['tankorId']][0]['tankorNev'];
+			echo '</span>';
+
+			echo ', '.$ADAT['termek'][$_ORA['teremId']]['leiras'];
+
+			echo '<br/>';
+	
+			echo '<span class="helyett">';
+			echo $ADAT['tanarok'][$_T['tanarId']]['tanarNev'];
+			echo '</span>';
+			if ($_ORA['ki']!='') echo ' '.$ADAT['tanarok'][$_ORA['ki']]['tanarNev'];
+
+			if (isset($_ORA['oo'])) echo ' &deg;'; // else tervezett
+
+	    echo '</div>';
+
+    }
+
+
+?>