Rev: 4695rev4695

32 files changed, 282 insertions, 75 deletions

diff --git a/mayor-orig/mayor-base/log/mayor-base.rev b/mayor-orig/mayor-base/log/mayor-base.rev
index 54f5b275..9bce5583 100644
--- a/mayor-orig/mayor-base/log/mayor-base.rev
+++ b/mayor-orig/mayor-base/log/mayor-base.rev
@@ -1 +1 @@
-4691
+4695
diff --git a/mayor-orig/mayor-base/www/skin/classic/base/css/base.css b/mayor-orig/mayor-base/www/skin/classic/base/css/base.css
index 54b53fb8..4ee80f46 100644
--- a/mayor-orig/mayor-base/www/skin/classic/base/css/base.css
+++ b/mayor-orig/mayor-base/www/skin/classic/base/css/base.css
@@ -102,7 +102,8 @@
 	padding-left: 140px; 
     }
 
-    #nav li { position: relative; }
+    #nav li { position: relative;  }
+    #nav li:first { white-space: nowrap; }
     #nav > li { float: left; z-index: 20; text-align: center; padding: 0;
 /*	    background-color: #3fa79c;  */
 	    background-color: #3496B9;
diff --git a/mayor-orig/mayor-base/www/skin/default/base/html/base.phtml b/mayor-orig/mayor-base/www/skin/default/base/html/base.phtml
index 19dfa38e..78a5dea8 100644
--- a/mayor-orig/mayor-base/www/skin/default/base/html/base.phtml
+++ b/mayor-orig/mayor-base/www/skin/default/base/html/base.phtml
@@ -137,7 +137,8 @@ function includeJS($page,$sub,$f,$skin) {
 		    echo '<script language="JavaScript" type="text/javascript"  charset="utf-8" src="'.$_f.'?ver='._MAYORREV.'"></script>'."\n";
 		}
 	    }
