From f594cba3efc0da6c87b3da9e288245f237cfac51 Mon Sep 17 00:00:00 2001
From: M.Gergo
Date: Tue, 24 Mar 2020 22:22:19 +0100
Subject: Rev: 4635

---
 mayor-orig/mayor-base/log/mayor-base.rev           |  2 +-
 mayor-orig/mayor-felveteli/log/mayor-felveteli.rev |  2 +-
 mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev |  2 +-
 .../mayor-installer-orig/log/mayor-installer.rev   |  2 +-
 .../log/mayor-installer-sulix.rev                  |  2 +-
 mayor-orig/mayor-jatek/log/mayor-jatek.rev         |  2 +-
 .../log/mayor-locales-de_DE.rev                    |  2 +-
 .../log/mayor-locales-en_US.rev                    |  2 +-
 .../log/mayor-locales-jp_JP.rev                    |  2 +-
 mayor-orig/mayor-naplo/log/mayor-naplo.rev         |  2 +-
 .../module-naplo/html/orarend/orarend.phtml        | 13 ++++++++---
 mayor-orig/mayor-portal/log/mayor-portal.rev       |  2 +-
 mayor-orig/mayor-wiki/log/mayor-wiki.rev           |  2 +-
 mayor-orig/md5sum                                  | 26 +++++++++++-----------
 mayor-orig/rev.txt                                 |  2 +-
 15 files changed, 36 insertions(+), 29 deletions(-)

(limited to 'mayor-orig')

