This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "FusionForge".
The branch, 6.0 has been updated
via 4ac208d21703ec401742ecdb79cf3a0c804cfe40 (commit)
via ced16c3e272801131164d8aae66381352a76bf3a (commit)
from d178a73a0e61150462f1770a31ad84e4837f0252 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 4ac208d21703ec401742ecdb79cf3a0c804cfe40
Author: Franck Villaume <[email protected]>
Date: Sun May 24 17:36:43 2015 +0200
fix html_chartid function
diff --git a/src/common/reporting/report_utils.php
b/src/common/reporting/report_utils.php
index 88e1b99..33ac43c 100644
--- a/src/common/reporting/report_utils.php
+++ b/src/common/reporting/report_utils.php
@@ -5,7 +5,7 @@
* Copyright 2003-2004, Tim Perdue/GForge, LLC
* Copyright 2009, Roland Mas
* Copyright (C) 2010 Alain Peyrat - Alcatel-Lucent
- * Copyright 2013,2014 Franck Villaume - TrivialDev
+ * Copyright 2013,2015 Franck Villaume - TrivialDev
*
* This file is part of FusionForge. FusionForge is free software;
* you can redistribute it and/or modify it under the terms of the
@@ -586,7 +586,7 @@ function report_graph($type, $SPAN, $start, $end) {
plot'.$chartid.'.replot( { resetAxes: true } );
});'."\n";
echo '//]]></script>';
- echo $HTML->html_chartid($chartid, $label[0].' ('.date(_('Y-m-d'),
$start).' - '.date(_('Y-m-d'), $end).')');
+ echo $HTML->html_chartid('chart'.$chartid, $label[0].'
('.date(_('Y-m-d'), $start).' - '.date(_('Y-m-d'), $end).')');
return true;
}
@@ -874,7 +874,7 @@ function report_actgraph($type, $SPAN, $start, $end, $id,
$area) {
plot'.$chartid.'.replot();
});'."\n";
echo '//]]></script>';
- echo $HTML->html_chartid($chartid, $areaname.' ('.date(_('Y-m-d'),
$start).' - '.date(_('Y-m-d'), $end).')');
+ echo $HTML->html_chartid('chart'.$chartid, $areaname.'
('.date(_('Y-m-d'), $start).' - '.date(_('Y-m-d'), $end).')');
return true;
}
@@ -976,7 +976,7 @@ function report_toolspiegraph($datatype = 0, $start, $end) {
plot'.$chartid.'.replot( { resetAxes: true } );
});'."\n";
echo '//]]></script>';
- echo $HTML->html_chartid($chartid, $arr[$datatype].'
('.date(_('Y-m-d'), $start).' - '.date(_('Y-m-d'), $end).')');
+ echo $HTML->html_chartid('chart'.$chartid, $arr[$datatype].'
('.date(_('Y-m-d'), $start).' - '.date(_('Y-m-d'), $end).')');
} else {
echo $HTML->information(_('No data to display.'));
}
@@ -1040,7 +1040,7 @@ function report_timegraph($type = 'site', $area =
'tasks', $start, $end, $id = 0
plot'.$chartid.'.replot( { resetAxes: true } );
});'."\n";
echo '//]]></script>';
- echo $HTML->html_chartid($chartid, $arr[$area].'
('.date(_('Y-m-d'), $start).' - '.date(_('Y-m-d'), $end).')');
+ echo $HTML->html_chartid('chart'.$chartid, $arr[$area].'
('.date(_('Y-m-d'), $start).' - '.date(_('Y-m-d'), $end).')');
} else {
echo $HTML->information(_('No data to display.'));
}
@@ -1143,7 +1143,7 @@ function report_sitetimebargraph($start, $end) {
plot'.$chartid.'.replot();
});'."\n";
echo '//]]></script>';
- echo $HTML->html_chartid($chartid, $areaname.'
('.date(_('Y-m-d'), $start).' - '.date(_('Y-m-d'), $end).')');
+ echo $HTML->html_chartid('chart'.$chartid, $areaname.'
('.date(_('Y-m-d'), $start).' - '.date(_('Y-m-d'), $end).')');
} else {
echo $HTML->information(_('No data to display.'));
}
@@ -1235,7 +1235,7 @@ function report_pm_hbar($id, $values, $ticks, $labels,
$stackSeries = false) {
plot'.$id.'.replot();
});'."\n";
echo '//]]></script>';
- echo $HTML->html_chartid($chartid);
+ echo $HTML->html_chartid('chart'.$id);
}
// Local Variables:
diff --git a/src/www/include/Layout.class.php b/src/www/include/Layout.class.php
index 8ccee7e3..afa9461 100644
--- a/src/www/include/Layout.class.php
+++ b/src/www/include/Layout.class.php
@@ -8,7 +8,7 @@
* Copyright 2010-2012, Alain Peyrat - Alcatel-Lucent
* Copyright © 2011 Thorsten Glaser – tarent GmbH
* Copyright 2011 - Marc-Etienne Vargenau, Alcatel-Lucent
- * Copyright 2012-2014, Franck Villaume - TrivialDev
+ * Copyright 2012-2015, Franck Villaume - TrivialDev
* http://fusionforge.org
*
* This file is part of FusionForge. FusionForge is free software;
@@ -1504,10 +1504,10 @@ if (isset($params['group']) && $params['group']) {
* @param string $figcaption_title title of the chart
* @return string
*/
- function html_chartid($chart_id = 0, $figcaption_title = '') {
+ function html_chartid($chart_id = 'chart0', $figcaption_title = '') {
$htmlcode = html_ao('figure');
- $htmlcode .= html_e('figcaption', array(), $figcaption_title);
- $htmlcode .= html_ao('div', array('id' => 'chart'.$chart_id));
+ $htmlcode .= html_e('figcaption', array(), $figcaption_title,
false);
+ $htmlcode .= html_ao('div', array('id' => $chart_id));
$htmlcode .= html_ac(html_ap() -2);
return $htmlcode;
}
diff --git a/src/www/scm/include/scm_utils.php
b/src/www/scm/include/scm_utils.php
index dba0dcc..0689ff0 100644
--- a/src/www/scm/include/scm_utils.php
+++ b/src/www/scm/include/scm_utils.php
@@ -5,7 +5,7 @@
* Copyright 2004-2005 (c) GForge LLC, Tim Perdue
* Copyright 2010 (c), Franck Villaume - Capgemini
* Copyright (C) 2010-2011 Alain Peyrat - Alcatel-Lucent
- * Copyright 2012-2014, Franck Villaume - TrivialDev
+ * Copyright 2012-2015, Franck Villaume - TrivialDev
* http://fusionforge.org
*
* This file is part of FusionForge. FusionForge is free software;
@@ -194,7 +194,7 @@ function commitstime_graph($group_id, $chartid) {
plot'.$chartid.'.replot();
});'."\n";
echo '//]]></script>';
- echo $HTML->html_chartid($chartid);
+ echo $HTML->html_chartid('chart'.$chartid);
}
function commits_graph($group_id, $days, $chartid) {
@@ -258,7 +258,7 @@ function commits_graph($group_id, $days, $chartid) {
plot'.$chartid.'.replot( { resetAxes: true } );
});'."\n";
echo '//]]></script>';
- echo $HTML->html_chartid($chartid);
+ echo $HTML->html_chartid('chart'.$chartid);
} else {
echo $HTML->information(_('No commits during this period.'));
}
commit ced16c3e272801131164d8aae66381352a76bf3a
Author: Franck Villaume <[email protected]>
Date: Sun May 24 17:35:56 2015 +0200
indent
diff --git a/src/www/include/html.php b/src/www/include/html.php
index 2591990..9a5e499 100644
--- a/src/www/include/html.php
+++ b/src/www/include/html.php
@@ -6,7 +6,7 @@
* Copyright 2010 (c) FusionForge Team
* Copyright (C) 2010-2012 Alain Peyrat - Alcatel-Lucent
* Copyright 2011, Franck Villaume - Capgemini
- * Copyright 2011-2014, Franck Villaume - TrivialDev
+ * Copyright 2011-2015, Franck Villaume - TrivialDev
* Copyright © 2011, 2012
* Thorsten “mirabilos” Glaser <[email protected]>
*
@@ -1128,17 +1128,17 @@ function html_eo($name, $attrs = array()) {
* @param string $name
* element name
* @param array $attrs
- * (optional) associative array of element attributes
+ * (optional) associative array of element attributes
* values: arrays are space-imploded;
* false values and empty arrays ignored
* @param string $content
* (optional) XHTML to be placed inside
* @param bool $shortform
- * (optional) allow short open-close form
- * (default: true)
- * @param bool $indent
- * (optional) indent output; disable if extra spacing breaks the rendering
- * (default: true)
+ * (optional) allow short open-close form
+ * (default: true)
+ * @param bool $indent
+ * (optional) indent output; disable if extra spacing
breaks the rendering
+ * (default: true)
* @return string
* XHTML string suitable for echo'ing
*/
-----------------------------------------------------------------------
Summary of changes:
src/common/reporting/report_utils.php | 14 +++++++-------
src/www/include/Layout.class.php | 8 ++++----
src/www/include/html.php | 14 +++++++-------
src/www/scm/include/scm_utils.php | 6 +++---
4 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/src/common/reporting/report_utils.php
b/src/common/reporting/report_utils.php
index 88e1b99..33ac43c 100644
--- a/src/common/reporting/report_utils.php
+++ b/src/common/reporting/report_utils.php
@@ -5,7 +5,7 @@
* Copyright 2003-2004, Tim Perdue/GForge, LLC
* Copyright 2009, Roland Mas
* Copyright (C) 2010 Alain Peyrat - Alcatel-Lucent
- * Copyright 2013,2014 Franck Villaume - TrivialDev
+ * Copyright 2013,2015 Franck Villaume - TrivialDev
*
* This file is part of FusionForge. FusionForge is free software;
* you can redistribute it and/or modify it under the terms of the
@@ -586,7 +586,7 @@ function report_graph($type, $SPAN, $start, $end) {
plot'.$chartid.'.replot( { resetAxes: true } );
});'."\n";
echo '//]]></script>';
- echo $HTML->html_chartid($chartid, $label[0].' ('.date(_('Y-m-d'),
$start).' - '.date(_('Y-m-d'), $end).')');
+ echo $HTML->html_chartid('chart'.$chartid, $label[0].'
('.date(_('Y-m-d'), $start).' - '.date(_('Y-m-d'), $end).')');
return true;
}
@@ -874,7 +874,7 @@ function report_actgraph($type, $SPAN, $start, $end, $id,
$area) {
plot'.$chartid.'.replot();
});'."\n";
echo '//]]></script>';
- echo $HTML->html_chartid($chartid, $areaname.' ('.date(_('Y-m-d'),
$start).' - '.date(_('Y-m-d'), $end).')');
+ echo $HTML->html_chartid('chart'.$chartid, $areaname.'
('.date(_('Y-m-d'), $start).' - '.date(_('Y-m-d'), $end).')');
return true;
}
@@ -976,7 +976,7 @@ function report_toolspiegraph($datatype = 0, $start, $end) {
plot'.$chartid.'.replot( { resetAxes: true } );
});'."\n";
echo '//]]></script>';
- echo $HTML->html_chartid($chartid, $arr[$datatype].'
('.date(_('Y-m-d'), $start).' - '.date(_('Y-m-d'), $end).')');
+ echo $HTML->html_chartid('chart'.$chartid, $arr[$datatype].'
('.date(_('Y-m-d'), $start).' - '.date(_('Y-m-d'), $end).')');
} else {
echo $HTML->information(_('No data to display.'));
}
@@ -1040,7 +1040,7 @@ function report_timegraph($type = 'site', $area =
'tasks', $start, $end, $id = 0
plot'.$chartid.'.replot( { resetAxes: true } );
});'."\n";
echo '//]]></script>';
- echo $HTML->html_chartid($chartid, $arr[$area].'
('.date(_('Y-m-d'), $start).' - '.date(_('Y-m-d'), $end).')');
+ echo $HTML->html_chartid('chart'.$chartid, $arr[$area].'
('.date(_('Y-m-d'), $start).' - '.date(_('Y-m-d'), $end).')');
} else {
echo $HTML->information(_('No data to display.'));
}
@@ -1143,7 +1143,7 @@ function report_sitetimebargraph($start, $end) {
plot'.$chartid.'.replot();
});'."\n";
echo '//]]></script>';
- echo $HTML->html_chartid($chartid, $areaname.'
('.date(_('Y-m-d'), $start).' - '.date(_('Y-m-d'), $end).')');
+ echo $HTML->html_chartid('chart'.$chartid, $areaname.'
('.date(_('Y-m-d'), $start).' - '.date(_('Y-m-d'), $end).')');
} else {
echo $HTML->information(_('No data to display.'));
}
@@ -1235,7 +1235,7 @@ function report_pm_hbar($id, $values, $ticks, $labels,
$stackSeries = false) {
plot'.$id.'.replot();
});'."\n";
echo '//]]></script>';
- echo $HTML->html_chartid($chartid);
+ echo $HTML->html_chartid('chart'.$id);
}
// Local Variables:
diff --git a/src/www/include/Layout.class.php b/src/www/include/Layout.class.php
index 8ccee7e3..afa9461 100644
--- a/src/www/include/Layout.class.php
+++ b/src/www/include/Layout.class.php
@@ -8,7 +8,7 @@
* Copyright 2010-2012, Alain Peyrat - Alcatel-Lucent
* Copyright © 2011 Thorsten Glaser – tarent GmbH
* Copyright 2011 - Marc-Etienne Vargenau, Alcatel-Lucent
- * Copyright 2012-2014, Franck Villaume - TrivialDev
+ * Copyright 2012-2015, Franck Villaume - TrivialDev
* http://fusionforge.org
*
* This file is part of FusionForge. FusionForge is free software;
@@ -1504,10 +1504,10 @@ if (isset($params['group']) && $params['group']) {
* @param string $figcaption_title title of the chart
* @return string
*/
- function html_chartid($chart_id = 0, $figcaption_title = '') {
+ function html_chartid($chart_id = 'chart0', $figcaption_title = '') {
$htmlcode = html_ao('figure');
- $htmlcode .= html_e('figcaption', array(), $figcaption_title);
- $htmlcode .= html_ao('div', array('id' => 'chart'.$chart_id));
+ $htmlcode .= html_e('figcaption', array(), $figcaption_title,
false);
+ $htmlcode .= html_ao('div', array('id' => $chart_id));
$htmlcode .= html_ac(html_ap() -2);
return $htmlcode;
}
diff --git a/src/www/include/html.php b/src/www/include/html.php
index 2591990..9a5e499 100644
--- a/src/www/include/html.php
+++ b/src/www/include/html.php
@@ -6,7 +6,7 @@
* Copyright 2010 (c) FusionForge Team
* Copyright (C) 2010-2012 Alain Peyrat - Alcatel-Lucent
* Copyright 2011, Franck Villaume - Capgemini
- * Copyright 2011-2014, Franck Villaume - TrivialDev
+ * Copyright 2011-2015, Franck Villaume - TrivialDev
* Copyright © 2011, 2012
* Thorsten “mirabilos” Glaser <[email protected]>
*
@@ -1128,17 +1128,17 @@ function html_eo($name, $attrs = array()) {
* @param string $name
* element name
* @param array $attrs
- * (optional) associative array of element attributes
+ * (optional) associative array of element attributes
* values: arrays are space-imploded;
* false values and empty arrays ignored
* @param string $content
* (optional) XHTML to be placed inside
* @param bool $shortform
- * (optional) allow short open-close form
- * (default: true)
- * @param bool $indent
- * (optional) indent output; disable if extra spacing breaks the rendering
- * (default: true)
+ * (optional) allow short open-close form
+ * (default: true)
+ * @param bool $indent
+ * (optional) indent output; disable if extra spacing
breaks the rendering
+ * (default: true)
* @return string
* XHTML string suitable for echo'ing
*/
diff --git a/src/www/scm/include/scm_utils.php
b/src/www/scm/include/scm_utils.php
index dba0dcc..0689ff0 100644
--- a/src/www/scm/include/scm_utils.php
+++ b/src/www/scm/include/scm_utils.php
@@ -5,7 +5,7 @@
* Copyright 2004-2005 (c) GForge LLC, Tim Perdue
* Copyright 2010 (c), Franck Villaume - Capgemini
* Copyright (C) 2010-2011 Alain Peyrat - Alcatel-Lucent
- * Copyright 2012-2014, Franck Villaume - TrivialDev
+ * Copyright 2012-2015, Franck Villaume - TrivialDev
* http://fusionforge.org
*
* This file is part of FusionForge. FusionForge is free software;
@@ -194,7 +194,7 @@ function commitstime_graph($group_id, $chartid) {
plot'.$chartid.'.replot();
});'."\n";
echo '//]]></script>';
- echo $HTML->html_chartid($chartid);
+ echo $HTML->html_chartid('chart'.$chartid);
}
function commits_graph($group_id, $days, $chartid) {
@@ -258,7 +258,7 @@ function commits_graph($group_id, $days, $chartid) {
plot'.$chartid.'.replot( { resetAxes: true } );
});'."\n";
echo '//]]></script>';
- echo $HTML->html_chartid($chartid);
+ echo $HTML->html_chartid('chart'.$chartid);
} else {
echo $HTML->information(_('No commits during this period.'));
}
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
