From 2fa3485e5ecc0bb188c5ff5fdc40883aaf5f7cfd Mon Sep 17 00:00:00 2001
From: zarzuelo <noreply@pandorafms.org>
Date: Tue, 3 Jun 2014 08:39:39 +0000
Subject: [PATCH] 2014-06-03 Sergio Martin <sergio.martin@artica.es>
* general/news_dialog.php: Fix a bug in modal window news that
did incompatible with "first time" modal help
* include/graphs/functions_gd.php: Add a white background to the
progress bars
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10087 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
---
pandora_console/ChangeLog | 8 ++++++++
pandora_console/general/news_dialog.php | 4 ++--
pandora_console/include/graphs/functions_gd.php | 12 +++++-------
3 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index dfd0bddd55..e809f8c6b0 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,11 @@
+2014-06-03 Sergio Martin <sergio.martin@artica.es>
+
+ * general/news_dialog.php: Fix a bug in modal window news that
+ did incompatible with "first time" modal help
+
+ * include/graphs/functions_gd.php: Add a white background to the
+ progress bars
+
2014-06-03 Junichi Satoh <junichi@rworks.jp>
* godmode/agentes/module_manager_editor_common.php: Changed to disable
diff --git a/pandora_console/general/news_dialog.php b/pandora_console/general/news_dialog.php
index 1847a0fdc8..9c8f62b541 100644
--- a/pandora_console/general/news_dialog.php
+++ b/pandora_console/general/news_dialog.php
@@ -50,7 +50,7 @@ echo '<div id="news_dialog" title="" style="display: none;">';
echo '<div style="position:absolute; margin: 0 auto; top: 340px; right: 10px; width: 570px">';
echo '<div style="float: right; width: 20%;">';
- html_print_submit_button("Ok", 'hide-login-help', false, 'class="ui-button-dialog ui-widget ui-state-default ui-corner-all ui-button-text-only sub ok" style="width:100px;"');
+ html_print_submit_button("Ok", 'hide-news-help', false, 'class="ui-button-dialog ui-widget ui-state-default ui-corner-all ui-button-text-only sub ok" style="width:100px;"');
echo '</div>';
echo '</div>';
@@ -93,7 +93,7 @@ $(document).ready (function () {
}
}
- $("#submit-hide-login-help").click (function () {
+ $("#submit-hide-news-help").click (function () {
$("#news_dialog" ).dialog('close');
inew++;
show_new ();
diff --git a/pandora_console/include/graphs/functions_gd.php b/pandora_console/include/graphs/functions_gd.php
index 8717b22331..f0804cc60b 100755
--- a/pandora_console/include/graphs/functions_gd.php
+++ b/pandora_console/include/graphs/functions_gd.php
@@ -201,7 +201,6 @@ function gd_progress_bubble ($width, $height, $progress, $title, $font, $out_of_
//colors
$back = ImageColorAllocate($image,255,255,255);
- imagecolortransparent ($image, $back);
$black = ImageColorAllocate($image,0,0,0);
$red = ImageColorAllocate($image,255,60,75);
@@ -298,7 +297,7 @@ function gd_progress_bar ($width, $height, $progress, $title, $font, $out_of_lim
//colors
$back = ImageColorAllocate($image,255,255,255);
- imagecolortransparent ($image, $back);
+
$bordercolor = ImageColorAllocate($image,174,174,174);
$text = ImageColorAllocate($image,74,74,74);
$red = ImageColorAllocate($image,255,60,75);
@@ -316,9 +315,7 @@ function gd_progress_bar ($width, $height, $progress, $title, $font, $out_of_lim
$soft_red_border = ImageColorAllocate($image,255, 154, 84);
$other_red = ImageColorAllocate($image,239, 141, 122);
$other_red_border = ImageColorAllocate($image,255, 112, 86);
-
- ImageRectangleWithRoundedCorners($image,0,0,$width-1,$height-1,$radius,$back,false);
-
+
$x1 = 1;
$y1 = 1;
$x2 = $ratingbar;
@@ -393,8 +390,9 @@ function gd_progress_bar ($width, $height, $progress, $title, $font, $out_of_lim
}
if ($bordercolor !== false) {
- $x1-=1;
- $x2 = $width-2;
+ $x1--;
+ $x2 = $width-1;
+ $y1--;
imageline($image, $x1+$radius, $y1, $x2-$radius, $y1, $bordercolor);
imageline($image, $x1+$radius, $y2, $x2-$radius, $y2, $bordercolor);
imageline($image, $x1, $y1+$radius, $x1, $y2-$radius, $bordercolor);