[Fusionforge-commits] r11458 - in trunk/src: common/forum www/developer www/include www/mail www/project/admin www/scm/include www/stats www/survey/admin www/top

Alain Peyrat aljeux at libremir.placard.fr.eu.org
Mon Nov 8 18:38:27 CET 2010


Author: aljeux
Date: 2010-11-08 18:38:27 +0100 (Mon, 08 Nov 2010)
New Revision: 11458

Modified:
   trunk/src/common/forum/ForumAdmin.class.php
   trunk/src/www/developer/monitor.php
   trunk/src/www/include/stats_function.php
   trunk/src/www/mail/mail_utils.php
   trunk/src/www/project/admin/index.php
   trunk/src/www/scm/include/scm_utils.php
   trunk/src/www/stats/i18n.php
   trunk/src/www/stats/lastlogins.php
   trunk/src/www/stats/projects.php
   trunk/src/www/survey/admin/survey.php
   trunk/src/www/top/index.php
Log:
Messages improvements

Modified: trunk/src/common/forum/ForumAdmin.class.php
===================================================================
--- trunk/src/common/forum/ForumAdmin.class.php	2010-11-08 17:38:13 UTC (rev 11457)
+++ trunk/src/common/forum/ForumAdmin.class.php	2010-11-08 17:38:27 UTC (rev 11458)
@@ -6,6 +6,7 @@
  * Copyright 2002-2004 (c) GForge Team
  * Copyright 2005 (c) Daniel Perez
  * Copyright 2010 (c) Franck Villaume - Capgemini
+ * Copyright (C) 2010 Alain Peyrat - Alcatel-Lucent
  * http://fusionforge.org/
  *
  * This file is part of FusionForge.
@@ -208,7 +209,7 @@
 				form_release_key(getStringFromRequest("form_key"));
 				exit_error($f->getErrorMessage(),'forums');
 			} else {
-				$feedback = _('Forum created successfully');
+				$feedback = _('Forum added successfully');
 			}
 			return $feedback;
 		}
@@ -294,7 +295,7 @@
 			<script type="text/javascript">
 		
 			function confirmDel() {
-				var agree=confirm("Proceed? Actions are permanent!");
+				var agree=confirm("' . _('Proceed? Actions are permanent!') . '");
 				if (agree) {
 					return true;
 				} else {

Modified: trunk/src/www/developer/monitor.php
===================================================================
--- trunk/src/www/developer/monitor.php	2010-11-08 17:38:13 UTC (rev 11457)
+++ trunk/src/www/developer/monitor.php	2010-11-08 17:38:27 UTC (rev 11458)
@@ -61,10 +61,10 @@
 							  user_getid ()));
 
 			if (!$result) {
-				echo "<div class=\"error\">"._('Error inserting into user_diary_monitor')."</div>";
+				echo '<p class="error">' . _('Error inserting into user_diary_monitor') . '</p>';
 			} else {
-				echo "<div class=\"feedback\">"._('User is now being monitored')."</div>";
-				echo '<p>' . _('You will now be emailed this user\'s diary entries.') . '</p>';
+				echo '<p class="feedback">' . _('User is now being monitored') . '</p>';
+				echo '<p>' . _("You will now be emailed this user's diary entries.") . '</p>';
 				echo '<p>' . _('To turn off monitoring, simply click the <strong>Monitor user</strong> link again.') . '</p>';
 			}
 
@@ -72,15 +72,14 @@
 			$result = db_query_params ('DELETE FROM user_diary_monitor WHERE user_id=$1 AND monitored_user=$2',
 						   array (user_getid(),
 							  $diary_user));
-			echo "<div class=\"feedback\">"._('Monitoring has been turned off')."</div>";
+			echo '<p class="feedback">' . _('Monitoring has been turned off') . "</p>";
 			echo _('You will not receive any more emails from this user');
 	
 		}
 		$HTML->footer (array());
 	} else {
-		$HTML->header (array('title'=>_('Choose a User first')));
-		echo '
-			<h1>'._('Error - Choose a User To Monitor First').'</h1>';
+		$HTML->header(array('title'=>_('Error - Choose a User To Monitor First')));
+		echo '<h1>'._('Error - Choose a User To Monitor First').'</h1>';
 		$HTML->footer (array());
 	} 
 

Modified: trunk/src/www/include/stats_function.php
===================================================================
--- trunk/src/www/include/stats_function.php	2010-11-08 17:38:13 UTC (rev 11457)
+++ trunk/src/www/include/stats_function.php	2010-11-08 17:38:27 UTC (rev 11458)
@@ -3,6 +3,7 @@
  *
  * Copyright 1999-2001 (c) VA Linux Systems 
  * Copyright 2010, FusionForge Team
