[evolvis-commits] r17680: [#1824] Really fix rendering of related tasks of a tracker item

mirabilos at evolvis.org mirabilos at evolvis.org
Wed Nov 2 15:07:20 CET 2011


Author: mirabilos
Date: 2011-11-02 15:07:20 +0100 (Wed, 02 Nov 2011)
New Revision: 17680

Modified:
   trunk/gforge_base/evolvisforge-5.1/src/www/tracker/include/ArtifactTypeHtml.class.php
   trunk/gforge_base/evolvisforge-5.1/src/www/tracker/mod.php
Log:
[#1824] Really fix rendering of related tasks of a tracker item

The rendering routine was mistakenly called twice from mod.php;
once in a <div> context (now gone, to align with detail.php and
mod-limited.php) and once in a <table> context; also, fix the
latter’s XHTML tag nesting broken in Evolvis SVN r17592


Modified: trunk/gforge_base/evolvisforge-5.1/src/www/tracker/include/ArtifactTypeHtml.class.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/www/tracker/include/ArtifactTypeHtml.class.php	2011-11-02 09:40:31 UTC (rev 17679)
+++ trunk/gforge_base/evolvisforge-5.1/src/www/tracker/include/ArtifactTypeHtml.class.php	2011-11-02 14:07:20 UTC (rev 17680)
@@ -227,16 +227,15 @@
 
 		if ($taskcount > 0) {
 			echo '<tr><td colspan="2">';
-			echo '<b>'._("Related Tasks").':</b>'.'<br/>';
+			echo '<b>' . _("Related Tasks") . ':</b>' . "<br />\n";
 			$title_arr = array();
 			$title_arr[] = _('Task Summary');
 			$title_arr[] = _('Start Date');
 			$title_arr[] = _('End Date');
 			$title_arr[] = _('Status');
 			(($is_admin) ? $title_arr[]=_('Remove Relation') : '');
-			echo $GLOBALS['HTML']->listTableTop($title_arr);
 
-			//echo '<table cellspacing="0">';
+			echo $GLOBALS['HTML']->listTableTop($title_arr);
 			for ($i = 0; $i < $taskcount; $i++) {
 				$taskinfo  = db_fetch_array($ah->relatedtasks, $i);
 				$totalPercentage += $taskinfo['percent_complete'];
@@ -256,12 +255,12 @@
 					(($is_admin) ? '<td><input type="checkbox" name="remlink[]" value="'.$taskid.'" /></td>' : '').
 					'</tr>';
 			}
-                        echo '</table>';
 			echo $GLOBALS['HTML']->listTableBottom();
 
 			echo "\n<hr /><p style=\"text-align:right;\">";
 			printf(_('Average completion rate: %d%%'), (int)($totalPercentage/$taskcount));
-			echo "</p>\n";			echo '</td></tr>';
+			echo "</p>\n";
+			echo "</td></tr>\n";
 		}
 	}
 

Modified: trunk/gforge_base/evolvisforge-5.1/src/www/tracker/mod.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/www/tracker/mod.php	2011-11-02 09:40:31 UTC (rev 17679)
+++ trunk/gforge_base/evolvisforge-5.1/src/www/tracker/mod.php	2011-11-02 14:07:20 UTC (rev 17680)
@@ -221,15 +221,6 @@
 	</td></tr>
 </table>
 </div>
-<?php
-if ($group->usesPM()) {
-?>
-<div class="tabbertab" title="<?php echo _('Related Tasks'); ?>">
-	<?php
-		$ath->renderRelatedTasks($group, $ah);
-	?>
-</div>
-<?php } ?>
 <div class="tabbertab" title="<?php echo _('Attachments'); ?>">
 		<h2><?php echo _('Existing Files') ?>:</h2>
 <table border="0" width="80%">



More information about the evolvis-commits mailing list