aboutsummaryrefslogtreecommitdiffstats
path: root/mayor-orig/mayor-naplo/www/skin
diff options
context:
space:
mode:
Diffstat (limited to 'mayor-orig/mayor-naplo/www/skin')
-rw-r--r--mayor-orig/mayor-naplo/www/skin/ajax/module-naplo/html/hibabejelento/admin.phtml6
-rw-r--r--mayor-orig/mayor-naplo/www/skin/classic/module-naplo/css/orarend/orarend.css5
-rw-r--r--mayor-orig/mayor-naplo/www/skin/classic/module-naplo/css/uzeno/uzeno.css3
-rw-r--r--mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/hirnok/cronFutar.phtml18
-rw-r--r--mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/hirnok/hirnok.phtml20
-rw-r--r--mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/orarend/orarend.phtml9
-rw-r--r--mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/uzeno/postas.phtml4
7 files changed, 58 insertions, 7 deletions
diff --git a/mayor-orig/mayor-naplo/www/skin/ajax/module-naplo/html/hibabejelento/admin.phtml b/mayor-orig/mayor-naplo/www/skin/ajax/module-naplo/html/hibabejelento/admin.phtml
index 69585645..cc889416 100644
--- a/mayor-orig/mayor-naplo/www/skin/ajax/module-naplo/html/hibabejelento/admin.phtml
+++ b/mayor-orig/mayor-naplo/www/skin/ajax/module-naplo/html/hibabejelento/admin.phtml
@@ -68,8 +68,8 @@
$_color='#ff5722';
$_class="icon-question-sign";
}
- echo '<div style="width:90%; margin: 0px auto; border: solid 1px #aaa; border-radius: 2px; ">';
- echo '<div style="font-size:10px; background-color: #3c3c64; color: white; font-weight: normal; border-bottom: solid 1px #dddddd; padding:4px 10px;">Hangya - '.superdate($ADAT['kerelmek'][$i]['rogzitesDt']).'</div>';
+ echo '<div style="width:90%; margin: 0px auto; border: solid 0px #aaa; border-radius: 2px; ">';
+ echo '<div style="border-radius: 4px 4px 0px 0px; font-size:10px; background-color: #3c3c64; color: white; font-weight: normal; border-bottom: solid 1px #dddddd; padding:4px 10px;">Hangya - '.superdate($ADAT['kerelmek'][$i]['rogzitesDt']).'</div>';
echo '<div style="background-color: #eee; padding:10px;border-bottom: solid 0px #dddddd; padding:3px 3px; min-height:30px;">';
echo '<a style="color: black;" href="'.$_link.'">';
@@ -85,7 +85,7 @@
//padding:10px; border-bottom: solid 1px #3c3c64; padding:3px 10px;">'.
//htmlspecialchars($ADAT['kerelmek'][$i]['valasz']).' '.$_K['jovahagyasAccount'].'</div>';
echo '<style type="text/css">
- table.kerelemValasz {background-color:#ddd;width:100%;}
+ table.kerelemValasz {background-color: #ddd;width:100%;}
table.kerelemValasz td {font-size:10px; background-color:white; padding:2px 4px; vertical-align:top;}
table.kerelemValasz td.dt {background-color: #eee;text-align: right;}
</style>';
diff --git a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/css/orarend/orarend.css b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/css/orarend/orarend.css
index 0cfda59b..fab07933 100644
--- a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/css/orarend/orarend.css
+++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/css/orarend/orarend.css
@@ -71,6 +71,11 @@ table.orarend tbody tr td div.oraMostVan {
border-color: lightgreen; border-width: 0px 4px 0px 4px; border-radius:2px;
}
+table.orarend tbody tr td div.utolsoora {
+ border-style: solid;
+ border-color: orange; border-width: 0px 0px 2px 0px; border-radius:2px;
+}
+
table.orarend tbody tr td div.dolgozat {
background-color: orange; color:white;
border-radius:2px; padding:2px;
diff --git a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/css/uzeno/uzeno.css b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/css/uzeno/uzeno.css
index 04d5ea37..29c35b1a 100644
--- a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/css/uzeno/uzeno.css
+++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/css/uzeno/uzeno.css
@@ -128,6 +128,9 @@
a span.icon-network { color: #aaa; }
a:hover span.icon-network { color: cornflowerblue; }
+ #uzenoSearchIcon { cursor:pointer; background-color: #bbb; border-radius:2px; padding:3px 3px 2px 2px; color:white; }
+ #uzenoSearchIcon:hover { background-color: cornflowerblue; }
+
@media (max-width: 764px) {
table.uzeno tbody tr td.felado { min-width:80px;}
diff --git a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/hirnok/cronFutar.phtml b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/hirnok/cronFutar.phtml
index 84d59777..ffd8ed68 100644
--- a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/hirnok/cronFutar.phtml
+++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/hirnok/cronFutar.phtml
@@ -51,6 +51,24 @@
return $RETURN_STR;
}
+ function generateFutar_utolsoora($D) {
+ $a_az[0] = 'a';
+ $a_az[1] = 'az';
+ $a_az[2] = 'a';
+ $a_az[3] = 'a';
+ $a_az[4] = 'a';
+ $a_az[5] = 'az';
+ $a_az[6] = 'a';
+ $a_az[7] = 'a';
+ $a_az[8] = 'a';
+ $a_az[9] = 'a';
+ $a_az[10] = 'a';
+ $a_az[11] = 'a';
+ $a_az[12] = 'a';
+ $RETURN_STR .='Ma a haladási napló szerint a(z) <b>'.$D['adat']['teremNev'].'</b> teremben '.$a_az[$D['adat']['utolsooraateremben']].' <b>'.$D['adat']['utolsooraateremben'].'. óra</b> után már nincs óra!';
+ return $RETURN_STR;
+ }
+
function generateFutarBadge_jegy($D) {
// return '<i class="material-icons">face</i>';
}
diff --git a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/hirnok/hirnok.phtml b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/hirnok/hirnok.phtml
index a70662e9..61352d81 100644
--- a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/hirnok/hirnok.phtml
+++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/hirnok/hirnok.phtml
@@ -55,6 +55,9 @@
function putHirnokBadge_idoszak($D) {
echo '<span class="icon-calendar-sign"></span>';
}
+ function putHirnokBadge_utolsoora($D) {
+ echo '<span class="icon-broom" style="background-color: #00bcd4"></span>';
+ }
function putHirnokBadge_haladasiBeiratlan($D) {
if ($D['db']!=0)
@@ -113,6 +116,23 @@
echo 'Aktív <b>'.$D['idoszakAdat']['tipus'].'</b> időszak: '.$D['idoszakAdat']['tolDt'].' – '.$D['idoszakAdat']['igDt'];
}
+ function putHirnok_utolsoora($D) {
+ $a_az[0] = 'a';
+ $a_az[1] = 'az';
+ $a_az[2] = 'a';
+ $a_az[3] = 'a';
+ $a_az[4] = 'a';
+ $a_az[5] = 'az';
+ $a_az[6] = 'a';
+ $a_az[7] = 'a';
+ $a_az[8] = 'a';
+ $a_az[9] = 'a';
+ $a_az[10] = 'a';
+ $a_az[11] = 'a';
+ $a_az[12] = 'a';
+ echo 'Ma a haladási napló szerint a(z) <b>'.$D['adat']['teremNev'].'</b> teremben '.$a_az[$D['adat']['utolsooraateremben']].' <b>'.$D['adat']['utolsooraateremben'].'. óra</b> után már nincs óra!';
+ }
+
function putHirnokBadge_hianyzas($D) {
$ICON = array('késés'=>'timer','felmentés'=>'accessible','felszerelés hiány'=>'accessibility',
'hiányzás'=>'location_off'); // location_off, grid_off, blur_off
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 b8d74048..f8b8d393 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
@@ -24,6 +24,9 @@
function putOrarend($ADAT) {
global $aHetNapjai,$skin;
+ // $ADAT['utolsoorak'][$teremId]['oraId']
+
+
/* Képzés-Mátrix */
//dump($ADAT['kepzesOraterv']);
if (is_array($ADAT['kepzesOraterv']) && count($ADAT['kepzesOraterv'])>0) {
@@ -237,6 +240,7 @@
$_tankorTipus = $ADAT['tankorok'][$_T['tankorId']][0]['tankorTipus'];
$_tankorTipusId = $ADAT['tankorok'][$_T['tankorId']][0]['tankorTipusId'];
$_oraMostVan = (in_array($_ORA['oraId'],$ADAT['orakMost']));
+ $_utolsoora = ($_ORA['oraId']!='' && $_ORA['oraId'] == $ADAT['utolsoorak'][$dt][$_valosTeremId]['oraId']);
//
if ($kepzes_figyel
&&$ADAT['tankorTipus'][$_tankorTipusId]['oratervi'] == 'óratervi'
@@ -249,14 +253,15 @@
$_osztalyJel = $_T['osztalyJel'];
// figyelem, itt jön a kiírás, a _putOra fv helyett:
$_tipusClass = str_replace(' ','_',$_ORA['tipus']);
- $_oraMostVanClass = ($_oraMostVan) ? ' oraMostVan':'';
+ $_oraMostVanClass = ($_oraMostVan) ? ' oraMostVan ':'';
+ $_utolsooraClass = ($_utolsoora) ? ' utolsoora ':'';
if ($_T['jelleg']=='osztályfüggetlen') {
$_tipusClass .= ' osztályfüggetlen';
}
$_oraAdat = (isset($_ORA['oo']) && _POLICY!='public') ? 'oraAdat' : ''; // haladási
$_hianyzasAdat = $ADAT['hianyzas'][$_ORA['oraId']][0];
$_hianyzasClass = (is_array($_hianyzasAdat) && $_hianyzasAdat['hTipus']=='hiányzás') ? ' nemVoltBent ':'';
- echo '<div class="'.$_tipusClass.$_frissClass.$_oraMostVanClass.$_hianyzasClass.' '.$_oraAdat.'" data-oraid="'.$_ORA['oraId'].'" title="'.$_ORA['tipus'].'" >';
+ echo '<div class="'.$_tipusClass.$_frissClass.$_oraMostVanClass.$_utolsooraClass.$_hianyzasClass.' '.$_oraAdat.'" data-oraid="'.$_ORA['oraId'].'" title="'.$_ORA['tipus'].'" >';
if (is_array($_hianyzasAdat)) {
echo '<span class="hianyzasTicker '.ekezettelen($_hianyzasAdat['hTipus']).' '.ekezettelen($_hianyzasAdat['statusz']).' '.ekezettelen($_hianyzasAdat['igazolas']).'">';
diff --git a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/uzeno/postas.phtml b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/uzeno/postas.phtml
index 65a45fae..0ac05060 100644
--- a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/uzeno/postas.phtml
+++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/uzeno/postas.phtml
@@ -24,7 +24,7 @@
echo '<input type="hidden" name="mayorToken" class="mayorToken" value="'.$_SESSION['mayorToken'].'" />'; // rendhagyó eset, mert az egész tartalmat lecseréli az onLoadUpdate, és a form-tól kezdjük...
echo '<input type="hidden" name="kuuk" value="'.$ADAT['kuuk'].'" />';
echo '<input type="hidden" name="tanev" value="'.$ADAT['tanev'].'" />';
- echo '<table class="ujUzenet" align="center">';
+ echo '<table class="ujUzenet" align="center" style="background-color: rgba(240,240,240,0.4);">';
echo '<tr><th>'._UJ_UZENET;
if (__UZENOADMIN ===true && $ADAT['user']['feladoTipus']!='admin') {
echo ' <select id="asWho" name="asWho" class="onChangeUpdate">';
@@ -38,7 +38,7 @@
echo '<tr><td>';
echo _CIMZETT.': ';
// echo '<span style="" id="uzenoSearchIcon"><img src="/skin/classic/module-naplo/img/toolSearch.png" alt="ዖ" style="height:15px; width:15px;" align="middle" class="searchIcon"/>'.'</span>';
- echo '<span style="font-size:15px; cursor:pointer" id="uzenoSearchIcon">⌕</span>';
+ echo '<span id="uzenoSearchIcon" class="icon-search"></span>';
echo '<input style="display:none" type="text" name="pattern" id="pattern" class="onChangeUpdate" placeholder="'._NEV.'" />';
echo '<button style="display:none" type="button">'._KERES.'</button>';
if (is_array($ADAT['r'])) {