+ * Copyright (C) 2010 Alain Peyrat - Alcatel-Lucent
  * http://fusionforge.org
  *
  * This file is part of FusionForge.
@@ -37,7 +38,7 @@
 
 	if (!$result || $rows < 1) {
 		echo '<h1>Stats Problem</h1>';
-		echo '<div class="error">'.db_error().'</div>';
+		echo '<p class="error">Stats Problem'.db_error().'</p>';
 	} else {
 		$j=0;
 		for ($i=0; $i<$rows; $i++) {
@@ -59,8 +60,6 @@
 		GraphIt($name_string,$vals,'Page Views By Week');
 	}
 
-	echo '<p>&nbsp;</p>';
-
 /*
 	Projects added by week
 */
@@ -70,7 +69,7 @@
 
 	if (!$result || $rows < 1) {
 		echo '<h1>Stats Problem</h1>';
-		echo '<div class="error">'.db_error().'</div>';
+		echo '<p class="error">Stats Problem'.db_error().'</p>';
 	} else {
 		$count=array();
 		$dates=array();
@@ -82,7 +81,6 @@
 		}
 		GraphIt($dates,$count,'New Projects Added Each Week');
 	}
-	echo '<p>&nbsp;</p>';
 
 /*
 	Users added by week
@@ -93,7 +91,7 @@
 
 	if (!$result || $rows < 1) {
 		echo '<h1>Stats Problem</h1>';
-		echo '<div class="error">'.db_error().'</div>';
+		echo '<p class="error">Stats Problem'.db_error().'</p>';
 	} else {
 		$count=array();
 		$dates=array();
@@ -105,7 +103,6 @@
 		}
 		GraphIt($dates,$count,'New Users Added Each Week');
 	}
-	echo '<p>&nbsp;</p>';
 
 }
 
@@ -124,13 +121,11 @@
 
 	if (!$result || $rows < 1) {
 		echo '<h1>Stats Problem</h1>';
-		echo '<div class="error">'.db_error().'</div>';
+		echo '<p class="error">Stats Problem'.db_error().'</p>';
 	} else {
 		GraphResult($result,'Logo Showings By Day');
 	}
 
-	echo '<p>&nbsp;</p>';
-
 /*
 	logo impressions/group
 */
@@ -141,13 +136,10 @@
 
 	if (!$result || $rows < 1) {
 		echo '<h1>Stats Problem</h1>';
-		echo '<div class="error">'.db_error().'</div>';
+		echo '<p class="error">Stats Problem'.db_error().'</p>';
 	} else {
 		GraphResult($result,'Logo Showings By Project');
 	}
-
-	echo '<p>&nbsp;</p>';
-
 }
 
 
@@ -165,11 +157,10 @@
 
 	if (!$result || $rows < 1) {
 		echo '<h1>Stats Problem</h1>';
-		echo '<div class="error">'.db_error().'</div>';
+		echo '<p class="error">Stats Problem'.db_error().'</p>';
 	} else {
 		GraphResult($result,'Page Views By Browser');
 	}
