From ef8b3fd973fa34b303370d5acc21744e57bca507 Mon Sep 17 00:00:00 2001
From: M.Gergo
Date: Mon, 17 May 2021 17:50:05 +0200
Subject: Rev: 4787

---
 mayor-orig/mayor-felveteli/log/mayor-felveteli.rev |  2 +-
 .../include/menu/public/hu_HU/module-felveteli.php |  4 +--
 .../www/include/modules/felveteli/base/rights.php  |  4 +--
 .../www/static/hu_HU/felveteli/felveteli.html      | 29 ++++++++++++++++++++++
 4 files changed, 34 insertions(+), 5 deletions(-)

(limited to 'mayor-orig/mayor-felveteli')

diff --git a/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev b/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev
index 7e1fd933..1a48a10f 100644
--- a/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev
+++ b/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev
@@ -1 +1 @@
-4716
+4787
diff --git a/mayor-orig/mayor-felveteli/www/include/menu/public/hu_HU/module-felveteli.php b/mayor-orig/mayor-felveteli/www/include/menu/public/hu_HU/module-felveteli.php
index 953cc817..af0ae564 100644
--- a/mayor-orig/mayor-felveteli/www/include/menu/public/hu_HU/module-felveteli.php
+++ b/mayor-orig/mayor-felveteli/www/include/menu/public/hu_HU/module-felveteli.php
@@ -27,8 +27,8 @@ if (in_array(__PORTAL_CODE,array('vmg','kos'))) {
 //	    'informatika' => array(array('txt' => 'Informatika','icon'=>'icon-hand-right')),
 	    'matematika' => array(array('txt' => 'Matematika','icon'=>'icon-hand-right')),
 //    	    'kozponti' => array(array('txt' => 'Központi eredmények', 'url' => 'index.php?page=felveteli&sub=&f=kozponti')),
-	    'pontszamito' => array(array('txt' => 'Pontszámító segéd', 'url' => 'index.php?page=felveteli&sub=&f=pontszamito')),
-    	    'szobeli' => array(array('txt' => 'Eredmények', 'url' => 'index.php?page=felveteli&sub=&f=szobeli')),
+//	    'pontszamito' => array(array('txt' => 'Pontszámító segéd', 'url' => 'index.php?page=felveteli&sub=&f=pontszamito')),
+//    	    'szobeli' => array(array('txt' => 'Eredmények', 'url' => 'index.php?page=felveteli&sub=&f=szobeli')),
 //    	    'nyiltlevel2016' => array(array('txt' => 'Nyílt levél 2016', 'url' => 'index.php?page=felveteli&sub=&f=nyiltlevel2014')),
 //	    'kos' => array(array('txt'=>'Felvételi (általános iskola)', 'url'=>'index.php?page=felveteli&sub=kos')),
 	);
diff --git a/mayor-orig/mayor-felveteli/www/include/modules/felveteli/base/rights.php b/mayor-orig/mayor-felveteli/www/include/modules/felveteli/base/rights.php
index 6c6dfff5..46fad33f 100644
--- a/mayor-orig/mayor-felveteli/www/include/modules/felveteli/base/rights.php
+++ b/mayor-orig/mayor-felveteli/www/include/modules/felveteli/base/rights.php
@@ -2,11 +2,11 @@
 
     define('_CATEGORY','egyéb');
 
-    if (_USERACCOUNT=='mayoradmin' || (_POLICY=='private' && memberOf(_USERACCOUNT, 'felveteliadmin'))) {
+/*    if (_USERACCOUNT=='mayoradmin' || (_POLICY=='private' && memberOf(_USERACCOUNT, 'felveteliadmin'))) {
         $AUTH['my']['categories'][] = 'felveteliadmin';
 	define('__FELVETELIADMIN',true);
     } else {
         define('__FELVETELIADMIN',false);
     }
-
+*/
 ?>
diff --git a/mayor-orig/mayor-felveteli/www/static/hu_HU/felveteli/felveteli.html b/mayor-orig/mayor-felveteli/www/static/hu_HU/felveteli/felveteli.html
index 4d68ac34..ebe5a930 100644
--- a/mayor-orig/mayor-felveteli/www/static/hu_HU/felveteli/felveteli.html
+++ b/mayor-orig/mayor-felveteli/www/static/hu_HU/felveteli/felveteli.html
@@ -7,4 +7,33 @@
     Felvételi Tájékoztató 2021/2022 (.pdf)
   </a>
 </div>
+
+<div style="margin-top: 6px; text-align:center;">
+  <a style="font-weight: bold; font-size: 16px; color: #837389;" href="/vmg/felveteli/FT2021b.pdf" title="Fissítve: 2020. november 9.">
+    Felvételi Tájékoztató 2021/2022 (.pdf)
+  </a>
+</div>
+
+<ul><li><a href="https://varosmajor.eu">Felvételi információk</a> (link)</li></ul>
+
+<style type="text/css">
+
+.iframe-container {
+  overflow: hidden;
+  padding-top: 56.25%;
+  position: relative;
+}
+
+.iframe-container iframe {
+  border: 0;
+  height: 100%;
+  left: 0;
+  position: absolute;
+  top: 0;
+  width: 100%;
+}
+</style>
+
+<div class="iframe-container"><iframe loading="lazy" src="https://varosmajor.eu/#tartalom"></iframe></div>
+
 </div>
-- 
cgit v1.2.3