[Fusionforge-commits] FusionForge branch master updated. v6.0.3-398-ga66a83d

Franck Villaume nerville at libremir.placard.fr.eu.org
Mon Mar 14 23:33:00 CET 2016


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  a66a83d79f178c7300a5c883186c84718f4ea1aa (commit)
       via  7a4eff82161e66a92e1be1f40082ca48732bde46 (commit)
      from  f60cdb079dfc63298bc87a2167d26f77f820217c (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=a66a83d79f178c7300a5c883186c84718f4ea1aa

commit a66a83d79f178c7300a5c883186c84718f4ea1aa
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Mon Mar 14 23:32:08 2016 +0100

    use HTML helpers on icon & fix missing icon

diff --git a/src/common/tracker/views/form-adminroadmap.php b/src/common/tracker/views/form-adminroadmap.php
index cac6ab1..18fb32a 100644
--- a/src/common/tracker/views/form-adminroadmap.php
+++ b/src/common/tracker/views/form-adminroadmap.php
@@ -4,7 +4,7 @@
  *
  * Copyright 2011, Alcatel-Lucent
  * Copyright (C) 2012 Alain Peyrat - Alcatel-Lucent
- * Copyright 2014-2015, Franck Villaume - TrivialDev
+ * Copyright 2014-2016, Franck Villaume - TrivialDev
  *
  * This file is part of FusionForge. FusionForge is free software;
  * you can redistribute it and/or modify it under the terms of the
@@ -468,11 +468,11 @@ if (! isset($ihm) || $ihm !== true) {
 					*/
 					'<td class="align-center">'.
 					util_make_link('/tracker/admin/?group_id='.$group_id.'&roadmap_id='.$roadmap->getID().'&admin_roadmap=1&update_roadmap=1',
-							html_image('ic/forum_edit.gif','','',array('alt' => _('Modify roadmap'), 'title' => _('Modify roadmap')))).
+							$HTML->getConfigurePic(_('Modify roadmap'), 'modifyroadmap')).
 					util_make_link('/tracker/admin/?group_id='.$group_id.'&roadmap_id='.$roadmap->getID().'&admin_roadmap=1&manage_release=1',
-							html_image('ic/survey-question-add.png','','',array('alt' => _('Manage releases'), 'title' => _('Manage releases')))).
+							html_image('ic/tag.png','','',array('alt' => _('Manage releases'), 'title' => _('Manage releases')))).
 					util_make_link('/tracker/admin/?group_id='.$group_id.'&roadmap_id='.$roadmap->getID().'&admin_roadmap=1&delete_roadmap=1',
-							html_image('ic/trash.png','','',array('alt' => _('Delete roadmap'), 'title' => _('Delete roadmap')))).
+							$HTML->getDeletePic(_('Delete roadmap'), 'delroadmap')).
 					'</td>'."\n".
 					'</tr>'."\n";
 			$pos++;

https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=7a4eff82161e66a92e1be1f40082ca48732bde46

commit 7a4eff82161e66a92e1be1f40082ca48732bde46
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Mon Mar 14 23:31:45 2016 +0100

    use HTML helpers

diff --git a/src/common/tracker/actions/admin-ind.php b/src/common/tracker/actions/admin-ind.php
index 1df8208..0764f47 100644
--- a/src/common/tracker/actions/admin-ind.php
+++ b/src/common/tracker/actions/admin-ind.php
@@ -6,7 +6,7 @@
  * Copyright 2002-2003, Tim Perdue/GForge, LLC
  * Copyright 2010, FusionForge Team
  * Copyright 2011, Franck Villaume - Capgemini
- * Copyright 2012-2015, Franck Villaume - TrivialDev
+ * Copyright 2012-2016, Franck Villaume - TrivialDev
  *
  * This file is part of FusionForge. FusionForge is free software;
  * you can redistribute it and/or modify it under the terms of the
@@ -101,24 +101,18 @@ if (!isset($at_arr) || !$at_arr || count($at_arr) < 1) {
 	echo $HTML->listTableTop($tablearr);
 
 	for ($j = 0; $j < count($at_arr); $j++) {
-		echo '
-		<tr '. $HTML->boxGetAltRowStyle($j) . '>
-			<td><a href="'.util_make_url ('/tracker/admin/?atid='. $at_arr[$j]->getID() . '&group_id='.$group_id).'">' .
-				html_image("ic/tracker20w.png","20","20") . '  '.
-				$at_arr[$j]->getName() .'</a>
-			</td>
-			<td>'.$at_arr[$j]->getDescription() .'
-			</td>
-		</tr>';
+		$cells = array();
+		$cells[][] = util_make_link('/tracker/admin/?atid='.$at_arr[$j]->getID().'&group_id='.$group_id, html_image('ic/tracker20w.png', 20, 20).' '.
+						$at_arr[$j]->getName());
+		$cells[][] = $at_arr[$j]->getDescription();
+		echo $HTML->multiTableRow(array('class' => $HTML->boxGetAltRowStyle($j, true)), $cells);
 	}
 	echo $HTML->listTableBottom();
 
 	$roadmap_factory = new RoadmapFactory($group);
 	$roadmaps = $roadmap_factory->getRoadmaps(true);
 	if (!empty($roadmaps)) {
-		echo '	<p id="roadmapadminlink">
-			'.util_make_link('/tracker/admin/?group_id='.$group_id.'&admin_roadmap=1', _('Manage your roadmaps.')).'
-			</p>';
+		echo html_e('p', array('id' => 'roadmapadminlink'), util_make_link('/tracker/admin/?group_id='.$group_id.'&admin_roadmap=1', _('Manage your roadmaps.')));
 	}
 }
 

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

Summary of changes:
 src/common/tracker/actions/admin-ind.php       | 20 +++++++-------------
 src/common/tracker/views/form-adminroadmap.php |  8 ++++----
 2 files changed, 11 insertions(+), 17 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list