[Fusionforge-commits] FusionForge branch master updated. a95b70ae98bdd587528fdc01369dabb104cedce6

Franck Villaume nerville at fusionforge.org
Tue Mar 25 14:10:19 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, master has been updated
       via  a95b70ae98bdd587528fdc01369dabb104cedce6 (commit)
       via  b37e3c6855f6f50ce68f2cf6f289665004a42303 (commit)
       via  979084df683701aa898f751b4f98c5b787541441 (commit)
      from  fd149394c71851a003c20fd10927bc9cdeed8917 (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 a95b70ae98bdd587528fdc01369dabb104cedce6
Merge: fd14939 b37e3c6
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Tue Mar 25 14:10:14 2014 +0100

    merge Branch_5_3

diff --cc src/www/pm/browse_task.php
index b4ec427,764096c..4bfeb6b
--- a/src/www/pm/browse_task.php
+++ b/src/www/pm/browse_task.php
@@@ -313,41 -294,24 +313,43 @@@ if ($rows < 1) 
  		}
  	}
  
 +	echo $HTML->listTableBottom();
 +
  	/*
 -		Show extra rows for <-- Prev / Next -->
 +	 Show extra rows for <-- Prev / Next -->
  	*/
 -	echo '<tr><td colspan="2">';
  	if ($offset > 0) {
 -		echo util_make_link ('/pm/task.php?func=browse&group_project_id='.$group_project_id.'&group_id='.$group_id.'&offset='.($offset-$paging),'<strong>← '._('previous').'</strong>');
 -	} else {
 -		echo ' ';
 +		echo util_make_link (getStringFromServer('PHP_SELF').'?func=browse&group_project_id='.$group_project_id.'&group_id='.$group_id.'&offset='.($offset-$paging),'<strong>← '._('previous').'</strong>');
 +		echo '  ';
 +	}
 +	$pages = $totalTasks / $paging;
 +	$currentpage = intval($offset / $paging);
 +	if ($pages > 1) {
 +		$skipped_pages=false;
 +		for ($j=0; $j<$pages; $j++) {
 +			if ($pages > 20) {
 +				if ((($j > 4) && ($j < ($currentpage-5))) || (($j > ($currentpage+5)) && ($j < ($pages-5)))) {
 +					if (!$skipped_pages) {
 +						$skipped_pages=true;
 +						echo ".... ";
 +					}
 +					continue;
 +				} else {
 +					$skipped_pages=false;
 +				}
 +			}
 +			if ($j * $paging == $offset) {
 +				echo '<strong>'.($j+1).'</strong>  ';
 +			} else {
 +				echo util_make_link (getStringFromServer('PHP_SELF').'?func=browse&group_project_id='.$group_project_id.'&group_id='.$group_id.'&offset='.($j*$paging),'<strong>'.($j+1).'</strong>').'  ';
 +			}
 +		}
  	}
 -	echo '</td><td> </td><td colspan="2">';
  	if ( $totalTasks > $offset + $paging) {
- 		echo util_make_link (getStringFromServer('PHP_SELF').'?func=browse&group_project_id='.$group_project_id.'&group_id='.$group_id.'&offset='.($offset+$paging),'<strong>'._('next').' →</strong>');
 -		echo util_make_link ('/pm/task.php?func=browse&group_project_id='.$group_project_id.'&group_id='.$group_id.'&offset='.($offset+$paging),'<strong>'._('next').' →</strong>');
++		echo util_make_link('/pm/task.php?func=browse&group_project_id='.$group_project_id.'&group_id='.$group_id.'&offset='.($offset+$paging),'<strong>'._('next').' →</strong>');
+ 	} else {
+ 		echo ' ';
  	}
 -	echo '</td></tr>';
 -
 -	echo $GLOBALS['HTML']->listTableBottom();
  
  	echo '<div style="display:table;width:100%">';
  	echo '<div style="display:table-row">';

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

Summary of changes:
 src/common/tracker/actions/browse.php |    4 ++--
 src/www/pm/browse_task.php            |    4 +++-
 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 +++++++++++++----------------
 14 files changed, 64 insertions(+), 96 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list