From cbb307f369ee869a15383020a8ed36274d819c83 Mon Sep 17 00:00:00 2001
From: M.Gergo
Date: Fri, 4 Feb 2022 14:00:07 +0100
Subject: Rev: 4828

---
 mayor-orig/mayor-naplo/log/mayor-naplo.rev                     |  2 +-
 .../mayor-naplo/www/policy/private/naplo/orarend/orarend.php   | 10 ++++++----
 .../skin/classic/module-naplo/html/osztalyozo/dolgozat.phtml   |  2 +-
 .../module-naplo/javascript/osztalyozo/dolgozat.jquery.min.js  |  1 +
 4 files changed, 9 insertions(+), 6 deletions(-)

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

diff --git a/mayor-orig/mayor-naplo/log/mayor-naplo.rev b/mayor-orig/mayor-naplo/log/mayor-naplo.rev
index 84bef267..61dcbb9b 100644
--- a/mayor-orig/mayor-naplo/log/mayor-naplo.rev
+++ b/mayor-orig/mayor-naplo/log/mayor-naplo.rev
@@ -1 +1 @@
-4825
+4828
diff --git a/mayor-orig/mayor-naplo/www/policy/private/naplo/orarend/orarend.php b/mayor-orig/mayor-naplo/www/policy/private/naplo/orarend/orarend.php
index 761156cd..c883a0e7 100644
--- a/mayor-orig/mayor-naplo/www/policy/private/naplo/orarend/orarend.php
+++ b/mayor-orig/mayor-naplo/www/policy/private/naplo/orarend/orarend.php
@@ -2,9 +2,11 @@
 
     global $ADAT;
 
-    if ($ADAT['orarendvane']==0)
-	putNincsOrarend();
-    if (is_array($ADAT))
-	putOrarend($ADAT);
+    if ($skin!='ajax' && $ADAT['orarendvane']==0) {
+        putNincsOrarend();
+    }
+    if (is_array($ADAT)) {
+        putOrarend($ADAT);
+    }
 
 ?>
diff --git a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/osztalyozo/dolgozat.phtml b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/osztalyozo/dolgozat.phtml
index 5b26a9b9..744dce31 100644
--- a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/osztalyozo/dolgozat.phtml
+++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/osztalyozo/dolgozat.phtml
@@ -87,7 +87,7 @@
 	echo '</table>';
 
 	echo '<script type="text/javascript" src="https://www.gstatic.com/charts/loader.js"></script>'; 
-	echo '<table align="center" style="width:90%; border: solid 1px #888;">';
+	echo '<table align="center" style="width:90%; border: solid 1px white;">';
 	echo '<tr><th>';
 	    echo '<div id="chart_div""></div>';
 	echo '</th></tr></table>';
diff --git a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/javascript/osztalyozo/dolgozat.jquery.min.js b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/javascript/osztalyozo/dolgozat.jquery.min.js
index 5ec0ede5..9d72dee6 100644
--- a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/javascript/osztalyozo/dolgozat.jquery.min.js
+++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/javascript/osztalyozo/dolgozat.jquery.min.js
@@ -21,6 +21,7 @@ $(function() {
 	});
        var chart = new google.visualization.Calendar(document.getElementById('chart_div'));
        var options = {
+      height:400,
 	    title: "Dolgozatok (terhelés)",
 	    colorAxis: {colors:['cornflowerblue','#ff0000']},
 	    calendar: {
-- 
cgit v1.2.3