[Fusionforge-commits] FusionForge branch Branch_5_3 updated. b37e3c6855f6f50ce68f2cf6f289665004a42303

Franck Villaume nerville at fusionforge.org
Tue Mar 25 14:04:50 CET 2014


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, Branch_5_3 has been updated
       via  b37e3c6855f6f50ce68f2cf6f289665004a42303 (commit)
      from  979084df683701aa898f751b4f98c5b787541441 (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 b37e3c6855f6f50ce68f2cf6f289665004a42303
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Tue Mar 25 14:04:16 2014 +0100

    fix html syntax, fix php warning

diff --git a/src/www/reporting/groupadded.php b/src/www/reporting/groupadded.php
index a28e2eb..bed2aa7 100644
--- a/src/www/reporting/groupadded.php
+++ b/src/www/reporting/groupadded.php
@@ -68,11 +68,10 @@ report_header(_('Projects Added'));
 <td><input type="submit" name="submit" value="<?php echo _('Refresh'); ?>" /></td>
 </tr></table>
 </form>
-<?php if ($start != $end) { ?>
-	<p>
-	<?php report_graph('groupadded', $SPAN, $start, $end); ?>
-	</p>
-<?php }
+<?php
+if ($start != $end) {
+	report_graph('groupadded', $SPAN, $start, $end);
+}
 
 report_footer();
 
diff --git a/src/www/reporting/groupcum.php b/src/www/reporting/groupcum.php
index d735341..b81abb5 100644
--- a/src/www/reporting/groupcum.php
+++ b/src/www/reporting/groupcum.php
@@ -68,11 +68,10 @@ report_header(_('Cumulative Projects'));
 <td><input type="submit" name="submit" value="<?php echo _('Refresh'); ?>" /></td>
 </tr></table>
 </form>
-<?php if ($start != $end) { ?>
-	<p>
-	<?php report_graph('groupcumul', $SPAN, $start, $end); ?>
-	</p>
-<?php }
+<?php
+if ($start != $end) {
+	report_graph('groupcumul', $SPAN, $start, $end);
+}
 
 report_footer();
 
diff --git a/src/www/reporting/projectact.php b/src/www/reporting/projectact.php
index fa98a27..891dce4 100644
--- a/src/www/reporting/projectact.php
+++ b/src/www/reporting/projectact.php
@@ -74,12 +74,9 @@ report_header(_('Project Activity'));
 <td><input type="submit" name="submit" value="<?php echo _('Refresh'); ?>" /></td>
 </tr></table>
 </form>
-<?php if ($g_id && $start != $end) { ?>
-	<p>
-	<?php report_actgraph('project', $SPAN, $start, $end, $g_id, $area); ?>
-	</p>
-	<?php
-
+<?php
+if ($g_id && $start != $end) {
+	report_actgraph('project', $SPAN, $start, $end, $g_id, $area);
 }
 
 report_footer();
diff --git a/src/www/reporting/projecttime.php b/src/www/reporting/projecttime.php
index 90500a0..ac32c3b 100644
--- a/src/www/reporting/projecttime.php
+++ b/src/www/reporting/projecttime.php
@@ -84,29 +84,24 @@ $a2[]='user';
 </tr></table>
 </form>
 <?php
-	if ($g_id && $typ=='r') {
-		$report=new ReportProjectTime($g_id,$type,$start,$end);
+if ($g_id && $typ=='r') {
+	$report=new ReportProjectTime($g_id,$type,$start,$end);
 
-		$labels = $report->labels;
-	    $data = $report->getData();
+	$labels = $report->labels;
+	$data = $report->getData();
 
-	    echo $HTML->listTableTop (array(_('Type'),
-	    		_('Time')));
-
-	    for ($i=0; $i<count($labels); $i++) {
+	echo $HTML->listTableTop (array(_('Type'),
+		_('Time')));
 
+	for ($i=0; $i<count($labels); $i++) {
 		echo '<tr '. $HTML->boxGetAltRowStyle($i) .'>'.
-			'<td>'. $labels[$i] .'</td><td>'. $data[$i] .'</td></tr>';
-	    }
-
-	    echo $HTML->listTableBottom ();
+		'<td>'. $labels[$i] .'</td><td>'. $data[$i] .'</td></tr>';
+	}
 
-	} elseif ($g_id && $start != $end) { ?>
-	<p>
-	<?php report_timegraph('project', $type, $start, $end, $g_id); ?>
-	</p>
-	<?php
+	echo $HTML->listTableBottom ();
 
+} elseif ($g_id && $start != $end) {
+	report_timegraph('project', $type, $start, $end, $g_id);
 }
 
 report_footer();
diff --git a/src/www/reporting/siteact.php b/src/www/reporting/siteact.php
index 1b53b35..bef2dd5 100644
--- a/src/www/reporting/siteact.php
+++ b/src/www/reporting/siteact.php
@@ -74,12 +74,9 @@ report_header(_('Site-Wide Activity'));
 <td><input type="submit" name="submit" value="<?php echo _('Refresh'); ?>" /></td>
 </tr></table>
 </form>
-<?php if ($area && $start != $end) { ?>
-	<p>
-	<?php report_actgraph('sitewide', $SPAN, $start, $end, 0, $area); ?>
-	</p>
-	<?php
-
+<?php
+if ($area && $start != $end) {
+	report_actgraph('sitewide', $SPAN, $start, $end, 0, $area);
 }
 
 report_footer();
diff --git a/src/www/reporting/sitetime.php b/src/www/reporting/sitetime.php
index f925fa0..5f54db1 100644
--- a/src/www/reporting/sitetime.php
+++ b/src/www/reporting/sitetime.php
@@ -36,7 +36,7 @@ if ($report->isError()) {
 }
 
 $typ = getStringFromRequest('typ');
-$type = getStringFromRequest('type');
+$type = getStringFromRequest('type', 'tasks');
 $start = getIntFromRequest('start');
 $end = getIntFromRequest('end');
 
@@ -99,11 +99,8 @@ if ($typ =='r') {
 	}
 
 	echo $HTML->listTableBottom ();
-} elseif ($start != $end) { ?>
-<p>
-<?php report_timegraph('site', $type, $start, $end); ?>
-</p>
-<?php
+} elseif ($start != $end) {
+	report_timegraph('site', $type, $start, $end);
 }
 report_footer();
 
diff --git a/src/www/reporting/sitetimebar.php b/src/www/reporting/sitetimebar.php
index 95ea7b0..771d5ee 100644
--- a/src/www/reporting/sitetimebar.php
+++ b/src/www/reporting/sitetimebar.php
@@ -104,16 +104,8 @@ if ($typ=='r') {
 
 	echo $HTML->listTableBottom ();
 
-} elseif ($start != $end) { ?>
-	<p>
-	<?php
-		report_sitetimebargraph($start, $end);
-	?>
-	<noscript>
-	<img src="sitetimebar_graph.php?<?php echo "start=$start&end=$end"; ?>"  alt="" />
-	</noscript>
-	</p>
-	<?php
+} elseif ($start != $end) {
+	report_sitetimebargraph($start, $end);
 }
 
 report_footer();
diff --git a/src/www/reporting/toolspie.php b/src/www/reporting/toolspie.php
index bdc8220..5145b0f 100644
--- a/src/www/reporting/toolspie.php
+++ b/src/www/reporting/toolspie.php
@@ -68,11 +68,10 @@ report_header(_('Tool Pie Graphs'));
 <td><input type="submit" name="submit" value="<?php echo _('Refresh'); ?>" /></td>
 </tr></table>
 </form>
-<?php if ($start != $end) { ?>
-<p>
-<?php report_toolspiegraph($datatype, $start, $end); ?>
-</p>
-<?php }
+<?php
+if ($start != $end) {
+	report_toolspiegraph($datatype, $start, $end);
+}
 
 report_footer();
 
diff --git a/src/www/reporting/useract.php b/src/www/reporting/useract.php
index cea38da..d5ee42f 100644
--- a/src/www/reporting/useract.php
+++ b/src/www/reporting/useract.php
@@ -89,14 +89,10 @@ if ($sw) {
 	<td><input type="submit" name="submit" value="<?php echo _('Refresh'); ?>" /></td>
 	</tr></table>
 	</form>
-	<?php if ($dev_id && $start != $end) { ?>
-		<p>
-		<?php report_actgraph('user', $SPAN, $start, $end, $dev_id, $area); ?>
-		</p>
-		<?php
-
+	<?php
+	if ($dev_id && $start != $end) {
+		report_actgraph('user', $SPAN, $start, $end, $dev_id, $area);
 	}
-
 }
 
 report_footer();
diff --git a/src/www/reporting/useradded.php b/src/www/reporting/useradded.php
index c8b7457..ea75943 100644
--- a/src/www/reporting/useradded.php
+++ b/src/www/reporting/useradded.php
@@ -67,11 +67,10 @@ report_header(_('Users Added'));
 <td><input type="submit" name="submit" value="<?php echo _('Refresh'); ?>" /></td>
 </tr></table>
 </form>
-<?php if ($start != $end) { ?>
-	<p>
-	<?php report_graph('useradded', $SPAN, $start, $end); ?>
-	</p>
-<?php }
+<?php
+if ($start != $end) {
+	report_graph('useradded', $SPAN, $start, $end);
+}
 
 report_footer();
 
diff --git a/src/www/reporting/usercum.php b/src/www/reporting/usercum.php
index ea6b4e7..1168657 100644
--- a/src/www/reporting/usercum.php
+++ b/src/www/reporting/usercum.php
@@ -67,11 +67,10 @@ report_header(_('Cumulative Users'));
 <td><input type="submit" name="submit" value="<?php echo _('Refresh'); ?>" /></td>
 </tr></table>
 </form>
-<?php if ($start != $end) { ?>
-	<p>
-	<?php report_graph('usercumul', $SPAN, $start, $end); ?>
-	</p>
-<?php }
+<?php
+if ($start != $end) {
+	report_graph('usercumul', $SPAN, $start, $end);
+}
 
 report_footer();
 
diff --git a/src/www/reporting/usertime.php b/src/www/reporting/usertime.php
index 46dc0ec..1d6ffe6 100644
--- a/src/www/reporting/usertime.php
+++ b/src/www/reporting/usertime.php
@@ -98,28 +98,25 @@ if ($sw) {
 	</tr></table>
 	</form>
 	<?php
-		if ($dev_id && $typ=='r') {
-			$report=new ReportUserTime($dev_id,$type,$start,$end);
-			$labels = $report->labels;
-			$data = $report->getData();
+	if ($dev_id && $typ=='r') {
+		$report=new ReportUserTime($dev_id,$type,$start,$end);
+		$labels = $report->labels;
+		$data = $report->getData();
 
-			echo $HTML->listTableTop(array(_('Type'), _('Time')));
+		echo $HTML->listTableTop(array(_('Type'), _('Time')));
 
-			for ($i=0; $i<count($labels); $i++) {
+		for ($i=0; $i<count($labels); $i++) {
 
-				echo '<tr '. $HTML->boxGetAltRowStyle($i) .'>'.
-					'<td>'. $labels[$i] .'</td><td>'. $data[$i] .'</td></tr>';
+			echo '<tr '. $HTML->boxGetAltRowStyle($i) .'>'.
+				'<td>'. $labels[$i] .'</td><td>'. $data[$i] .'</td></tr>';
 
-			}
+		}
 
-			echo $HTML->listTableBottom ();
+		echo $HTML->listTableBottom ();
 
-		} elseif ($dev_id && $start != $end) { ?>
-		<p>
-		<?php report_timegraph('user', $type, $start, $end, $dev_id); ?>
-		</p>
-		<?php
-		}
+	} elseif ($dev_id && $start != $end) {
+		report_timegraph('user', $type, $start, $end, $dev_id);
+	}
 }
 
 report_footer();

-----------------------------------------------------------------------

Summary of changes:
 src/www/reporting/groupadded.php  |    9 ++++-----
 src/www/reporting/groupcum.php    |    9 ++++-----
 src/www/reporting/projectact.php  |    9 +++------
 src/www/reporting/projecttime.php |   29 ++++++++++++-----------------
 src/www/reporting/siteact.php     |    9 +++------
 src/www/reporting/sitetime.php    |    9 +++------
 src/www/reporting/sitetimebar.php |   12 ++----------
 src/www/reporting/toolspie.php    |    9 ++++-----
 src/www/reporting/useract.php     |   10 +++-------
 src/www/reporting/useradded.php   |    9 ++++-----
 src/www/reporting/usercum.php     |    9 ++++-----
 src/www/reporting/usertime.php    |   29 +++++++++++++----------------
 12 files changed, 59 insertions(+), 93 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list