diff options
Diffstat (limited to 'mayor-orig')
20 files changed, 56 insertions, 30 deletions
diff --git a/mayor-orig/mayor-base/log/mayor-base.rev b/mayor-orig/mayor-base/log/mayor-base.rev index de4ba040..acbf96c3 100644 --- a/mayor-orig/mayor-base/log/mayor-base.rev +++ b/mayor-orig/mayor-base/log/mayor-base.rev @@ -1 +1 @@ -4710 +4712 diff --git a/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev b/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev index de4ba040..acbf96c3 100644 --- a/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev +++ b/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev @@ -1 +1 @@ -4710 +4712 diff --git a/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev b/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev index de4ba040..acbf96c3 100644 --- a/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev +++ b/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev @@ -1 +1 @@ -4710 +4712 diff --git a/mayor-orig/mayor-installer-orig/log/mayor-installer.rev b/mayor-orig/mayor-installer-orig/log/mayor-installer.rev index de4ba040..acbf96c3 100644 --- a/mayor-orig/mayor-installer-orig/log/mayor-installer.rev +++ b/mayor-orig/mayor-installer-orig/log/mayor-installer.rev @@ -1 +1 @@ -4710 +4712 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 de4ba040..acbf96c3 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 @@ -4710 +4712 diff --git a/mayor-orig/mayor-jatek/log/mayor-jatek.rev b/mayor-orig/mayor-jatek/log/mayor-jatek.rev index de4ba040..acbf96c3 100644 --- a/mayor-orig/mayor-jatek/log/mayor-jatek.rev +++ b/mayor-orig/mayor-jatek/log/mayor-jatek.rev @@ -1 +1 @@ -4710 +4712 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 de4ba040..acbf96c3 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 @@ -4710 +4712 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 de4ba040..acbf96c3 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 @@ -4710 +4712 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 de4ba040..acbf96c3 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 @@ -4710 +4712 diff --git a/mayor-orig/mayor-naplo/log/mayor-naplo.rev b/mayor-orig/mayor-naplo/log/mayor-naplo.rev index de4ba040..acbf96c3 100644 --- a/mayor-orig/mayor-naplo/log/mayor-naplo.rev +++ b/mayor-orig/mayor-naplo/log/mayor-naplo.rev @@ -1 +1 @@ -4710 +4712 diff --git a/mayor-orig/mayor-naplo/www/policy/private/naplo/haladasi/hazifeladat-pre.php b/mayor-orig/mayor-naplo/www/policy/private/naplo/haladasi/hazifeladat-pre.php index 86ca57a0..a973e454 100644 --- a/mayor-orig/mayor-naplo/www/policy/private/naplo/haladasi/hazifeladat-pre.php +++ b/mayor-orig/mayor-naplo/www/policy/private/naplo/haladasi/hazifeladat-pre.php @@ -80,7 +80,8 @@ } if ($oraId>0 && $ADAT['oraAdat']['oraBeirhato']===true ) { $leiras = readVariable($_POST['oraLeiras'],'string'); - updateHaladasiNaploOra($oraId, $leiras); + $cimkeId = readVariable($_POST['cimkeId'],'string'); + updateHaladasiNaploOra($oraId, $leiras, $cimkeId); } } elseif (__TANAR===true && $action=='lattam') { $lr = db_connect('naplo'); diff --git a/mayor-orig/mayor-naplo/www/policy/private/naplo/tools/getOraAdat-pre.php b/mayor-orig/mayor-naplo/www/policy/private/naplo/tools/getOraAdat-pre.php index 064bc796..308e7b4f 100644 --- a/mayor-orig/mayor-naplo/www/policy/private/naplo/tools/getOraAdat-pre.php +++ b/mayor-orig/mayor-naplo/www/policy/private/naplo/tools/getOraAdat-pre.php @@ -25,7 +25,8 @@ $dolgozatBeirhato = $oraBeirhato; if ($oraBeirhato===true && $action=='oraBeiras') { $leiras = readVariable($_POST['leiras'], 'string'); - updateHaladasiNaploOra($oraId,$leiras); + $cimkeId = readVariable($_POST['cimkeId'], 'id'); + updateHaladasiNaploOra($oraId,$leiras,$cimkeId); } $_JSON['oraAdat'] = $ORAADAT = getOraAdatById($oraId); if ($ORAADAT['hazifeladatId']>0) { @@ -56,6 +57,7 @@ <input class="mayorToken" type="hidden" name="mayorToken" value="'.$_SESSION['mayorToken'].'" /> <input type="hidden" name="action" value="oraBeiras" /> <input type="hidden" name="oraId" value="'.$oraId.'" /> + <input type="hidden" name="cimkeId" value="'.$_JSON['oraAdat']['cimkeId'].'" /> <textarea name="leiras" style="margin-top:8px; width:99%; height:100px;">'. supertext($_JSON['oraAdat']['leiras']).'</textarea>'; $oraForm .= '<button type="button" class="setOraAdat mentes" value="mentés" data-oraid="'.$oraId.'"><span class="icon-ok"></span> MENTÉS </button>'; $oraForm .= '</form>'; diff --git a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/css/naplo.css b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/css/naplo.css index f12a5b14..c88905c2 100644 --- a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/css/naplo.css +++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/css/naplo.css @@ -251,6 +251,13 @@ div.arckepContainer.szulo span {background-color: #40e0d0; } div.arckepContainer.diak span {background-color: #6495ed; } + span.cimke { margin:0px 1px; border-radius: 2px; font-size:xx-small; color:white; padding: 0px 2px 0px 2px; background-color:#ddd; } + span.cimke_0 { background-color: #4caf50; } + span.cimke_1 { background-color: red; } + span.cimke_2 { background-color: orange; } + span.cimke_3 { background-color: #3f51b5; } + span.cimke_4 { background-color: #673ab7; } + @media (max-width: 764px) { #toolBarTitle {display:;} diff --git a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/haladasi/hazifeladat.phtml b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/haladasi/hazifeladat.phtml index 419fbc49..dd9c3687 100644 --- a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/haladasi/hazifeladat.phtml +++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/haladasi/hazifeladat.phtml @@ -8,8 +8,11 @@ echo ($ADAT['oraAdat']['dt']).' ('.$ADAT['oraAdat']['dt'].'), '.$ADAT['oraAdat']['ora'].'. '._ORA; echo '</span>'; echo ' – <span class="tankorNev tankorAdat" data-tankorid="'.$ADAT['oraAdat']['tankorId'].'">'.$ADAT['oraAdat']['tankorNev'].'</span>'; + if ($ADAT['oraAdat']['cimkeLeiras']!='') { + echo ' – '.'<span class="cimke cimke_'.(intval($ADAT['oraAdat']['cimkeId'])%5).'">'.$ADAT['oraAdat']['cimkeLeiras'].'</span>'; + } echo ' – <span class="tanarNev" data-tanarid="'.$ADAT['oraAdat']['ki'].'">'.$ADAT['oraAdat']['kiCn'].'</span>'; - // echo '<p>'.$ADAT['oraAdat']['leiras'].'</p>'; + echo '</fieldset>'."\n"; @@ -124,6 +127,7 @@ echo '<style type="text/css"> if ($skin != 'ajax') formBegin(array('class'=>'hazifeladat')); echo '<input type="hidden" name="action" value="hazifeladatBeiras"/>'; echo '<input type="hidden" name="oraId" value="'.$ADAT['oraAdat']['oraId'].'"/>'; + echo '<input type="hidden" name="cimkeId" value="'.$ADAT['oraAdat']['cimkeId'].'"/>'; echo '<input type="hidden" name="hazifeladatId" value="'.$ADAT['hazifeladatId'].'"/>'; echo '<fieldset class="adatok"><legend>'.ucfirst(_TANANYAG).'</legend>'."\n"; 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 61655882..f53e34a7 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 @@ -41,7 +41,7 @@ CREATE TABLE `hirek` ( `lang` varchar(5) default 'hu_HU', `cim` text, `txt` text, - `owner` varchar(10) default NULL, + `owner` varchar(255) default NULL, `flag` tinyint(3) unsigned NOT NULL default '0', `cid` tinyint(3) unsigned NOT NULL default '0', `pic` varchar(20) default NULL, diff --git a/mayor-orig/mayor-portal/log/mayor-portal.rev b/mayor-orig/mayor-portal/log/mayor-portal.rev index de4ba040..acbf96c3 100644 --- a/mayor-orig/mayor-portal/log/mayor-portal.rev +++ b/mayor-orig/mayor-portal/log/mayor-portal.rev @@ -1 +1 @@ -4710 +4712 diff --git a/mayor-orig/mayor-portal/update/rev004710-1-mayor_portal.sql b/mayor-orig/mayor-portal/update/rev004710-1-mayor_portal.sql new file mode 100644 index 00000000..5ac98672 --- /dev/null +++ b/mayor-orig/mayor-portal/update/rev004710-1-mayor_portal.sql @@ -0,0 +1,12 @@ +DELIMITER $$ +DROP PROCEDURE IF EXISTS upgrade_database_4710 $$ + +CREATE PROCEDURE upgrade_database_4710() +BEGIN +SET NAMES utf8 COLLATE utf8_hungarian_ci; + +ALTER TABLE `hirek` MODIFY `owner` varchar(255) DEFAULT NULL; + +END $$ +DELIMITER ; +CALL upgrade_database_4710(); diff --git a/mayor-orig/mayor-wiki/log/mayor-wiki.rev b/mayor-orig/mayor-wiki/log/mayor-wiki.rev index de4ba040..acbf96c3 100644 --- a/mayor-orig/mayor-wiki/log/mayor-wiki.rev +++ b/mayor-orig/mayor-wiki/log/mayor-wiki.rev @@ -1 +1 @@ -4710 +4712 diff --git a/mayor-orig/md5sum b/mayor-orig/md5sum index c59d4b06..a2be5a7a 100644 --- a/mayor-orig/md5sum +++ b/mayor-orig/md5sum @@ -1,13 +1,13 @@ -Revision 4710 -cb8cda74ec914985cfc33eeb1c0f600b mayor-fenntarto-rev4710.tgz -fce4128a082128b51ccd3c1f7da49d16 mayor-installer-sulix-rev4710.tgz -57cf545c827177cc44b1b976799235e0 mayor-wiki-rev4710.tgz -6093ef06efd2db548e5e6478e277df76 mayor-installer-rev4710.tgz -6020d68cd542a943247ae84e62f82271 mayor-portal-rev4710.tgz -bfeaeacfbb2e08af566791a15d22e94f mayor-felveteli-rev4710.tgz -92806a3648b8ae4d97cf4931539bc2ac mayor-jatek-rev4710.tgz -77ecb781efc6202022fbc0c88c339944 mayor-locales-jp_JP-rev4710.tgz -52e12bcaca7f74a4be364bc52babfd3c mayor-locales-de_DE-rev4710.tgz -91ef318a14aed435ef505255cefde6d0 mayor-locales-en_US-rev4710.tgz -b54133612c87fd2c3de6094485296e19 mayor-naplo-rev4710.tgz -1386d084c17d51d0fd101f37c37b02bd mayor-base-rev4710.tgz +Revision 4712 +58c3a908ac6c47b264d9c97c050bd3bd mayor-fenntarto-rev4712.tgz +8e8360e59413398833af2d1c25cdb99a mayor-installer-sulix-rev4712.tgz +20e4bddd751039d937afa56d99959869 mayor-wiki-rev4712.tgz +dde325efee1db53bb4c4388b4002df58 mayor-installer-rev4712.tgz +4d7b12a7fcf3229c757c008104021fd2 mayor-portal-rev4712.tgz +08123717b7ceed610968b0b6cc78cded mayor-felveteli-rev4712.tgz +2efc50b93cd5b9a849fd063a6a8b4523 mayor-jatek-rev4712.tgz +637d3e4edffc6840a831e41d84443b92 mayor-locales-jp_JP-rev4712.tgz +37e9bc8b52a7d83176bd660611d466ad mayor-locales-de_DE-rev4712.tgz +a3b30626e585c285ca6635169219b2ec mayor-locales-en_US-rev4712.tgz +38c4be37ac4d964ecc81deadb74c6553 mayor-naplo-rev4712.tgz +0cb609ef44637d0ed42f3f22afb29e08 mayor-base-rev4712.tgz diff --git a/mayor-orig/rev.txt b/mayor-orig/rev.txt index de4ba040..acbf96c3 100644 --- a/mayor-orig/rev.txt +++ b/mayor-orig/rev.txt @@ -1 +1 @@ -4710 +4712 |