[Fusionforge-commits] r12042 - in trunk/src: common/include www/admin www/pm www/project/admin

Alain Peyrat aljeux at libremir.placard.fr.eu.org
Wed Jan 19 20:43:43 CET 2011


Author: aljeux
Date: 2011-01-19 20:43:43 +0100 (Wed, 19 Jan 2011)
New Revision: 12042

Modified:
   trunk/src/common/include/utils.php
   trunk/src/www/admin/groupedit.php
   trunk/src/www/pm/browse_task.php
   trunk/src/www/project/admin/index.php
   trunk/src/www/project/admin/massfinish.php
Log:
Misc minor changes

Modified: trunk/src/common/include/utils.php
===================================================================
--- trunk/src/common/include/utils.php	2011-01-19 19:43:37 UTC (rev 12041)
+++ trunk/src/common/include/utils.php	2011-01-19 19:43:43 UTC (rev 12042)
@@ -6,6 +6,7 @@
  * Copyright 2009-2010, Roland Mas
  * Copyright 2009-2010, Franck Villaume - Capgemini
  * Copyright 2010, Thorsten Glaser <t.glaser at tarent.de>
+ * Copyright (C) 2011 Alain Peyrat - Alcatel-Lucent
  *
  * This file is part of FusionForge.
  *
@@ -1116,7 +1117,7 @@
 	if ($absolute) {
 		return '<a ' . $ep . 'href="' . $path . '">' . $text . '</a>' ;
 	} else {
-		return '<a ' . $ep . 'href="' . util_make_url ($path) . '">' . $text . '</a>' ;
+		return '<a ' . $ep . 'href="' . util_make_uri($path) . '">' . $text . '</a>' ;
 	}
 }
 

Modified: trunk/src/www/admin/groupedit.php
===================================================================
--- trunk/src/www/admin/groupedit.php	2011-01-19 19:43:37 UTC (rev 12041)
+++ trunk/src/www/admin/groupedit.php	2011-01-19 19:43:43 UTC (rev 12042)
@@ -4,6 +4,7 @@
  *
  * Copyright 1999-2001 (c) VA Linux Systems
  * Copyright 2010 (c) Franck Villaume - Capgemini
+ * Copyright (C) 2011 Alain Peyrat - Alcatel-Lucent
  *
  * This file is part of FusionForge.
  *
@@ -92,13 +93,13 @@
 
 }
 
-site_admin_header(array('title'=>_('Site Admin: Project Info')));
+$title = _('Site Admin: Project Info for ') . $group->getPublicName();
+site_admin_header(array('title'=>$title));
+?>
 
-echo '<h2>'.$group->getPublicName().'</h2>' ;?>
+<h2><?php echo util_make_link("/project/admin/?group_id=$group_id", _('[Project Admin]')); ?></h2>
+<h2><?php echo util_make_link("/admin/groupdelete.php?group_id=$group_id", _('Permanently Delete Project')); ?></h2>
 
-<h3><?php echo util_make_link("/project/admin/?group_id=$group_id", _('[Project Admin]')); ?></h3>
-<h3><?php echo util_make_link("/admin/groupdelete.php?group_id=$group_id", _('Permanently Delete Project')); ?></h3>
-
 <form action="<?php echo getStringFromServer('PHP_SELF'); ?>" method="post">
 
 <table>

Modified: trunk/src/www/pm/browse_task.php
===================================================================
--- trunk/src/www/pm/browse_task.php	2011-01-19 19:43:37 UTC (rev 12041)
+++ trunk/src/www/pm/browse_task.php	2011-01-19 19:43:43 UTC (rev 12042)
@@ -5,6 +5,7 @@
  * Copyright 1999-2001 (c) VA Linux Systems, Tim Perdue
  * Copyright 2002 GForge, LLC, Tim Perdue
  * Copyright 2010, FusionForge Team
+ * Copyright (C) 2011 Alain Peyrat - Alcatel-Lucent
  * http://fusionforge.org
  *
  * This file is part of FusionForge.
@@ -167,7 +168,7 @@
 if ($rows < 1) {
 
 	echo '
-		<div class="feedback">'._('No Matching Tasks found').'</div>
+		<p class="feedback">'._('No Matching Tasks found').'</p>
 		<p />
 		<div class="warning">'._('Add tasks using the link above').'</div>';
 	echo db_error();

Modified: trunk/src/www/project/admin/index.php
===================================================================
--- trunk/src/www/project/admin/index.php	2011-01-19 19:43:37 UTC (rev 12041)
+++ trunk/src/www/project/admin/index.php	2011-01-19 19:43:43 UTC (rev 12042)
@@ -8,7 +8,7 @@
  *
  * Copyright 2004 GForge, LLC - Tim Perdue
  * Copyright 2010, Franck Villaume - Capgemini
- * Copyright (C) 2010 Alain Peyrat - Alcatel-Lucent
+ * Copyright (C) 2010-2011 Alain Peyrat - Alcatel-Lucent
  * http://fusionforge.org
  *
  * This file is part of FusionForge.
@@ -110,9 +110,7 @@
 	}
 }
 
-$adminheadertitle=sprintf(_('Project Admin: %1$s'), $group->getPublicName() );
-project_admin_header(array('title'=>$adminheadertitle, 'group'=>$group->getID()));
-
+project_admin_header(array('title'=>_('Project Information'), 'group'=>$group->getID()));
 ?>
 
 <table class="my-layout-table">

Modified: trunk/src/www/project/admin/massfinish.php
===================================================================
--- trunk/src/www/project/admin/massfinish.php	2011-01-19 19:43:37 UTC (rev 12041)
+++ trunk/src/www/project/admin/massfinish.php	2011-01-19 19:43:43 UTC (rev 12042)
@@ -4,6 +4,7 @@
  *
  * Copyright 2004 (c) Tim Perdue - GForge LLC
  * Copyright 2010 (c) Franck Villaume - Capgemini
+ * Copyright (C) 2011 Alain Peyrat - Alcatel-Lucent
  * http://fusionforge.org
  *
  * This file is part of FusionForge.
@@ -64,7 +65,7 @@
 		ORDER BY realname ASC", array(db_int_array_to_any_clause($arr)));
 }
 
-project_admin_header(array('title'=>_('Edit Role'),'group'=>$group_id));
+project_admin_header(array('title'=>_('Add Users From List'),'group'=>$group_id));
 
 echo '
 <h1>'._('Add Users From List').'</h1>




More information about the Fusionforge-commits mailing list