[evolvis-commits] r7051: a small bugfix to feature request #603

papel at evolvis.org papel at evolvis.org
Mon Oct 25 09:34:50 CEST 2010


Author: papel
Date: 2010-10-25 09:34:49 +0200 (Mon, 25 Oct 2010)
New Revision: 7051

Modified:
   branches/papel-reporting/www/tracker/browse.php
Log:
a small bugfix to feature request #603

Modified: branches/papel-reporting/www/tracker/browse.php
===================================================================
--- branches/papel-reporting/www/tracker/browse.php	2010-10-22 07:30:38 UTC (rev 7050)
+++ branches/papel-reporting/www/tracker/browse.php	2010-10-25 07:34:49 UTC (rev 7051)
@@ -653,20 +653,28 @@
 				//End params for the next pages			
 
 			echo '<br />';
+
+			if($pages > 1) {
+
+				if($realSelectedPage == $pages && $realSelectedPage == 2) {
+					$total = $pages * $maxEntriesOnPage;
+					echo '<a href="'.getStringFromServer('PHP_SELF')."?func=browse&amp;group_id=".$group_id.'&atid='.$ath->getID().'&set='. $set.'&search_tracker=1"><strong>← '._('previous').' </strong></a>&nbsp;&nbsp;';				
+				} elseif($realSelectedPage == $pages) {
+					$total = $pages * $maxEntriesOnPage;
+					echo '<a href="'.getStringFromServer('PHP_SELF')."?func=browse&amp;group_id=".$group_id.'&atid='.$ath->getID().'&set='. $set.'&start='.$pNS[$realSelectedPage-2].'&tracker='.$pNT[$realSelectedPage-2].'&selected_tracker='.$selected_tracker.'&search_all='.$search_all.'&page_count='.$selected_page.'&total='.($total - (2 * $maxEntriesOnPage)).'&pNS='.$prevStarts.'&pNT='.$prevTrackers.'"><strong>← '._('previous').' </strong></a>&nbsp;&nbsp;';
 				
-			if($realSelectedPage == $pages) {
-				$total = $pages * $maxEntriesOnPage;
-				echo '<a href="'.getStringFromServer('PHP_SELF')."?func=browse&amp;group_id=".$group_id.'&atid='.$ath->getID().'&set='. $set.'&start='.$pNS[$realSelectedPage-2].'&tracker='.$pNT[$realSelectedPage-2].'&selected_tracker='.$selected_tracker.'&search_all='.$search_all.'&page_count='.$selected_page.'&total='.($total - (2 * $maxEntriesOnPage)).'&pNS='.$prevStarts.'&pNT='.$prevTrackers.'"><strong>← '._('previous').' </strong></a>&nbsp;&nbsp;';
-			} elseif($realSelectedPage == 1) {		
-				echo '<a href="'.getStringFromServer('PHP_SELF')."?func=browse&amp;group_id=".$group_id.'&atid='.$ath->getID().'&set='. $set.'&start='.$m.'&tracker='.$tracker_count.'&selected_tracker='.$selected_tracker.'&search_all='.$search_all.'&page_count='.$page_count.'&total='.$entriesTotal.'&pNS='.$nextStarts.'&pNT='.$nextTrackers.'&mflag="'.$maxEntriesBreakFlag.'""><strong>'._('next'). ' →</strong></a>&nbsp;&nbsp;';
-			} elseif($realSelectedPage == 2) { //The link to the previous page goes to the first page
-				echo '<a href="'.getStringFromServer('PHP_SELF')."?func=browse&amp;group_id=".$group_id.'&atid='.$ath->getID().'&set='. $set.'&search_tracker=1'.'"><strong>← '._('previous').'</strong></a>&nbsp;&nbsp;'; //pNS and pNT not needed in this link	
-				echo '<a href="'.getStringFromServer('PHP_SELF')."?func=browse&amp;group_id=".$group_id.'&atid='.$ath->getID().'&set='. $set.'&start='.$m.'&tracker='.$tracker_count.'&selected_tracker='.$selected_tracker.'&search_all='.$search_all.'&page_count='.$page_count.'&total='.$entriesTotal.'&pNS='.$nextStarts.'&pNT='.$nextTrackers.'&mflag="'.$maxEntriesBreakFlag.'""><strong>'._('next').' →</strong></a>&nbsp;&nbsp;';
-			} else {
-				echo '<a href="'.getStringFromServer('PHP_SELF')."?func=browse&amp;group_id=".$group_id.'&atid='.$ath->getID().'&set='. $set.'&start='.$pNS[$realSelectedPage-2].'&tracker='.$pNT[$realSelectedPage-2].'&selected_tracker='.$selected_tracker.'&search_all='.$search_all.'&page_count='.($selected_page-1).'&total='.($total - (2 * $maxEntriesOnPage)).'&pNS='.$prevStarts.'&pNT='.$prevTrackers.'"><strong>← '._('previous').'</strong></a>&nbsp;&nbsp;';
-				echo '<a href="'.getStringFromServer('PHP_SELF')."?func=browse&amp;group_id=".$group_id.'&atid='.$ath->getID().'&set='. $set.'&start='.$m.'&tracker='.$tracker_count.'&selected_tracker='.$selected_tracker.'&search_all='.$search_all.'&page_count='.$page_count.'&total='.$entriesTotal.'&pNS='.$nextStarts.'&pNT='.$nextTrackers.'&mflag="'.$maxEntriesBreakFlag.'""><strong>'._('next').' →</strong></a>&nbsp;&nbsp;';
+				} elseif($realSelectedPage == 1) {	
+					echo '<a href="'.getStringFromServer('PHP_SELF')."?func=browse&amp;group_id=".$group_id.'&atid='.$ath->getID().'&set='. $set.'&start='.$m.'&tracker='.$tracker_count.'&selected_tracker='.$selected_tracker.'&search_all='.$search_all.'&page_count='.$page_count.'&total='.$entriesTotal.'&pNS='.$nextStarts.'&pNT='.$nextTrackers.'&mflag="'.$maxEntriesBreakFlag.'""><strong>'._('next'). ' →</strong></a>&nbsp;&nbsp;';
+				
+				} elseif($realSelectedPage == 2) { //The link to the previous page goes to the first page
+					echo '<a href="'.getStringFromServer('PHP_SELF')."?func=browse&amp;group_id=".$group_id.'&atid='.$ath->getID().'&set='. $set.'&search_tracker=1"><strong>← '._('previous').' </strong></a>&nbsp;&nbsp;';			
+					echo '<a href="'.getStringFromServer('PHP_SELF')."?func=browse&amp;group_id=".$group_id.'&atid='.$ath->getID().'&set='. $set.'&start='.$m.'&tracker='.$tracker_count.'&selected_tracker='.$selected_tracker.'&search_all='.$search_all.'&page_count='.$page_count.'&total='.$entriesTotal.'&pNS='.$nextStarts.'&pNT='.$nextTrackers.'&mflag="'.$maxEntriesBreakFlag.'""><strong>'._('next').' →</strong></a>&nbsp;&nbsp;';
+				} else {
+					echo '<a href="'.getStringFromServer('PHP_SELF')."?func=browse&amp;group_id=".$group_id.'&atid='.$ath->getID().'&set='. $set.'&start='.$pNS[$realSelectedPage-2].'&tracker='.$pNT[$realSelectedPage-2].'&selected_tracker='.$selected_tracker.'&search_all='.$search_all.'&page_count='.($selected_page-1).'&total='.($total - (2 * $maxEntriesOnPage)).'&pNS='.$prevStarts.'&pNT='.$prevTrackers.'"><strong>← '._('previous').'</strong></a>&nbsp;&nbsp;';
+					echo '<a href="'.getStringFromServer('PHP_SELF')."?func=browse&amp;group_id=".$group_id.'&atid='.$ath->getID().'&set='. $set.'&start='.$m.'&tracker='.$tracker_count.'&selected_tracker='.$selected_tracker.'&search_all='.$search_all.'&page_count='.$page_count.'&total='.$entriesTotal.'&pNS='.$nextStarts.'&pNT='.$nextTrackers.'&mflag="'.$maxEntriesBreakFlag.'""><strong>'._('next').' →</strong></a>&nbsp;&nbsp;';
+				}
+				echo '<br /><br /><br />';
 			}
-			echo '<br /><br /><br />';
 
 		} else {
 			



More information about the evolvis-commits mailing list