-	    if (__RICH_TEXT_EDITOR===true && $f == 'egyhir') {
+/*
+	    if (__RICH_TEXT_EDITOR===true && $f == 'egyhir') { // disabled
 		// Koschtit Image Gallery
 		if ($page == 'portal') {
 		    //require_once('skin/classic/share/javascript/koschtit/ki_include.php');
@@ -147,7 +148,7 @@ function includeJS($page,$sub,$f,$skin) {
 		    <script src="skin/classic/share/javascript/tiny_mce/tiny_mce.js" type="text/javascript"></script>
 		    <script src="skin/classic/module-portal/javascript/hirek/egyhir.php?lang='.$lang.'" type="text/javascript"></script>';
 	    }
-
+*/
 	//	if (file_exists(($_f="skin/$skin/base/javascript/jstorage.min.js")) ) {
 	//	echo '<script language="JavaScript" type="text/javascript"  charset="utf-8" src="'.$_f.'?ver='._MAYORREV.'"></script>'."\n";
 	//    }	    
diff --git a/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev b/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev
index 54f5b275..9bce5583 100644
--- a/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev
+++ b/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev
@@ -1 +1 @@
-4691
+4695
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 4fa2aa1d..953cc817 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
@@ -1,5 +1,7 @@
 <?php
 
+if (in_array(__PORTAL_CODE,array('vmg','kos'))) {
+
     if (__PORTAL_CODE=='kos' || $sub == 'kos') {
 	$MENU['felveteli'] = array(
     	    array('txt' => 'Felvételi (általános iskola)', 'url' => 'index.php?page=felveteli&sub=kos')
@@ -45,4 +47,6 @@
         array('txt' => '6.', 'url' => 'index.php?page=felveteli&sub=tajekoztato/20082009&f=6'),
     );
 */
+
+}
 ?>
diff --git a/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev b/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev
index 54f5b275..9bce5583 100644
--- a/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev
+++ b/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev
@@ -1 +1 @@
-4691
+4695
diff --git a/mayor-orig/mayor-installer-orig/log/mayor-installer.rev b/mayor-orig/mayor-installer-orig/log/mayor-installer.rev
index 54f5b275..9bce5583 100644
--- a/mayor-orig/mayor-installer-orig/log/mayor-installer.rev
+++ b/mayor-orig/mayor-installer-orig/log/mayor-installer.rev
@@ -1 +1 @@
-4691
+4695
diff --git a/mayor-orig/mayor-installer-sulix/log/mayor-installer-sulix.rev b/mayor-orig/mayor-installer-sulix/log/mayor-installer-sulix.rev
index 54f5b275..9bce5583 100644
--- a/mayor-orig/mayor-installer-sulix/log/mayor-installer-sulix.rev
+++ b/mayor-orig/mayor-installer-sulix/log/mayor-installer-sulix.rev
@@ -1 +1 @@
-4691
+4695
diff --git a/mayor-orig/mayor-jatek/log/mayor-jatek.rev b/mayor-orig/mayor-jatek/log/mayor-jatek.rev
index 54f5b275..9bce5583 100644
--- a/mayor-orig/mayor-jatek/log/mayor-jatek.rev
+++ b/mayor-orig/mayor-jatek/log/mayor-jatek.rev
@@ -1 +1 @@
-4691
+4695
diff --git a/mayor-orig/mayor-locales-de_DE/log/mayor-locales-de_DE.rev b/mayor-orig/mayor-locales-de_DE/log/mayor-locales-de_DE.rev
index 54f5b275..9bce5583 100644
--- a/mayor-orig/mayor-locales-de_DE/log/mayor-locales-de_DE.rev
+++ b/mayor-orig/mayor-locales-de_DE/log/mayor-locales-de_DE.rev
@@ -1 +1 @@
-4691
+4695
diff --git a/mayor-orig/mayor-locales-en_US/log/mayor-locales-en_US.rev b/mayor-orig/mayor-locales-en_US/log/mayor-locales-en_US.rev
index 54f5b275..9bce5583 100644
--- a/mayor-orig/mayor-locales-en_US/log/mayor-locales-en_US.rev
+++ b/mayor-orig/mayor-locales-en_US/log/mayor-locales-en_US.rev
@@ -1 +1 @@
-4691
+4695
diff --git a/mayor-orig/mayor-locales-jp_JP/log/mayor-locales-jp_JP.rev b/mayor-orig/mayor-locales-jp_JP/log/mayor-locales-jp_JP.rev
index 54f5b275..9bce5583 100644
--- a/mayor-orig/mayor-locales-jp_JP/log/mayor-locales-jp_JP.rev
+++ b/mayor-orig/mayor-locales-jp_JP/log/mayor-locales-jp_JP.rev
@@ -1 +1 @@
-4691
+4695
diff --git a/mayor-orig/mayor-naplo/log/mayor-naplo.rev b/mayor-orig/mayor-naplo/log/mayor-naplo.rev
index 54f5b275..9bce5583 100644
--- a/mayor-orig/mayor-naplo/log/mayor-naplo.rev
+++ b/mayor-orig/mayor-naplo/log/mayor-naplo.rev
@@ -1 +1 @@
-4691
+4695
diff --git a/mayor-orig/mayor-portal/install/mayor-portal/mysql/mayor-portal.sql b/mayor-orig/mayor-portal/install/mayor-portal/mysql/mayor-portal.sql
index 842760b7..61655882 100644
--- a/mayor-orig/mayor-portal/install/mayor-portal/mysql/mayor-portal.sql
+++ b/mayor-orig/mayor-portal/install/mayor-portal/mysql/mayor-portal.sql
@@ -61,13 +61,23 @@ SET character_set_client = @saved_cs_client;
 
 DROP TABLE IF EXISTS `kategoriak`;
 CREATE TABLE `kategoriak` (
-  `id` mediumint(8) unsigned NOT NULL default '0',
-  `leiras` varchar(70) NOT NULL default '',
+  `id` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `leiras` varchar(70) NOT NULL DEFAULT '',
   `precode` text,
-  `postcode` text
+  `postcode` text,
+  UNIQUE KEY `id` (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 PACK_KEYS=1;
 
-
+DROP TABLE IF EXISTS `hirKategoria`;
+CREATE TABLE `hirKategoria` (
+  `hirId` int(10) unsigned NOT NULL,
+  `kategoriaId` mediumint(8) unsigned NOT NULL,
+  PRIMARY KEY (`hirId`,`kategoriaId`),
+  KEY `hirKategoria_FKIndex1` (`hirId`),
+  KEY `hirKategoria_FKIndex2` (`kategoriaId`),
+  CONSTRAINT `hirKategoria_ibfk_1` FOREIGN KEY (`hirId`) REFERENCES `hirek` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+  CONSTRAINT `hirKategoria_ibfk_2` FOREIGN KEY (`kategoriaId`) REFERENCES `kategoriak` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_hungarian_ci;
 --
 -- Table structure for table `linkek`
 --
diff --git a/mayor-orig/mayor-portal/log/mayor-portal.rev b/mayor-orig/mayor-portal/log/mayor-portal.rev
index 54f5b275..9bce5583 100644
--- a/mayor-orig/mayor-portal/log/mayor-portal.rev
+++ b/mayor-orig/mayor-portal/log/mayor-portal.rev
@@ -1 +1 @@
-4691
+4695
diff --git a/mayor-orig/mayor-portal/update/rev004693-1-mayor_portal.sql b/mayor-orig/mayor-portal/update/rev004693-1-mayor_portal.sql
new file mode 100644
index 00000000..5b36028d
--- /dev/null
+++ b/mayor-orig/mayor-portal/update/rev004693-1-mayor_portal.sql
@@ -0,0 +1,32 @@
+DELIMITER $$
+DROP PROCEDURE IF EXISTS upgrade_database_4693 $$
+
+CREATE PROCEDURE upgrade_database_4693()
+BEGIN
+SET NAMES utf8 COLLATE utf8_hungarian_ci;
+
+IF NOT EXISTS (SELECT * FROM information_schema.STATISTICS WHERE TABLE_SCHEMA=DATABASE() and TABLE_NAME='kategoriak' AND COLUMN_NAME='id') THEN
+    ALTER TABLE `kategoriak` ADD UNIQUE INDEX (id);
+END IF;
+
+ALTER TABLE `hirek` ENGINE = InnoDB;
+ALTER TABLE `kategoriak` ENGINE = InnoDB;
+
+IF NOT EXISTS (SELECT * FROM information_schema.TABLES WHERE TABLE_SCHEMA=DATABASE() and TABLE_NAME='hirKategoria') THEN
+CREATE TABLE `hirKategoria` (
+ `hirId` int(10) unsigned NOT NULL,
+ `kategoriaId` mediumint(8) unsigned NOT NULL,
+  PRIMARY KEY (`hirId`,`kategoriaId`),
+  KEY `hirKategoria_FKIndex1` (`hirId`),
+  KEY `hirKategoria_FKIndex2` (`kategoriaId`),
+  CONSTRAINT `hirKategoria_ibfk_1` FOREIGN KEY (`hirId`) REFERENCES `hirek` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+  CONSTRAINT `hirKategoria_ibfk_2` FOREIGN KEY (`kategoriaId`) REFERENCES `kategoriak` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_hungarian_ci ;
+END IF;
+
+-- hirek.cid --> hirKategoria kapcsolo
+INSERT IGNORE INTO hirKategoria SELECT hirek.id as hirId,hirek.cid AS kategoriaId from hirek where hirek.cid!=0;
+
+END $$
+DELIMITER ;
+CALL upgrade_database_4693();
diff --git a/mayor-orig/mayor-portal/www/include/modules/portal/hirek/egyhir.php b/mayor-orig/mayor-portal/www/include/modules/portal/hirek/egyhir.php
index c93a81bd..1c5c8bc9 100644
--- a/mayor-orig/mayor-portal/www/include/modules/portal/hirek/egyhir.php
+++ b/mayor-orig/mayor-portal/www/include/modules/portal/hirek/egyhir.php
@@ -13,7 +13,7 @@
 	$flag = intval($DATA['flag']);
 	$class = intval($DATA['class']);
 	$lang = (in_array($DATA['lang'],$LANGUAGES)) ? $DATA['lang'] : _DEFAULT_LANG;
-	if ($DATA['cid']>0) $cid = $DATA['cid'];
+	if ($DATA['cid']>0) $cid = $DATA['cid']; // -- TODO!!!!
 	$csoport = $DATA['csoport'];
 	if ($hirId!='' && __HIREKADMIN == false ) {
 	    $q = "SELECT owner FROM hirek WHERE owner='%s'";
@@ -41,6 +41,13 @@
 	    }
 	} else $q = '';
 	if ($q!='') $r = db_query($q,array('modul'=>'portal','result'=>'insert','values'=>$v));
+	if (is_array($DATA['kategoriaId'])) {
+	    for ($i=0; $i<count($DATA['kategoriaId']); $i++) {
+		$q = "INSERT IGNORE INTO `hirKategoria` (hirId,kategoriaId) VALUES (%u,%u)";
+		$v = array($hirId,$DATA['kategoriaId'][$i]);
+		db_query($q,array('modul'=>'portal','result'=>'insert','values'=>$v));
+	    }
+	}
 	return $r;
     }
 
diff --git a/mayor-orig/mayor-portal/www/include/modules/portal/share/hirek.php b/mayor-orig/mayor-portal/www/include/modules/portal/share/hirek.php
index d7db431e..0de316b6 100644
--- a/mayor-orig/mayor-portal/www/include/modules/portal/share/hirek.php
+++ b/mayor-orig/mayor-portal/www/include/modules/portal/share/hirek.php
@@ -42,7 +42,7 @@
 	} else $WHERE = '';
 
 	if ($SET['all']===true) $WHERE = ''; 
-	$q = "SELECT * FROM hirek $WHERE ORDER BY kdt DESC,vdt DESC".$L;
+	$q = "SELECT hirek.*, hirek.id AS hirId, GROUP_CONCAT(kategoriaId) AS hirkategoriak FROM hirek LEFT JOIN hirKategoria ON (hirek.id=hirId) $WHERE GROUP BY hirek.id ORDER BY kdt DESC,vdt DESC".$L;
 	$HIREK['szovegek'] = db_query($q, array('modul'=>'portal','result'=>'indexed'));
 	return $HIREK;
     }
diff --git a/mayor-orig/mayor-portal/www/policy/private/portal/hirek/egyhir-pre.php b/mayor-orig/mayor-portal/www/policy/private/portal/hirek/egyhir-pre.php
index 0d5cbf71..ef18e58c 100644
--- a/mayor-orig/mayor-portal/www/policy/private/portal/hirek/egyhir-pre.php
+++ b/mayor-orig/mayor-portal/www/policy/private/portal/hirek/egyhir-pre.php
@@ -26,6 +26,7 @@ if (_RIGHTS_OK !== true) die();
         $DATA['flag']= readVariable($_POST['flag'],'numeric',null);
         $DATA['class']= readVariable($_POST['class'],'numeric',null);
         $DATA['cid']= readVariable($_POST['cid'],'numeric',null);
+        $DATA['kategoriaId']= readVariable($_POST['kategoriaId'],'id',null);
         $DATA['lang'] = readVariable($_POST['lang'],'strictstring',$LANGUAGES);
 	$DATA['owner'] = _USERACCOUNT;
 	if (is_array($_POST['csoport'])) {
diff --git a/mayor-orig/mayor-portal/www/policy/private/portal/hirek/hirekAdmin-pre.php b/mayor-orig/mayor-portal/www/policy/private/portal/hirek/hirekAdmin-pre.php
index 630c9cbd..1e51b811 100644
--- a/mayor-orig/mayor-portal/www/policy/private/portal/hirek/hirekAdmin-pre.php
+++ b/mayor-orig/mayor-portal/www/policy/private/portal/hirek/hirekAdmin-pre.php
@@ -6,6 +6,39 @@
     }
 
     require_once('include/modules/portal/share/hirek.php');
-    $HIREK = getHirek(array('all'=>true)); // minden nyelvű hír
 
+    if ($action=='kategoriaSzerkeszt') {
+	$_id = readVariable($_POST['id'],'id');
+	if (is_numeric($_id)) {
+	    $_leiras = readVariable($_POST['leiras'],'string');
+	    $_precode = readVariable($_POST['precode'],'html');
+	    $_postcode = readVariable($_POST['postcode'],'html');
+	    $q = "INSERT INTO kategoriak (id,leiras,precode,postcode) VALUES (%u,'%s','%s','%s')";
+	    $v = array($_id,$_leiras,$_precode,$_postcode);
+	    db_query($q,array('modul'=>'portal','values'=>$v));
+	}
+	$KATEGORIAIDK = readVariable($_POST['kategoriaId'],'id');
+	for ($i=0; $i<count($KATEGORIAIDK); $i++) {
+	    $_id = $KATEGORIAIDK[$i];
+	    $_leiras = readVariable($_POST['leiras_'.$_id],'string');
+	    $_precode = readVariable($_POST['precode_'.$_id],'string');
+	    $_postcode = readVariable($_POST['postcode_'.$_id],'string');
+	    $q = "UPDATE kategoriak SET leiras='%s',precode='%s',postcode='%s' WHERE id=%u";
+	    $v = array($_leiras,$_precode,$_postcode,$_id);
+	    db_query($q,array('modul'=>'portal','values'=>$v));
+	}
+	$KATEGORIAIDK = readVariable($_POST['kategoriaTorlendo'],'id');
+	for ($i=0; $i<count($KATEGORIAIDK); $i++) {
+	    $_id = $KATEGORIAIDK[$i];
+	    $q = "DELETE FROM kategoriak WHERE id=%u";
+	    $v = array($_id);
+	    db_query($q,array('modul'=>'portal','values'=>$v));
+	}
+    } 
+
+
+    $ADAT = getHirek(array('all'=>true)); // minden nyelvű hír
+    $ADAT['kategoriak'] = getKategoriak();
+    $ADAT['kategoriaId2txt'] = reindex($ADAT['kategoriak'],array('id'));
+dump($ADAT['kategoriaId2txt']);
 ?>
diff --git a/mayor-orig/mayor-portal/www/policy/private/portal/hirek/hirekAdmin.php b/mayor-orig/mayor-portal/www/policy/private/portal/hirek/hirekAdmin.php
index 2474b23e..909018dc 100644
--- a/mayor-orig/mayor-portal/www/policy/private/portal/hirek/hirekAdmin.php
+++ b/mayor-orig/mayor-portal/www/policy/private/portal/hirek/hirekAdmin.php
@@ -1,5 +1,7 @@
 <?php
 
-    global $HIREK;
-    putHirek($HIREK['szovegek']);
+    global $ADAT;
+
+    putKategoriaSzerkeszto($ADAT['kategoriak']);
+    putHirek($ADAT);
 ?>
diff --git a/mayor-orig/mayor-portal/www/skin/classic/module-portal/css/hirek/egyhir.css b/mayor-orig/mayor-portal/www/skin/classic/module-portal/css/hirek/egyhir.css
index 8be4a7c3..1ea5cb6d 100644
--- a/mayor-orig/mayor-portal/www/skin/classic/module-portal/css/hirek/egyhir.css
+++ b/mayor-orig/mayor-portal/www/skin/classic/module-portal/css/hirek/egyhir.css
@@ -3,40 +3,62 @@
 
     div.egyhir {
 	margin-left: 50px;
+	margin-right:50px;
     }
 
     div.egyhir form {
 	font-weight: bold;
+	margin-bottom: 40px;
+	border-bottom: solid 1px #eee;
     }
 
     div.egyhir label {
-
+	padding-right: 1em;
     }
 
     div.egyhir input {
-	background-color: white;
+/*	background-color: white;
 	border: solid 1px #667766;
-    }
+*/    }
 
     div.egyhir textarea {
 	width: 80%;
 	height: 300px;
+/*
 	border: solid 1px #667766;	
 	background-color: white;
+*/
     }
 
     table.egyhirdetail {
 	background-color: #eeeeee;
-	border-bottom: solid 2px #667766;
     }
     table.egyhirdetail td {
 	border: solid 1px #667766;
+	line-height: 2em;
+	padding: 0.4em;
     }
     table.egyhirdetail th {
-	background-color: #667766;
+	background-color: cornflowerblue;
 	color: white;
 	height:30px;
-	border-bottom: solid 2px #001100;
     }
 
     .mceEditor iframe { border: blue 1px solid; }
+
+    #pic, #cim { line-height: 1.4em; margin-bottom:1em;}
+
+span.kategoriaSelector { border-radius: 4px; padding: 2px 4px; background-color: white; border: solid 1px black; font-weight:normal;
+cursor: pointer;
+-webkit-transition : 100ms ease-out;
+  -moz-transition : 100ms ease-out;
+  -o-transition : 100ms ease-out;
+  transition : 100ms ease-out;
+ }
+
+span.kategoriaSelector.selected { background-color: #d64161; color:white; }
+span.kategoriaSelector.modified { background-color: #878f99; color:white; border-color:white; }
+span.kategoriaSelector.selected.modified { background-color: #6b5b95; color:white;  border-color: black;}
+span.kategoriaSelector:hover { border: solid 1px #6b5b95; background-color: #ff7b25; color:white; }
+span.kategoriaSelector.selected:hover { background-color: #878f99; color:white; }
+
diff --git a/mayor-orig/mayor-portal/www/skin/classic/module-portal/css/hirek/hirekAdmin.css b/mayor-orig/mayor-portal/www/skin/classic/module-portal/css/hirek/hirekAdmin.css
index 9e05068d..347cd17f 100644
--- a/mayor-orig/mayor-portal/www/skin/classic/module-portal/css/hirek/hirekAdmin.css
+++ b/mayor-orig/mayor-portal/www/skin/classic/module-portal/css/hirek/hirekAdmin.css
@@ -10,15 +10,24 @@
 
     table.hAdmin {
 	background-color: #445560;
-	
+	width:90%;	
     }
     table.hAdmin tr td {
-	background-color: #eeeeee;
+	background-color: #eee;
+    	padding: 2px 4px;
+	line-height: 1.6em;
+    }
+    table.hAdmin tr:hover td {
+	outline: solid 1px #d64161;
+	background-color: #fff;
     }
 
+    table.hAdmin tr td.latszik {
+	background-color: #d64161; color:white;
+    }
 
     table.hAdmin tr.unk td {
-	background-color: #993456;
+	background-color: #feb236;
     }
     table.hAdmin tr.old td {
 	background-color: #999999;
diff --git a/mayor-orig/mayor-portal/www/skin/classic/module-portal/css/portal.css b/mayor-orig/mayor-portal/www/skin/classic/module-portal/css/portal.css
index cc128d4f..5152e545 100644
--- a/mayor-orig/mayor-portal/www/skin/classic/module-portal/css/portal.css
+++ b/mayor-orig/mayor-portal/www/skin/classic/module-portal/css/portal.css
@@ -86,8 +86,10 @@ hr {display: none;}
 
     table.portalMain div.dobozTart a { color: black }
 
-
-
+    
+    div.static h1 { margin: 20px;}
+    div.static p { margin-left: 26px; margin-right:26px; margin-bottom: 1.2rem; font-size: 14px; line-height:1.6em;}
+    
 @media (max-width: 850px) {
   .bal, .jobb {
     display: none;
diff --git a/mayor-orig/mayor-portal/www/skin/classic/module-portal/html/hirek/egyhir.phtml b/mayor-orig/mayor-portal/www/skin/classic/module-portal/html/hirek/egyhir.phtml
index b8e0f7ee..f24068ca 100644
--- a/mayor-orig/mayor-portal/www/skin/classic/module-portal/html/hirek/egyhir.phtml
+++ b/mayor-orig/mayor-portal/www/skin/classic/module-portal/html/hirek/egyhir.phtml
@@ -30,7 +30,10 @@
 		    echo '<script src="//cdn.ckeditor.com/4.14.0/standard/ckeditor.js" charset="utf-8"></script>';
 
 		    echo '<table class="egyhirdetail" cellspacing="1">';
-		    echo '<tr><th colspan="3">'._BEALLITASOK.'</th></tr>';
+		    echo '<tr><th colspan="3">';
+			echo _BEALLITASOK;
+			if ($HIR['owner']!='') echo ' ('.$HIR['owner'].')';
+		    echo '</th></tr>';
 		    echo '<tr><td style="text-align:right">';
 
 		    echo _TOLDT.': <input type="text" name="kdt" id="kdt" value="'.$HIR['kdt'].'" class="datetime" /><br/>';	
@@ -40,21 +43,34 @@
 		echo '<td>';
 
 		    reset($LANGUAGES);
-		    echo '<select name="lang">';
-		    for($i=0; $i<count($LANGUAGES); $i++) {
+
+		    if (count($LANGUAGES) == 1) {
+			echo '<input type="hidden" name="lang" value="'.$LANGUAGES[0].'" />';
+		    } else {
+			echo '<select name="lang">';
+			for($i=0; $i<count($LANGUAGES); $i++) {
 			//echo '<input type="checkbox" name="policies" value="'.$LANGUAGES[$i].'" />';
 			$_CHK = ($LANGUAGES[$i]==$HIR['lang']) ? ' selected="selected" ':'';
 			echo '<option value="'.$LANGUAGES[$i].'" '.$_CHK.'/>';
 			echo $LANGUAGES[$i];
 			echo '</option>';
+			}
+			echo '</select>';
 		    }
-		    echo '</select>';
-	
 		    _putKategoriak($ADAT,$HIR['cid']);
 
 	    	echo '</td>';
-		echo '<td>';
-		    echo $HIR['owner'];
+		echo '<td style="line-height:2em; max-width: 300px">';
+		    // ujfajta kategoria kezelés
+		    $SELECTED_HIRKATEGORIAK = explode(',',$HIR['hirkategoriak']);
+		    for ($i=0; $i<count($ADAT['kategoriak']); $i++) {
+			$_D = $ADAT['kategoriak'][$i];
+			$_SEL = (in_array($_D['id'],$SELECTED_HIRKATEGORIAK)) ? ' selected ':''; 
+		
+			echo '<span class="kategoriaSelector '.$_SEL.'" id="kategoriaSelector_'.$_D['id'].'" data-kategoriaid="'.$_D['id'].'">'.$_D['leiras'].'</span> ';
+		    }
+		    echo '<span id="kategoriaSelectorContainer"></span>';
+		    // -------------------------
 		echo '</td>';
 		echo '</tr>';
 
@@ -67,7 +83,6 @@
 		    $_CHK = ($FLAGS[$i]==$HIR['flag']) ? ' checked="checked" ':'';
 		    echo '<input type="radio" id="F'.$i.'" name="flag" value="'.$FLAGS[$i].'" '.$_CHK.'/>';
 		    echo '<label for="F'.$i.'">';
-		    echo '&nbsp;&nbsp;&nbsp;&nbsp;';
 		    echo $FLAGSS[$i];
 		    echo '('.$FLAGS[$i].')';
 		    echo '</label>';
@@ -124,8 +139,8 @@
 	    echo "\n".'<textarea name="txt" id="txt" class="wysiwyg" rows="10" cols="80">'.htmlspecialchars($HIR['txt']).'</textarea>'."\n";
 
 	    echo '<br/>';
-	    echo _KEP;
-	    echo '<input type="text" name="pic" id="pic" size="128" value="'.$HIR['pic'].'" /><br/>';
+	    echo _KEP.': ';
+	    echo '<input type="text" name="pic" id="pic" size="128" value="'.$HIR['pic'].'" placeholder="https://"/><br/>';
 	    echo '<input type="submit" value="'._ROGZIT.'" />';
 	    echo '<input type="hidden" name="action" value="save" />';
 	    echo '<input type="hidden" name="hirId" value="'.($HIR['id']).'" />';
diff --git a/mayor-orig/mayor-portal/www/skin/classic/module-portal/html/hirek/hirekAdmin.phtml b/mayor-orig/mayor-portal/www/skin/classic/module-portal/html/hirek/hirekAdmin.phtml
index 6dc5900d..1f55154a 100644
--- a/mayor-orig/mayor-portal/www/skin/classic/module-portal/html/hirek/hirekAdmin.phtml
+++ b/mayor-orig/mayor-portal/www/skin/classic/module-portal/html/hirek/hirekAdmin.phtml
@@ -1,27 +1,55 @@
 <?php
 
-    function putHirek($ADAT) {
+    function putKategoriaSzerkeszto($ADAT) {
+	if (!in_array(__PORTAL_CODE,array('vmg','kanizsay'))) return false;
+	formBegin();
+	echo '<table align="center">';
+
+	    for ($i=0; $i<count($ADAT); $i++) {
+		$D = $ADAT[$i];
+		echo '<tr>';
+		echo '<td><input type="hidden" name="kategoriaId[]" value="'.$D['id'].'" />';
+		    echo '<input type="checkbox" name="kategoriaTorlendo[]" value="'.$D['id'].'" title="Törlöm!" />';
+		    echo $D['id'];
+		echo '</td>';
+//		echo '<td>'.$D['leiras'].'</td>';
+		echo '<td><input type="text" name="leiras_'.$D['id'].'" value="'.$D['leiras'].'" placeholder="leírás" /></td>';
+		echo '<td><input type="text" name="precode_'.$D['id'].'" value="'.htmlentities($D['precode']).'" placeholder="precode" /></td>';
+		echo '<td><input type="text" name="postcode_'.$D['id'].'" value="'.htmlentities($D['postcode']).'" placeholder="postcode" /></td>';
+		echo '<td>'.$D['precode'].'</td>';
+		echo '<td>'.$D['postcode'].'</td>';
+		echo '</tr>';
+	    }
 
-/*
-    hideShowContainer
-    onClickHideShow
-    openable
-*/
+	    echo '<tr>';
+		echo '<td><input type="text" name="id" value="" placeholder="id" /></td>';
+		echo '<td><input type="text" name="leiras" value="" placeholder="leírás" /></td>';
+		echo '<td><input type="text" name="precode" value="" placeholder="precode" /></td>';
+		echo '<td><input type="text" name="postcode" value="" placeholder="postcode" /></td>';
+	    echo '</tr>';
+	    echo '<tr><th colspan="4">';
+	    echo '<input type="hidden" name="action" value="kategoriaSzerkeszt" />';
+	    echo '<input type="submit">';
+	    echo '</th></tr>';
+	    echo '</table>';
+	formEnd();
+    }
 
+    function putHirek($ADAT) {
 	$CLASS = array(1=>'külső hír',2=>'kis hír',6=>'csak belső',0=>'ISMERETLEN');
 	$FLAGS = array(0=>'nem látszik', 1=>'látszik', 2=>2, 3=>3);
 	$now = time();
-	echo '<table class="hAdmin hideShowContainer" align="center">';
-	echo '<tr><th colspan="5"><button type="button" class="onClickHideShow">+++</button></th></tr>'."\n";
-	for ($i=0; $i<count($ADAT); $i++) {
-	    $D = $ADAT[$i];
+	echo '<table class="hAdmin hideShowContainer" align="center" cellspacing="1">';
+	echo '<tr><td colspan="7"><button type="button" class="onClickHideShow">Mindent mutass!</button></td></tr>'."\n";
+	for ($i=0; $i<count($ADAT['szovegek']); $i++) {
+	    $D = $ADAT['szovegek'][$i];
 	    if ($D['class']==0) $_class='class="unk"'; else 
 	    if (strtotime($D['vdt'])<$now || $D['flag']==0) $_class='class="old openable" style="display: none"'; else $_class="";
 
 	    echo '<tr '.$_class.'>';
-	    echo '<td>';
-		echo $D['lang'];
-	    echo '</td>';
+	    // echo '<td>';
+		// echo $D['lang'];
+	    // echo '</td>';
 
 	    echo '<td>';
 		echo '<a href="'.href('index.php?page=portal&sub=hirek&f=egyhir&hirId='.$D['id']).'">';
@@ -36,10 +64,20 @@
 		echo ' '.$D['csoport'];
 	    echo '</td>';
 	    echo '<td>';
-		echo $D['owner'];
+		if ($D['hirkategoriak']!='') {
+		    $_K = explode(',',$D['hirkategoriak']);
+		    for($j=0; $j<count($_K); $j++) {
+			echo ' '.$ADAT['kategoriaId2txt'][$_K[$j]][0]['leiras'];
+		    }
+		}
 	    echo '</td>';
 	    echo '<td>';
+		echo $D['owner'];
+	    echo '</td>';
+	    echo '<td style="white-space: nowrap">';
 		echo $D['kdt'];
+	    echo '</td>';
+	    echo '<td style="white-space: nowrap">';
 		echo $D['vdt'];
 	    echo '</td></tr>';
 	    echo "\n\n";
diff --git a/mayor-orig/mayor-portal/www/skin/classic/module-portal/html/share/doboz.phtml b/mayor-orig/mayor-portal/www/skin/classic/module-portal/html/share/doboz.phtml
index 7c903e27..8c8ded7b 100644
--- a/mayor-orig/mayor-portal/www/skin/classic/module-portal/html/share/doboz.phtml
+++ b/mayor-orig/mayor-portal/www/skin/classic/module-portal/html/share/doboz.phtml
@@ -22,8 +22,9 @@
 	    $bgcolor =  ($SET['background-color']=='') ? '#eeeeee' : $SET['background-color'] ;
 	    $width = ($SET['width']=='') ? '100%':$SET['width'];
 	    if ($SET['header-link']!='') $cime = '<a href="'.$SET['header-link'].'">'.$cime.'</a>';
+	    if (isset($SET['header-css']) && $SET['header-css']!='') $_style = $SET['header-css'];
 	    echo '<div class="doboz">';
-		echo '<div class="dobozCim" style="width: '.$width.'; background-color: '.$SET['header-color'].'"><span>'.$cime.'</span></div>';
+		echo '<div class="dobozCim" style="width: '.$width.'; background-color: '.$SET['header-color'].'; '.$_style.'"><span>'.$cime.'</span></div>';
 		echo '<div class="dobozTart" style="background-color: '.$bgcolor.'">'.$bele.'</div>';
 	    echo '</div>';
 
diff --git a/mayor-orig/mayor-portal/www/skin/classic/module-portal/javascript/portal.jquery.min.js b/mayor-orig/mayor-portal/www/skin/classic/module-portal/javascript/portal.jquery.min.js
index 0969c5c7..41d70923 100644
--- a/mayor-orig/mayor-portal/www/skin/classic/module-portal/javascript/portal.jquery.min.js
+++ b/mayor-orig/mayor-portal/www/skin/classic/module-portal/javascript/portal.jquery.min.js
@@ -10,4 +10,33 @@ $(function() {
 	}
     });
 
+    $('span.kategoriaSelector').click(function() {
+	$(this).toggleClass('selected');
+	$(this).toggleClass('modified');	
+	$('#kategoriaSelectorContainer').html('');
+       $('span.kategoriaSelector.selected').each(function() {
+       $('<input />', { 
+           type: 'hidden', 
+           name: 'kategoriaId[]', 
+           value: $(this).data('kategoriaid')
+       }).appendTo($('#kategoriaSelectorContainer')); 
+	});
+    });
+
+
+/*
+   myForm.on('submit', function(e) {
+       //e.preventDefault();
+       $('span.kategoriaSelector.selected').each(function() {
+       $('<input />', { 
+           type: 'text',
+           name: 'kategoriaId[]',
+           value: $(this).data('kategoriaid')
+       }).appendTo(myForm); // append each input to the form     
+      });
+
+       //myForm.submit(); // submit the form
+   });
+*/
+
 });
diff --git a/mayor-orig/mayor-wiki/log/mayor-wiki.rev b/mayor-orig/mayor-wiki/log/mayor-wiki.rev
index 54f5b275..9bce5583 100644
--- a/mayor-orig/mayor-wiki/log/mayor-wiki.rev
+++ b/mayor-orig/mayor-wiki/log/mayor-wiki.rev
@@ -1 +1 @@
-4691
+4695
diff --git a/mayor-orig/md5sum b/mayor-orig/md5sum
index 052b0a58..39f0774c 100644
--- a/mayor-orig/md5sum
+++ b/mayor-orig/md5sum
@@ -1,13 +1,13 @@
-Revision 4691
-71107f2d0381381d16916e473db42dba  mayor-fenntarto-rev4691.tgz
-a80ee713915cb729bf44f9c831f3e74a  mayor-installer-sulix-rev4691.tgz
-a0777d620e206b07b6e3565864a58fec  mayor-wiki-rev4691.tgz
-a58f5bd16055fc5f168b39a70052de05  mayor-installer-rev4691.tgz
-512a43eb1223ecec3b81ea1eda4c16f6  mayor-portal-rev4691.tgz
-21a67636b6d1d0c2ca040d1210901aaf  mayor-felveteli-rev4691.tgz
-1d2ff3b0f71141f6e3c916c749eab426  mayor-jatek-rev4691.tgz
-f5490a7abb4629401ac267ec0e23a9ac  mayor-locales-jp_JP-rev4691.tgz
-d9d56f15c55aaca9e5e6447455e8b593  mayor-locales-de_DE-rev4691.tgz
-b03f1fa2e742a0d3245a1c1b719dbd6f  mayor-locales-en_US-rev4691.tgz
-5b7345dd3db4f2aa184d4440beb7bd5e  mayor-naplo-rev4691.tgz
-6b1cef87715c325d36a3d24e66378cbf  mayor-base-rev4691.tgz
+Revision 4695
+8006f6a2333f838cf1c3a4c464aed480  mayor-fenntarto-rev4695.tgz
+0413e87eaa2472d46297b1b1e67964c9  mayor-installer-sulix-rev4695.tgz
+7b1958ba242c788088f8e0fa8b19ac06  mayor-wiki-rev4695.tgz
+ce7a02daded0bc1a5b9379455fe7d497  mayor-installer-rev4695.tgz
+31a165054c79b9638a9d31cdaedb2f28  mayor-portal-rev4695.tgz
+d4f27043abc3a93c21d8939bd1ecb2e5  mayor-felveteli-rev4695.tgz
+93cab4f2a25ecae24063f2a189884046  mayor-jatek-rev4695.tgz
+2d3becd23208144f80333ee7855359d3  mayor-locales-jp_JP-rev4695.tgz
+9bd9f2a196265369cf9edc46c17adf51  mayor-locales-de_DE-rev4695.tgz
+620f79072f95112bc578085c4bb0829b  mayor-locales-en_US-rev4695.tgz
+c869569cb053d07c3b3fc97f47c7a86e  mayor-naplo-rev4695.tgz
+79f3aac8fcfb484b28f30467c7056505  mayor-base-rev4695.tgz
diff --git a/mayor-orig/rev.txt b/mayor-orig/rev.txt
index 54f5b275..9bce5583 100644
--- a/mayor-orig/rev.txt
+++ b/mayor-orig/rev.txt
@@ -1 +1 @@
-4691
+4695
diff --git a/rev.txt b/rev.txt
index 54f5b275..9bce5583 100644
--- a/rev.txt
+++ b/rev.txt
@@ -1 +1 @@
-4691
+4695