aboutsummaryrefslogtreecommitdiffstats
path: root/mayor-orig/mayor-naplo/www
diff options
context:
space:
mode:
Diffstat (limited to 'mayor-orig/mayor-naplo/www')
-rw-r--r--mayor-orig/mayor-naplo/www/policy/private/naplo/orarend/orarend.php10
-rw-r--r--mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/osztalyozo/dolgozat.phtml2
-rw-r--r--mayor-orig/mayor-naplo/www/skin/classic/module-naplo/javascript/osztalyozo/dolgozat.jquery.min.js1
3 files changed, 8 insertions, 5 deletions
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: {