-	echo '<p>&nbsp;</p>';
 
 /*
 	Platform
@@ -181,11 +172,10 @@
 
 	if (!$result || $rows < 1) {
 		echo '<h1>Stats Problem</h1>';
-		echo '<div class="error">'.db_error().'</div>';
+		echo '<p class="error">Stats Problem'.db_error().'</p>';
 	} else {
 		GraphResult($result,'Page Views By Platform');
 	}
-	echo '<p>&nbsp;</p>';
 
 /*
 	Browser/ver
@@ -197,11 +187,10 @@
 
 	if (!$result || $rows < 1) {
 		echo '<h1>Stats Problem</h1>';
-		echo '<div class="error">'.db_error().'</div>';
+		echo '<p class="error">Stats Problem'.db_error().'</p>';
 	} else {
 		ShowResultSet($result,'Page Views By Platform/Browser Version');
 	}
-	echo '<p>&nbsp;</p>';
 }
 
 ?>

Modified: trunk/src/www/mail/mail_utils.php
===================================================================
--- trunk/src/www/mail/mail_utils.php	2010-11-08 17:38:13 UTC (rev 11457)
+++ trunk/src/www/mail/mail_utils.php	2010-11-08 17:38:27 UTC (rev 11458)
@@ -4,6 +4,7 @@
  *
  * Copyright 1999-2001 (c) VA Linux Systems
  * Copyright 2003-2004 (c) Guillaume Smet - Open Wide
+ * Copyright (C) 2010 Alain Peyrat - Alcatel-Lucent
  * http://fusionforge.org/
  *
  * This file is part of FusionForge.
@@ -46,7 +47,7 @@
 			if (forge_check_perm ('project_admin', $project->getID())) {
 				echo $HTML->subMenu(
 					array(
-						_('Admin')
+						_('Administration')
 					),
 					array(
 						'/mail/admin/?group_id='.$group_id

Modified: trunk/src/www/project/admin/index.php
===================================================================
--- trunk/src/www/project/admin/index.php	2010-11-08 17:38:13 UTC (rev 11457)
+++ trunk/src/www/project/admin/index.php	2010-11-08 17:38:27 UTC (rev 11458)
@@ -8,6 +8,7 @@
  *
  * Copyright 2004 GForge, LLC - Tim Perdue
  * Copyright 2010 (c), Franck Villaume
+ * Copyright (C) 2010 Alain Peyrat - Alcatel-Lucent
  *
  * This file is part of FusionForge.
  *
@@ -126,13 +127,16 @@
 
 <input type="hidden" name="group_id" value="<?php echo $group->getID(); ?>" />
 
+<h2><?php echo _('Descriptive Project Name'); ?></h2>
 <p>
-<?php echo _('Descriptive Project Name') ?>:<br />
 <input type="text" name="form_group_name" value="<?php echo $group->getPublicName(); ?>" size="40" maxlength="40" />
 </p>
 
+<h2><?php echo _('Short Description'); ?></h2>
 <p>
-<?php echo _('Short Description (255 Character Max, HTML will be stripped from this description)') ?>:<br />
+<?php echo _('Maximum 255 characters, HTML will be stripped from this description'); ?>
+</p>
+<p>
 <textarea cols="80" rows="3" name="form_shortdesc">
 <?php echo $group->getDescription(); ?>
 </textarea>
@@ -145,10 +149,13 @@
 </p>
 <?php } ?>
 
-<p><?php echo _('Trove Categorization:&nbsp;') ?><a href="/project/admin/group_trove.php?group_id=<?php echo $group->getID(); ?>">[<?php echo _('Edit') ?>]</a></p>
+<h2><?php echo _('Trove Categorization'); ?></h2>
+<p>
+<a href="/project/admin/group_trove.php?group_id=<?php echo $group->getID(); ?>">[<?php echo _('Edit Trove'); ?>]</a>
+</p>
 
+<h2><?php echo _('Homepage Link') ?></h2>
 <p>
-<?php echo _('Homepage Link') ?>:<br />
 <input type="text" name="form_homepage" size="100" value="<?php echo $group->getHomePage(); ?>" />
 </p>
 
@@ -259,7 +266,6 @@
 
 		</td>
 	</tr>
-
 </table>
 
 <?php

Modified: trunk/src/www/scm/include/scm_utils.php
===================================================================
--- trunk/src/www/scm/include/scm_utils.php	2010-11-08 17:38:13 UTC (rev 11457)
+++ trunk/src/www/scm/include/scm_utils.php	2010-11-08 17:38:27 UTC (rev 11458)
@@ -4,6 +4,7 @@
  *
  * Copyright 2004-2005 (c) GForge LLC, Tim Perdue
  * Copyright 2010 (c), Franck Villaume
+ * Copyright (C) 2010 Alain Peyrat - Alcatel-Lucent
  * http://fusionforge.org
  *
  * This file is part of FusionForge.
@@ -47,8 +48,8 @@
 		if (forge_check_perm ('project_admin', $project->getID())) {
 			echo $HTML->subMenu(
 				array(
-					_('SCM'),
-					_('Admin'),
+					_('View Source Code'),
+					_('Administration'),
 					_('Reporting')
 					),
 				array(

Modified: trunk/src/www/stats/i18n.php
===================================================================
--- trunk/src/www/stats/i18n.php	2010-11-08 17:38:13 UTC (rev 11457)
+++ trunk/src/www/stats/i18n.php	2010-11-08 17:38:27 UTC (rev 11458)
@@ -4,6 +4,7 @@
  *
  * Copyright 1999-2001 (c) VA Linux Systems
  * Copyright 2010 (c) FusionForge Team
+ * Copyright (C) 2010 Alain Peyrat - Alcatel-Lucent
  * http://fusionforge.org
  *
  * This file is part of FusionForge.
@@ -29,7 +30,7 @@
 
 session_require_global_perm ('forge_stats', 'read') ;
 
-$HTML->header(array('title' => sprintf(_('%1$s I18n Statistics'), forge_get_config ('forge_name'))));
+$HTML->header(array('title' => sprintf(_('%1$s I18n Statistics: Languages Distributions'), forge_get_config ('forge_name'))));
 echo "<h1>".sprintf(_('Languages Distributions'), forge_get_config ('forge_name'))." </h1>";
 echo $GLOBALS['HTML']->listTableTop(array(_('Language')."",_('Users')."","%"));
 

Modified: trunk/src/www/stats/lastlogins.php
===================================================================
--- trunk/src/www/stats/lastlogins.php	2010-11-08 17:38:13 UTC (rev 11457)
+++ trunk/src/www/stats/lastlogins.php	2010-11-08 17:38:27 UTC (rev 11458)
@@ -4,6 +4,7 @@
  *
  * Copyright 1999-2001 (c) VA Linux Systems
  * Copyright 2010 (c) Franck Villaume
+ * Copyright (C) 2010 Alain Peyrat - Alcatel-Lucent
  * http://fusionforge.org/
  *
  * This file is part of FusionForge.
@@ -41,8 +42,7 @@
 	exit_error(_('No records found","Database error: "').db_error());
 }
 
-$HTML->header(array('title'=>_('Last Logins')));
-
+$HTML->header(array('title'=>_('Most Recent Opened Sessions')));
 print '<h1>'._('Most Recent Opened Sessions').'</h1>';
 
 ?>

Modified: trunk/src/www/stats/projects.php
===================================================================
--- trunk/src/www/stats/projects.php	2010-11-08 17:38:13 UTC (rev 11457)
+++ trunk/src/www/stats/projects.php	2010-11-08 17:38:27 UTC (rev 11458)
@@ -4,6 +4,7 @@
  *
  * Copyright 1999-2001 (c) VA Linux Systems
  * Copyright 2010 (c) FusionForge Team
+ * Copyright (C) 2010 Alain Peyrat - Alcatel-Lucent
  * http://fusionforge.org
  *
  * This file is part of FusionForge.
@@ -34,7 +35,7 @@
 
 session_require_global_perm ('forge_stats', 'read') ;
 
-$HTML->header(array('title'=>sprintf(_('%1$s Site Statistics'), forge_get_config ('forge_name'))));
+$HTML->header(array('title'=>sprintf(_('%1$s Site Project Statistical Comparisons'), forge_get_config ('forge_name'))));
 
 ?>
 <h1><?php echo _('Project Statistical Comparisons'); ?></h1>

Modified: trunk/src/www/survey/admin/survey.php
===================================================================
--- trunk/src/www/survey/admin/survey.php	2010-11-08 17:38:13 UTC (rev 11457)
+++ trunk/src/www/survey/admin/survey.php	2010-11-08 17:38:27 UTC (rev 11458)
@@ -4,6 +4,7 @@
  *
  * Copyright 2004 (c) GForge Team
  * Copyright 2010 (c) FusionForge Team
+ * Copyright (C) 2010 Alain Peyrat - Alcatel-Lucent
  * http://fusionforge.org/
  *
  * This file is part of FusionForge.
@@ -88,7 +89,8 @@
     form_release_key(getStringFromRequest("form_key"));
 } 
 
-$sh->header(array('title'=>_('Add a Survey')));
+$title = $survey_id ? _('Edit a Survey') : _('Add a Survey');
+$sh->header(array('title'=>$title));
 
 echo ($sh->ShowAddSurveyForm($s));
 

Modified: trunk/src/www/top/index.php
===================================================================
--- trunk/src/www/top/index.php	2010-11-08 17:38:13 UTC (rev 11457)
+++ trunk/src/www/top/index.php	2010-11-08 17:38:27 UTC (rev 11458)
@@ -4,6 +4,7 @@
  *
  * Copyright 1999-2001 (c) VA Linux Systems
  * Copyright 2002-2004 (c) GForge Team
+ * Copyright (C) 2010 Alain Peyrat - Alcatel-Lucent
  * http://fusionforge.org/
  *
  * This file is part of FusionForge.
@@ -26,7 +27,7 @@
 require_once('../env.inc.php');
 require_once $gfcommon.'include/pre.php';
 
-$HTML->header(array('title'=>_('Top Projects')));
+$HTML->header(array('title'=>sprintf(_('Top %1$s Projects'), forge_get_config ('forge_name'))));
 ?>
 
 <h1><?php printf(_('Top %1$s Projects'), forge_get_config ('forge_name')); ?></h1>




More information about the Fusionforge-commits mailing list