diff --git a/mayor-orig/mayor-base/log/mayor-base.rev b/mayor-orig/mayor-base/log/mayor-base.rev
index 2e58f957..2996c056 100644
--- a/mayor-orig/mayor-base/log/mayor-base.rev
+++ b/mayor-orig/mayor-base/log/mayor-base.rev
@@ -1 +1 @@
-4633
+4635
diff --git a/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev b/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev
index 2e58f957..2996c056 100644
--- a/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev
+++ b/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev
@@ -1 +1 @@
-4633
+4635
diff --git a/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev b/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev
index 2e58f957..2996c056 100644
--- a/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev
+++ b/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev
@@ -1 +1 @@
-4633
+4635
diff --git a/mayor-orig/mayor-installer-orig/log/mayor-installer.rev b/mayor-orig/mayor-installer-orig/log/mayor-installer.rev
index 2e58f957..2996c056 100644
--- a/mayor-orig/mayor-installer-orig/log/mayor-installer.rev
+++ b/mayor-orig/mayor-installer-orig/log/mayor-installer.rev
@@ -1 +1 @@
-4633
+4635
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 2e58f957..2996c056 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 @@
-4633
+4635
diff --git a/mayor-orig/mayor-jatek/log/mayor-jatek.rev b/mayor-orig/mayor-jatek/log/mayor-jatek.rev
index 2e58f957..2996c056 100644
--- a/mayor-orig/mayor-jatek/log/mayor-jatek.rev
+++ b/mayor-orig/mayor-jatek/log/mayor-jatek.rev
@@ -1 +1 @@
-4633
+4635
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 2e58f957..2996c056 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 @@
-4633
+4635
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 2e58f957..2996c056 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 @@
-4633
+4635
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 2e58f957..2996c056 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 @@
-4633
+4635
diff --git a/mayor-orig/mayor-naplo/log/mayor-naplo.rev b/mayor-orig/mayor-naplo/log/mayor-naplo.rev
index 2e58f957..2996c056 100644
--- a/mayor-orig/mayor-naplo/log/mayor-naplo.rev
+++ b/mayor-orig/mayor-naplo/log/mayor-naplo.rev
@@ -1 +1 @@
-4633
+4635
diff --git a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/orarend/orarend.phtml b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/orarend/orarend.phtml
index c04cd9ec..5c75bfb6 100644
--- a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/orarend/orarend.phtml
+++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/orarend/orarend.phtml
@@ -262,9 +262,16 @@
 				    $_hianyzasClass = (is_array($_hianyzasAdat) && $_hianyzasAdat['hTipus']=='hiányzás') ? ' nemVoltBent ':''; 
 				    echo '<div class="'.$_tipusClass.$_frissClass.$_oraMostVanClass.$_utolsooraClass.$_hianyzasClass.' '.$_oraAdat.'" data-oraid="'.$_ORA['oraId'].'" title="'.$_ORA['tipus'].'" >';
 				    if (isset($_ORA['hazifeladatId'])) {
-					if ($_ORA['diakHazifeladat']['hazifeladatDiakStatus'] == 'kész') $_hfcolor = 'lightgreen';
-					else $_hfcolor = '#e91e63';
-					echo '<span class="icon-home-alt" title="h.f." style="color:'.$_hfcolor.'; padding-right:2px;"></span>';
+					if ($_ORA['hazifeladatFeltoltesEngedely']==1) {
+					    $_icon = 'icon-paper-clip-alt';
+					    if ($_ORA['diakHazifeladat']['hazifeladatDiakStatus'] == 'kész') { $_hfcolor = 'lightgreen';
+					    } else { $_hfcolor = '#3f51b5'; }
+					} else {
+					    $_icon= 'icon-home-alt';
+					    if ($_ORA['diakHazifeladat']['hazifeladatDiakStatus'] == 'kész') { $_hfcolor = 'lightgreen';
+					    } else { $_hfcolor = '#e91e63'; }
+					}
+					echo '<span class="'.$_icon.'" title="h.f." style="color:'.$_hfcolor.'; padding-right:2px;"></span>';
 				    }
 
 				    if (is_array($_hianyzasAdat)) {
diff --git a/mayor-orig/mayor-portal/log/mayor-portal.rev b/mayor-orig/mayor-portal/log/mayor-portal.rev
index 2e58f957..2996c056 100644
--- a/mayor-orig/mayor-portal/log/mayor-portal.rev
+++ b/mayor-orig/mayor-portal/log/mayor-portal.rev
@@ -1 +1 @@
-4633
+4635
diff --git a/mayor-orig/mayor-wiki/log/mayor-wiki.rev b/mayor-orig/mayor-wiki/log/mayor-wiki.rev
index 2e58f957..2996c056 100644
--- a/mayor-orig/mayor-wiki/log/mayor-wiki.rev
+++ b/mayor-orig/mayor-wiki/log/mayor-wiki.rev
@@ -1 +1 @@
-4633
+4635
diff --git a/mayor-orig/md5sum b/mayor-orig/md5sum
index 6140f4bc..2c28df09 100644
--- a/mayor-orig/md5sum
+++ b/mayor-orig/md5sum
@@ -1,13 +1,13 @@
-Revision 4633
-b9733091e1e0f09e37ee12c4a4f8caa1  mayor-fenntarto-rev4633.tgz
-4aeaae6affdf88d1852729565a91aeaa  mayor-installer-sulix-rev4633.tgz
-fc4533cc0bdbeb16401e7641ff124532  mayor-wiki-rev4633.tgz
-47871e634b04e9553d999cb743e0f3bc  mayor-installer-rev4633.tgz
-46e7fad1930020c06631cc27a0315975  mayor-portal-rev4633.tgz
-be292de2043d50072e57bcee8f9d9944  mayor-felveteli-rev4633.tgz
-6fe9da5ad13be0d2eb967b8ab63fbb42  mayor-jatek-rev4633.tgz
-e244f53f1f7d8831d1fe142a3f3ae25d  mayor-locales-jp_JP-rev4633.tgz
-680a1c5ef2aba4c799308e67bb501fb4  mayor-locales-de_DE-rev4633.tgz
-d45093641913d06eba7c211d045e3d45  mayor-locales-en_US-rev4633.tgz
-f7b27582fe01b1c7961cf9dffd4edb3a  mayor-naplo-rev4633.tgz
-bb8e2b455abda12f8169927255907ba5  mayor-base-rev4633.tgz
+Revision 4635
+41562a4824f29be1ae0372b7d502aef2  mayor-fenntarto-rev4635.tgz
+536f0fc97bfd4fd2f31ced5a11958fd4  mayor-installer-sulix-rev4635.tgz
+a27fd616a31df8a1d6918366fe6fb5ec  mayor-wiki-rev4635.tgz
+af3e635ff220b8561908e52d72db80db  mayor-installer-rev4635.tgz
+2b6b81a1158df50b1bbd35a929f43bbe  mayor-portal-rev4635.tgz
+85b8f21103e2c43295b03e92c90ce3c7  mayor-felveteli-rev4635.tgz
+73f734ee3beca396c19c4d6d127646d5  mayor-jatek-rev4635.tgz
+bb88ea04ffd8ec678bcd3125251f85d9  mayor-locales-jp_JP-rev4635.tgz
+e36c28d0e9ec82814481f9a5cae7e51a  mayor-locales-de_DE-rev4635.tgz
+973b58703d7151c5aac3a7bd61e89922  mayor-locales-en_US-rev4635.tgz
+efef72ed8fee0ecddf5f155427138e33  mayor-naplo-rev4635.tgz
+84154bb49db92bf6d4f34fa3e52873c6  mayor-base-rev4635.tgz
diff --git a/mayor-orig/rev.txt b/mayor-orig/rev.txt
index 2e58f957..2996c056 100644
--- a/mayor-orig/rev.txt
+++ b/mayor-orig/rev.txt
@@ -1 +1 @@
-4633
+4635
-- 
cgit v1.2.3