[Fusionforge-commits] r11460 - in trunk/src: common/reporting www/admin www/admin/trove www/include www/reporting www/stats

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


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

Modified:
   trunk/src/common/reporting/report_utils.php
   trunk/src/www/admin/massmail.php
   trunk/src/www/admin/trove/trove_cat_add.php
   trunk/src/www/admin/trove/trove_cat_edit.php
   trunk/src/www/admin/trove/trove_cat_list.php
   trunk/src/www/admin/unsubscribe.php
   trunk/src/www/include/html.php
   trunk/src/www/reporting/rebuild.php
   trunk/src/www/reporting/timecategory.php
   trunk/src/www/stats/graphs.php
Log:
Improve headers.

Modified: trunk/src/common/reporting/report_utils.php
===================================================================
--- trunk/src/common/reporting/report_utils.php	2010-11-08 17:38:38 UTC (rev 11459)
+++ trunk/src/common/reporting/report_utils.php	2010-11-08 17:38:48 UTC (rev 11460)
@@ -4,6 +4,7 @@
  *
  * Copyright 2003-2004, Tim Perdue/GForge, LLC
  * Copyright 2009, Roland Mas
+ * Copyright (C) 2010 Alain Peyrat - Alcatel-Lucent
  *
  * This file is part of FusionForge.
  *
@@ -24,8 +25,8 @@
  */
 
 function report_header($title) {
-	site_header(array('title'=>" "._('Reporting').": " . $title));
-
+	$t = sprintf(_('%1$s Reporting'), forge_get_config ('forge_name')) . ": " . $title;
+	site_header(array('title'=>$t));
 	echo "<h1>".sprintf(_('%1$s Reporting'), forge_get_config ('forge_name'))."</h1>\n";
 }
 

Modified: trunk/src/www/admin/massmail.php
===================================================================
--- trunk/src/www/admin/massmail.php	2010-11-08 17:38:38 UTC (rev 11459)
+++ trunk/src/www/admin/massmail.php	2010-11-08 17:38:48 UTC (rev 11460)
@@ -8,6 +8,7 @@
  *
  * Copyright 1999-2001 (c) VA Linux Systems
  * Copyright 2010 (c) Franck Villaume - Capgemini
+ * Copyright (C) 2010 Alain Peyrat - Alcatel-Lucent
  *
  * This file is part of FusionForge.
  *
@@ -77,15 +78,11 @@
 	exit();
 }
 
-site_admin_header(array('title'=>_('Massmail admin')));
+$title = sprintf(_('Mail Engine for %1$s Subscribers'), forge_get_config ('forge_name'));
+site_admin_header(array('title'=>$title));
+print '<h1>'.sprintf(_('Mail Engine for %1$s Subscribers'), forge_get_config ('forge_name')) .'</h1>';
 
 print '
-<h1>'
-.sprintf(_('Mail Engine for %1$s Subscribers'), forge_get_config ('forge_name')) .
-'</h1>
-';
-
-print '
 <p>
 <a href="#active">' ._('Active Deliveries').'</a>
 </p>

Modified: trunk/src/www/admin/trove/trove_cat_add.php
===================================================================
--- trunk/src/www/admin/trove/trove_cat_add.php	2010-11-08 17:38:38 UTC (rev 11459)
+++ trunk/src/www/admin/trove/trove_cat_add.php	2010-11-08 17:38:48 UTC (rev 11460)
@@ -3,6 +3,7 @@
  * Site Admin: Trove Admin: add new leaf category
  *
  * Copyright 1999-2001 (c) VA Linux Systems
+ * Copyright (C) 2010 Alain Peyrat - Alcatel-Lucent
  *
  * This file is part of FusionForge.
  *
@@ -76,9 +77,8 @@
 	}
 } 
 
-site_admin_header(array('title'=>_('Site Admin: Trove - Add Node')));
+site_admin_header(array('title'=>_('Add New Trove Category')));
 ?>
-
 <h1><?php echo _('Add New Trove Category'); ?></h1>
 
 <form action="trove_cat_add.php" method="post">

