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, master has been updated
via ca02215287fdc9025ed489e09ae0619b51fb36a6 (commit)
via 7ff4335b91309e8ad97cec383ec58a4d771aaf14 (commit)
from 213fe40c7470dea48560bf51a66fce6cbc21a12d (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 -----------------------------------------------------------------
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=ca02215287fdc9025ed489e09ae0619b51fb36a6
commit ca02215287fdc9025ed489e09ae0619b51fb36a6
Author: Franck Villaume <[email protected]>
Date: Sat Dec 17 11:13:22 2016 +0100
align button with select box
diff --git a/src/www/reporting/groupadded.php b/src/www/reporting/groupadded.php
index 08d760b..97065e9 100644
--- a/src/www/reporting/groupadded.php
+++ b/src/www/reporting/groupadded.php
@@ -66,7 +66,7 @@ echo $HTML->openForm(array('action' =>
getStringFromServer('PHP_SELF'), 'method'
<td><strong><?php echo _('Type')._(':'); ?></strong><br /><?php echo
report_span_box('SPAN',$SPAN); ?></td>
<td><strong><?php echo _('Start Date')._(':'); ?></strong><br /><?php echo
report_months_box($report, 'start', $start); ?></td>
<td><strong><?php echo _('End Date')._(':'); ?></strong><br /><?php echo
report_months_box($report, 'end', $end); ?></td>
-<td><input type="submit" name="submit" value="<?php echo _('Refresh'); ?>"
/></td>
+<td><br><input type="submit" name="submit" value="<?php echo _('Refresh'); ?>"
/></td>
</tr></table>
<?php
echo $HTML->closeForm();
diff --git a/src/www/reporting/groupcum.php b/src/www/reporting/groupcum.php
index 871242b..41c68ef 100644
--- a/src/www/reporting/groupcum.php
+++ b/src/www/reporting/groupcum.php
@@ -66,7 +66,7 @@ echo $HTML->openForm(array('action' =>
getStringFromServer('PHP_SELF'), 'method'
<td><strong><?php echo _('Type')._(':'); ?></strong><br /><?php echo
report_span_box('SPAN',$SPAN); ?></td>
<td><strong><?php echo _('Start Date')._(':'); ?></strong><br /><?php echo
report_months_box($report, 'start', $start); ?></td>
<td><strong><?php echo _('End Date')._(':'); ?></strong><br /><?php echo
report_months_box($report, 'end', $end); ?></td>
-<td><input type="submit" name="submit" value="<?php echo _('Refresh'); ?>"
/></td>
+<td><br><input type="submit" name="submit" value="<?php echo _('Refresh'); ?>"
/></td>
</tr></table>
<?php
echo $HTML->closeForm();
diff --git a/src/www/reporting/projectact.php b/src/www/reporting/projectact.php
index 96d228d..7e37632 100644
--- a/src/www/reporting/projectact.php
+++ b/src/www/reporting/projectact.php
@@ -71,7 +71,7 @@ echo $HTML->openForm(array('action' =>
getStringFromServer('PHP_SELF'), 'method'
<td><strong><?php echo _('Type')._(':'); ?></strong><br /><?php echo
report_span_box('SPAN',$SPAN); ?></td>
<td><strong><?php echo _('Start Date')._(':'); ?></strong><br /><?php echo
report_months_box($report, 'start', $start); ?></td>
<td><strong><?php echo _('End Date')._(':'); ?></strong><br /><?php echo
report_months_box($report, 'end', $end); ?></td>
-<td><input type="submit" name="submit" value="<?php echo _('Refresh'); ?>"
/></td>
+<td><br><input type="submit" name="submit" value="<?php echo _('Refresh'); ?>"
/></td>
</tr></table>
<?php
echo $HTML->closeForm();
diff --git a/src/www/reporting/projecttime.php
b/src/www/reporting/projecttime.php
index 0363192..05922e3 100644
--- a/src/www/reporting/projecttime.php
+++ b/src/www/reporting/projecttime.php
@@ -81,7 +81,7 @@ echo $HTML->openForm(array('action' =>
getStringFromServer('PHP_SELF'), 'method'
<td><strong><?php echo _('Type')._(':'); ?></strong><br /><?php echo
html_build_select_box_from_arrays($a2,$a,'type',$type,false); ?></td>
<td><strong><?php echo _('Start Date')._(':'); ?></strong><br /><?php echo
report_months_box($report, 'start', $start); ?></td>
<td><strong><?php echo _('End Date')._(':'); ?></strong><br /><?php echo
report_months_box($report, 'end', $end); ?></td>
-<td><input type="submit" name="submit" value="<?php echo _('Refresh'); ?>"
/></td>
+<td><br><input type="submit" name="submit" value="<?php echo _('Refresh'); ?>"
/></td>
</tr></table>
<?php
echo $HTML->closeForm();
diff --git a/src/www/reporting/siteact.php b/src/www/reporting/siteact.php
index f2ffd2f..880dfbf 100644
--- a/src/www/reporting/siteact.php
+++ b/src/www/reporting/siteact.php
@@ -69,7 +69,7 @@ echo $HTML->openForm(array('action' =>
getStringFromServer('PHP_SELF'), 'method'
<td><strong><?php echo _('Type')._(':'); ?></strong><br /><?php echo
report_span_box('SPAN',$SPAN); ?></td>
<td><strong><?php echo _('Start Date')._(':'); ?></strong><br /><?php echo
report_months_box($report, 'start', $start); ?></td>
<td><strong><?php echo _('End Date')._(':'); ?></strong><br /><?php echo
report_months_box($report, 'end', $end); ?></td>
-<td><input type="submit" name="submit" value="<?php echo _('Refresh'); ?>"
/></td>
+<td><br><input type="submit" name="submit" value="<?php echo _('Refresh'); ?>"
/></td>
</tr></table>
<?php
echo $HTML->closeForm();
diff --git a/src/www/reporting/sitetime.php b/src/www/reporting/sitetime.php
index c837e7f..506af3f 100644
--- a/src/www/reporting/sitetime.php
+++ b/src/www/reporting/sitetime.php
@@ -79,7 +79,7 @@ echo $HTML->openForm(array('action' =>
getStringFromServer('PHP_SELF'), 'method'
<td><strong><?php echo _('Type')._(':'); ?></strong><br /><?php echo
html_build_select_box_from_arrays($a2,$a,'type',$type,false); ?></td>
<td><strong><?php echo _('Start Date')._(':'); ?></strong><br /><?php echo
report_months_box($report, 'start', $start); ?></td>
<td><strong><?php echo _('End Date')._(':'); ?></strong><br /><?php echo
report_months_box($report, 'end', $end); ?></td>
-<td>
+<td><br>
<input type="hidden" name="typ" value="<?php echo $typ; ?>" />
<input type="submit" name="submit" value="<?php echo _('Refresh'); ?>"
/>
</td>
diff --git a/src/www/reporting/sitetimebar.php
b/src/www/reporting/sitetimebar.php
index 909c74c..b8b72a0 100644
--- a/src/www/reporting/sitetimebar.php
+++ b/src/www/reporting/sitetimebar.php
@@ -67,7 +67,7 @@ echo $HTML->openForm(array('action' =>
getStringFromServer('PHP_SELF'), 'method'
<table><tr>
<td><strong><?php echo _('Start Date')._(':'); ?></strong><br /><?php echo
report_months_box($report, 'start', $start); ?></td>
<td><strong><?php echo _('End Date')._(':'); ?></strong><br /><?php echo
report_months_box($report, 'end', $end); ?></td>
-<td><input type="submit" name="submit" value="<?php echo _('Refresh'); ?>"
/></td>
+<td><br><input type="submit" name="submit" value="<?php echo _('Refresh'); ?>"
/></td>
</tr></table>
<?php
echo $HTML->closeForm();
diff --git a/src/www/reporting/toolspie.php b/src/www/reporting/toolspie.php
index 22cda0d..466a9bb 100644
--- a/src/www/reporting/toolspie.php
+++ b/src/www/reporting/toolspie.php
@@ -67,7 +67,7 @@ echo $HTML->openForm(array('action' =>
getStringFromServer('PHP_SELF'), 'method'
<td><strong><?php echo _('Trackers')._(':'); ?></strong><br /><?php echo
report_tracker_box('datatype',$datatype); ?></td>
<td><strong><?php echo _('Start Date')._(':'); ?></strong><br /><?php echo
report_months_box($report, 'start', $start); ?></td>
<td><strong><?php echo _('End Date')._(':'); ?></strong><br /><?php echo
report_months_box($report, 'end', $end); ?></td>
-<td><input type="submit" name="submit" value="<?php echo _('Refresh'); ?>"
/></td>
+<td><br><input type="submit" name="submit" value="<?php echo _('Refresh'); ?>"
/></td>
</tr></table>
<?php
echo $HTML->closeForm();
diff --git a/src/www/reporting/useract.php b/src/www/reporting/useract.php
index 6add041..4ba8132 100644
--- a/src/www/reporting/useract.php
+++ b/src/www/reporting/useract.php
@@ -86,7 +86,7 @@ if ($sw) {
$cells[][] = html_e('strong', array(),
_('Type')._(':').html_e('br').report_span_box('SPAN', $SPAN));
$cells[][] = html_e('strong', array(), _('Start
Date')._(':').html_e('br').report_months_box($report, 'start', $start));
$cells[][] = html_e('strong', array(), _('End
Date')._(':').html_e('br').report_months_box($report, 'end', $end));
- $cells[][] = html_e('input', array('type' => 'submit', 'name' =>
'submit', 'value' => _('Refresh')));
+ $cells[][] = html_e('br').html_e('input', array('type' => 'submit',
'name' => 'submit', 'value' => _('Refresh')));
echo $HTML->multiTableRow(array(), $cells);
echo $HTML->listTableBottom();
echo $HTML->closeForm();
diff --git a/src/www/reporting/useradded.php b/src/www/reporting/useradded.php
index b32e0f6..0774cd5 100644
--- a/src/www/reporting/useradded.php
+++ b/src/www/reporting/useradded.php
@@ -66,7 +66,7 @@ echo $HTML->openForm(array('action' =>
getStringFromServer('PHP_SELF'), 'method'
<td><strong><?php echo _('Type')._(':'); ?></strong><br /><?php echo
report_span_box('SPAN',$SPAN); ?></td>
<td><strong><?php echo _('Start Date')._(':'); ?></strong><br /><?php echo
report_months_box($report, 'start', $start); ?></td>
<td><strong><?php echo _('End Date')._(':'); ?></strong><br /><?php echo
report_months_box($report, 'end', $end); ?></td>
-<td><input type="submit" name="submit" value="<?php echo _('Refresh'); ?>"
/></td>
+<td><br><input type="submit" name="submit" value="<?php echo _('Refresh'); ?>"
/></td>
</tr></table>
<?php
echo $HTML->closeForm();
diff --git a/src/www/reporting/usercum.php b/src/www/reporting/usercum.php
index 60096b0..44e7422 100644
--- a/src/www/reporting/usercum.php
+++ b/src/www/reporting/usercum.php
@@ -64,7 +64,7 @@ echo $HTML->openForm(array('action' =>
getStringFromServer('PHP_SELF'), 'method'
<td><strong><?php echo _('Type')._(':'); ?></strong><br /><?php echo
report_span_box('SPAN',$SPAN); ?></td>
<td><strong><?php echo _('Start Date')._(':'); ?></strong><br /><?php echo
report_months_box($report, 'start', $start); ?></td>
<td><strong><?php echo _('End Date')._(':'); ?></strong><br /><?php echo
report_months_box($report, 'end', $end); ?></td>
-<td><input type="submit" name="submit" value="<?php echo _('Refresh'); ?>"
/></td>
+<td><br><input type="submit" name="submit" value="<?php echo _('Refresh'); ?>"
/></td>
</tr></table>
<?php
echo $HTML->closeForm();
diff --git a/src/www/reporting/usersummary.php
b/src/www/reporting/usersummary.php
index a103a0e..7082268 100644
--- a/src/www/reporting/usersummary.php
+++ b/src/www/reporting/usersummary.php
@@ -73,7 +73,7 @@ report_header(_('User Summary Report'));
<td><strong><?php echo _('Start Date')._(':');
?></strong><br /><?php echo report_weeks_box($report, 'start', $start); ?></td>
<td><strong><?php echo _('End Date')._(':');
?></strong><br /><?php echo report_weeks_box($report, 'end', $end); ?></td>
<td><strong><?php echo _('Task Status')._(':');
?></strong><br /><?php echo
html_build_select_box_from_arrays($l,$n,'tstat',$tstat,false); ?></td>
- <td><input type="submit" name="submit" value="<?php
echo _('Refresh'); ?>" /></td>
+ <td><br><input type="submit" name="submit" value="<?php
echo _('Refresh'); ?>" /></td>
</tr>
</table>
<?php
diff --git a/src/www/reporting/usertime.php b/src/www/reporting/usertime.php
index 4b3c7aa..5f5ca7b 100644
--- a/src/www/reporting/usertime.php
+++ b/src/www/reporting/usertime.php
@@ -96,7 +96,7 @@ if ($sw) {
<td><strong><?php echo _('Type')._(':'); ?></strong><br /><?php echo
html_build_select_box_from_arrays($a2,$a,'type',$type,false); ?></td>
<td><strong><?php echo _('Start Date')._(':'); ?></strong><br /><?php
echo report_months_box($report, 'start', $start); ?></td>
<td><strong><?php echo _('End Date')._(':'); ?></strong><br /><?php
echo report_months_box($report, 'end', $end); ?></td>
- <td><input type="submit" name="submit" value="<?php echo _('Refresh');
?>" /></td>
+ <td><br><input type="submit" name="submit" value="<?php echo
_('Refresh'); ?>" /></td>
</tr></table>
<?php
echo $HTML->closeForm();
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=7ff4335b91309e8ad97cec383ec58a4d771aaf14
commit 7ff4335b91309e8ad97cec383ec58a4d771aaf14
Author: Franck Villaume <[email protected]>
Date: Sat Dec 17 11:06:34 2016 +0100
fix weekly report. use the correct array to find the value to display
diff --git a/src/common/reporting/report_utils.php
b/src/common/reporting/report_utils.php
index ca0d5f2..d29202e 100644
--- a/src/common/reporting/report_utils.php
+++ b/src/common/reporting/report_utils.php
@@ -520,7 +520,7 @@ function report_graph($type, $SPAN, $start, $end) {
}
for ($j = 0; $j < count($timeStampArr); $j++) {
if (in_array($timeStampArrFormat[$j],
$wrdates)) {
- $thekey =
array_search($timeStampArr[$j], $wrdates);
+ $thekey =
array_search($timeStampArr[$j], $rdates);
if (isset($ydata[$z][$thekey]))
{
if ($ydata[$z][$thekey]
=== false) {
$ydata[$z][$thekey] = 0;
-----------------------------------------------------------------------
Summary of changes:
src/common/reporting/report_utils.php | 2 +-
src/www/reporting/groupadded.php | 2 +-
src/www/reporting/groupcum.php | 2 +-
src/www/reporting/projectact.php | 2 +-
src/www/reporting/projecttime.php | 2 +-
src/www/reporting/siteact.php | 2 +-
src/www/reporting/sitetime.php | 2 +-
src/www/reporting/sitetimebar.php | 2 +-
src/www/reporting/toolspie.php | 2 +-
src/www/reporting/useract.php | 2 +-
src/www/reporting/useradded.php | 2 +-
src/www/reporting/usercum.php | 2 +-
src/www/reporting/usersummary.php | 2 +-
src/www/reporting/usertime.php | 2 +-
14 files changed, 14 insertions(+), 14 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
