[Fusionforge-commits] r12102 - in branches/Branch_5_1: src/common/forum src/common/include src/common/reporting src/common/widget src/www src/www/account src/www/admin src/www/admin/trove src/www/developer src/www/export src/www/forum src/www/forum/admin src/www/frs/include src/www/include src/www/mail src/www/mail/admin src/www/my src/www/news src/www/news/admin src/www/pm src/www/pm/admin src/www/pm/include src/www/project src/www/project/admin src/www/project/report src/www/project/stats src/www/register src/www/reporting src/www/scm src/www/scm/include src/www/search/include/renderers src/www/soap/tracker src/www/stats src/www/survey src/www/survey/admin src/www/survey/include src/www/themes/css src/www/themes/funky src/www/themes/funky/css src/www/themes/gforge src/www/top src/www/tracker src/www/tracker/admin src/www/tracker/include src/www/tracker/reporting src/www/widgets tests/func/RBAC tests/func/Tasks
Alain Peyrat
aljeux at libremir.placard.fr.eu.org
Sat Jan 29 14:12:43 CET 2011
Author: aljeux
Date: 2011-01-29 14:12:42 +0100 (Sat, 29 Jan 2011)
New Revision: 12102
Modified:
branches/Branch_5_1/src/common/forum/ForumHTML.class.php
branches/Branch_5_1/src/common/include/exit.php
branches/Branch_5_1/src/common/reporting/report_utils.php
branches/Branch_5_1/src/common/widget/WidgetLayoutManager.class.php
branches/Branch_5_1/src/www/404.php
branches/Branch_5_1/src/www/account/index.php
branches/Branch_5_1/src/www/account/lostlogin.php
branches/Branch_5_1/src/www/account/pending-resend.php
branches/Branch_5_1/src/www/admin/admin_table.php
branches/Branch_5_1/src/www/admin/approve-pending.php
branches/Branch_5_1/src/www/admin/configman.php
branches/Branch_5_1/src/www/admin/globalroleedit.php
branches/Branch_5_1/src/www/admin/groupdelete.php
branches/Branch_5_1/src/www/admin/grouplist.php
branches/Branch_5_1/src/www/admin/index.php
branches/Branch_5_1/src/www/admin/massmail.php
branches/Branch_5_1/src/www/admin/pluginman.php
branches/Branch_5_1/src/www/admin/search.php
branches/Branch_5_1/src/www/admin/trove/trove_cat_add.php
branches/Branch_5_1/src/www/admin/trove/trove_cat_edit.php
branches/Branch_5_1/src/www/admin/trove/trove_cat_list.php
branches/Branch_5_1/src/www/admin/unsubscribe.php
branches/Branch_5_1/src/www/admin/useredit.php
branches/Branch_5_1/src/www/admin/userlist.php
branches/Branch_5_1/src/www/developer/diary.php
branches/Branch_5_1/src/www/developer/monitor.php
branches/Branch_5_1/src/www/export/rss20_projects.php
branches/Branch_5_1/src/www/forum/admin/index.php
branches/Branch_5_1/src/www/forum/forum.php
branches/Branch_5_1/src/www/forum/index.php
branches/Branch_5_1/src/www/forum/message.php
branches/Branch_5_1/src/www/forum/myforums.php
branches/Branch_5_1/src/www/frs/include/frs_utils.php
branches/Branch_5_1/src/www/include/logger.php
branches/Branch_5_1/src/www/include/project_home.php
branches/Branch_5_1/src/www/include/stats_function.php
branches/Branch_5_1/src/www/include/user_home.php
branches/Branch_5_1/src/www/mail/admin/index.php
branches/Branch_5_1/src/www/mail/index.php
branches/Branch_5_1/src/www/mail/mail_utils.php
branches/Branch_5_1/src/www/my/diary.php
branches/Branch_5_1/src/www/news/admin/index.php
branches/Branch_5_1/src/www/news/news_utils.php
branches/Branch_5_1/src/www/pm/admin/index.php
branches/Branch_5_1/src/www/pm/include/ProjectGroupHTML.class.php
branches/Branch_5_1/src/www/pm/index.php
branches/Branch_5_1/src/www/pm/mod_task.php
branches/Branch_5_1/src/www/project/admin/group_trove.php
branches/Branch_5_1/src/www/project/admin/index.php
branches/Branch_5_1/src/www/project/admin/massfinish.php
branches/Branch_5_1/src/www/project/admin/project_admin_utils.php
branches/Branch_5_1/src/www/project/admin/roleedit.php
branches/Branch_5_1/src/www/project/memberlist.php
branches/Branch_5_1/src/www/project/report/index.php
branches/Branch_5_1/src/www/project/request.php
branches/Branch_5_1/src/www/project/stats/index.php
branches/Branch_5_1/src/www/register/index.php
branches/Branch_5_1/src/www/reporting/groupadded.php
branches/Branch_5_1/src/www/reporting/groupcum.php
branches/Branch_5_1/src/www/reporting/projectact.php
branches/Branch_5_1/src/www/reporting/projecttime.php
branches/Branch_5_1/src/www/reporting/rebuild.php
branches/Branch_5_1/src/www/reporting/siteact.php
branches/Branch_5_1/src/www/reporting/sitetime.php
branches/Branch_5_1/src/www/reporting/sitetimebar.php
branches/Branch_5_1/src/www/reporting/timeadd.php
branches/Branch_5_1/src/www/reporting/timecategory.php
branches/Branch_5_1/src/www/reporting/toolspie.php
branches/Branch_5_1/src/www/reporting/useract.php
branches/Branch_5_1/src/www/reporting/useradded.php
branches/Branch_5_1/src/www/reporting/usercum.php
branches/Branch_5_1/src/www/reporting/usersummary.php
branches/Branch_5_1/src/www/reporting/usertime.php
branches/Branch_5_1/src/www/scm/include/scm_utils.php
branches/Branch_5_1/src/www/scm/viewvc.php
branches/Branch_5_1/src/www/search/include/renderers/FullProjectHtmlSearchRenderer.class.php
branches/Branch_5_1/src/www/search/include/renderers/HtmlSearchRenderer.class.php
branches/Branch_5_1/src/www/search/include/renderers/PeopleHtmlSearchRenderer.class.php
branches/Branch_5_1/src/www/search/include/renderers/ProjectHtmlSearchRenderer.class.php
branches/Branch_5_1/src/www/soap/tracker/tracker.php
branches/Branch_5_1/src/www/stats/graphs.php
branches/Branch_5_1/src/www/stats/i18n.php
branches/Branch_5_1/src/www/stats/index.php
branches/Branch_5_1/src/www/stats/lastlogins.php
branches/Branch_5_1/src/www/stats/projects.php
branches/Branch_5_1/src/www/survey/admin/index.php
branches/Branch_5_1/src/www/survey/admin/show_results.php
branches/Branch_5_1/src/www/survey/admin/survey.php
branches/Branch_5_1/src/www/survey/include/SurveyHTML.class.php
branches/Branch_5_1/src/www/survey/index.php
branches/Branch_5_1/src/www/survey/privacy.php
branches/Branch_5_1/src/www/survey/survey.php
branches/Branch_5_1/src/www/survey/survey_resp.php
branches/Branch_5_1/src/www/tarballs.php
branches/Branch_5_1/src/www/themes/css/fusionforge.css
branches/Branch_5_1/src/www/themes/funky/Theme.class.php
branches/Branch_5_1/src/www/themes/funky/css/theme.css
branches/Branch_5_1/src/www/themes/gforge/Theme.class.php
branches/Branch_5_1/src/www/top/index.php
branches/Branch_5_1/src/www/top/mostactive.php
branches/Branch_5_1/src/www/top/toplist.php
branches/Branch_5_1/src/www/top/topusers.php
branches/Branch_5_1/src/www/tracker/admin/form-deleteextrafieldelement.php
branches/Branch_5_1/src/www/tracker/admin/form-extrafieldcopy.php
branches/Branch_5_1/src/www/tracker/admin/form-workflow.php
branches/Branch_5_1/src/www/tracker/admin/form-workflow_roles.php
branches/Branch_5_1/src/www/tracker/browse.php
branches/Branch_5_1/src/www/tracker/deleteartifact.php
branches/Branch_5_1/src/www/tracker/detail.php
branches/Branch_5_1/src/www/tracker/include/ArtifactHtml.class.php
branches/Branch_5_1/src/www/tracker/include/ArtifactTypeHtml.class.php
branches/Branch_5_1/src/www/tracker/ind.php
branches/Branch_5_1/src/www/tracker/mod-limited.php
branches/Branch_5_1/src/www/tracker/mod.php
branches/Branch_5_1/src/www/tracker/reporting/index.php
branches/Branch_5_1/src/www/tracker/taskmgr.php
branches/Branch_5_1/src/www/widgets/widgets.php
branches/Branch_5_1/tests/func/RBAC/rbacTest.php
branches/Branch_5_1/tests/func/Tasks/createTaskTest.php
Log:
Handle <h1> and sub menu directly in header() to allow cleaner code and allow theme to embed submenu inside the menu if needed.
Modified: branches/Branch_5_1/src/common/forum/ForumHTML.class.php
===================================================================
--- branches/Branch_5_1/src/common/forum/ForumHTML.class.php 2011-01-29 10:32:52 UTC (rev 12101)
+++ branches/Branch_5_1/src/common/forum/ForumHTML.class.php 2011-01-29 13:12:42 UTC (rev 12102)
@@ -5,7 +5,7 @@
* Copyright 1999-2001, Tim Perdue - Sourceforge
* Copyright 2002, Tim Perdue - GForge, LLC
* Copyright 2010 (c) 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. FusionForge is free software;
@@ -58,7 +58,6 @@
$params['group']=db_result($result,0,'group_id');
$params['toptab']='news';
$HTML->header($params);
- echo '<h1>' . $params['title'] . '</h1>';
echo '<table><tr><td valign="top">';
if (!$result || db_numrows($result) < 1) {
@@ -100,41 +99,37 @@
echo news_show_latest($params['group'],5,false);
echo $HTML->boxBottom();
echo '</td></tr></table>';
- } else {
- site_project_header($params);
- echo '<h1>' . $params['title'] . '</h1>';
}
- } else {
- site_project_header($params);
- echo '<h1>' . $params['title'] . '</h1>';
}
$menu_text=array();
$menu_links=array();
+ $menu_text[]=_('View Forums');
+ $menu_links[]='/forum/?group_id='.$group_id;
+
if ($f){
if ($forum_id) {
$menu_text[]=_('Discussion Forums:') .' '. $f->getName();
$menu_links[]='/forum/forum.php?forum_id='.$forum_id;
}
if (forge_check_perm ('forum_admin', $f->Group->getID())) {
- $menu_text[]=_('Admin');
+ $menu_text[]=_('Administration');
$menu_links[]='/forum/admin/?group_id='.$group_id;
}
} else {
$gg=group_get_object($group_id);
if (forge_check_perm ('forum_admin', $group_id)) {
- $menu_text[]=_('Admin');
+ $menu_text[]=_('Administration');
$menu_links[]='/forum/admin/?group_id='.$group_id;
}
}
if (count($menu_text) > 0) {
- echo $HTML->subMenu(
- $menu_text,
- $menu_links
- );
+ $params['submenu'] =$HTML->subMenu($menu_text,$menu_links);
}
+ site_project_header($params);
+
$pluginManager = plugin_manager_get_object();
if ($f && $pluginManager->PluginIsInstalled('blocks') && plugin_hook ("blocks", "forum_".$f->getName()))
echo '<br />';
@@ -220,7 +215,7 @@
$ret_val .= $am->PrintAttachLink($msg,$group_id,$msgforum->getID()) . '
<br />
'.
- html_image('ic/msg.png',"10","12") .
+ html_image('ic/msg.png') .
$bold_begin. $msg->getSubject() . $bold_end .' '.
'<br />'. date(_('Y-m-d H:i'),$msg->getPostDate()) .'
</td>
@@ -257,7 +252,7 @@
$am = new AttachManager();
$msgforum =& $msg->getForum();
$fa = new ForumAdmin($msgforum->Group->getID());
- $url = util_make_url('/forum/message.php?msg_id='. $msg->getID() .'&group_id='.$group_id);
+ $url = util_make_uri('/forum/message.php?msg_id='. $msg->getID() .'&group_id='.$group_id);
$ret_val =
'<table border="0" width="100%" cellspacing="0">
<tr>
@@ -449,7 +444,7 @@
}
$ret_val .= $ah_begin .
- html_image('ic/msg.png',"10","12").' ';
+ html_image('ic/msg.png').' ';
/*
See if this message is new or not
*/
Modified: branches/Branch_5_1/src/common/include/exit.php
===================================================================
--- branches/Branch_5_1/src/common/include/exit.php 2011-01-29 10:32:52 UTC (rev 12101)
+++ branches/Branch_5_1/src/common/include/exit.php 2011-01-29 13:12:42 UTC (rev 12102)
@@ -31,7 +31,6 @@
function exit_error($text="", $toptab='') {
global $HTML,$group_id;
$HTML->header(array('title'=>_('Exiting with error'), 'group'=>$group_id, 'toptab'=>$toptab));
- echo '<h1>' . _('Exiting with error') . '</h1>';
echo $HTML->error_msg(htmlspecialchars($text));
$HTML->footer(array());
exit;
Modified: branches/Branch_5_1/src/common/reporting/report_utils.php
===================================================================
--- branches/Branch_5_1/src/common/reporting/report_utils.php 2011-01-29 10:32:52 UTC (rev 12101)
+++ branches/Branch_5_1/src/common/reporting/report_utils.php 2011-01-29 13:12:42 UTC (rev 12102)
@@ -28,7 +28,6 @@
function report_header($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";
}
function report_footer() {
Modified: branches/Branch_5_1/src/common/widget/WidgetLayoutManager.class.php
===================================================================
--- branches/Branch_5_1/src/common/widget/WidgetLayoutManager.class.php 2011-01-29 10:32:52 UTC (rev 12101)
+++ branches/Branch_5_1/src/common/widget/WidgetLayoutManager.class.php 2011-01-29 13:12:42 UTC (rev 12102)
@@ -1,6 +1,7 @@
<?php
/**
* Copyright (c) Xerox Corporation, Codendi Team, 2001-2009. All rights reserved
+ * Copyright (C) 2011 Alain Peyrat - Alcatel-Lucent
*
* This file is a part of Codendi.
*
@@ -62,11 +63,11 @@
$req = db_query_params($sql,array($owner_type,$owner_id));
if ($data = db_fetch_array($req)) {
$readonly = !$this->_currentUserCanUpdateLayout($owner_id, $owner_type);
- if (!$readonly) {
- echo '<p class="customize"><a href="/widgets/widgets.php?owner='. $owner_type.$owner_id .'&layout_id='. $data['id'] .'">'. _("Customize") .'</a></p>';
- } else if ($owner_type === self::OWNER_TYPE_GROUP) {
- echo '<br />';
- }
+// if (!$readonly) {
+// echo '<p class="customize"><a href="/widgets/widgets.php?owner='. $owner_type.$owner_id .'&layout_id='. $data['id'] .'">'. _("Customize") .'</a></p>';
+// } else if ($owner_type === self::OWNER_TYPE_GROUP) {
+// echo '<br />';
+// }
$layout = new WidgetLayout($data['id'], $data['name'], $data['description'], $data['scope']);
$sql = 'SELECT * FROM layouts_rows WHERE layout_id = $1 ORDER BY rank';
$req_rows = db_query_params($sql,array($layout->id));
Modified: branches/Branch_5_1/src/www/404.php
===================================================================
--- branches/Branch_5_1/src/www/404.php 2011-01-29 10:32:52 UTC (rev 12101)
+++ branches/Branch_5_1/src/www/404.php 2011-01-29 13:12:42 UTC (rev 12102)
@@ -25,7 +25,6 @@
require_once $gfcommon.'include/pre.php';
$HTML->header(array('title'=>_('Requested Page not Found (Error 404)')));
-echo "<h1>".util_make_link('/',_('Requested Page not Found (Error 404)'))."</h1>";
$HTML->footer(array());
?>
Modified: branches/Branch_5_1/src/www/account/index.php
===================================================================
--- branches/Branch_5_1/src/www/account/index.php 2011-01-29 10:32:52 UTC (rev 12101)
+++ branches/Branch_5_1/src/www/account/index.php 2011-01-29 13:12:42 UTC (rev 12102)
@@ -4,6 +4,7 @@
*
* Copyright 1999-2001 (c) VA Linux Systems
* Copyright 2010 (c) Franck Villaume
+ * Copyright (C) 2011 Alain Peyrat - Alcatel-Lucent
*
* This file is part of FusionForge.
*
@@ -93,7 +94,6 @@
$title = _('Account Maintenance');
site_user_header(array('title'=>$title));
-echo '<h1>' . $title . '</h1>';
echo '<form action="'.util_make_url('/account/').'" method="post">';
echo '<input type="hidden" name="form_key" value="'.form_generate_key().'"/>';
@@ -122,7 +122,7 @@
<td><strong><?php print date(_('Y-m-d H:i'),$u->getAddDate()); ?></strong></td>
</tr>
<tr valign="top">
-<td><?php echo _('User ID:'); ?> </td>
+<td><?php echo _('User Id:'); ?> </td>
<td><strong><?php print $u->getID(); ?></strong></td>
</tr>
Modified: branches/Branch_5_1/src/www/account/lostlogin.php
===================================================================
--- branches/Branch_5_1/src/www/account/lostlogin.php 2011-01-29 10:32:52 UTC (rev 12101)
+++ branches/Branch_5_1/src/www/account/lostlogin.php 2011-01-29 13:12:42 UTC (rev 12102)
@@ -87,7 +87,6 @@
$title = _("Lost Password Login") ;
$HTML->header(array('title'=>$title));
-echo '<h1>'.$title.'</h1>' ;
echo '<p>' ;
printf (_('Welcome, %s. You may now change your password.'),$u->getUnixName());
echo '</p>';
Modified: branches/Branch_5_1/src/www/account/pending-resend.php
===================================================================
--- branches/Branch_5_1/src/www/account/pending-resend.php 2011-01-29 10:32:52 UTC (rev 12101)
+++ branches/Branch_5_1/src/www/account/pending-resend.php 2011-01-29 13:12:42 UTC (rev 12102)
@@ -56,7 +56,6 @@
}
$HTML->header(array('title'=>_('Resend confirmation email to a pending account')));
-echo '<h1>' . _('Resend confirmation email to a pending account') . '</h1>';
if (forge_get_config('require_unique_email')) {
echo _('Fill in a user name or email address and click \'Submit\' to resend the confirmation email.');
Modified: branches/Branch_5_1/src/www/admin/admin_table.php
===================================================================
--- branches/Branch_5_1/src/www/admin/admin_table.php 2011-01-29 10:32:52 UTC (rev 12101)
+++ branches/Branch_5_1/src/www/admin/admin_table.php 2011-01-29 13:12:42 UTC (rev 12102)
@@ -339,7 +339,6 @@
return $unit;
}
-
require_once('../env.inc.php');
require_once $gfcommon.'include/pre.php';
@@ -347,9 +346,6 @@
$HTML->header(array('title'=>sprintf(_('Edit the %1$ss Table'), ucwords(getUnitLabel($unit)))));
-echo '<h1>'.sprintf(_('Edit the %1$ss Table'), ucwords(getUnitLabel($unit))).'</h1>
-<p>'.util_make_link ('/admin/',_('Site Admin Home')).'</p>';
-
// $table, $unit and $primary_key are variables passed from the parent scripts
$id = getStringFromRequest('id');
Modified: branches/Branch_5_1/src/www/admin/approve-pending.php
===================================================================
--- branches/Branch_5_1/src/www/admin/approve-pending.php 2011-01-29 10:32:52 UTC (rev 12101)
+++ branches/Branch_5_1/src/www/admin/approve-pending.php 2011-01-29 13:12:42 UTC (rev 12102)
@@ -108,7 +108,6 @@
}
site_admin_header(array('title'=>_('Approving Pending Projects')), 'approve_projects');
-echo '<h1>' . _('Approving Pending Projects') . '</h1>';
// get current information
$res_grp = db_query_params("SELECT * FROM groups WHERE status='P'", array(), $LIMIT);
Modified: branches/Branch_5_1/src/www/admin/configman.php
===================================================================
--- branches/Branch_5_1/src/www/admin/configman.php 2011-01-29 10:32:52 UTC (rev 12101)
+++ branches/Branch_5_1/src/www/admin/configman.php 2011-01-29 13:12:42 UTC (rev 12102)
@@ -32,7 +32,6 @@
require_once $gfwww.'admin/admin_utils.php';
site_admin_header(array('title'=>_('Configuration Manager')));
-echo '<h1>' . _('Configuration Manager') . '</h1>';
echo "<h2>".sprintf (_('Configuration from the config API (*.ini files)'))."</h2>" ;
Modified: branches/Branch_5_1/src/www/admin/globalroleedit.php
===================================================================
--- branches/Branch_5_1/src/www/admin/globalroleedit.php 2011-01-29 10:32:52 UTC (rev 12101)
+++ branches/Branch_5_1/src/www/admin/globalroleedit.php 2011-01-29 13:12:42 UTC (rev 12102)
@@ -27,7 +27,6 @@
require_once $gfwww.'include/role_utils.php';
site_admin_header(array('title'=>_('Site Admin')));
-echo '<h1>' . _('Site Admin') . '</h1>';
$role_id = getIntFromRequest('role_id');
$data = getStringFromRequest('data');
Modified: branches/Branch_5_1/src/www/admin/groupdelete.php
===================================================================
--- branches/Branch_5_1/src/www/admin/groupdelete.php 2011-01-29 10:32:52 UTC (rev 12101)
+++ branches/Branch_5_1/src/www/admin/groupdelete.php 2011-01-29 13:12:42 UTC (rev 12102)
@@ -53,7 +53,6 @@
$title = _('Permanently and irretrievably delete project').': '.$group->getPublicName();
site_admin_header(array('title'=>$title));
-echo '<h1>'.$title.'</h1>';
?>
<form action="<?php echo getStringFromServer('PHP_SELF').'?group_id='.$group_id; ?>" method="post">
Modified: branches/Branch_5_1/src/www/admin/grouplist.php
===================================================================
--- branches/Branch_5_1/src/www/admin/grouplist.php 2011-01-29 10:32:52 UTC (rev 12101)
+++ branches/Branch_5_1/src/www/admin/grouplist.php 2011-01-29 13:12:42 UTC (rev 12102)
@@ -26,7 +26,6 @@
require_once $gfwww.'admin/admin_utils.php';
site_admin_header(array('title'=>_('Project List')));
-echo '<h1>' . _('Project List') . '</h1>';
$sortorder = getStringFromRequest('sortorder');
$group_name_search = getStringFromRequest('group_name_search');
Modified: branches/Branch_5_1/src/www/admin/index.php
===================================================================
--- branches/Branch_5_1/src/www/admin/index.php 2011-01-29 10:32:52 UTC (rev 12101)
+++ branches/Branch_5_1/src/www/admin/index.php 2011-01-29 13:12:42 UTC (rev 12102)
@@ -39,7 +39,6 @@
$warning_msg = htmlspecialchars(getStringFromRequest('warning_msg'));
site_admin_header(array('title'=>_('Site Admin')));
-echo '<h1>' . _('Site Admin') . '</h1>';
$abc_array = array('A','B','C','D','E','F','G','H','I','J','K','L','M','N','O','P','Q','R','S','T','U','V','W','X','Y','Z','0','1','2','3','4','5','6','7','8','9');
Modified: branches/Branch_5_1/src/www/admin/massmail.php
===================================================================
--- branches/Branch_5_1/src/www/admin/massmail.php 2011-01-29 10:32:52 UTC (rev 12101)
+++ branches/Branch_5_1/src/www/admin/massmail.php 2011-01-29 13:12:42 UTC (rev 12102)
@@ -72,7 +72,6 @@
$title = _('Massmail admin');
site_admin_header(array('title'=>$title));
- echo '<h1>' . $title . '</h1>';
print "<p class=\"feedback\">" ._('Mailing successfully scheduled for delivery'). "</p>";
site_admin_footer(array());
exit();
@@ -80,7 +79,6 @@
$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 '
<p>
Modified: branches/Branch_5_1/src/www/admin/pluginman.php
===================================================================
--- branches/Branch_5_1/src/www/admin/pluginman.php 2011-01-29 10:32:52 UTC (rev 12101)
+++ branches/Branch_5_1/src/www/admin/pluginman.php 2011-01-29 13:12:42 UTC (rev 12102)
@@ -105,7 +105,6 @@
}
site_admin_header(array('title'=>_('Plugin Manager')));
-echo '<h1>' . _('Plugin Manager') . '</h1>';
?>
<form name="theform" action="<?php echo getStringFromServer('PHP_SELF'); ?>" method="get">
Modified: branches/Branch_5_1/src/www/admin/search.php
===================================================================
--- branches/Branch_5_1/src/www/admin/search.php 2011-01-29 10:32:52 UTC (rev 12101)
+++ branches/Branch_5_1/src/www/admin/search.php 2011-01-29 13:12:42 UTC (rev 12102)
@@ -41,7 +41,6 @@
}
site_admin_header(array('title'=>_('Admin Search Results')));
-echo '<h1>' . _('Admin Search Results') . '</h1>';
function format_name($name, $status) {
if ($status == 'D') {
Modified: branches/Branch_5_1/src/www/admin/trove/trove_cat_add.php
===================================================================
--- branches/Branch_5_1/src/www/admin/trove/trove_cat_add.php 2011-01-29 10:32:52 UTC (rev 12101)
+++ branches/Branch_5_1/src/www/admin/trove/trove_cat_add.php 2011-01-29 13:12:42 UTC (rev 12102)
@@ -79,7 +79,6 @@
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">
<input type="hidden" name="form_key" value="<?php echo form_generate_key(); ?>" />
Modified: branches/Branch_5_1/src/www/admin/trove/trove_cat_edit.php
===================================================================
--- branches/Branch_5_1/src/www/admin/trove/trove_cat_edit.php 2011-01-29 10:32:52 UTC (rev 12101)
+++ branches/Branch_5_1/src/www/admin/trove/trove_cat_edit.php 2011-01-29 13:12:42 UTC (rev 12102)
@@ -112,7 +112,6 @@
site_admin_header(array('title'=>_('Edit Trove Category')));
?>
-<h1><?php echo _('Edit Trove Category'); ?></h1>
<form action="trove_cat_edit.php" method="post">
Modified: branches/Branch_5_1/src/www/admin/trove/trove_cat_list.php
===================================================================
--- branches/Branch_5_1/src/www/admin/trove/trove_cat_list.php 2011-01-29 10:32:52 UTC (rev 12101)
+++ branches/Branch_5_1/src/www/admin/trove/trove_cat_list.php 2011-01-29 13:12:42 UTC (rev 12102)
@@ -3,7 +3,7 @@
* Site Admin: Trove Admin: browse entire Trove tree
*
* Copyright 1999-2001 (c) VA Linux Systems
- * Copyright (C) 2010 Alain Peyrat - Alcatel-Lucent
+ * Copyright (C) 2010-2011 Alain Peyrat - Alcatel-Lucent
*
* This file is part of FusionForge.
*
@@ -46,7 +46,7 @@
$title = '';
}
- print html_image('ic/cfolder15.png','15','13');
+ print html_image('ic/cfolder15.png');
print (' <span class="trove-nodes" title="'.$title.'">'.$text.'</span> ');
if ($nodeid == 0) {
print ('<a href="trove_cat_add.php?parent_trove_cat_id='.$nodeid.'">['._('Add').']</a> ');
@@ -76,7 +76,6 @@
site_admin_header(array('title'=>_('Browse Trove Tree')));
?>
-<h1><?php echo _('Browse Trove Tree'); ?></h1>
<?php
Modified: branches/Branch_5_1/src/www/admin/unsubscribe.php
===================================================================
--- branches/Branch_5_1/src/www/admin/unsubscribe.php 2011-01-29 10:32:52 UTC (rev 12101)
+++ branches/Branch_5_1/src/www/admin/unsubscribe.php 2011-01-29 13:12:42 UTC (rev 12102)
@@ -88,7 +88,6 @@
site_admin_header(array('title'=>_('Site Mailings Subscription Maintenance')));
?>
-<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')); ?>
Modified: branches/Branch_5_1/src/www/admin/useredit.php
===================================================================
--- branches/Branch_5_1/src/www/admin/useredit.php 2011-01-29 10:32:52 UTC (rev 12101)
+++ branches/Branch_5_1/src/www/admin/useredit.php 2011-01-29 13:12:42 UTC (rev 12102)
@@ -3,6 +3,7 @@
* Site Admin user properties editing page
*
* Copyright 1999-2001 (c) VA Linux Systems
+ * Copyright (C) 2011 Alain Peyrat - Alcatel-Lucent
*
* This file is part of FusionForge.
*
@@ -84,7 +85,6 @@
$title = _('Site Admin: User Info');
site_admin_header(array('title'=>$title));
-echo '<h1>' . $title . '</h1>'
?>
<h2><?php echo _('Account Information'); ?><sup>1</sup></h2>
@@ -96,7 +96,7 @@
<table>
<tr>
<td>
-<?php echo _('User ID:'); ?>
+<?php echo _('User Id:'); ?>
</td>
<td>
<?php echo $u->getID(); ?>
Modified: branches/Branch_5_1/src/www/admin/userlist.php
===================================================================
--- branches/Branch_5_1/src/www/admin/userlist.php 2011-01-29 10:32:52 UTC (rev 12101)
+++ branches/Branch_5_1/src/www/admin/userlist.php 2011-01-29 13:12:42 UTC (rev 12102)
@@ -29,7 +29,6 @@
session_require_global_perm ('forge_admin');
$HTML->header(array('title'=>_('User List')));
-echo '<h1>' . _('User List') . '</h1>';
/**
* performAction() - Updates the indicated user status
Modified: branches/Branch_5_1/src/www/developer/diary.php
===================================================================
--- branches/Branch_5_1/src/www/developer/diary.php 2011-01-29 10:32:52 UTC (rev 12101)
+++ branches/Branch_5_1/src/www/developer/diary.php 2011-01-29 13:12:42 UTC (rev 12102)
@@ -39,7 +39,6 @@
$title = _('Diary And Notes For').': '. $user_obj->getRealName();
echo $HTML->header(array('title'=>$title));
- echo '<h1>'. $title .'</h1>';
if ($diary_id) {
$res = db_query_params ('SELECT * FROM user_diary WHERE user_id=$1 AND id=$2 AND is_public=1',
Modified: branches/Branch_5_1/src/www/developer/monitor.php
===================================================================
--- branches/Branch_5_1/src/www/developer/monitor.php 2011-01-29 10:32:52 UTC (rev 12101)
+++ branches/Branch_5_1/src/www/developer/monitor.php 2011-01-29 13:12:42 UTC (rev 12102)
@@ -45,7 +45,6 @@
site_user_header(array('title'=>_('Monitor a User')));
- echo '<h1>'._('Monitor a User').'</h1>';
$result = db_query_params ('SELECT * FROM user_diary_monitor WHERE user_id=$1 AND monitored_user=$2;',
array (user_getid(),
$diary_user));
@@ -77,7 +76,6 @@
$HTML->footer (array());
} else {
$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: branches/Branch_5_1/src/www/export/rss20_projects.php
===================================================================
--- branches/Branch_5_1/src/www/export/rss20_projects.php 2011-01-29 10:32:52 UTC (rev 12101)
+++ branches/Branch_5_1/src/www/export/rss20_projects.php 2011-01-29 13:12:42 UTC (rev 12102)
@@ -18,8 +18,6 @@
array ('A'),
$limit);
-//rss20_dump_project_result_set($res,$GLOBALS['sys_default_name'].' Full Project Listing');
-// quick and dirty fix
rss_dump_project_result_set($res,forge_get_config ('forge_name').' Full Project Listing');
?>
</rss>
Modified: branches/Branch_5_1/src/www/forum/admin/index.php
===================================================================
--- branches/Branch_5_1/src/www/forum/admin/index.php 2011-01-29 10:32:52 UTC (rev 12101)
+++ branches/Branch_5_1/src/www/forum/admin/index.php 2011-01-29 13:12:42 UTC (rev 12102)
@@ -5,6 +5,7 @@
* Copyright 1999-2001 (c) VA Linux Systems
* Copyright 2002-2004 (c) GForge Team
* Copyright 2010 (c) Franck Villaume - Capgemini
+ * Copyright (C) 2011 Alain Peyrat - Alcatel-Lucent
* http://fusionforge.org/
*
* This file is part of FusionForge.
@@ -382,11 +383,11 @@
exit_error($ff->getErrorMessage(),'forums');
}
- $farr =& $ff->getForums();
+ $farr = $ff->getForums();
if ($ff->isError()) {
- echo '<h1>'.sprintf(_('No Forums Found For %s'), $g->getPublicName()) .'</h1>';
- echo '<div class="error">'.$ff->getErrorMessage().'</div>';
+ echo '<p class="error">'.sprintf(_('No Forums Found For %s'), $g->getPublicName())
+ . $ff->getErrorMessage().'</p>';
forum_footer(array());
exit;
}
@@ -458,11 +459,11 @@
exit_error($ff->getErrorMessage(),'forums');
}
- $farr =& $ff->getForumsAdmin();
+ $farr = $ff->getForumsAdmin();
if ($ff->isError()) {
- echo '<h1>'.sprintf(_('No Forums Found For %1$s'), $g->getPublicName()) .'</h1>';
- echo '<div class="error">'.$ff->getErrorMessage().'</div>';
+ echo '<p class="error">'.sprintf(_('No Forums Found For %s'), $g->getPublicName())
+ . $ff->getErrorMessage().'</p>';
forum_footer(array());
exit;
}
Modified: branches/Branch_5_1/src/www/forum/forum.php
===================================================================
--- branches/Branch_5_1/src/www/forum/forum.php 2011-01-29 10:32:52 UTC (rev 12101)
+++ branches/Branch_5_1/src/www/forum/forum.php 2011-01-29 13:12:42 UTC (rev 12102)
@@ -5,7 +5,7 @@
* Copyright 1999-2001, Tim Perdue - Sourceforge
* Copyright 2002, Tim Perdue - GForge, LLC
* Copyright 2010 (c) 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. FusionForge is free software;
@@ -269,7 +269,7 @@
$ret_val .= '<tr '. $GLOBALS['HTML']->boxGetAltRowStyle($total_rows) .'>
<td><a href="'.util_make_url ('/forum/message.php?msg_id='.$msg->getID().
'&group_id='.$group_id).'&reply=0">'.
- html_image('ic/msg.png',"10","12").' ';
+ html_image('ic/msg.png').' ';
/*
See if this message is new or not
If so, highlite it in bold
@@ -343,9 +343,9 @@
$i=0;
while (($row=db_fetch_array($result)) && ($i < $max_rows)) {
$ret_val .= '
- <tr '. $GLOBALS['HTML']->boxGetAltRowStyle($i) .'><td><a href="'.util_make_url ('/forum/forum.php?thread_id='.
+ <tr '. $GLOBALS['HTML']->boxGetAltRowStyle($i) .'><td><a href="'.util_make_uri('/forum/forum.php?thread_id='.
$row['thread_id'].'&forum_id='.$forum_id.'&group_id='.$group_id).'">'.
- html_image('ic/cfolder15.png',"15","13") . ' ';
+ html_image('ic/cfolder15.png') . ' ';
/*
See if this message is new or not
If so, highlite it in bold
@@ -390,7 +390,7 @@
if ($avail_rows > $max_rows) {
$ret_val .= '<span class="next">
- <a href="'.util_make_url ('/forum/forum.php?max_rows='.$max_rows.'&style='.$style.'&offset='.($offset+$i).
+ <a href="'.util_make_uri('/forum/forum.php?max_rows='.$max_rows.'&style='.$style.'&offset='.($offset+$i).
'&forum_id='.$forum_id.'&group_id='.$group_id).'">
<strong> '._('Older Messages') .
html_image('t.png',"15","15") . '</strong></a></span>';
Modified: branches/Branch_5_1/src/www/forum/index.php
===================================================================
--- branches/Branch_5_1/src/www/forum/index.php 2011-01-29 10:32:52 UTC (rev 12101)
+++ branches/Branch_5_1/src/www/forum/index.php 2011-01-29 13:12:42 UTC (rev 12102)
@@ -5,6 +5,7 @@
* Copyright 1999-2001, Tim Perdue - Sourceforge
* Copyright 2002, Tim Perdue - GForge, LLC
* Copyright 2010 (c) Franck Villaume - Capgemini
+ * Copyright (C) 2011 Alain Peyrat - Alcatel-Lucent
*
* This file is part of FusionForge. FusionForge is free software;
* you can redistribute it and/or modify it under the terms of the
@@ -60,7 +61,7 @@
// echo _('<p>Choose a forum and you can browse, search, and post messages.<p>');
- echo $HTML->subMenu(array(_("My Monitored Forums")),array("/forum/myforums.php?group_id=$group_id"));
+ echo $HTML->printsubMenu(array(_("My Monitored Forums")),array("/forum/myforums.php?group_id=$group_id"));
plugin_hook ("blocks", "forum index");
@@ -82,9 +83,9 @@
case 1 : $modlvl = _('Anonymous & Non Project Users');break;
case 2 : $modlvl = _('All Except Admins');break;
}
- echo '<tr '. $HTML->boxGetAltRowStyle($j) . '><td><a href="forum.php?forum_id='. $farr[$j]->getID() .
- '&group_id=' . $group_id . '">'.
- html_image("ic/forum20w.png","20","20") .
+ echo '<tr '. $HTML->boxGetAltRowStyle($j) . '><td>'.
+ '<a href="'.util_make_uri('/forum/forum.php?forum_id='.$farr[$j]->getID().'&group_id='.$group_id).'">'.
+ html_image('ic/forum20w.png') .
' ' .
$farr[$j]->getName() .'</a></td>
<td>'.$farr[$j]->getDescription().'</td>
Modified: branches/Branch_5_1/src/www/forum/message.php
===================================================================
--- branches/Branch_5_1/src/www/forum/message.php 2011-01-29 10:32:52 UTC (rev 12101)
+++ branches/Branch_5_1/src/www/forum/message.php 2011-01-29 13:12:42 UTC (rev 12102)
@@ -5,6 +5,7 @@
* Copyright 1999-2001, Tim Perdue - Sourceforge
* Copyright 2002, 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. FusionForge is free software;
@@ -184,7 +185,7 @@
}
$ret_val .= '<tr '. $GLOBALS['HTML']->boxGetAltRowStyle($total_rows) .'>
<td>'. $ah_begin .
- html_image('ic/msg.png',"10","12").' ';
+ html_image('ic/msg.png').' ';
/*
See if this message is new or not
If so, highlite it in bold
Modified: branches/Branch_5_1/src/www/forum/myforums.php
===================================================================
--- branches/Branch_5_1/src/www/forum/myforums.php 2011-01-29 10:32:52 UTC (rev 12101)
+++ branches/Branch_5_1/src/www/forum/myforums.php 2011-01-29 13:12:42 UTC (rev 12102)
@@ -44,7 +44,6 @@
forum_header(array('title'=>_('My Monitored Forums')));
} else {
site_header(array('title'=>_('My Monitored Forums'), 'user_id' => $user_id));
- echo "<h1>" . _('My Monitored Forums') . "</h1>";
}
//get the user monitored forums
@@ -62,7 +61,6 @@
}
//now, i need to create a forum object per each forum that the user is monitoring
-
$monitored_forums = array();
for ($i=0;$i<db_numrows($result);$i++) {
$monitored_forums[$i] = db_fetch_array($result);
Modified: branches/Branch_5_1/src/www/frs/include/frs_utils.php
===================================================================
--- branches/Branch_5_1/src/www/frs/include/frs_utils.php 2011-01-29 10:32:52 UTC (rev 12101)
+++ branches/Branch_5_1/src/www/frs/include/frs_utils.php 2011-01-29 13:12:42 UTC (rev 12102)
@@ -4,6 +4,7 @@
*
* Copyright 1999-2001 (c) VA Linux Systems
* Copyright 2002-2004 (c) GForge Team
+ * Copyright (C) 2011 Alain Peyrat - Alcatel-Lucent
* http://fusionforge.org/
*
* This file is part of FusionForge.
@@ -68,11 +69,9 @@
$params['toptab']='frs';
$params['group']=$group_id;
- site_project_header($params);
- echo '<h1>' . $params['title'] . '</h1>';
if (forge_check_perm ('frs', $group_id, 'write')) {
- echo $HTML->subMenu(
+ $params['submenu'] = $HTML->subMenu(
array(
_('View File Releases'),
_('Reporting'),
@@ -85,6 +84,7 @@
)
);
}
+ site_project_header($params);
}
function frs_footer() {
Modified: branches/Branch_5_1/src/www/include/logger.php
===================================================================
--- branches/Branch_5_1/src/www/include/logger.php 2011-01-29 10:32:52 UTC (rev 12101)
+++ branches/Branch_5_1/src/www/include/logger.php 2011-01-29 13:12:42 UTC (rev 12102)
@@ -1,6 +1,7 @@
<?php
/**
* Copyright 1999-2001 (c) VA Linux Systems
+ * Copyright (C) 2011 Alain Peyrat - Alcatel-Lucent
* http://fusionforge.org
*
* This file is part of FusionForge.
@@ -61,7 +62,7 @@
'H'));
// store subpage id for analyzing later
- $subpage = @$expl_pathinfo[3];
+ $subpage = isset($expl_pathinfo[3])?$expl_pathinfo[3]:'';
$subpage2 = isset($expl_pathinfo[4]) ? $expl_pathinfo[4] : '';
//set up the group_id
Modified: branches/Branch_5_1/src/www/include/project_home.php
===================================================================
--- branches/Branch_5_1/src/www/include/project_home.php 2011-01-29 10:32:52 UTC (rev 12101)
+++ branches/Branch_5_1/src/www/include/project_home.php 2011-01-29 13:12:42 UTC (rev 12102)
@@ -4,6 +4,7 @@
*
* Copyright 1999-2001 (c) VA Linux Systems
* Copyright 2010, FusionForge Team
+ * Copyright (C) 2011 Alain Peyrat - Alcatel-Lucent
* http://fusionforge.org
*
* This file is part of FusionForge.
@@ -27,6 +28,7 @@
require_once $gfwww.'include/trove.php';
require_once $gfwww.'include/project_summary.php';
require_once $gfcommon.'include/tag_cloud.php';
+require_once $gfcommon.'include/HTTPRequest.class.php';
require_once $gfcommon.'widget/WidgetLayoutManager.class.php';
session_require_perm ('project_read', $group_id) ;
@@ -39,11 +41,45 @@
use_javascript('/scripts/codendi/LayoutManager.js');
use_javascript('/scripts/codendi/ReorderColumns.js');
-site_project_header(array('title'=>$title,'h1' => '', 'group'=>$group_id,'toptab'=>'home'));
-
$request =& HTTPRequest::instance();
$request->set('group_id',$group_id);
+$params['submenu'] = '';
+
+if (session_loggedin()) {
+ $group = group_get_object($group_id);
+ if (!$group || !is_object($group)) {
+ exit_no_group();
+ } elseif ($group->isError()) {
+ exit_error($group->getErrorMessage(), 'home');
+ }
+
+ $perm =& $group->getPermission( session_get_user() );
+ if ($perm && is_object($perm) && $perm->isAdmin()) {
+ $sql = "SELECT l.*
+ FROM layouts AS l INNER JOIN owner_layouts AS o ON(l.id = o.layout_id)
+ WHERE o.owner_type = $1
+ AND o.owner_id = $2
+ AND o.is_default = 1
+ ";
+ $res = db_query_params($sql,array('g', $group_id));
+ if($res && db_numrows($res)<1) {
+ $lm = new WidgetLayoutManager();
+ $lm->createDefaultLayoutForProject($group_id,1);
+ $res = db_query_params($sql,array('g', $group_id));
+ }
+ $id = db_result($res, 0 , 'id');
+ $params['submenu'] = $HTML->subMenu(
+ array(_("Add widgets"),
+ _("Customize Layout")),
+ array('/widgets/widgets.php?owner=g'. $group_id .'&layout_id='. $id,
+ '/widgets/widgets.php?owner=g'. $group_id .'&layout_id='. $id.'&update=layout'));
+ }
+}
+
+site_project_header(array('title'=>$title, 'h1' => '', 'group'=>$group_id, 'toptab' => 'home',
+ 'submenu' => $params['submenu']));
+
$lm = new WidgetLayoutManager();
$lm->displayLayout($group_id, WidgetLayoutManager::OWNER_TYPE_GROUP);
Modified: branches/Branch_5_1/src/www/include/stats_function.php
===================================================================
--- branches/Branch_5_1/src/www/include/stats_function.php 2011-01-29 10:32:52 UTC (rev 12101)
+++ branches/Branch_5_1/src/www/include/stats_function.php 2011-01-29 13:12:42 UTC (rev 12102)
@@ -37,7 +37,6 @@
$rows = db_numrows($result);
if (!$result || $rows < 1) {
- echo '<h1>Stats Problem</h1>';
echo '<p class="error">Stats Problem'.db_error().'</p>';
} else {
$j=0;
@@ -68,7 +67,6 @@
$rows = db_numrows($result);
if (!$result || $rows < 1) {
- echo '<h1>Stats Problem</h1>';
echo '<p class="error">Stats Problem'.db_error().'</p>';
} else {
$count=array();
@@ -90,7 +88,6 @@
$rows = db_numrows($result);
if (!$result || $rows < 1) {
- echo '<h1>Stats Problem</h1>';
echo '<p class="error">Stats Problem'.db_error().'</p>';
} else {
$count=array();
@@ -120,7 +117,6 @@
$rows = db_numrows($result);
if (!$result || $rows < 1) {
- echo '<h1>Stats Problem</h1>';
echo '<p class="error">Stats Problem'.db_error().'</p>';
} else {
GraphResult($result,'Logo Showings By Day');
@@ -135,7 +131,6 @@
$rows = db_numrows($result);
if (!$result || $rows < 1) {
- echo '<h1>Stats Problem</h1>';
echo '<p class="error">Stats Problem'.db_error().'</p>';
} else {
GraphResult($result,'Logo Showings By Project');
@@ -156,7 +151,6 @@
$rows = db_numrows($result);
if (!$result || $rows < 1) {
- echo '<h1>Stats Problem</h1>';
echo '<p class="error">Stats Problem'.db_error().'</p>';
} else {
GraphResult($result,'Page Views By Browser');
@@ -171,7 +165,6 @@
$rows = db_numrows($result);
if (!$result || $rows < 1) {
- echo '<h1>Stats Problem</h1>';
echo '<p class="error">Stats Problem'.db_error().'</p>';
} else {
GraphResult($result,'Page Views By Platform');
@@ -186,7 +179,6 @@
$rows = db_numrows($result);
if (!$result || $rows < 1) {
- echo '<h1>Stats Problem</h1>';
echo '<p class="error">Stats Problem'.db_error().'</p>';
} else {
ShowResultSet($result,'Page Views By Platform/Browser Version');
Modified: branches/Branch_5_1/src/www/include/user_home.php
===================================================================
--- branches/Branch_5_1/src/www/include/user_home.php 2011-01-29 10:32:52 UTC (rev 12101)
+++ branches/Branch_5_1/src/www/include/user_home.php 2011-01-29 13:12:42 UTC (rev 12102)
@@ -31,7 +31,6 @@
$title = _('User Profile');
$HTML->header(array('title'=>$title));
-echo '<h1>' . $title . '</h1>';
echo $HTML->boxTop(_('Personal Information'), _('Personal Information')); ?>
Modified: branches/Branch_5_1/src/www/mail/admin/index.php
===================================================================
--- branches/Branch_5_1/src/www/mail/admin/index.php 2011-01-29 10:32:52 UTC (rev 12101)
+++ branches/Branch_5_1/src/www/mail/admin/index.php 2011-01-29 13:12:42 UTC (rev 12102)
@@ -5,6 +5,7 @@
* Copyright 1999-2001 (c) VA Linux Systems
* Copyright 2003-2004 (c) Guillaume Smet - Open Wide
* Copyright 2010 (c) Franck Villaume - Capgemini
+ * Copyright (C) 2011 Alain Peyrat - Alcatel-Lucent
* http://fusionforge.org/
*
* This file is part of FusionForge.
@@ -134,9 +135,14 @@
// Form to add list
//
if(getIntFromGet('add_list')) {
- mail_header(array(
- 'title' => _('Add a Mailing List')));
- printf(_('<p>Lists are named in this manner:<br /><strong>projectname-listname@%1$s</strong></p><p>It will take <span class="important">6-24 Hours</span> for your list to be created.</p>'), forge_get_config('lists_host'));
+ mail_header(array('title' => _('Add a Mailing List')));
+ print '<p>';
+ printf(_('Lists are named in this manner:<br /><strong>projectname-listname@%1$s</strong>'), forge_get_config('lists_host'));
+ print '</p>';
+
+ print '<p>';
+ print _('It will take <span class="important">6-24 Hours</span> for your list to be created.');
+ print '</p>';
$mlFactory = new MailingListFactory($group);
if (!$mlFactory || !is_object($mlFactory) || $mlFactory->isError()) {
@@ -146,8 +152,7 @@
$mlArray =& $mlFactory->getMailingLists();
if ($mlFactory->isError()) {
- echo '<h1>'._('Error').' '._('Unable to get the lists') .'</h1>';
- echo '<div class="error">'.$mlFactory->getErrorMessage().'</div>';
+ echo '<p class="error">'._('Error').' '._('Unable to get the lists') .$mlFactory->getErrorMessage().'</p>';
mail_footer(array());
exit;
}
Modified: branches/Branch_5_1/src/www/mail/index.php
===================================================================
--- branches/Branch_5_1/src/www/mail/index.php 2011-01-29 10:32:52 UTC (rev 12101)
+++ branches/Branch_5_1/src/www/mail/index.php 2011-01-29 13:12:42 UTC (rev 12102)
@@ -5,6 +5,7 @@
* Copyright 1999-2001 (c) VA Linux Systems
* Copyright 2003-2004 (c) Guillaume Smet - Open Wide
* Copyright 2010 (c) Franck Villaume - Capgemini
+ * Copyright (C) 2011 Alain Peyrat - Alcatel-Lucent
* http://fusionforge.org/
*
* This file is part of FusionForge.
@@ -57,7 +58,7 @@
$mlArray =& $mlFactory->getMailingLists();
if ($mlFactory->isError()) {
- echo '<div class="error">'.sprintf(_('Unable to get the list %s : %s'), $group->getPublicName(), $mlFactory->getErrorMessage()) .'</div>';
+ echo '<p class="error">'.sprintf(_('Unable to get the list %s : %s'), $group->getPublicName(), $mlFactory->getErrorMessage()) .'</p>';
mail_footer(array());
exit;
}
Modified: branches/Branch_5_1/src/www/mail/mail_utils.php
===================================================================
--- branches/Branch_5_1/src/www/mail/mail_utils.php 2011-01-29 10:32:52 UTC (rev 12101)
+++ branches/Branch_5_1/src/www/mail/mail_utils.php 2011-01-29 13:12:42 UTC (rev 12102)
@@ -4,7 +4,7 @@
*
* Copyright 1999-2001 (c) VA Linux Systems
* Copyright 2003-2004 (c) Guillaume Smet - Open Wide
- * Copyright (C) 2010 Alain Peyrat - Alcatel-Lucent
+ * Copyright (C) 2010-2011 Alain Peyrat - Alcatel-Lucent
* http://fusionforge.org/
*
* This file is part of FusionForge.
@@ -40,21 +40,18 @@
}
}
- site_project_header($params);
- echo '<h1>' . $params['title']. '</h1>';
-
+ $labels = array();
+ $links = array();
+ $labels[] = _('View Lists');
+ $links[] = '/mail/?group_id='.$group_id;
if (session_loggedin()) {
if (forge_check_perm ('project_admin', $project->getID())) {
- echo $HTML->subMenu(
- array(
- _('Administration')
- ),
- array(
- '/mail/admin/?group_id='.$group_id
- )
- );
+ $labels[] = _('Administration');
+ $links[] = '/mail/admin/?group_id='.$group_id;
}
}
+ $params['submenu'] = $HTML->subMenu($labels,$links);
+ site_project_header($params);
} else {
exit_no_group();
}
Modified: branches/Branch_5_1/src/www/my/diary.php
===================================================================
--- branches/Branch_5_1/src/www/my/diary.php 2011-01-29 10:32:52 UTC (rev 12101)
+++ branches/Branch_5_1/src/www/my/diary.php 2011-01-29 13:12:42 UTC (rev 12102)
@@ -170,7 +170,6 @@
}
site_user_header(array('title'=>_('My Diary And Notes')));
- echo '<h1>' . _('My Diary And Notes') . '</h1>';
echo '
<h2>'. $info_str .'</h2>
Modified: branches/Branch_5_1/src/www/news/admin/index.php
===================================================================
--- branches/Branch_5_1/src/www/news/admin/index.php 2011-01-29 10:32:52 UTC (rev 12101)
+++ branches/Branch_5_1/src/www/news/admin/index.php 2011-01-29 13:12:42 UTC (rev 12102)
@@ -122,7 +122,6 @@
echo notepad_func();
echo '
- <h1>'.sprintf(_('Approve a NewsByte For Project: %1$s'), $group->getPublicName()).'</h1>
<p />
<form id="newsadminform" action="'.getStringFromServer('PHP_SELF').'" method="post">
<input type="hidden" name="group_id" value="'.db_result($result,0,'group_id').'" />
@@ -171,7 +170,6 @@
$rows=db_numrows($result);
$group = group_get_object($group_id);
- echo '<h1>'._('List of News Submitted for Project').': '.$group->getPublicName().'</h1>';
if ($rows < 1) {
echo '
<p class="warning_msg">'._('No Queued Items Found').'</p>';
@@ -274,7 +272,6 @@
$user =& user_get_object(db_result($result,0,'submitted_by'));
echo '
- <h1>'.sprintf(_('Approve a NewsByte For Project: %1$s'), $group->getPublicName()).'</h1>
<p />
<form action="'.getStringFromServer('PHP_SELF').'" method="post">
<input type="hidden" name="for_group" value="'.db_result($result,0,'group_id').'" />
Modified: branches/Branch_5_1/src/www/news/news_utils.php
===================================================================
--- branches/Branch_5_1/src/www/news/news_utils.php 2011-01-29 10:32:52 UTC (rev 12101)
+++ branches/Branch_5_1/src/www/news/news_utils.php 2011-01-29 13:12:42 UTC (rev 12102)
@@ -4,6 +4,7 @@
*
* Copyright 1999-2001 (c) VA Linux Systems
* Copyright 2002-2004 (c) GForge Team
+ * Copyright (C) 2011 Alain Peyrat - Alcatel-Lucent
* http://fusionforge.org/
*
* This file is part of FusionForge.
@@ -32,15 +33,8 @@
$params['toptab']='news';
$params['group']=$group_id;
- /*
- Show horizontal links
- */
+
if ($group_id && ($group_id != forge_get_config('news_group'))) {
- site_project_header($params);
- } else {
- $HTML->header($params);
- }
- if ($group_id && ($group_id != forge_get_config('news_group'))) {
$menu_texts=array();
$menu_links=array();
@@ -52,13 +46,28 @@
$project = group_get_object($params['group']);
if ($project && is_object($project) && !$project->isError()) {
if (forge_check_perm ('project_admin', $group_id)) {
- $menu_texts[]=_('Admin');
+ $menu_texts[]=_('Administration');
$menu_links[]='/news/admin/?group_id='.$group_id;
}
}
}
- echo $HTML->subMenu($menu_texts,$menu_links);
+ $params['submenu'] = $HTML->subMenu($menu_texts,$menu_links);
}
+ /*
+ Show horizontal links
+ */
+ if ($group_id && ($group_id != forge_get_config('news_group'))) {
+ site_project_header($params);
+ } else {
+ $HTML->header($params);
+ if(isset($GLOBALS['error_msg']) && $GLOBALS['error_msg']) {
+ echo html_error_top($GLOBALS['error_msg']);
+ }
+ if (!empty($feedback)) {
+ html_feedback_top($feedback);
+ }
+
+ }
}
function news_footer($params) {
Modified: branches/Branch_5_1/src/www/pm/admin/index.php
===================================================================
--- branches/Branch_5_1/src/www/pm/admin/index.php 2011-01-29 10:32:52 UTC (rev 12101)
+++ branches/Branch_5_1/src/www/pm/admin/index.php 2011-01-29 13:12:42 UTC (rev 12102)
@@ -5,6 +5,7 @@
* Copyright 1999/2000, Sourceforge.net 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.
@@ -315,7 +316,7 @@
session_require_perm ('pm', $pg->getID(), 'manager') ;
- pm_header(array('title'=>_('Update Subproject Tasks: ').$pg->getName()));
+ pm_header(array('title'=>_('Change Tasks Status')));
?>
<p><?php echo _('You can modify an existing subproject using this form. Please note that private subprojects can still be viewed by members of your project, but not the general public.') ?></p>
Modified: branches/Branch_5_1/src/www/pm/include/ProjectGroupHTML.class.php
===================================================================
--- branches/Branch_5_1/src/www/pm/include/ProjectGroupHTML.class.php 2011-01-29 10:32:52 UTC (rev 12101)
+++ branches/Branch_5_1/src/www/pm/include/ProjectGroupHTML.class.php 2011-01-29 13:12:42 UTC (rev 12102)
@@ -5,6 +5,7 @@
* Copyright 1999/2000, Sourceforge.net 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.
@@ -48,16 +49,13 @@
exit_disabled('home');
}
- site_project_header($params);
- echo '<h1>' . $params['title']. '</h1>';
-
$labels = array();
$links = array();
$labels[] = _('View Subprojects');
$links[] = '/pm/?group_id='.$group_id;
if ($group_project_id) {
- $labels[] = (($pg) ? $pg->getName() .': ' : '') ._('Browse tasks');
+ $labels[] = (($pg) ? $pg->getName() : '');
$links[] = '/pm/task.php?group_id='.$group_id.'&group_project_id='.$group_project_id.'&func=browse';
if (session_loggedin()) {
$labels[] = _('Add Task');
@@ -89,11 +87,17 @@
$links[] = '/pm/reporting/?group_id='.$group_id;
$labels[] = _('Administration');
$links[] = '/pm/admin/?group_id='.$group_id.'&group_project_id='.$group_project_id.'&update_pg=1';
+ } else if (forge_check_perm ('pm_admin', $group_id)) {
+ $labels[] = _('Administration');
+ $links[] = '/pm/admin/?group_id='.$group_id;
}
+
if(!empty($labels)) {
- echo ($HTML->subMenu($labels,$links));
+ $params['submenu'] = $HTML->subMenu($labels,$links);
}
+ site_project_header($params);
+
if ($pg)
plugin_hook ("blocks", "tasks_".$pg->getName());
}
Modified: branches/Branch_5_1/src/www/pm/index.php
===================================================================
--- branches/Branch_5_1/src/www/pm/index.php 2011-01-29 10:32:52 UTC (rev 12101)
+++ branches/Branch_5_1/src/www/pm/index.php 2011-01-29 13:12:42 UTC (rev 12102)
@@ -5,6 +5,7 @@
* Copyright 1999/2000, Sourceforge.net 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.
@@ -57,14 +58,6 @@
plugin_hook("blocks", "tasks index");
-if (forge_check_perm ('pm_admin', $group_id)) {
- $menu_text=array();
- $menu_links=array();
- $menu_text[]=_('Admin');
- $menu_links[]='/pm/admin/?group_id='.$group_id;
- echo $HTML->subMenu($menu_text,$menu_links);
-}
-
if (count($pg_arr) < 1 || $pg_arr == false) {
echo '<p class="warning_msg">'._('No Subprojects Found').'</p>';
echo '<p>'._('No subprojects have been set up, or you cannot view them.').'</p>';
Modified: branches/Branch_5_1/src/www/pm/mod_task.php
===================================================================
--- branches/Branch_5_1/src/www/pm/mod_task.php 2011-01-29 10:32:52 UTC (rev 12101)
+++ branches/Branch_5_1/src/www/pm/mod_task.php 2011-01-29 13:12:42 UTC (rev 12102)
@@ -5,6 +5,7 @@
* Copyright 1999/2000, Sourceforge.net 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.
@@ -262,16 +263,18 @@
$title_arr[]=_('User');
$title_arr[]=' ';
+$xi = 0;
+
$report=new Report();
if ($report->isError()) {
exit_error($report->getErrorMessage(),'pm');
}
+echo '<form action="/reporting/timeadd.php" method="post" />
+ <input type="hidden" name="project_task_id" value="'.$project_task_id.'" />
+ <input type="hidden" name="submit" value="1" />';
echo $HTML->listTableTop ($title_arr);
- echo '<form action="/reporting/timeadd.php" method="post" />
- <input type="hidden" name="project_task_id" value="'.$project_task_id.'">
- <input type="hidden" name="submit" value="1" />
- <tr '.$HTML->boxGetAltRowStyle(@$xi++).'>
+echo '<tr '.$HTML->boxGetAltRowStyle($xi++).'>
<td style="text-align:center">'. report_weeks_box($report, 'week') .'</td>
<td style="text-align:center">'. report_day_adjust_box($report, 'days_adjust') .'</td>
<td style="text-align:center"><input type="text" name="hours" value="" size="3" maxlength="3" /></td>
@@ -280,7 +283,7 @@
<td style="text-align:center"><input type="submit" name="add" value="'._('Add').'" /><input type="submit" name="cancel" value="'._('Cancel').'" /></td>
</tr></form>';
-//setenv("TZ=" . $user_timezone); //restore the user�s timezone
+//setenv("TZ=" . $user_timezone); //restore the user's timezone
//
// Display Time Recorded for this task
Modified: branches/Branch_5_1/src/www/project/admin/group_trove.php
===================================================================
--- branches/Branch_5_1/src/www/project/admin/group_trove.php 2011-01-29 10:32:52 UTC (rev 12101)
+++ branches/Branch_5_1/src/www/project/admin/group_trove.php 2011-01-29 13:12:42 UTC (rev 12102)
@@ -75,7 +75,6 @@
project_admin_header(array('title'=>_('Edit Trove Categorization'),'group'=>$group_id));
?>
-<h1><?php echo _('Edit Trove Categorization') ?></h1>
<p><?php echo _('Select up to three locations for this project in each of the Trove root categories. If the project does not require any or all of these locations, simply select "None Selected".') ?></p>
<p><?php echo _('IMPORTANT: Projects should be categorized in the most specific locations available in the map. Simultaneous categorization in a specific category AND a parent category will result in only the more specific categorization being accepted.') ?></p>
Modified: branches/Branch_5_1/src/www/project/admin/index.php
===================================================================
--- branches/Branch_5_1/src/www/project/admin/index.php 2011-01-29 10:32:52 UTC (rev 12101)
+++ branches/Branch_5_1/src/www/project/admin/index.php 2011-01-29 13:12:42 UTC (rev 12102)
@@ -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: branches/Branch_5_1/src/www/project/admin/massfinish.php
===================================================================
--- branches/Branch_5_1/src/www/project/admin/massfinish.php 2011-01-29 10:32:52 UTC (rev 12101)
+++ branches/Branch_5_1/src/www/project/admin/massfinish.php 2011-01-29 13:12:42 UTC (rev 12102)
@@ -67,7 +67,6 @@
project_admin_header(array('title'=>_('Edit Role'),'group'=>$group_id));
echo '
-<h1>'._('Add Users From List').'</h1>
<p>
'._('Choose the role for each user and then press "Add All".').'
</p>
Modified: branches/Branch_5_1/src/www/project/admin/project_admin_utils.php
===================================================================
--- branches/Branch_5_1/src/www/project/admin/project_admin_utils.php 2011-01-29 10:32:52 UTC (rev 12101)
+++ branches/Branch_5_1/src/www/project/admin/project_admin_utils.php 2011-01-29 13:12:42 UTC (rev 12102)
@@ -4,6 +4,7 @@
*
* Copyright 1999-2001 (c) VA Linux Systems
* Copyright 2002-2004 (c) GForge Team
+ * Copyright (C) 2011 Alain Peyrat - Alcatel-Lucent
* http://fusionforge.org/
*
* This file is part of FusionForge.
@@ -41,9 +42,6 @@
return;
}
- site_project_header($params);
- echo '<h1>' . $params['title'] . '</h1>';
-
$labels = array();
$links = array();
@@ -89,10 +87,11 @@
$links[] = '/project/stats/?group_id='.$group_id;
plugin_hook("quota_link_project_admin");
- echo ($HTML->beginSubMenu());
- echo $HTML->printSubMenu($labels, $links);
+ $params['submenu'] = $HTML->subMenu($labels, $links);
+
plugin_hook ("groupadminmenu", $params) ;
- echo ($HTML->endSubMenu());
+
+ site_project_header($params);
}
/*
@@ -140,8 +139,6 @@
this group_id
*/
- echo '<h1>'._('Project History').'</h1>';
-
$result=group_get_history($group_id);
$rows=db_numrows($result);
Modified: branches/Branch_5_1/src/www/project/admin/roleedit.php
===================================================================
--- branches/Branch_5_1/src/www/project/admin/roleedit.php 2011-01-29 10:32:52 UTC (rev 12101)
+++ branches/Branch_5_1/src/www/project/admin/roleedit.php 2011-01-29 13:12:42 UTC (rev 12102)
@@ -4,6 +4,7 @@
*
* Copyright 2004 (c) GForge LLC
* Copyright 2010, Roland Mas
+ * Copyright (C) 2011 Alain Peyrat - Alcatel-Lucent
*
* This file is part of FusionForge.
*
@@ -135,29 +136,26 @@
}
}
-project_admin_header(array('title'=>_('Edit Role'),'group'=>$group_id));
-
-//
-// If observer role, show title
-//
if ($role_id=='observer') {
- echo '<h1>'._('Edit Observer').'</h1>';
- echo _('Use this page to edit the permissions and access levels of non-members of your project. Non-members includes users who are not logged in.');
+ $title= _('Edit Observer');
+ $msg = _('Use this page to edit the permissions and access levels of non-members of your project. Non-members includes users who are not logged in.');
} else {
if (!$role_id) {
- echo '<h1>'._('New Role').'</h1>';
+ $title= _('New Role');
} else {
- echo '<h1>'._('Edit Role').'</h1>';
+ $title= _('Edit Role');
}
if (USE_PFO_RBAC) {
- echo _('Use this page to edit the permissions attached to each role. Note that each role has at least as much access as the Anonymous and LoggedIn roles. For example, if the the Anonymous role has read access to a forum, all other roles will have it too.');
+ $msg = _('Use this page to edit the permissions attached to each role. Note that each role has at least as much access as the Anonymous and LoggedIn roles. For example, if the the Anonymous role has read access to a forum, all other roles will have it too.');
} else {
- echo _('Use this page to edit your project\'s Roles. Note that each member has at least as much access as the Observer. For example, if the Observer can read CVS, so can any other role in the project.');
+ $msg = _('Use this page to edit your project\'s Roles. Note that each member has at least as much access as the Observer. For example, if the Observer can read CVS, so can any other role in the project.');
}
}
+project_admin_header(array('title'=> $title,'group'=>$group_id));
+
+echo '<p>'.$msg.'</p>';
echo '
-<p>
<form action="'.getStringFromServer('PHP_SELF').'?group_id='.$group_id.'&role_id='. $role_id .'" method="post">';
if (USE_PFO_RBAC) {
Modified: branches/Branch_5_1/src/www/project/memberlist.php
===================================================================
--- branches/Branch_5_1/src/www/project/memberlist.php 2011-01-29 10:32:52 UTC (rev 12101)
+++ branches/Branch_5_1/src/www/project/memberlist.php 2011-01-29 13:12:42 UTC (rev 12102)
@@ -35,8 +35,6 @@
site_project_header(array('title'=>_('Project Member List'),'group'=>$group_id,'toptab'=>'memberlist'));
-echo '<h1>' . _('Project Member List') . '</h1>';
-
echo '<p>' . _('If you would like to contribute to this project by becoming a developer, contact one of the project admins, designated in bold text below.') . '</p>';
// beginning of the user descripion block
Modified: branches/Branch_5_1/src/www/project/report/index.php
===================================================================
--- branches/Branch_5_1/src/www/project/report/index.php 2011-01-29 10:32:52 UTC (rev 12101)
+++ branches/Branch_5_1/src/www/project/report/index.php 2011-01-29 13:12:42 UTC (rev 12102)
@@ -128,7 +128,6 @@
$title = _('Project Member List');
site_project_header(array('title'=>$title,'group'=>$group_id,'toptab'=>'memberlist'));
-echo '<h1>' . $title . '</h1>';
echo '<p>';
echo _('If you would like to contribute to this project by becoming a developer, contact one of the project admins, designated in bold text below.');
Modified: branches/Branch_5_1/src/www/project/request.php
===================================================================
--- branches/Branch_5_1/src/www/project/request.php 2011-01-29 10:32:52 UTC (rev 12101)
+++ branches/Branch_5_1/src/www/project/request.php 2011-01-29 13:12:42 UTC (rev 12102)
@@ -54,7 +54,6 @@
$title = _('Request to join project') . ' '.$group->getPublicName();
site_project_header(array('title'=>$title,'group'=>$group_id,'toptab'=>'summary'));
-echo '<h1>'. $title.'</h1>';
plugin_hook ("blocks", "request_join");
Modified: branches/Branch_5_1/src/www/project/stats/index.php
===================================================================
--- branches/Branch_5_1/src/www/project/stats/index.php 2011-01-29 10:32:52 UTC (rev 12101)
+++ branches/Branch_5_1/src/www/project/stats/index.php 2011-01-29 13:12:42 UTC (rev 12102)
@@ -4,6 +4,7 @@
*
* Copyright 2003 GForge, LLC
* Copyright 2010 (c) Franck Villaume - Capgemini
+ * Copyright (C) 2011 Alain Peyrat - Alcatel-Lucent
* http://fusionforge.org/
*
* This file is part of FusionForge.
@@ -75,19 +76,23 @@
if ($delta > 365) $SPAN=3;
}
-project_admin_header(array('title'=>_('Project Activity').' '.$group->getPublicName(),'group'=>$group_id,'toptab'=>'admin'));
-
$area = util_ensure_value_in_set ($area, array ('tracker','forum','docman','taskman','downloads')) ;
if ($SPAN && !is_numeric($SPAN)) { $SPAN = 1; }
if ($start && !is_numeric($start)) { $start = false; }
if ($end && !is_numeric($end)) { $end = false; }
+$params['title'] = _('Project Statistics');
+$params['group'] = $group_id;
+$params['toptab'] = 'activity';
+$params['submenu'] = $HTML->subMenu(array(_('Statistics')), array('/project/stats/?group_id='.$group_id));
+
+site_project_header($params);
+
//
// BEGIN PAGE CONTENT CODE
//
?>
<div align="center">
-<h1><?php echo _('Project Activity'); ?></h1>
<form action="<?php echo getStringFromServer('PHP_SELF'); ?>" method="get">
<input type="hidden" name="group_id" value="<?php echo $group_id; ?>" />
@@ -105,6 +110,6 @@
</div>
<?php
-project_admin_footer( array() );
+site_project_footer( array() );
?>
Modified: branches/Branch_5_1/src/www/register/index.php
===================================================================
--- branches/Branch_5_1/src/www/register/index.php 2011-01-29 10:32:52 UTC (rev 12101)
+++ branches/Branch_5_1/src/www/register/index.php 2011-01-29 13:12:42 UTC (rev 12102)
@@ -162,7 +162,6 @@
}
site_header(array('title'=>_('Register Project')));
-echo '<h1>' . _('Register Project') . '</h1>';
?>
<p>
Modified: branches/Branch_5_1/src/www/reporting/groupadded.php
===================================================================
--- branches/Branch_5_1/src/www/reporting/groupadded.php 2011-01-29 10:32:52 UTC (rev 12101)
+++ branches/Branch_5_1/src/www/reporting/groupadded.php 2011-01-29 13:12:42 UTC (rev 12102)
@@ -55,7 +55,6 @@
report_header(_('Projects Added'));
?>
-<h2><?php echo _('Projects Added'); ?></h2>
<form action="<?php echo getStringFromServer('PHP_SELF'); ?>" method="get">
<table><tr>
Modified: branches/Branch_5_1/src/www/reporting/groupcum.php
===================================================================
--- branches/Branch_5_1/src/www/reporting/groupcum.php 2011-01-29 10:32:52 UTC (rev 12101)
+++ branches/Branch_5_1/src/www/reporting/groupcum.php 2011-01-29 13:12:42 UTC (rev 12102)
@@ -54,7 +54,6 @@
report_header(_('Cumulative Projects'));
?>
-<h2><?php echo _('Cumulative Projects'); ?></h2>
<form action="<?php echo getStringFromServer('PHP_SELF'); ?>" method="get">
<table><tr>
Modified: branches/Branch_5_1/src/www/reporting/projectact.php
===================================================================
--- branches/Branch_5_1/src/www/reporting/projectact.php 2011-01-29 10:32:52 UTC (rev 12101)
+++ branches/Branch_5_1/src/www/reporting/projectact.php 2011-01-29 13:12:42 UTC (rev 12102)
@@ -57,7 +57,6 @@
report_header(_('Project Activity'));
?>
-<h2><?php echo _('Project Activity'); ?></h2>
<form action="<?php echo getStringFromServer('PHP_SELF'); ?>" method="get">
<input type="hidden" name="sw" value="<?php echo $sw; ?>" />
Modified: branches/Branch_5_1/src/www/reporting/projecttime.php
===================================================================
--- branches/Branch_5_1/src/www/reporting/projecttime.php 2011-01-29 10:32:52 UTC (rev 12101)
+++ branches/Branch_5_1/src/www/reporting/projecttime.php 2011-01-29 13:12:42 UTC (rev 12102)
@@ -67,7 +67,6 @@
$a2[]='user';
?>
-<h2><?php echo _('Time Tracking By Project'); ?></h2>
<form action="<?php echo getStringFromServer('PHP_SELF'); ?>" method="get">
<input type="hidden" name="sw" value="<?php echo $sw; ?>" />
Modified: branches/Branch_5_1/src/www/reporting/rebuild.php
===================================================================
--- branches/Branch_5_1/src/www/reporting/rebuild.php 2011-01-29 10:32:52 UTC (rev 12101)
+++ branches/Branch_5_1/src/www/reporting/rebuild.php 2011-01-29 13:12:42 UTC (rev 12102)
@@ -46,7 +46,7 @@
}
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: branches/Branch_5_1/src/www/reporting/siteact.php
===================================================================
--- branches/Branch_5_1/src/www/reporting/siteact.php 2011-01-29 10:32:52 UTC (rev 12101)
+++ branches/Branch_5_1/src/www/reporting/siteact.php 2011-01-29 13:12:42 UTC (rev 12102)
@@ -58,7 +58,6 @@
report_header(_('Site-Wide Activity'));
?>
-<h2><?php echo _('Site-Wide Activity'); ?></h2>
<form action="<?php echo getStringFromServer('PHP_SELF'); ?>" method="get">
<table><tr>
Modified: branches/Branch_5_1/src/www/reporting/sitetime.php
===================================================================
--- branches/Branch_5_1/src/www/reporting/sitetime.php 2011-01-29 10:32:52 UTC (rev 12101)
+++ branches/Branch_5_1/src/www/reporting/sitetime.php 2011-01-29 13:12:42 UTC (rev 12102)
@@ -67,7 +67,6 @@
$a2[]='user';
?>
-<h2><?php echo _('Site-Wide Time Tracking'); ?></h2>
<form action="<?php echo getStringFromServer('PHP_SELF'); ?>" method="get">
<table><tr>
Modified: branches/Branch_5_1/src/www/reporting/sitetimebar.php
===================================================================
--- branches/Branch_5_1/src/www/reporting/sitetimebar.php 2011-01-29 10:32:52 UTC (rev 12101)
+++ branches/Branch_5_1/src/www/reporting/sitetimebar.php 2011-01-29 13:12:42 UTC (rev 12102)
@@ -55,7 +55,6 @@
report_header(_('Site-Wide Time Tracking'));
?>
-<h2><?php echo _('Site-Wide Time Tracking'); ?></h2>
<form action="<?php echo getStringFromServer('PHP_SELF'); ?>" method="get">
<input type="hidden" name="typ" value="<?php echo $typ; ?>" />
<table><tr>
Modified: branches/Branch_5_1/src/www/reporting/timeadd.php
===================================================================
--- branches/Branch_5_1/src/www/reporting/timeadd.php 2011-01-29 10:32:52 UTC (rev 12101)
+++ branches/Branch_5_1/src/www/reporting/timeadd.php 2011-01-29 13:12:42 UTC (rev 12102)
@@ -139,9 +139,10 @@
$title_arr[]=_('Category');
$title_arr[]=' ';
+ $xi = 0;
+ $total_hours = 0;
+
echo $HTML->listTableTop ($title_arr);
-
- $xi = 0;
while ($r=db_fetch_array($res)) {
echo '<form action="'.getStringFromServer('PHP_SELF').'?week='.$week.'&project_task_id='.$r['project_task_id'].'" method="post">
<input type="hidden" name="submit" value="1" />
Modified: branches/Branch_5_1/src/www/reporting/timecategory.php
===================================================================
--- branches/Branch_5_1/src/www/reporting/timecategory.php 2011-01-29 10:32:52 UTC (rev 12101)
+++ branches/Branch_5_1/src/www/reporting/timecategory.php 2011-01-29 13:12:42 UTC (rev 12102)
@@ -82,7 +82,6 @@
echo $HTML->listTableBottom();
?>
-<h2><?php echo _('Manage Time Tracker Categories'); ?></h2>
<p>
<?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>
Modified: branches/Branch_5_1/src/www/reporting/toolspie.php
===================================================================
--- branches/Branch_5_1/src/www/reporting/toolspie.php 2011-01-29 10:32:52 UTC (rev 12101)
+++ branches/Branch_5_1/src/www/reporting/toolspie.php 2011-01-29 13:12:42 UTC (rev 12102)
@@ -59,7 +59,6 @@
}
?>
-<h2><?php echo _('Tool Pie Graphs'); ?></h2>
<form action="<?php echo getStringFromServer('PHP_SELF'); ?>" method="get">
<table><tr>
<td><strong><?php echo _('Trackers'); ?>:</strong><br /><?php echo report_tracker_box('datatype',$datatype); ?></td>
Modified: branches/Branch_5_1/src/www/reporting/useract.php
===================================================================
--- branches/Branch_5_1/src/www/reporting/useract.php 2011-01-29 10:32:52 UTC (rev 12101)
+++ branches/Branch_5_1/src/www/reporting/useract.php 2011-01-29 13:12:42 UTC (rev 12102)
@@ -71,7 +71,6 @@
if ($sw) {
?>
- <h2><?php echo _('User Activity'); ?></h2>
<form action="<?php echo getStringFromServer('PHP_SELF'); ?>" method="get">
<input type="hidden" name="sw" value="<?php echo $sw; ?>" />
Modified: branches/Branch_5_1/src/www/reporting/useradded.php
===================================================================
--- branches/Branch_5_1/src/www/reporting/useradded.php 2011-01-29 10:32:52 UTC (rev 12101)
+++ branches/Branch_5_1/src/www/reporting/useradded.php 2011-01-29 13:12:42 UTC (rev 12102)
@@ -54,7 +54,6 @@
report_header(_('Users Added'));
?>
-<h2><?php echo _('Users Added'); ?></h2>
<form action="<?php echo getStringFromServer('PHP_SELF'); ?>" method="get">
<table><tr>
<td><strong><?php echo _('Type'); ?>:</strong><br /><?php echo report_span_box('SPAN',$SPAN); ?></td>
Modified: branches/Branch_5_1/src/www/reporting/usercum.php
===================================================================
--- branches/Branch_5_1/src/www/reporting/usercum.php 2011-01-29 10:32:52 UTC (rev 12101)
+++ branches/Branch_5_1/src/www/reporting/usercum.php 2011-01-29 13:12:42 UTC (rev 12102)
@@ -54,7 +54,6 @@
report_header(_('Cumulative Users'));
?>
-<h2><?php echo _('Cumulative Users'); ?></h2>
<form action="<?php echo getStringFromServer('PHP_SELF'); ?>" method="get">
<table><tr>
Modified: branches/Branch_5_1/src/www/reporting/usersummary.php
===================================================================
--- branches/Branch_5_1/src/www/reporting/usersummary.php 2011-01-29 10:32:52 UTC (rev 12101)
+++ branches/Branch_5_1/src/www/reporting/usersummary.php 2011-01-29 13:12:42 UTC (rev 12102)
@@ -61,7 +61,6 @@
report_header(_('User Summary Report'));
?>
- <h2><?php echo _('User Summary Report'); ?></h2>
<p>
<?php echo _('Choose the range from the pop-up boxes below. The report will list all tasks with an open date in that range.'); ?>
</p>
Modified: branches/Branch_5_1/src/www/reporting/usertime.php
===================================================================
--- branches/Branch_5_1/src/www/reporting/usertime.php 2011-01-29 10:32:52 UTC (rev 12101)
+++ branches/Branch_5_1/src/www/reporting/usertime.php 2011-01-29 13:12:42 UTC (rev 12102)
@@ -81,7 +81,6 @@
$a2[]='subproject';
?>
- <h2><?php echo _('User Time Reporting'); ?></h2>
<form action="<?php echo getStringFromServer('PHP_SELF'); ?>" method="get">
<input type="hidden" name="sw" value="<?php echo $sw; ?>" />
Modified: branches/Branch_5_1/src/www/scm/include/scm_utils.php
===================================================================
--- branches/Branch_5_1/src/www/scm/include/scm_utils.php 2011-01-29 10:32:52 UTC (rev 12101)
+++ branches/Branch_5_1/src/www/scm/include/scm_utils.php 2011-01-29 13:12:42 UTC (rev 12102)
@@ -4,7 +4,7 @@
*
* Copyright 2004-2005 (c) GForge LLC, Tim Perdue
* Copyright 2010 (c), Franck Villaume
- * Copyright (C) 2010 Alain Peyrat - Alcatel-Lucent
+ * Copyright (C) 2010-2011 Alain Peyrat - Alcatel-Lucent
* http://fusionforge.org
*
* This file is part of FusionForge.
@@ -40,27 +40,29 @@
if (!$project->usesSCM()) {
exit_disabled();
}
- site_project_header(array('title'=>_('SCM Repository'),'group'=>$params['group'],'toptab'=>'scm',));
/*
Show horizontal links
*/
if (session_loggedin()) {
if (forge_check_perm ('project_admin', $project->getID())) {
- echo $HTML->subMenu(
+ $params['submenu'] = $HTML->subMenu(
array(
_('View Source Code'),
- _('Administration'),
- _('Reporting')
+ _('Reporting'),
+ _('Administration')
),
array(
'/scm/?group_id='.$params['group'],
- '/scm/admin/?group_id='.$params['group'],
- '/scm/reporting/?group_id='.$params['group']
+ '/scm/reporting/?group_id='.$params['group'],
+ '/scm/admin/?group_id='.$params['group']
)
);
}
}
- echo '<div class="scm">';
+
+ $params['toptab'] = 'scm';
+ site_project_header($params);
+ echo '<div id="scm" class="scm">';
}
function scm_footer() {
Modified: branches/Branch_5_1/src/www/scm/viewvc.php
===================================================================
--- branches/Branch_5_1/src/www/scm/viewvc.php 2011-01-29 10:32:52 UTC (rev 12101)
+++ branches/Branch_5_1/src/www/scm/viewvc.php 2011-01-29 13:12:42 UTC (rev 12102)
@@ -6,6 +6,7 @@
* Portion of this file is inspired from the ViewCVS wrapper
* contained in CodeX.
* Copyright (c) Xerox Corporation, CodeX / CodeX Team, 2001,2002. All Rights Reserved.
+ * Copyright (C) 2011 Alain Peyrat - Alcatel-Lucent
* http://codex.xerox.com
*
* Copyright 2010 (c), Franck Villaume
@@ -145,7 +146,11 @@
$content = mb_convert_encoding($content, 'UTF-8', $encoding);
}
}
+ scm_header(array('title'=>_("SCM Repository"),
+ 'group'=>$Group->getID()));
+
echo $content;
+ scm_footer(array());
} else {
// TODO does not seem to work when allow_tar = 1 in ViewCVS conf
// (allow to generate on the fly a tar.gz): the generated file
Modified: branches/Branch_5_1/src/www/search/include/renderers/FullProjectHtmlSearchRenderer.class.php
===================================================================
--- branches/Branch_5_1/src/www/search/include/renderers/FullProjectHtmlSearchRenderer.class.php 2011-01-29 10:32:52 UTC (rev 12101)
+++ branches/Branch_5_1/src/www/search/include/renderers/FullProjectHtmlSearchRenderer.class.php 2011-01-29 13:12:42 UTC (rev 12102)
@@ -85,7 +85,6 @@
function writeBody() {
$title = _('Entire project search');
site_project_header(array('title' => $title, 'group' => $this->groupId, 'toptab' => ''));
- echo '<h1>' . $title . '</h1>';
echo $this->getResult();
}
Modified: branches/Branch_5_1/src/www/search/include/renderers/HtmlSearchRenderer.class.php
===================================================================
--- branches/Branch_5_1/src/www/search/include/renderers/HtmlSearchRenderer.class.php 2011-01-29 10:32:52 UTC (rev 12101)
+++ branches/Branch_5_1/src/www/search/include/renderers/HtmlSearchRenderer.class.php 2011-01-29 13:12:42 UTC (rev 12102)
@@ -4,6 +4,7 @@
*
* Copyright 1999-2001 (c) VA Linux Systems
* Copyright 2004 (c) Guillaume Smet / Open Wide
+ * Copyright (C) 2011 Alain Peyrat - Alcatel-Lucent
* http://fusionforge.org
*
* This file is part of FusionForge.
@@ -97,7 +98,7 @@
$searchQuery =& $this->searchQuery;
$query =& $this->query;
- $html = '<h1>'.sprintf(_('Search results for <em>%1$s</em>'), $query['words']).'</h1>';
+ $html = '<h2>'.sprintf(_('Search results for <em>%1$s</em>'), $query['words']).'</h2>';
if(!$searchQuery->getResult() || $searchQuery->getRowsCount() < 1) {
$html .= '<p><strong>'.sprintf(_('No matches found for <em>%1$s</em>'), $query['words']).'</strong></p>';
$html .= db_error();
@@ -204,7 +205,6 @@
function getResultId($fieldName) {
return db_result($this->searchQuery->getResult(), 0, $fieldName);
}
-
}
?>
Modified: branches/Branch_5_1/src/www/search/include/renderers/PeopleHtmlSearchRenderer.class.php
===================================================================
--- branches/Branch_5_1/src/www/search/include/renderers/PeopleHtmlSearchRenderer.class.php 2011-01-29 10:32:52 UTC (rev 12101)
+++ branches/Branch_5_1/src/www/search/include/renderers/PeopleHtmlSearchRenderer.class.php 2011-01-29 13:12:42 UTC (rev 12102)
@@ -53,7 +53,6 @@
function writeHeader() {
$GLOBALS['HTML']->header(array('title'=>_('People Search')));
parent::writeHeader();
- echo '<h1>' . _('People Search') . '</h1>';
}
/**
Modified: branches/Branch_5_1/src/www/search/include/renderers/ProjectHtmlSearchRenderer.class.php
===================================================================
--- branches/Branch_5_1/src/www/search/include/renderers/ProjectHtmlSearchRenderer.class.php 2011-01-29 10:32:52 UTC (rev 12101)
+++ branches/Branch_5_1/src/www/search/include/renderers/ProjectHtmlSearchRenderer.class.php 2011-01-29 13:12:42 UTC (rev 12102)
@@ -53,7 +53,6 @@
function writeHeader() {
$GLOBALS['HTML']->header(array('title'=>_('Project Search'), 'pagename'=>'search'));
parent::writeHeader();
- echo '<h1>' . _('Project Search') . '</h1>';
}
/**
Modified: branches/Branch_5_1/src/www/soap/tracker/tracker.php
===================================================================
--- branches/Branch_5_1/src/www/soap/tracker/tracker.php 2011-01-29 10:32:52 UTC (rev 12101)
+++ branches/Branch_5_1/src/www/soap/tracker/tracker.php 2011-01-29 13:12:42 UTC (rev 12102)
@@ -3,6 +3,7 @@
* SOAP Tracker Include - this file contains wrapper functions for the SOAP interface
*
* Copyright 2004 (c) GForge, LLC
+ * Copyright (C) 2011 Alain Peyrat - Alcatel-Lucent
* http://gforge.org
*
* This file is part of FusionForge.
@@ -603,7 +604,7 @@
$priority,$assigned_to,$summary,$details,$extra_fields) {
continue_session($session_ser);
- $grp =& group_get_object($group_id);
+ $grp = group_get_object($group_id);
if (!$grp || !is_object($grp)) {
return new soap_fault ('','addArtifact','Could Not Get Project','Could Not Get Project');
} elseif ($grp->isError()) {
@@ -639,7 +640,7 @@
function &updateArtifact($session_ser,$group_id,$group_artifact_id,$artifact_id,$status_id,
$priority,$assigned_to,$summary,$details,$new_artifact_type_id,$extra_fields_data) {
continue_session($session_ser);
- $grp =& group_get_object($group_id);
+ $grp = group_get_object($group_id);
if (!$grp || !is_object($grp)) {
return new soap_fault ('','updateArtifact','Could Not Get Project','Could Not Get Project');
} elseif ($grp->isError()) {
@@ -676,7 +677,7 @@
//
function &getArtifactTechnicians($session_ser,$group_id,$group_artifact_id) {
continue_session($session_ser);
- $grp =& group_get_object($group_id);
+ $grp = group_get_object($group_id);
if (!$grp || !is_object($grp)) {
return new soap_fault ('','getArtifactTechnicians','Could Not Get Project','Could Not Get Project');
} elseif ($grp->isError()) {
@@ -701,7 +702,7 @@
//
function &getArtifacts($session_ser,$group_id,$group_artifact_id,$assigned_to,$status) {
continue_session($session_ser);
- $grp =& group_get_object($group_id);
+ $grp = group_get_object($group_id);
if (!$grp || !is_object($grp)) {
return new soap_fault ('','getArtifacts','Could Not Get Project','Could Not Get Project');
} elseif ($grp->isError()) {
@@ -808,7 +809,7 @@
//
function &getArtifactFiles($session_ser,$group_id,$group_artifact_id,$artifact_id) {
continue_session($session_ser);
- $grp =& group_get_object($group_id);
+ $grp = group_get_object($group_id);
if (!$grp || !is_object($grp)) {
return new soap_fault ('','getArtifactFiles','Could Not Get Project','Could Not Get Project');
} elseif ($grp->isError()) {
@@ -862,7 +863,7 @@
function getArtifactFileData($session_ser,$group_id,$group_artifact_id,$artifact_id,$file_id) {
continue_session($session_ser);
- $grp =& group_get_object($group_id);
+ $grp = group_get_object($group_id);
if (!$grp || !is_object($grp)) {
return new soap_fault ('','getArtifactFileData','Could Not Get Project','Could Not Get Project');
} elseif ($grp->isError()) {
@@ -913,7 +914,7 @@
function addArtifactFile($session_ser,$group_id,$group_artifact_id,$artifact_id,$base64_contents,$description,$filename,$filetype) {
continue_session($session_ser);
- $grp =& group_get_object($group_id);
+ $grp = group_get_object($group_id);
if (!$grp || !is_object($grp)) {
return new soap_fault ('','addArtifactFile','Could Not Get Project','Could Not Get Project');
} elseif ($grp->isError()) {
@@ -959,7 +960,7 @@
//
function &getArtifactMessages($session_ser,$group_id,$group_artifact_id,$artifact_id) {
continue_session($session_ser);
- $grp =& group_get_object($group_id);
+ $grp = group_get_object($group_id);
if (!$grp || !is_object($grp)) {
return new soap_fault ('','getArtifactMessages','Could Not Get Project','Could Not Get Project');
} elseif ($grp->isError()) {
@@ -1009,7 +1010,7 @@
//
function &addArtifactMessage($session_ser,$group_id,$group_artifact_id,$artifact_id,$body) {
continue_session($session_ser);
- $grp =& group_get_object($group_id);
+ $grp = group_get_object($group_id);
if (!$grp || !is_object($grp)) {
return new soap_fault ('','addArtifactMessage','Could Not Get Project','Could Not Get Project');
} elseif ($grp->isError()) {
@@ -1089,7 +1090,7 @@
function artifactGetChangeLog($session_ser, $group_id, $group_artifact_id, $artifact_id) {
continue_session($session_ser);
- $grp =& group_get_object($group_id);
+ $grp = group_get_object($group_id);
if (!$grp || !is_object($grp)) {
return new soap_fault ('','artifactGetChangeLog','Could Not Get Project','Could Not Get Project');
} elseif ($grp->isError()) {
Modified: branches/Branch_5_1/src/www/stats/graphs.php
===================================================================
--- branches/Branch_5_1/src/www/stats/graphs.php 2011-01-29 10:32:52 UTC (rev 12101)
+++ branches/Branch_5_1/src/www/stats/graphs.php 2011-01-29 13:12:42 UTC (rev 12102)
@@ -31,7 +31,6 @@
session_require_global_perm ('forge_stats', 'read') ;
$HTML->header(array('title'=>sprintf(_('%1$s Sitewide Statistics Graphs'), forge_get_config ('forge_name'))));
-print '<h1>'._('Sitewide Statistics Graphs').'</h1>' . "\n";
?>
<hr />
Modified: branches/Branch_5_1/src/www/stats/i18n.php
===================================================================
--- branches/Branch_5_1/src/www/stats/i18n.php 2011-01-29 10:32:52 UTC (rev 12101)
+++ branches/Branch_5_1/src/www/stats/i18n.php 2011-01-29 13:12:42 UTC (rev 12102)
@@ -31,7 +31,6 @@
session_require_global_perm ('forge_stats', 'read') ;
$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')."","%"));
$total=db_result(db_query_params('SELECT count(user_name) AS total FROM users', array()),0,'total');
Modified: branches/Branch_5_1/src/www/stats/index.php
===================================================================
--- branches/Branch_5_1/src/www/stats/index.php 2011-01-29 10:32:52 UTC (rev 12101)
+++ branches/Branch_5_1/src/www/stats/index.php 2011-01-29 13:12:42 UTC (rev 12102)
@@ -36,7 +36,6 @@
// BEGIN PAGE CONTENT CODE
//
-print '<h1>'._('Sitewide aggregate statistics').'</h1>';
?>
<hr />
Modified: branches/Branch_5_1/src/www/stats/lastlogins.php
===================================================================
--- branches/Branch_5_1/src/www/stats/lastlogins.php 2011-01-29 10:32:52 UTC (rev 12101)
+++ branches/Branch_5_1/src/www/stats/lastlogins.php 2011-01-29 13:12:42 UTC (rev 12102)
@@ -43,7 +43,6 @@
}
$HTML->header(array('title'=>_('Most Recent Opened Sessions')));
-print '<h1>'._('Most Recent Opened Sessions').'</h1>';
?>
Modified: branches/Branch_5_1/src/www/stats/projects.php
===================================================================
--- branches/Branch_5_1/src/www/stats/projects.php 2011-01-29 10:32:52 UTC (rev 12101)
+++ branches/Branch_5_1/src/www/stats/projects.php 2011-01-29 13:12:42 UTC (rev 12102)
@@ -38,7 +38,6 @@
$HTML->header(array('title'=>sprintf(_('%1$s Site Project Statistical Comparisons'), forge_get_config ('forge_name'))));
?>
-<h1><?php echo _('Project Statistical Comparisons'); ?></h1>
<hr />
Modified: branches/Branch_5_1/src/www/survey/admin/index.php
===================================================================
--- branches/Branch_5_1/src/www/survey/admin/index.php 2011-01-29 10:32:52 UTC (rev 12101)
+++ branches/Branch_5_1/src/www/survey/admin/index.php 2011-01-29 13:12:42 UTC (rev 12102)
@@ -53,7 +53,6 @@
exit_permission_denied(_('You are not a Project admin'),'surveys');
}
-echo '<h1>'._('Survey Administration').'</h1>';
?>
<p>
Modified: branches/Branch_5_1/src/www/survey/admin/show_results.php
===================================================================
--- branches/Branch_5_1/src/www/survey/admin/show_results.php 2011-01-29 10:32:52 UTC (rev 12101)
+++ branches/Branch_5_1/src/www/survey/admin/show_results.php 2011-01-29 13:12:42 UTC (rev 12102)
@@ -4,6 +4,7 @@
*
* Copyright 1999-2001 (c) VA Linux Systems
* Copyright 2002-2004 (c) GForge Team
+ * Copyright (C) 2011 Alain Peyrat - Alcatel-Lucent
* http://fusionforge.org/
*
* This file is part of FusionForge.
@@ -54,7 +55,6 @@
$title = _('Survey Results');
$sh->header(array('title'=>$title));
-echo '<h1>' . $title . '</h1>';
if (!session_loggedin() || !user_ismember($group_id,'A')) {
echo '<div class="error">'._('Permission denied').'</div>';
Modified: branches/Branch_5_1/src/www/survey/admin/survey.php
===================================================================
--- branches/Branch_5_1/src/www/survey/admin/survey.php 2011-01-29 10:32:52 UTC (rev 12101)
+++ branches/Branch_5_1/src/www/survey/admin/survey.php 2011-01-29 13:12:42 UTC (rev 12102)
@@ -4,7 +4,7 @@
*
* Copyright 2004 (c) GForge Team
* Copyright 2010 (c) FusionForge Team
- * Copyright (C) 2010 Alain Peyrat - Alcatel-Lucent
+ * Copyright (C) 2010-2011 Alain Peyrat - Alcatel-Lucent
* http://fusionforge.org/
*
* This file is part of FusionForge.
@@ -70,7 +70,7 @@
$feedback = _('Update Successful');
} else { /* Add */
$s->create($survey_title, $to_add, $is_active);
- $feedback = _('Survey Inserted');
+ $feedback = _('Survey Added');
}
}
Modified: branches/Branch_5_1/src/www/survey/include/SurveyHTML.class.php
===================================================================
--- branches/Branch_5_1/src/www/survey/include/SurveyHTML.class.php 2011-01-29 10:32:52 UTC (rev 12101)
+++ branches/Branch_5_1/src/www/survey/include/SurveyHTML.class.php 2011-01-29 13:12:42 UTC (rev 12102)
@@ -5,6 +5,7 @@
* Portions Copyright 1999-2001 (c) VA Linux Systems
* The rest Copyright 2002-2004 (c) GForge Team - Sung Kim
* Copyright 2008-2010 (c) FusionForge Team
+ * Copyright (C) 2011 Alain Peyrat - Alcatel-Lucent
* http://fusionforge.org/
*
* This file is part of FusionForge.
@@ -57,37 +58,31 @@
exit_disabled();
}
- site_project_header($params);
-
if ($is_admin_page && $group_id) {
- echo ($HTML->subMenu(
+ $params['submenu'] = $HTML->subMenu(
array(
- _('Surveys'),
- _('Admin'),
- _('Edit Survey'),
- _('Edit Questions'),
- _('Show Results')
+ _('Add Survey'),
+ _('Add Question'),
+ _('Show Results'),
+ _('Administration')
),
array(
- '/survey/?group_id='.$group_id,
- '/survey/admin/?group_id='.$group_id,
'/survey/admin/survey.php?group_id='.$group_id,
'/survey/admin/question.php?group_id='.$group_id,
- '/survey/admin/show_results.php?group_id='.$group_id
+ '/survey/admin/show_results.php?group_id='.$group_id,
+ '/survey/admin/?group_id='.$group_id
)
- ));
+ );
} else {
+ $labels[] = _('Views Surveys');
+ $links[] = '/survey/?group_id='.$group_id;
if (forge_check_perm ('project_admin', $group_id)) {
- echo ($HTML->subMenu(
- array(
- _('Administration')
- ),
- array(
- '/survey/admin/?group_id='.$group_id
- )
- )) ;
+ $labels[] = _('Administration');
+ $links[] = '/survey/admin/?group_id='.$group_id;
}
+ $params['submenu'] = $HTML->subMenu($labels,$links);
}
+ site_project_header($params);
}// end if (valid group id)
}
@@ -107,15 +102,13 @@
global $group_id;
/* Default is add */
- $title = _('Add a Question');
$question_button = _('Add this Question');
/* If we have a question object, it is a Modify */
if ($q && is_object($q) && !$q->isError() && $q->getID()) {
- $title = _('Edit A Question');
- $warning_msg = '<div class="warning">'.
+ $warning_msg = '<p class="warning_msg">'.
_('WARNING! It is a bad idea to change a question after responses to it have been submitted').
- '</div>';
+ '</p>';
$question_id = $q->getID();
$question = $q->getQuestion();
$question_type = $q->getQuestionType();
@@ -127,8 +120,7 @@
$question_type = '';
}
- $ret = '<h1>'. $title. '</h1>';
- $ret.= $warning_msg;
+ $ret = $warning_msg;
$ret.='<form action="'.getStringFromServer('PHP_SELF').'" method="post">';
$ret.='<p><input type="hidden" name="post" value="Y" />';
$ret.='<input type="hidden" name="group_id" value="'.$group_id.'" />';
@@ -167,16 +159,14 @@
}
/* Default is add */
- $title = _('Add a Survey');
$survey_button = _('Add this Survey');
$active = ' checked="checked" ';
$inactive = '';
/* If we have a survey object, it is a Modify */
if ($s && is_object($s) && !$s->isError() && $s->getID()) {
- $title = _('Edit A Survey');
- $warning_msg = '<div class="warning">'.
- _('WARNING! It is a bad idea to edit a survey after responses have been posted').'</div>';
+ $warning_msg = '<p class="warning_msg">'.
+ _('WARNING! It is a bad idea to edit a survey after responses have been posted').'</p>';
$survey_id = $s->getID();
$survey_title = $s->getTitle();
$survey_questions = $s->getQuestionString();
@@ -191,8 +181,7 @@
$survey_title = '';
}
- $ret = '<h1>'. $title. '</h1>';
- $ret.= $warning_msg;
+ $ret = $warning_msg;
$ret.='<form action="'.getStringFromServer('PHP_SELF').'" method="post">';
$ret.='<input type="hidden" name="post" value="Y" />';
$ret.='<input type="hidden" name="group_id" value="'.$group_id.'" />';
@@ -261,7 +250,6 @@
continue;
}
-
$ret.= "<tr ". $GLOBALS['HTML']->boxGetAltRowStyle($i) .">\n";
$ret.= '<td>'.$arr_to_del[$i]->getID().'</td>';
@@ -297,7 +285,7 @@
global $group_id;
$n = count($questions);
- $ret = "<h3>" . sprintf(ngettext("%d question found", "%d questions found", $n), $n)."</h3>";
+ $ret = "<h2>" . sprintf(ngettext("%d question found", "%d questions found", $n), $n)."</h2>";
/* Head information */
$title_arr = array ('Question ID', 'Question', 'Type', 'Edit/Delete');
@@ -363,7 +351,7 @@
$title_arr[] = _('Number of Votes');
}
if ($show_vote && $user_id) {
- $title_arr[] = _('Vote');
+ $title_arr[] = _('Did I Vote?');
}
if ($show_edit) {
$title_arr[] = _('Edit');
@@ -419,9 +407,9 @@
}
if ($show_vote && $user_id) {
if ($surveys[$i]->isUserVote($user_id)) {
- $ret.='<td>YES</td>';
+ $ret.='<td>'. _('Yes') . '</td>';
} else {
- $ret.='<td>NO</td>';
+ $ret.='<td>'. _('No') . '</td>';
}
}
if ($show_edit) {
@@ -468,13 +456,12 @@
$ret="";
if ($s->isUserVote(user_getid())) {
- $ret.= '<div class="warning">'. _('Warning - you are about to vote a second time on this survey.').'</div>';
+ $ret.= '<p class="warning_msg">'. _('Warning - you are about to vote a second time on this survey.').'</p>';
}
$ret.= '<form action="/survey/survey_resp.php" method="post">'.
'<input type="hidden" name="group_id" value="'.$group_id.'" />'.
'<input type="hidden" name="survey_id" value="'.$survey_id. '" />';
- $ret.= '<h3>'.$s->getTitle().'</h3>';
$ret.= '<table border="0">';
/* Keep question numbers */
@@ -586,7 +573,7 @@
/* No votes, no result to show */
if ($votes==0) {
- $ret.= '<ul><li/>'._('No Votes').'</ul>';
+ $ret.= '<ul><li>'._('No Votes').'</li></ul>';
return $ret;
}
@@ -710,7 +697,6 @@
}
return $rslt;
}
-
/**
* _makeBar - make Precentage bar as a cell in a table. Starts with <tr> and ends with </tr>
Modified: branches/Branch_5_1/src/www/survey/index.php
===================================================================
--- branches/Branch_5_1/src/www/survey/index.php 2011-01-29 10:32:52 UTC (rev 12101)
+++ branches/Branch_5_1/src/www/survey/index.php 2011-01-29 13:12:42 UTC (rev 12102)
@@ -46,7 +46,6 @@
$title = sprintf(_('Surveys for %1$s'), $g->getPublicName());
$sh = new SurveyHtml();
$sh->header(array('title'=>$title));
-echo '<h1>' . $title . '</h1>';
plugin_hook ("blocks", "survey index");
Modified: branches/Branch_5_1/src/www/survey/privacy.php
===================================================================
--- branches/Branch_5_1/src/www/survey/privacy.php 2011-01-29 10:32:52 UTC (rev 12101)
+++ branches/Branch_5_1/src/www/survey/privacy.php 2011-01-29 13:12:42 UTC (rev 12102)
@@ -32,7 +32,6 @@
$title = _('Survey Privacy');
$sh = new SurveyHtml();
$sh->header(array('title'=>$title));
-echo '<h1>' . $title . '</h1>';
echo '<p>';
echo _("The information collected in these surveys will never be sold to third parties or used to solicit you to purchase any goods or services.");
Modified: branches/Branch_5_1/src/www/survey/survey.php
===================================================================
--- branches/Branch_5_1/src/www/survey/survey.php 2011-01-29 10:32:52 UTC (rev 12101)
+++ branches/Branch_5_1/src/www/survey/survey.php 2011-01-29 13:12:42 UTC (rev 12102)
@@ -51,7 +51,6 @@
$title = sprintf(_('Vote for Survey: %1$s'), $s->getTitle());
$sh->header(array('title'=>$title));
-echo '<h1>' . $title . '</h1>';
if (!$survey_id) {
echo '<div class="error">'._('For some reason, the Project ID or Survey ID did not make it to this page').'</div>';
Modified: branches/Branch_5_1/src/www/survey/survey_resp.php
===================================================================
--- branches/Branch_5_1/src/www/survey/survey_resp.php 2011-01-29 10:32:52 UTC (rev 12101)
+++ branches/Branch_5_1/src/www/survey/survey_resp.php 2011-01-29 13:12:42 UTC (rev 12102)
@@ -42,7 +42,6 @@
$sh = new SurveyHtml();
$title = _('Survey Complete');
$sh->header(array('title'=>$title));
-echo '<h1>' . $title . '</h1>';
if (!$survey_id) {
/*
Modified: branches/Branch_5_1/src/www/tarballs.php
===================================================================
--- branches/Branch_5_1/src/www/tarballs.php 2011-01-29 10:32:52 UTC (rev 12101)
+++ branches/Branch_5_1/src/www/tarballs.php 2011-01-29 13:12:42 UTC (rev 12102)
@@ -6,6 +6,7 @@
* Copyright 1999-2001 (c) VA Linux Systems
* Copyright 2003-2004 (c) GForge
* Copyright 2010 (c) Franck Villaume
+ * Copyright (C) 2011 Alain Peyrat - Alcatel-Lucent
* http://fusionforge.org/
*
* This file is part of FusionForge.
@@ -59,7 +60,7 @@
readfile_chunked(forge_get_config('scm_tarballs_path').'/'.$filename);
} else {
- session_redirect(util_make_url("/404.php"));
+ session_redirect('/404.php');
}
?>
Modified: branches/Branch_5_1/src/www/themes/css/fusionforge.css
===================================================================
--- branches/Branch_5_1/src/www/themes/css/fusionforge.css 2011-01-29 10:32:52 UTC (rev 12101)
+++ branches/Branch_5_1/src/www/themes/css/fusionforge.css 2011-01-29 13:12:42 UTC (rev 12102)
@@ -725,4 +725,4 @@
.new_line {
clear: left;
margin-bottom: 1px;
-}
\ No newline at end of file
+}
Modified: branches/Branch_5_1/src/www/themes/funky/Theme.class.php
===================================================================
--- branches/Branch_5_1/src/www/themes/funky/Theme.class.php 2011-01-29 10:32:52 UTC (rev 12101)
+++ branches/Branch_5_1/src/www/themes/funky/Theme.class.php 2011-01-29 13:12:42 UTC (rev 12102)
@@ -4,6 +4,7 @@
*
* Copyright 2010, Antoine Mercadal - Capgemini
* Copyright 2010, Marc-Etienne Vargenau, Alcatel-Lucent
+ * Copyright (C) 2011 Alain Peyrat - Alcatel-Lucent
*
* This file is part of FusionForge.
*
@@ -23,7 +24,6 @@
* USA
*/
-
require_once $gfwww.'include/Layout.class.php';
define('TOP_TAB_HEIGHT', 30);
@@ -64,14 +64,27 @@
function bodyHeader($params)
{
- global $user_guide, $HTML;
+ global $user_guide;
+
+ // The root location for images
+ if (!isset($params['h1'])) {
+ $params['h1'] = $params['title'];
+ }
+
+ if (!$params['title']) {
+ $params['title'] = forge_get_config('forge_name');
+ } else {
+ $params['title'] = $params['title'] . " - forge_get_config('forge_name') ";
+ }
+
echo '<table id="header" class="width-100p100">' . "\n";
echo '<tr>' . "\n";
echo '<td id="header-col1">' . "\n";
- echo '<h1>'. util_make_link ('/', html_image('/header/top-logo.png',null,null,array('alt'=>'FusionForge Home'))) .'</h1>' . "\n";
+ echo util_make_link ('/', html_image('/header/top-logo.png',null,null,array('alt'=>'FusionForge Home'))) . "\n";
+
echo '</td>' . "\n";
echo '<td id="header-col2">' . "\n";
-
+
$items = $this->navigation->getUserLinks();
for ($j = 0; $j < count($items['titles']); $j++)
{
@@ -87,7 +100,7 @@
// echo $this->quicknewsbutton();
$this->quickNav();
$this->searchBox();
-
+
echo '</td></tr>' . "\n";
echo '<tr><td colspan="2" id="header-news">' . "\n";
//echo $this->quicknews();
@@ -100,6 +113,14 @@
echo '</div>' . "\n";
echo '<div id="maindiv">' . "\n";
+
+ if ($params['h1']) {
+ echo '<h1>'.$params['h1'].'</h1>';
+ } else {
+ echo '<h1 class="hide">'.$params['title'].'</h1>';
+ }
+ if (isset($params['submenu']))
+ echo $params['submenu'];
}
function bodyFooter($params) {
Modified: branches/Branch_5_1/src/www/themes/funky/css/theme.css
===================================================================
--- branches/Branch_5_1/src/www/themes/funky/css/theme.css 2011-01-29 10:32:52 UTC (rev 12101)
+++ branches/Branch_5_1/src/www/themes/funky/css/theme.css 2011-01-29 13:12:42 UTC (rev 12102)
@@ -52,6 +52,7 @@
h1 {
color: black;
-webkit-mask-image: -webkit-gradient(linear, 0% 0%, 0% 100%, from(rgba(0, 0, 0, 0.296875)), to(black));
+ display: none;
}
h2 {
Modified: branches/Branch_5_1/src/www/themes/gforge/Theme.class.php
===================================================================
--- branches/Branch_5_1/src/www/themes/gforge/Theme.class.php 2011-01-29 10:32:52 UTC (rev 12101)
+++ branches/Branch_5_1/src/www/themes/gforge/Theme.class.php 2011-01-29 13:12:42 UTC (rev 12102)
@@ -3,7 +3,7 @@
* Default Theme
*
* Copyright 2010 (c) FusionForge Team
- * Copyright (C) 2010 Alain Peyrat - Alcatel-Lucent
+ * Copyright (C) 2010-2011 Alain Peyrat - Alcatel-Lucent
* http://fusionforge.org
*
* This file is part of FusionForge.
@@ -30,6 +30,7 @@
define('BOTTOM_TAB_HEIGHT', 22);
class Theme extends Layout {
+ var $header_displayed = false;
function Theme() {
// Ensure our stylesheets are loaded before the default one (reset first).
@@ -49,14 +50,30 @@
}
function bodyHeader($params) {
- global $user_guide;
+ global $user_guide;
+ // Don't display the headers twice (when errors for example).
+ if ($this->header_displayed)
+ return;
+ $this->header_displayed=true;
+
+ // The root location for images
+ if (!isset($params['h1'])) {
+ $params['h1'] = $params['title'];
+ }
+
+ if (!$params['title']) {
+ $params['title'] = forge_get_config('forge_name');
+ } else {
+ $params['title'] = $params['title'] . " - forge_get_config('forge_name') ";
+ }
+
echo '
<table id="header" class="width-100p100">
<tr>
- <td id="header-col1">
- <h1>'. util_make_link ('/', html_image('header/top-logo.png',192,54,array('alt'=>'FusionForge Home'))) .'</h1>
- </td>
+ <td id="header-col1">';
+ echo util_make_link ('/', html_image('header/top-logo.png',192,54,array('alt'=>'FusionForge Home')));
+ echo '</td>
<td id="header-col2">';
$this->searchBox();
echo '
@@ -68,8 +85,7 @@
$links[] = util_make_link($items['urls'][$j], $items['titles'][$j],
array('class'=>'userlink'), true);
}
- echo implode(' | ', $links);
-
+ echo implode(' | ', $links);
plugin_hook ('headermenu', $params);
$this->quickNav();
@@ -81,17 +97,25 @@
<!-- outer tabs -->
';
echo $this->outerTabs($params);
- echo '<!-- inner tabs -->';
+ echo '<!-- inner tabs -->' . "\n";
if (isset($params['group']) && $params['group']) {
echo $this->projectTabs($params['toptab'],$params['group']);
}
echo '<div id="maindiv">
';
+// echo '<div class="printheader">'. forge_get_config('forge_name') . ' ' . util_make_url('/') .'</div>';
+
+ if ($params['h1']) {
+ echo '<h1>'.$params['h1'].'</h1>';
+ } else {
+ echo '<h1 class="hide">'.$params['title'].'</h1>';
+ }
+ if (isset($params['submenu']))
+ echo $params['submenu'];
}
function bodyFooter($params) {
- echo '</div> <!-- id="maindiv" -->
-';
+ echo '</div><!-- id="maindiv" -->' . "\n";
}
function footer($params) {
Modified: branches/Branch_5_1/src/www/top/index.php
===================================================================
--- branches/Branch_5_1/src/www/top/index.php 2011-01-29 10:32:52 UTC (rev 12101)
+++ branches/Branch_5_1/src/www/top/index.php 2011-01-29 13:12:42 UTC (rev 12102)
@@ -30,8 +30,6 @@
$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>
-
<p><?php printf(_('We track many project usage statistics on %1$s, and display here the top ranked projects in several categories.'), forge_get_config ('forge_name')); ?></p>
<ul>
<li><a href="mostactive.php?type=week"><?php echo _('Most Active This Week'); ?></a></li>
Modified: branches/Branch_5_1/src/www/top/mostactive.php
===================================================================
--- branches/Branch_5_1/src/www/top/mostactive.php 2011-01-29 10:32:52 UTC (rev 12101)
+++ branches/Branch_5_1/src/www/top/mostactive.php 2011-01-29 13:12:42 UTC (rev 12102)
@@ -5,6 +5,7 @@
*
* Copyright 1999-2000 (c) The SourceForge Crew
* Copyright 2002-2004 (c) GForge Team
+ * Copyright (C) 2011 Alain Peyrat - Alcatel-Lucent
* http://fusionforge.org/
*
* This file is part of FusionForge.
@@ -44,10 +45,8 @@
$HTML->header(array('title'=>$title));
-print '<h1>'.$title.'</h1>
+print '<p><em>('._('Updated Daily').')</em></p>
-<p><em>('._('Updated Daily').')</em></p>
-
<p>'.util_make_link ('/top/','['._('View Other Top Categories').']').'</p>';
$arr=array(_('Rank'),_('Project name'),_('Percentile'));
Modified: branches/Branch_5_1/src/www/top/toplist.php
===================================================================
--- branches/Branch_5_1/src/www/top/toplist.php 2011-01-29 10:32:52 UTC (rev 12101)
+++ branches/Branch_5_1/src/www/top/toplist.php 2011-01-29 13:12:42 UTC (rev 12102)
@@ -53,7 +53,6 @@
$column1 = _('Downloads');
}
$HTML->header(array('title'=>$title));
-print '<h1>'.$title.'</h1>';
print '<p>'.util_make_link ('/top/','['._('View Other Top Categories').']').'</p>';
$arr=array(_('Rank'),_('Project name'),"$column1");
echo $HTML->listTableTop($arr);
Modified: branches/Branch_5_1/src/www/top/topusers.php
===================================================================
--- branches/Branch_5_1/src/www/top/topusers.php 2011-01-29 10:32:52 UTC (rev 12101)
+++ branches/Branch_5_1/src/www/top/topusers.php 2011-01-29 13:12:42 UTC (rev 12102)
@@ -4,6 +4,7 @@
*
* Copyright 1999-2001 (c) VA Linux Systems
* Copyright 2002-2004 (c) GForge Team
+ * Copyright (C) 2011 Alain Peyrat - Alcatel-Lucent
* http://fusionforge.org/
*
* This file is part of FusionForge.
@@ -54,8 +55,7 @@
$HTML->header(array('title'=>_('Top users')));
-print '<h1>'._('Top users').'</h1>
-<br /><em>('._('Updated Daily').')</em>
+print '<br /><em>('._('Updated Daily').')</em>
<p>'.util_make_link ('/top/','['._('View Other Top Categories').']').'</p>';
Modified: branches/Branch_5_1/src/www/tracker/admin/form-deleteextrafieldelement.php
===================================================================
--- branches/Branch_5_1/src/www/tracker/admin/form-deleteextrafieldelement.php 2011-01-29 10:32:52 UTC (rev 12101)
+++ branches/Branch_5_1/src/www/tracker/admin/form-deleteextrafieldelement.php 2011-01-29 13:12:42 UTC (rev 12102)
@@ -3,6 +3,7 @@
* Tracker Facility
*
* Copyright 2010 (c) FusionForge Team
+ * Copyright (C) 2011 Alain Peyrat - Alcatel-Lucent
* http://fusionforge.org
*
* This file is part of FusionForge. FusionForge is free software;
@@ -42,11 +43,8 @@
} elseif ($ao->isError()) {
exit_error($ao->getErrorMessage(),'tracker');
} else {
- $title = sprintf(_('Remove a custom field element in %s'), $ath->getName()) ;
- $ath->adminHeader(array('title'=>$title));
- echo '
- <h2>'.$title.'</h2>';
+ $ath->adminHeader(array('title'=>sprintf(_("Delete a custom field element in: %s"), $ath->getName())));
?>
<form action="<?php echo getStringFromServer('PHP_SELF').'?group_id='.$group_id.'&atid='.$ath->getID(); ?>" method="post">
Modified: branches/Branch_5_1/src/www/tracker/admin/form-extrafieldcopy.php
===================================================================
--- branches/Branch_5_1/src/www/tracker/admin/form-extrafieldcopy.php 2011-01-29 10:32:52 UTC (rev 12101)
+++ branches/Branch_5_1/src/www/tracker/admin/form-extrafieldcopy.php 2011-01-29 13:12:42 UTC (rev 12102)
@@ -55,7 +55,6 @@
$title = sprintf(_('Copy choices from custom field %1$s'), $fb->getName());
$ath->adminHeader(array ('title'=>$title));
- echo "<h3>".$title."</h3>";
$efearr = $ath->getExtraFieldElements($id);
for ($i=0; $i<count($efearr); $i++) {
Modified: branches/Branch_5_1/src/www/tracker/admin/form-workflow.php
===================================================================
--- branches/Branch_5_1/src/www/tracker/admin/form-workflow.php 2011-01-29 10:32:52 UTC (rev 12101)
+++ branches/Branch_5_1/src/www/tracker/admin/form-workflow.php 2011-01-29 13:12:42 UTC (rev 12102)
@@ -85,8 +85,6 @@
echo '</tr>'."\n";
echo $GLOBALS['HTML']->listTableBottom();
- echo '<h2>'.sprintf(_('Configuring workflow for the %1$s field'), $field_name).'</h2>';
-
$count=count($title_arr);
$totitle_arr = array();
for ($i=0; $i<$count; $i++) {
Modified: branches/Branch_5_1/src/www/tracker/admin/form-workflow_roles.php
===================================================================
--- branches/Branch_5_1/src/www/tracker/admin/form-workflow_roles.php 2011-01-29 10:32:52 UTC (rev 12101)
+++ branches/Branch_5_1/src/www/tracker/admin/form-workflow_roles.php 2011-01-29 13:12:42 UTC (rev 12102)
@@ -3,6 +3,7 @@
* Workflow Form
*
* Copyright 2010, FusionForge Team
+ * Copyright (C) 2011 Alain Peyrat - Alcatel-Lucent
* http://fusionforge.org
*
* This file is part of FusionForge.
@@ -30,7 +31,6 @@
$next = getIntFromRequest('next');
// FORM TO UPDATE ARTIFACT TYPES
- $ath->adminHeader(array ('title'=> _('Configure allowed roles'),'pagename'=>'tracker_admin_customize_liste','titlevals'=>array($ath->getName())));
/*
List of possible user built Selection Boxes for an ArtifactType
@@ -55,8 +55,9 @@
$name[ $e['element_id'] ] = $e['element_name'];
}
+ $title = sprintf(_('Configuring allowed roles for the transitions from %1$s to %2$s'), $name[$from], $name[$next]);
+ $ath->adminHeader(array ('title'=>$title,'pagename'=>'tracker_admin_customize_liste','titlevals'=>array($ath->getName())));
?>
- <h1><?php printf(_('Configuring allowed roles for the transitions from %1$s to %2$s'), $name[$from], $name[$next]) ?></h1>
<form action="<?php echo getStringFromServer('PHP_SELF').'?group_id='.$group_id.'&atid='.$ath->getID(); ?>" method="post">
<input type="hidden" name="field_id" value="<?php echo $field_id ?>" />
<input type="hidden" name="workflow_roles" value="1" />
Modified: branches/Branch_5_1/src/www/tracker/browse.php
===================================================================
--- branches/Branch_5_1/src/www/tracker/browse.php 2011-01-29 10:32:52 UTC (rev 12101)
+++ branches/Branch_5_1/src/www/tracker/browse.php 2011-01-29 13:12:42 UTC (rev 12102)
@@ -4,7 +4,7 @@
*
* Copyright 1999-2001 (c) VA Linux Systems
* Copyright 2010 Roland Mas
- * Copyright 2010 Alain Peyrat, Alcatel-Lucent
+ * Copyright (C) 2011 Alain Peyrat - Alcatel-Lucent
*
* This file is part of FusionForge.
*
@@ -150,6 +150,8 @@
//build page title to make bookmarking easier
//if a user was selected, add the user_name to the title
//same for status
+use_javascript('/tabber/tabber.js');
+
$ath->header(array('atid'=>$ath->getID(), 'title'=>$ath->getName()));
/**
@@ -300,7 +302,6 @@
}
$status_box = $ath->statusBox('_status',$_status,true,_('Any'));
}
-echo '<script type="text/javascript" src="/tabber/tabber.js"></script>'."\n";
// start of RDFa
$proj_name = $group->getUnixName();
Modified: branches/Branch_5_1/src/www/tracker/deleteartifact.php
===================================================================
--- branches/Branch_5_1/src/www/tracker/deleteartifact.php 2011-01-29 10:32:52 UTC (rev 12101)
+++ branches/Branch_5_1/src/www/tracker/deleteartifact.php 2011-01-29 13:12:42 UTC (rev 12102)
@@ -3,6 +3,7 @@
* FusionForge Project Management Facility
*
* Copyright 2002 GForge, LLC
+ * Copyright (C) 2011 Alain Peyrat - Alcatel-Lucent
* http://fusionforge.org/
*
*/
@@ -13,8 +14,6 @@
?>
-<h1><?php echo _('Delete artifact').': [#'. $ah->getID(). '] ' . $ah->getSummary(); ?></h1>
-
<table>
<tr>
<td>
Modified: branches/Branch_5_1/src/www/tracker/detail.php
===================================================================
--- branches/Branch_5_1/src/www/tracker/detail.php 2011-01-29 10:32:52 UTC (rev 12101)
+++ branches/Branch_5_1/src/www/tracker/detail.php 2011-01-29 13:12:42 UTC (rev 12102)
@@ -3,6 +3,7 @@
* Tracker Detail
*
* Copyright 1999-2001 (c) VA Linux Systems
+ * Copyright (C) 2011 Alain Peyrat - Alcatel-Lucent
* http://fusionforge.org/
*
* This file is part of FusionForge.
@@ -22,16 +23,13 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-$ath->header(array
- ('title' => _('Detail').': [#'.$ah->getID(). '] '
- . util_unconvert_htmlspecialchars($ah->getSummary()),
- 'atid'=>$ath->getID()));
+use_javascript('/tabber/tabber.js');
+$ath->header(array ('title'=>'[#'. $ah->getID(). '] ' . $ah->getSummary(), 'atid'=>$ath->getID()));
+
echo notepad_func();
?>
- <h1>[#<?php echo $ah->getID(); ?>] <?php echo util_unconvert_htmlspecialchars($ah->getSummary()); ?></h1>
-
<form id="trackerdetailform" action="<?php echo getStringFromServer('PHP_SELF'); ?>?group_id=<?php echo $group_id; ?>&atid=<?php echo $ath->getID(); ?>" method="post" enctype="multipart/form-data">
<?php if (session_loggedin()) { ?>
@@ -96,7 +94,6 @@
<?php echo $ah->showDetails(); ?>
</td></tr>
</table>
-<script type="text/javascript" src="<?php echo util_make_uri('/tabber/tabber.js') ?>"></script>
<div id="tabber" class="tabber">
<div class="tabbertab" title="<?php echo _('Followups'); ?>">
<table border="0" width="80%">
Modified: branches/Branch_5_1/src/www/tracker/include/ArtifactHtml.class.php
===================================================================
--- branches/Branch_5_1/src/www/tracker/include/ArtifactHtml.class.php 2011-01-29 10:32:52 UTC (rev 12101)
+++ branches/Branch_5_1/src/www/tracker/include/ArtifactHtml.class.php 2011-01-29 13:12:42 UTC (rev 12102)
@@ -1,13 +1,14 @@
<?php
-/**
- *
- * SourceForge Generic Tracker facility
- *
- * SourceForge: Breaking Down the Barriers to Open Source Development
- * Copyright 1999-2001 (c) VA Linux Systems
- * http://sourceforge.net
- *
- */
+/*
+ *
+ * SourceForge Generic Tracker facility
+ *
+ * SourceForge: Breaking Down the Barriers to Open Source Development
+ * Copyright 1999-2001 (c) VA Linux Systems
+ * Copyright (C) 2011 Alain Peyrat - Alcatel-Lucent
+ * http://sourceforge.net
+ *
+ */
require_once $gfcommon.'tracker/Artifact.class.php';
@@ -35,7 +36,6 @@
$result = $this->getDetails();
$result = util_gen_cross_ref($result, $this->ArtifactType->Group->getID());
//$result = util_line_wrap( $result, 120,"\n");
- $result = preg_replace('/(*ANYCRLF)$/m', '<br />', $result);
$result = preg_replace('/\r?\n/', '<br />', $result);
$title_arr = array();
@@ -84,7 +84,7 @@
$text = db_result($result, $i, 'body');
$text = util_gen_cross_ref($text, $this->ArtifactType->Group->getID());
//$text = util_line_wrap( $text, 120,"\n");
- $text = preg_replace('/\n?\r/', '<br />', $text);
+ $text = preg_replace('/\r?\n/', '<br />', $text);
echo "<br /><br />".$text.'</td></tr>';
}
Modified: branches/Branch_5_1/src/www/tracker/include/ArtifactTypeHtml.class.php
===================================================================
--- branches/Branch_5_1/src/www/tracker/include/ArtifactTypeHtml.class.php 2011-01-29 10:32:52 UTC (rev 12101)
+++ branches/Branch_5_1/src/www/tracker/include/ArtifactTypeHtml.class.php 2011-01-29 13:12:42 UTC (rev 12102)
@@ -4,6 +4,7 @@
*
* Copyright 1999-2001 (c) VA Linux Systems - Sourceforge
* Copyright 2010 (c) Fusionforge Team
+ * Copyright (C) 2011 Alain Peyrat - Alcatel-Lucent
* http://fusionforge.org
*
* This file is part of FusionForge.
@@ -53,13 +54,12 @@
$params['toptab']='tracker';
$params['tabtext']=$this->getName();
- site_project_header($params);
- echo '<h1>' . $params['title'] . '</h1>';
-
$labels = array();
$links = array();
- $labels[] = $this->getName().': '._('Browse');
+ $labels[] = _("View Trackers");
+ $links[] = '/tracker/?group_id='.$group_id;
+ $labels[] = $this->getName();
$links[] = '/tracker/?func=browse&group_id='.$group_id.'&atid='. $this->getID();
$labels[] = _('Download .csv');
$links[] = '/tracker/?func=downloadcsv&group_id='.$group_id.'&atid='. $this->getID();
@@ -80,7 +80,7 @@
}
if (forge_check_perm ('tracker', $this->getID(), 'manager')) {
- $labels[] = _('Admin');
+ $labels[] = _('Administration');
$links[] = '/tracker/admin/?group_id='.$group_id.'&atid='.$this->getID();
}
} else {
@@ -88,7 +88,8 @@
$links[] = '/tracker/?group_id='.$group_id.'&atid='. $this->getID().'&func=monitor&start=1';
}
- echo $HTML->subMenu($labels,$links);
+ $params['submenu'] = $HTML->subMenu($labels,$links);
+ site_project_header($params);
if ($this)
plugin_hook ("blocks", "tracker_".$this->getName());
Modified: branches/Branch_5_1/src/www/tracker/ind.php
===================================================================
--- branches/Branch_5_1/src/www/tracker/ind.php 2011-01-29 10:32:52 UTC (rev 12101)
+++ branches/Branch_5_1/src/www/tracker/ind.php 2011-01-29 13:12:42 UTC (rev 12102)
@@ -3,6 +3,7 @@
* Tracker Front Page
*
* Copyright 2010, Franck Villaume - Capgemini
+ * Copyright (C) 2011 Alain Peyrat - Alcatel-Lucent
* http://fusionforge.org/
*
* This file is part of FusionForge.
@@ -44,7 +45,7 @@
if (forge_check_perm ('tracker_admin', $group_id)) {
$menu_text=array();
$menu_links=array();
- $menu_text[]=_('Admin');
+ $menu_text[]=_('Administration');
$menu_links[]='/tracker/admin/?group_id='.$group_id;
echo $HTML->subMenu($menu_text,$menu_links);
}
@@ -55,8 +56,6 @@
echo "<p><strong>".sprintf(_('No trackers have been set up, or you cannot view them.<p><span class="important">The Admin for this project will have to set up data types using the %1$s admin page %2$s</span>'), '<a href="'.util_make_url ('/tracker/admin/?group_id='.$group_id).'">', '</a>')."</strong>";
} else {
- echo '<h1>'.$params['title'].'</h1>';
-
plugin_hook ("blocks", "tracker index");
echo '<p>'._('Choose a tracker and you can browse/edit/add items to it.').'</p>';
Modified: branches/Branch_5_1/src/www/tracker/mod-limited.php
===================================================================
--- branches/Branch_5_1/src/www/tracker/mod-limited.php 2011-01-29 10:32:52 UTC (rev 12101)
+++ branches/Branch_5_1/src/www/tracker/mod-limited.php 2011-01-29 13:12:42 UTC (rev 12102)
@@ -3,6 +3,7 @@
* Tracker Facility
*
* Copyright 1999-2001 (c) VA Linux Systems
+ * Copyright (C) 2011 Alain Peyrat - Alcatel-Lucent
* http://fusionforge.org/
*
* This file is part of FusionForge.
@@ -21,11 +22,9 @@
* along with FusionForge; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+use_javascript('/tabber/tabber.js');
-$ath->header(array
- ('title' => _('Modify').' [#'.$ah->getID(). '] '
- . util_unconvert_htmlspecialchars($ah->getSummary()),
- 'atid'=>$ath->getID()));
+$ath->header(array ('title'=>'[#'. $ah->getID(). '] ' . $ah->getSummary(), 'atid'=>$ath->getID()));
echo notepad_func();
@@ -143,7 +142,6 @@
<?php echo $ah->showDetails(); ?>
</td></tr>
</table>
-<script type="text/javascript" src="<?php echo util_make_uri('/tabber/tabber.js') ?>"></script>
<div id="tabber" class="tabber">
<div class="tabbertab" title="<?php echo _('Followups');?>">
<table border="0" width="80%">
Modified: branches/Branch_5_1/src/www/tracker/mod.php
===================================================================
--- branches/Branch_5_1/src/www/tracker/mod.php 2011-01-29 10:32:52 UTC (rev 12101)
+++ branches/Branch_5_1/src/www/tracker/mod.php 2011-01-29 13:12:42 UTC (rev 12102)
@@ -4,6 +4,7 @@
*
* Copyright 1999-2001 (c) VA Linux Systems
* Copyright 2010 (c) Franck Villaume - Capgemini
+ * Copyright (C) 2011 Alain Peyrat - Alcatel-Lucent
* http://fusionforge.org/
*
* This file is part of FusionForge.
@@ -22,17 +23,13 @@
* along with FusionForge; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+use_javascript('/tabber/tabber.js');
-$ath->header(array
- ('title' => _('Modify').' [#'.$ah->getID(). '] '
- . util_unconvert_htmlspecialchars($ah->getSummary()),
- 'atid'=>$ath->getID()));
+$ath->header(array ('title'=>'[#'. $ah->getID(). '] ' . $ah->getSummary(), 'atid'=>$ath->getID()));
echo notepad_func();
?>
- <h1>[#<?php echo $ah->getID(); ?>] <?php echo $ah->getSummary(); ?></h1>
-
<form id="trackermodform" action="<?php echo getStringFromServer('PHP_SELF'); ?>?group_id=<?php echo $group_id; ?>&atid=<?php echo $ath->getID(); ?>" enctype="multipart/form-data" method="post">
<input type="hidden" name="form_key" value="<?php echo form_generate_key(); ?>"/>
<input type="hidden" name="func" value="postmod"/>
@@ -185,8 +182,7 @@
</div>
</td></tr>
</table>
-<script type="text/javascript" src="<?php echo util_make_uri('/tabber/tabber.js') ?>"></script>
-<div id="tabber" class="tabber">
+div id="tabber" class="tabber">
<div class="tabbertab" title="<?php echo _('Followups'); ?>">
<table border="0" width="80%">
<tr><td colspan="2">
Modified: branches/Branch_5_1/src/www/tracker/reporting/index.php
===================================================================
--- branches/Branch_5_1/src/www/tracker/reporting/index.php 2011-01-29 10:32:52 UTC (rev 12101)
+++ branches/Branch_5_1/src/www/tracker/reporting/index.php 2011-01-29 13:12:42 UTC (rev 12102)
@@ -3,6 +3,7 @@
* Reporting System
*
* Copyright 2004 (c) GForge LLC
+ * Copyright (C) 2011 Alain Peyrat - Alcatel-Lucent
*
* @version index.php,v 1.11 2004/08/05 20:48:59 tperdue Exp
* @author Tim Perdue tim at gforge.org
@@ -98,23 +99,21 @@
//
$vals=array();
$labels=array();
-$vals[]='activity'; $labels[]='Response Time';
-$vals[]='assignee'; $labels[]='By Assignee';
+$vals[]='activity'; $labels[]=_('Response Time');
+$vals[]='assignee'; $labels[]=_('By Assignee');
-//required params for site_project_header();
-$params=array();
-$params['group']=$group_id;
-$params['toptab']='tracker';
-$params['title'] = _('Project Activity');
+if ($atid) {
+ $h = new ArtifactTypeHtml($group, $atid);
+} else {
+ $h = new ArtifactTypeFactoryHtml($group);
+}
-echo site_project_header($params);
-echo '<h1>' . _('Project Activity') . '</h1>';
+$h->header(array('title' => _('Project Activity')));
?>
-<div align="center">
-<h1>Project Activity</h1>
<form action="<?php echo getStringFromServer('PHP_SELF'); ?>" method="get">
-<table><tr>
+<table style="margin-left: auto; margin-right: auto;">
+<tr>
<td>
<input type="hidden" name="group_id" value="<?php echo $group_id; ?>" />
<strong>Tracker:</strong><br /><?php echo html_build_select_box($restracker,'atid',$atid,false); ?></td>
@@ -141,5 +140,4 @@
}
?>
</p>
-</div>
-<?php echo site_project_footer(array()); ?>
+<?php $h->footer(array()); ?>
Modified: branches/Branch_5_1/src/www/tracker/taskmgr.php
===================================================================
--- branches/Branch_5_1/src/www/tracker/taskmgr.php 2011-01-29 10:32:52 UTC (rev 12101)
+++ branches/Branch_5_1/src/www/tracker/taskmgr.php 2011-01-29 13:12:42 UTC (rev 12102)
@@ -3,6 +3,7 @@
* Task Mgr And Tracker Integration
*
* Copyright 2003 GForge, LLC
+ * Copyright (C) 2011 Alain Peyrat - Alcatel-Lucent
* http://fusionforge.org
*
* This file is part of FusionForge.
@@ -92,11 +93,11 @@
exit_error(_('No Available Tasks Found'));
}
- $ath->header(array('atid'=>$ath->getID()));
+ $ath->header(array('titlevals'=>array($ath->getName()),
+ 'atid'=>$ath->getID(),
+ 'title'=>_('Build Relationship Between Tracker Items and Tasks')));
echo '
- <h3>'._('Build Relationship Between Tracker Items and Task Manager').'</h3>
-
<form name="foo" action="'. getStringFromServer('PHP_SELF') .'?func=taskmgr&group_id='.$group_id.'&atid='.$atid.'&aid='.$aid.'" method="post">
<p><strong>'._('Tracker Item').':</strong> [#'.$a->getID().'] '.$a->getSummary().'</p>
<p><strong>'._('Tasks Project').':</strong><br />';
@@ -147,19 +148,22 @@
}
}
- $ath->header(array('atid'=>$ath->getID()));
+ $ath->header(array('titlevals'=>array($ath->getName()),
+ 'atid'=>$ath->getID(),
+ 'title'=>_('Build Relationship Between Tracker Items and Tasks')));
- echo '<h3>'._('Build Relationship Between Tracker Items and Task Manager').'</h3>
- <form name="foo" action="'. getStringFromServer('PHP_SELF') .'?func=taskmgr&group_id='.$group_id.'&atid='.$atid.'&aid='.$aid.'" method="post">
+ echo '<form name="foo" action="'. getStringFromServer('PHP_SELF') .'?func=taskmgr&group_id='.$group_id.'&atid='.$atid.'&aid='.$aid.'" method="post">
<p><strong>'._('Tracker Item').':</strong> [#'.$a->getID().'] '.$a->getSummary().'</p>
<p><strong>'._('Tasks Project').':</strong></p>
<select name="group_project_id">';
for ($i=0; $i<count($pg_arr); $i++) {
echo '<option value="'.$pg_arr[$i]->getID().'">'.$pg_arr[$i]->getName().'</option>';
}
- echo '</select><br />
- <input type="submit" name="add_to_task" value="'._('Add Relation To Existing Task.').'." /><br />
+ echo '</select>
+ <p>
+ <input type="submit" name="add_to_task" value="'._('Add Relation to Existing Task').'" />
<input type="submit" name="new_task" value="'._('Create New Task').'" />
+ </p>
</form>';
}
Modified: branches/Branch_5_1/src/www/widgets/widgets.php
===================================================================
--- branches/Branch_5_1/src/www/widgets/widgets.php 2011-01-29 10:32:52 UTC (rev 12101)
+++ branches/Branch_5_1/src/www/widgets/widgets.php 2011-01-29 13:12:42 UTC (rev 12102)
@@ -68,9 +68,12 @@
$_REQUEST['group_id'] = $_GET['group_id'] = $group_id;
$request->params['group_id'] = $group_id; //bad!
if (user_ismember($group_id, 'A') || user_is_super_user()) {
- $title = _("Project info").' - '. $project->getPublicName();
+ if (HTTPRequest::instance()->get('update') == 'layout') {
+ $title = _("Customize layout");
+ } else {
+ $title = _("Add widgets");
+ }
site_project_header(array('title'=>$title,'group'=>$group_id,'toptab'=>'summary'));
- use_javascript('/scripts/codendi/LayoutManager.js');
$lm->displayAvailableWidgets($group_id, WidgetLayoutManager::OWNER_TYPE_GROUP, $layout_id);
site_footer(array());
} else {
Modified: branches/Branch_5_1/tests/func/RBAC/rbacTest.php
===================================================================
--- branches/Branch_5_1/tests/func/RBAC/rbacTest.php 2011-01-29 10:32:52 UTC (rev 12101)
+++ branches/Branch_5_1/tests/func/RBAC/rbacTest.php 2011-01-29 13:12:42 UTC (rev 12102)
@@ -1,6 +1,7 @@
<?php
/*
* Copyright 2010, Roland Mas
+ * Copyright (C) 2011 Alain Peyrat - Alcatel-Lucent
*
* This file is part of FusionForge.
*
@@ -30,7 +31,7 @@
$this->click("link=Admin");
$this->waitForPageToLoad("30000");
- $this->assertTrue($this->isTextPresent("Project Admin: ProjectA"));
+ $this->assertTrue($this->isTextPresent("Project Information"));
$this->click("link=Users and permissions");
$this->waitForPageToLoad("30000");
$this->assertTrue($this->isTextPresent("Members of ProjectA"));
Modified: branches/Branch_5_1/tests/func/Tasks/createTaskTest.php
===================================================================
--- branches/Branch_5_1/tests/func/Tasks/createTaskTest.php 2011-01-29 10:32:52 UTC (rev 12101)
+++ branches/Branch_5_1/tests/func/Tasks/createTaskTest.php 2011-01-29 13:12:42 UTC (rev 12102)
@@ -1,6 +1,6 @@
<?php
/*
- * Copyright (C) 2010 Alain Peyrat, Alcatel-Lucent
+ * Copyright (C) 2010-2011 Alain Peyrat - Alcatel-Lucent
*
* This file is part of FusionForge.
*
@@ -230,7 +230,7 @@
$this->assertTrue($this->isTextPresent("yourcategory"));
// Set Task1 to mycategory
- $this->click("link=To Do: Browse tasks");
+ $this->click("link=To Do");
$this->waitForPageToLoad("30000");
$this->click("link=exact:Task1: Hello Paris");
$this->waitForPageToLoad("30000");
@@ -239,7 +239,7 @@
$this->waitForPageToLoad("30000");
// Set Task2 to yourcategory
- $this->click("link=To Do: Browse tasks");
+ $this->click("link=To Do");
$this->waitForPageToLoad("30000");
$this->click("link=exact:Task2: Hello France");
$this->waitForPageToLoad("30000");
@@ -275,7 +275,7 @@
$this->assertFalse($this->isTextPresent("Task3:"));
// Set Detail view to Detailed
- $this->click("link=To Do: Browse tasks");
+ $this->click("link=To Do");
$this->waitForPageToLoad("30000");
$this->select("_category_id", "label=Any");
$this->select("_view", "label=Detailed");
@@ -331,7 +331,7 @@
function deleteTask()
{
// Delete a task
- $this->click("link=To Do: Browse tasks");
+ $this->click("link=To Do");
$this->waitForPageToLoad("30000");
$this->click("link=exact:Task3: Hello World");
$this->waitForPageToLoad("30000");
@@ -358,7 +358,7 @@
$this->waitForPageToLoad("30000");
$this->click("link=Tasks");
$this->waitForPageToLoad("30000");
- $this->click("link=To Do: Browse tasks");
+ $this->click("link=To Do");
$this->waitForPageToLoad("30000");
$this->click("link=exact:Task1: Hello Paris");
$this->waitForPageToLoad("30000");
More information about the Fusionforge-commits
mailing list