Modified: trunk/src/www/admin/trove/trove_cat_edit.php
===================================================================
--- trunk/src/www/admin/trove/trove_cat_edit.php	2010-11-08 17:38:38 UTC (rev 11459)
+++ trunk/src/www/admin/trove/trove_cat_edit.php	2010-11-08 17:38:48 UTC (rev 11460)
@@ -6,6 +6,7 @@
  * Trove tree.
  *
  * Copyright 1999-2001 (c) VA Linux Systems
+ * Copyright (C) 2010 Alain Peyrat - Alcatel-Lucent
  *
  * This file is part of FusionForge.
  *
@@ -109,9 +110,8 @@
 }
 $row_cat = db_fetch_array($res_cat);
 
-site_admin_header(array('title'=>_('Site Admin: Trove - Edit Category')));
+site_admin_header(array('title'=>_('Edit Trove Category')));
 ?>
-
 <h1><?php echo _('Edit Trove Category'); ?></h1>
 
 <form action="trove_cat_edit.php" method="post">

Modified: trunk/src/www/admin/trove/trove_cat_list.php
===================================================================
--- trunk/src/www/admin/trove/trove_cat_list.php	2010-11-08 17:38:38 UTC (rev 11459)
+++ trunk/src/www/admin/trove/trove_cat_list.php	2010-11-08 17:38:48 UTC (rev 11460)
@@ -3,6 +3,7 @@
  * Site Admin: Trove Admin: browse entire Trove tree
  *
  * Copyright 1999-2001 (c) VA Linux Systems
+ * Copyright (C) 2010 Alain Peyrat - Alcatel-Lucent
  *
  * This file is part of FusionForge.
  *
@@ -72,10 +73,9 @@
 
 html_use_tooltips();
 
-site_admin_header(array('title'=>_('Site Admin: Trove - Category List')));
+site_admin_header(array('title'=>_('Browse Trove Tree')));
 
 ?>
-
 <h1><?php echo _('Browse Trove Tree'); ?></h1>
 
 <?php

Modified: trunk/src/www/admin/unsubscribe.php
===================================================================
--- trunk/src/www/admin/unsubscribe.php	2010-11-08 17:38:38 UTC (rev 11459)
+++ trunk/src/www/admin/unsubscribe.php	2010-11-08 17:38:48 UTC (rev 11460)
@@ -6,6 +6,7 @@
  * unsubscribe specific user).
  *
  * Copyright 1999-2001 (c) VA Linux Systems
+ * Copyright (C) 2010 Alain Peyrat - Alcatel-Lucent
  *
  * This file is part of FusionForge.
  *
@@ -46,7 +47,7 @@
 		site_admin_header(array('title'=>_('Site Mailings Subscription Maintenance')));
 		?>
 
-		<h1><?php echo _('Unsubscribe user:'); ?> <?php echo $user_name; ?></h1>
+		<h2><?php echo _('Unsubscribe user:'); ?> <?php echo $user_name; ?></h2>
 		<p>
 		<?php echo _('You can unsubscribe user either from admin-initiated sitewide mailings or from all site mailings (admin-initiated and automated mailings, like forum and file release notifications).'); ?>
 		</p>
@@ -87,11 +88,8 @@
 site_admin_header(array('title'=>_('Site Mailings Subscription Maintenance')));
 
 ?>
+<h1><?php echo _('Site Mailings Subscription Maintenance'); ?></h1>
 
-<h1>
-<?php echo _('Site Mailings Subscription Maintenance'); ?>
-</h1>
-
 <p>
 <?php printf(_('Use field below to find users which match given pattern with the %1$s username, real name, or email address (substring match is preformed, use \'%%\' in the middle of pattern to specify 0 or more arbitrary characters). Click on the username to unsubscribe user from site mailings (new form will appear).'), forge_get_config ('forge_name')); ?>
 </p>

Modified: trunk/src/www/include/html.php
===================================================================
--- trunk/src/www/include/html.php	2010-11-08 17:38:38 UTC (rev 11459)
+++ trunk/src/www/include/html.php	2010-11-08 17:38:48 UTC (rev 11460)
@@ -4,6 +4,7 @@
  *
  * Copyright 1999-2001 (c) VA Linux Systems
  * Copyright 2010 (c) FusionForge Team
+ * Copyright (C) 2010 Alain Peyrat - Alcatel-Lucent
  *
  * This file is part of FusionForge.
  *
@@ -742,12 +743,15 @@
 	}
 
 	if (isset($params['title'])){
-		$params['h1']=$params['title'];
+		$h1=$params['title'];
 		$params['title']=$project->getPublicName().': '.$params['title'];
 	} else {
-		$params['h1']=$project->getPublicName();
+		$h1=$project->getPublicName();
 		$params['title']=$project->getPublicName();
 	}
+	if (!isset($params['h1'])){
+		$params['h1'] = $h1;
+	}
 	
 	site_header($params);
 	

Modified: trunk/src/www/reporting/rebuild.php
===================================================================
--- trunk/src/www/reporting/rebuild.php	2010-11-08 17:38:38 UTC (rev 11459)
+++ trunk/src/www/reporting/rebuild.php	2010-11-08 17:38:48 UTC (rev 11460)
@@ -4,6 +4,7 @@
  *
  * Copyright 2003-2004 (c) GForge LLC
  * Copyright 2010 (c) Franck Villaume
+ * Copyright (C) 2010 Alain Peyrat - Alcatel-Lucent
  * http://fusionforge.org
  *
  * This file is part of FusionForge.
@@ -44,10 +45,8 @@
 
 }
 
-report_header(_('Main Page'));
-echo '<h2>';
-echo _('Reporting System Initialization');
-echo '</h2>';
+report_header(_('Reporting System Initialization'));
+echo '<h2>'._('Reporting System Initialization').'</h2>';
 echo '<p>';
 echo _('Occasionally, if cronjobs failed or the database was damaged, you may have to rebuild the reporting tables.');
 echo '</p>';

Modified: trunk/src/www/reporting/timecategory.php
===================================================================
--- trunk/src/www/reporting/timecategory.php	2010-11-08 17:38:38 UTC (rev 11459)
+++ trunk/src/www/reporting/timecategory.php	2010-11-08 17:38:48 UTC (rev 11460)
@@ -3,6 +3,7 @@
  * Reporting System
  *
  * Copyright 2003-2004 (c) GForge LLC
+ * Copyright (C) 2010 Alain Peyrat - Alcatel-Lucent
  * http://fusionforge.org
  *
  * This file is part of FusionForge.
@@ -58,7 +59,7 @@
 
 }
 
-report_header(_('Main Page'));
+report_header(_('Manage Time Tracker Categories'));
 
 if ($time_code) {
 	$res1=db_query_params ('SELECT * FROM rep_time_category WHERE time_code=$1',
@@ -86,10 +87,12 @@
 <?php echo _('You can create categories for how time might be spent when completing a particular task. Examples of categories include "Meeting", "Coding", "Testing".'); ?>
 </p>
 <form action="<?php echo getStringFromServer('PHP_SELF'); ?>" method="post">
+<p>
 <input type="hidden" name="submit" value="1" />
 <input type="hidden" name="time_code" value="<?php echo $time_code; ?>" />
 <strong><?php echo _('Category Name'); ?>:</strong><br />
 <input type="text" name="category_name" value="<?php echo $category_name; ?>" />
+</p>
 <p>
 <?php
 

Modified: trunk/src/www/stats/graphs.php
===================================================================
--- trunk/src/www/stats/graphs.php	2010-11-08 17:38:38 UTC (rev 11459)
+++ trunk/src/www/stats/graphs.php	2010-11-08 17:38:48 UTC (rev 11460)
@@ -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,8 +30,7 @@
 
 session_require_global_perm ('forge_stats', 'read') ;
 
-$HTML->header(array('title'=>sprintf(_('%1$s Site Statistics'), forge_get_config ('forge_name'))));
-echo "\n\n";
+$HTML->header(array('title'=>sprintf(_('%1$s Sitewide Statistics Graphs'), forge_get_config ('forge_name'))));
 print '<h1>'._('Sitewide Statistics Graphs').'</h1>' . "\n";
 ?>
 




More information about the Fusionforge-commits mailing list