[Fusionforge-commits] FusionForge branch master updated. 3dc46e212b8b3a55fe02f5cd5505e1ed0a27c6f7
Alain Peyrat
aljeux at fusionforge.org
Thu May 2 14:37:09 CEST 2013
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "FusionForge".
The branch, master has been updated
via 3dc46e212b8b3a55fe02f5cd5505e1ed0a27c6f7 (commit)
via d969cd27ec3fedbb4d495cf7c0b4e064b4773161 (commit)
via fb8745c19325f9aa1534d220508ffbf79ef5d15e (commit)
via 60f71de807b2e89b695ea5484b757ebb03e4bf26 (commit)
via 497bfc2b90ab6052d50f757560959fc069804e9b (commit)
via cc510ac69f9c34757dbd173b5371bbb84d7dd7c9 (commit)
via f4d6e8724ec44ee15f0eef52f67ee340a3721c66 (commit)
via 85a08f56286e18527d658ba68314e7ff336a9ba2 (commit)
from 77242a5775934935114d8ff46521f11e0aae10e7 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 3dc46e212b8b3a55fe02f5cd5505e1ed0a27c6f7
Author: Alain Peyrat <alain.peyrat at alcatel-lucent.com>
Date: Thu May 2 14:36:54 2013 +0200
Fix exit_error call
diff --git a/src/common/tracker/actions/downloadcsv.php b/src/common/tracker/actions/downloadcsv.php
index 3fa2b86..95a48e0 100644
--- a/src/common/tracker/actions/downloadcsv.php
+++ b/src/common/tracker/actions/downloadcsv.php
@@ -35,9 +35,9 @@ session_require_perm ('tracker', $ath->getID(), 'read') ;
$af = new ArtifactFactory($ath);
if (!$af || !is_object($af)) {
- exit_error('Error','Could Not Get Factory');
+ exit_error(_('Could Not Get Factory'),'tracker');
} elseif ($af->isError()) {
- exit_error('Error',$af->getErrorMessage());
+ exit_error($af->getErrorMessage(),'tracker');
}
$offset = getStringFromRequest('offset');
commit d969cd27ec3fedbb4d495cf7c0b4e064b4773161
Author: Alain Peyrat <alain.peyrat at alcatel-lucent.com>
Date: Thu May 2 14:36:25 2013 +0200
Strings improvements
diff --git a/src/common/docman/actions/forcereindexenginesearch.php b/src/common/docman/actions/forcereindexenginesearch.php
index e4c5b10..b53cf37 100644
--- a/src/common/docman/actions/forcereindexenginesearch.php
+++ b/src/common/docman/actions/forcereindexenginesearch.php
@@ -27,7 +27,7 @@ global $g; //group object
global $group_id; // id of group
if ( !forge_check_perm('docman', $group_id, 'admin')) {
- $return_msg = _('Document Manager Action Denied');
+ $return_msg = _('Document Manager Action Denied.');
session_redirect('/docman/?group_id='.$group_id.'&warning_msg='.urlencode($return_msg));
}
diff --git a/src/common/docman/actions/monitordirectory.php b/src/common/docman/actions/monitordirectory.php
index 70f7cc9..bdbfc96 100644
--- a/src/common/docman/actions/monitordirectory.php
+++ b/src/common/docman/actions/monitordirectory.php
@@ -35,7 +35,7 @@ if (!forge_check_perm('docman', $group_id, 'read')) {
$directoryid = getStringFromRequest('directoryid');
$option = getStringFromRequest('option');
-$return_msg = _('Diretory').' ';
+$return_msg = _('Directory').' ';
switch ($option) {
case "add": {
if (!empty($directoryid)) {
diff --git a/src/common/docman/actions/monitorfile.php b/src/common/docman/actions/monitorfile.php
index 6501579..87e1b51 100644
--- a/src/common/docman/actions/monitorfile.php
+++ b/src/common/docman/actions/monitorfile.php
@@ -53,7 +53,7 @@ switch ($option) {
session_redirect('/docman/?group_id='.$group_id.'&view=listfile&dirid='.$dirid.'&warning_msg='.urlencode($warning_msg));
}
}
- $return_msg .= _('monitoring started');
+ $return_msg .= _('Monitoring Started');
break;
}
case "remove": {
@@ -73,7 +73,7 @@ switch ($option) {
session_redirect('/docman/?group_id='.$group_id.'&view=listfile&dirid='.$dirid.'&warning_msg='.urlencode($warning_msg));
}
}
- $return_msg .= _('monitoring stopped.');
+ $return_msg .= _('Monitoring Stopped');
break;
}
default: {
commit fb8745c19325f9aa1534d220508ffbf79ef5d15e
Author: Alain Peyrat <alain.peyrat at alcatel-lucent.com>
Date: Thu May 2 14:34:49 2013 +0200
Use exit_no_group() instead
diff --git a/src/common/include/GroupJoinRequest.class.php b/src/common/include/GroupJoinRequest.class.php
index 6161f0b..e07026d 100644
--- a/src/common/include/GroupJoinRequest.class.php
+++ b/src/common/include/GroupJoinRequest.class.php
@@ -62,8 +62,7 @@ class GroupJoinRequest extends Error {
$this->error();
if (!$Group || !is_object($Group)) {
- $this->setError('GroupJoinRequest:: No Valid Group Object');
- return false;
+ exit_no_group();
}
if ($Group->isError()) {
$this->setError('GroupJoinRequest:: '.$Group->getErrorMessage());
commit 60f71de807b2e89b695ea5484b757ebb03e4bf26
Author: Alain Peyrat <alain.peyrat at alcatel-lucent.com>
Date: Thu May 2 14:33:48 2013 +0200
Fix logic & wrong path in scmhook/commitEmail
diff --git a/src/plugins/scmhook/library/scmhg/commitEmail.class.php b/src/plugins/scmhook/library/scmhg/commitEmail.class.php
index 665d891..4297dd8 100644
--- a/src/plugins/scmhook/library/scmhg/commitEmail.class.php
+++ b/src/plugins/scmhook/library/scmhg/commitEmail.class.php
@@ -80,6 +80,7 @@ The hook is triggered after \'serve push pull bundle\' on the projects repositor
$root = forge_get_config('repos_path', 'scmhg') . '/' . $project_name;
$unix_group = forge_get_config('apache_group');
$unix_user = forge_get_config('apache_user');
+ $sendmail = forge_get_config('sendmail_path');
$main_repo = $root . '/.hg';
if (is_dir("$main_repo")) {
$mail = $project_name.'-commits@'.forge_get_config('web_host');
@@ -104,7 +105,6 @@ The hook is triggered after \'serve push pull bundle\' on the projects repositor
if (!isset( $hgrc_val['email'])) {
/*set email parameter*/
$hgrc_val['email']['from'] = $mail;
- $sendmail = forge_get_config('sendmail_path');
$hgrc_val['email']['method'] = $sendmail;
}
if (!isset( $hgrc_val['notify'])) {
@@ -171,7 +171,7 @@ The hook is triggered after \'serve push pull bundle\' on the projects repositor
fclose ($f);
rename ($main_repo.'/hgrc.new', $main_repo.'/hgrc');
system( "chown $unix_user:$unix_group $main_repo/hgrc" );
- system( "chmod 660 $path/hgrc" );
+ system("chmod 660 $main_repo/hgrc" );
}
return true;
}
@@ -181,6 +181,7 @@ The hook is triggered after \'serve push pull bundle\' on the projects repositor
* This is done by removing the needed entries from the projects hgrc file.
*
* @param $project object containing project data
+ * @return bool
*/
function disable($project) {
if (!$project) {
commit 497bfc2b90ab6052d50f757560959fc069804e9b
Author: Alain Peyrat <alain.peyrat at alcatel-lucent.com>
Date: Thu May 2 14:32:52 2013 +0200
Reduce strings
diff --git a/src/plugins/quota_management/www/quota.php b/src/plugins/quota_management/www/quota.php
index d8faee7..ac1a0a9 100644
--- a/src/plugins/quota_management/www/quota.php
+++ b/src/plugins/quota_management/www/quota.php
@@ -33,7 +33,7 @@ $_quota_block_size = 1024;
$_quota_block_size = trim(shell_exec("echo $BLOCK_SIZE")) + 0;
if ($_quota_block_size == 0) $_quota_block_size = 1024;
-site_admin_header(array('title'=>_('Site admin')));
+site_admin_header(array('title'=>_('Site Admin')));
?>
<h4>
<?php echo _('Ressources usage and quota'); ?>
diff --git a/src/plugins/quota_management/www/quota_admin.php b/src/plugins/quota_management/www/quota_admin.php
index 0062458..b09f390 100644
--- a/src/plugins/quota_management/www/quota_admin.php
+++ b/src/plugins/quota_management/www/quota_admin.php
@@ -35,7 +35,7 @@ $_quota_block_size = 1024;
$_quota_block_size = trim(shell_exec("echo $BLOCK_SIZE")) + 0;
if ($_quota_block_size == 0) $_quota_block_size = 1024;
-site_admin_header(array('title'=>_('Site admin')));
+site_admin_header(array('title'=>_('Site Admin')));
?>
<h4>
commit cc510ac69f9c34757dbd173b5371bbb84d7dd7c9
Merge: f4d6e87 77242a5
Author: Alain Peyrat <alain.peyrat at alcatel-lucent.com>
Date: Thu May 2 14:22:47 2013 +0200
Merge branch 'master' of git+ssh://scm.fusionforge.org//scmrepos/git/fusionforge/fusionforge
commit f4d6e8724ec44ee15f0eef52f67ee340a3721c66
Author: Alain Peyrat <alain.peyrat at alcatel-lucent.com>
Date: Fri Apr 5 18:26:52 2013 +0200
Drop hardcoded graph size & Misc in src/www/reporting
diff --git a/src/www/reporting/groupadded.php b/src/www/reporting/groupadded.php
index 9fa9388..d12d9ae 100644
--- a/src/www/reporting/groupadded.php
+++ b/src/www/reporting/groupadded.php
@@ -57,14 +57,14 @@ report_header(_('Projects Added'));
<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>
-<td><strong><?php echo _('Start'); ?>:</strong><br /><?php echo report_months_box($report, 'start', $start); ?></td>
-<td><strong><?php echo _('End'); ?>:</strong><br /><?php echo report_months_box($report, 'end', $end); ?></td>
+<td><strong><?php echo _('Type')._(':'); ?></strong><br /><?php echo report_span_box('SPAN',$SPAN); ?></td>
+<td><strong><?php echo _('Start Date')._(':'); ?></strong><br /><?php echo report_months_box($report, 'start', $start); ?></td>
+<td><strong><?php echo _('End Date')._(':'); ?></strong><br /><?php echo report_months_box($report, 'end', $end); ?></td>
<td><input type="submit" name="submit" value="<?php echo _('Refresh'); ?>" /></td>
</tr></table>
</form>
<?php if ($start != $end) { ?>
- <p><img src="groupadded_graph.php?<?php echo "SPAN=$SPAN&start=$start&end=$end"; ?>" width="640" height="480" alt="" /></p>
+ <p><img src="groupadded_graph.php?<?php echo "SPAN=$SPAN&start=$start&end=$end"; ?>" alt="" /></p>
<?php }
report_footer();
diff --git a/src/www/reporting/groupcum.php b/src/www/reporting/groupcum.php
index 267329d..28bcfe9 100644
--- a/src/www/reporting/groupcum.php
+++ b/src/www/reporting/groupcum.php
@@ -56,14 +56,14 @@ report_header(_('Cumulative Projects'));
<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>
-<td><strong><?php echo _('Start'); ?>:</strong><br /><?php echo report_months_box($report, 'start', $start); ?></td>
-<td><strong><?php echo _('End'); ?>:</strong><br /><?php echo report_months_box($report, 'end', $end); ?></td>
+<td><strong><?php echo _('Type')._(':'); ?></strong><br /><?php echo report_span_box('SPAN',$SPAN); ?></td>
+<td><strong><?php echo _('Start Date')._(':'); ?></strong><br /><?php echo report_months_box($report, 'start', $start); ?></td>
+<td><strong><?php echo _('End Date')._(':'); ?></strong><br /><?php echo report_months_box($report, 'end', $end); ?></td>
<td><input type="submit" name="submit" value="<?php echo _('Refresh'); ?>" /></td>
</tr></table>
</form>
<?php if ($start != $end) { ?>
- <p><img src="groupcum_graph.php?<?php echo "SPAN=$SPAN&start=$start&end=$end"; ?>" width="640" height="480" alt="" /></p>
+ <p><img src="groupcum_graph.php?<?php echo "SPAN=$SPAN&start=$start&end=$end"; ?>" alt="" /></p>
<?php }
report_footer();
diff --git a/src/www/reporting/projectact.php b/src/www/reporting/projectact.php
index b10277b..8729272 100644
--- a/src/www/reporting/projectact.php
+++ b/src/www/reporting/projectact.php
@@ -59,17 +59,17 @@ report_header(_('Project Activity'));
<form action="<?php echo getStringFromServer('PHP_SELF'); ?>" method="get">
<table><tr>
-<td><strong><?php echo _('Project'); ?>:</strong><br /><?php echo report_group_box('g_id',$g_id); ?></td>
-<td><strong><?php echo _('Areas'); ?>:</strong><br /><?php echo report_area_box('area',$area); ?></td>
-<td><strong><?php echo _('Type'); ?>:</strong><br /><?php echo report_span_box('SPAN',$SPAN); ?></td>
-<td><strong><?php echo _('Start'); ?>:</strong><br /><?php echo report_months_box($report, 'start', $start); ?></td>
-<td><strong><?php echo _('End'); ?>:</strong><br /><?php echo report_months_box($report, 'end', $end); ?></td>
+<td><strong><?php echo _('Project')._(':'); ?></strong><br /><?php echo report_group_box('g_id',$g_id); ?></td>
+<td><strong><?php echo _('Areas')._(':'); ?></strong><br /><?php echo report_area_box('area',$area); ?></td>
+<td><strong><?php echo _('Type')._(':'); ?></strong><br /><?php echo report_span_box('SPAN',$SPAN); ?></td>
+<td><strong><?php echo _('Start Date')._(':'); ?></strong><br /><?php echo report_months_box($report, 'start', $start); ?></td>
+<td><strong><?php echo _('End Date')._(':'); ?></strong><br /><?php echo report_months_box($report, 'end', $end); ?></td>
<td><input type="submit" name="submit" value="<?php echo _('Refresh'); ?>" /></td>
</tr></table>
</form>
<?php if ($g_id && $start != $end) { ?>
<p>
- <img src="projectact_graph.php?<?php echo "SPAN=$SPAN&start=$start&end=$end&g_id=$g_id&area=$area"; ?>" width="640" height="480" alt="" />
+ <img src="projectact_graph.php?<?php echo "SPAN=$SPAN&start=$start&end=$end&g_id=$g_id&area=$area"; ?>" alt="" />
</p>
<?php
diff --git a/src/www/reporting/projecttime.php b/src/www/reporting/projecttime.php
index 11fb950..3bf78a9 100644
--- a/src/www/reporting/projecttime.php
+++ b/src/www/reporting/projecttime.php
@@ -69,10 +69,10 @@ $a2[]='user';
<form action="<?php echo getStringFromServer('PHP_SELF'); ?>" method="get">
<input type="hidden" name="typ" value="<?php echo $typ; ?>" />
<table><tr>
-<td><strong><?php echo _('Project'); ?>:</strong><br /><?php echo report_group_box('g_id',$g_id); ?></td>
-<td><strong><?php echo _('Type'); ?>:</strong><br /><?php echo html_build_select_box_from_arrays($a2,$a,'type',$type,false); ?></td>
-<td><strong><?php echo _('Start'); ?>:</strong><br /><?php echo report_months_box($report, 'start', $start); ?></td>
-<td><strong><?php echo _('End'); ?>:</strong><br /><?php echo report_months_box($report, 'end', $end); ?></td>
+<td><strong><?php echo _('Project')._(':'); ?></strong><br /><?php echo report_group_box('g_id',$g_id); ?></td>
+<td><strong><?php echo _('Type')._(':'); ?></strong><br /><?php echo html_build_select_box_from_arrays($a2,$a,'type',$type,false); ?></td>
+<td><strong><?php echo _('Start Date')._(':'); ?></strong><br /><?php echo report_months_box($report, 'start', $start); ?></td>
+<td><strong><?php echo _('End Date')._(':'); ?></strong><br /><?php echo report_months_box($report, 'end', $end); ?></td>
<td><input type="submit" name="submit" value="<?php echo _('Refresh'); ?>" /></td>
</tr></table>
</form>
@@ -96,7 +96,7 @@ $a2[]='user';
} elseif ($g_id && $start != $end) { ?>
<p>
- <img src="projecttime_graph.php?<?php echo "start=$start&end=$end&g_id=$g_id&type=$type"; ?>" width="640" height="480" alt="" />
+ <img src="projecttime_graph.php?<?php echo "start=$start&end=$end&g_id=$g_id&type=$type"; ?>" alt="" />
</p>
<?php
diff --git a/src/www/reporting/siteact.php b/src/www/reporting/siteact.php
index 2436794..253ad45 100644
--- a/src/www/reporting/siteact.php
+++ b/src/www/reporting/siteact.php
@@ -60,16 +60,16 @@ report_header(_('Site-Wide Activity'));
<form action="<?php echo getStringFromServer('PHP_SELF'); ?>" method="get">
<table><tr>
-<td><strong><?php echo _('Areas'); ?>:</strong><br /><?php echo report_area_box('area',$area); ?></td>
-<td><strong><?php echo _('Type'); ?>:</strong><br /><?php echo report_span_box('SPAN',$SPAN); ?></td>
-<td><strong><?php echo _('Start'); ?>:</strong><br /><?php echo report_months_box($report, 'start', $start); ?></td>
-<td><strong><?php echo _('End'); ?>:</strong><br /><?php echo report_months_box($report, 'end', $end); ?></td>
+<td><strong><?php echo _('Areas')._(':'); ?></strong><br /><?php echo report_area_box('area',$area); ?></td>
+<td><strong><?php echo _('Type')._(':'); ?></strong><br /><?php echo report_span_box('SPAN',$SPAN); ?></td>
+<td><strong><?php echo _('Start Date')._(':'); ?></strong><br /><?php echo report_months_box($report, 'start', $start); ?></td>
+<td><strong><?php echo _('End Date')._(':'); ?></strong><br /><?php echo report_months_box($report, 'end', $end); ?></td>
<td><input type="submit" name="submit" value="<?php echo _('Refresh'); ?>" /></td>
</tr></table>
</form>
<?php if ($area && $start != $end) { ?>
<p>
- <img src="siteact_graph.php?<?php echo "SPAN=$SPAN&start=$start&end=$end&area=$area"; ?>" width="640" height="480" alt="" />
+ <img src="siteact_graph.php?<?php echo "SPAN=$SPAN&start=$start&end=$end&area=$area"; ?>" alt="" />
</p>
<?php
diff --git a/src/www/reporting/sitetime.php b/src/www/reporting/sitetime.php
index 1993e72..e599621 100644
--- a/src/www/reporting/sitetime.php
+++ b/src/www/reporting/sitetime.php
@@ -69,9 +69,9 @@ $a2[]='user';
<form action="<?php echo getStringFromServer('PHP_SELF'); ?>" method="get">
<table><tr>
-<td><strong><?php echo _('Type'); ?>:</strong><br /><?php echo html_build_select_box_from_arrays($a2,$a,'type',$type,false); ?></td>
-<td><strong><?php echo _('Start'); ?>:</strong><br /><?php echo report_months_box($report, 'start', $start); ?></td>
-<td><strong><?php echo _('End'); ?>:</strong><br /><?php echo report_months_box($report, 'end', $end); ?></td>
+<td><strong><?php echo _('Type')._(':'); ?></strong><br /><?php echo html_build_select_box_from_arrays($a2,$a,'type',$type,false); ?></td>
+<td><strong><?php echo _('Start Date')._(':'); ?></strong><br /><?php echo report_months_box($report, 'start', $start); ?></td>
+<td><strong><?php echo _('End Date')._(':'); ?></strong><br /><?php echo report_months_box($report, 'end', $end); ?></td>
<td>
<input type="hidden" name="typ" value="<?php echo $typ; ?>" />
<input type="submit" name="submit" value="<?php echo _('Refresh'); ?>" />
@@ -95,7 +95,7 @@ if ($typ =='r') {
echo $HTML->listTableBottom ();
} elseif ($start != $end) { ?>
<p>
-<img src="sitetime_graph.php?<?php echo "start=$start&end=$end&type=$type"; ?>" width="640" height="480" alt="" />
+<img src="sitetime_graph.php?<?php echo "start=$start&end=$end&type=$type"; ?>" alt="" />
</p>
<?php
}
diff --git a/src/www/reporting/sitetimebar.php b/src/www/reporting/sitetimebar.php
index ad28463..844368d 100644
--- a/src/www/reporting/sitetimebar.php
+++ b/src/www/reporting/sitetimebar.php
@@ -57,8 +57,8 @@ report_header(_('Site-Wide Time Tracking'));
<form action="<?php echo getStringFromServer('PHP_SELF'); ?>" method="get">
<input type="hidden" name="typ" value="<?php echo $typ; ?>" />
<table><tr>
-<td><strong><?php echo _('Start'); ?>:</strong><br /><?php echo report_months_box($report, 'start', $start); ?></td>
-<td><strong><?php echo _('End'); ?>:</strong><br /><?php echo report_months_box($report, 'end', $end); ?></td>
+<td><strong><?php echo _('Start Date')._(':'); ?></strong><br /><?php echo report_months_box($report, 'start', $start); ?></td>
+<td><strong><?php echo _('End Date')._(':'); ?></strong><br /><?php echo report_months_box($report, 'end', $end); ?></td>
<td><input type="submit" name="submit" value="<?php echo _('Refresh'); ?>" /></td>
</tr></table>
</form>
@@ -100,7 +100,7 @@ if ($typ=='r') {
} elseif ($start != $end) { ?>
<p>
- <img src="sitetimebar_graph.php?<?php echo "start=$start&end=$end"; ?>" width="640" height="480" alt="" />
+ <img src="sitetimebar_graph.php?<?php echo "start=$start&end=$end"; ?>" alt="" />
</p>
<?php
}
diff --git a/src/www/reporting/timecategory.php b/src/www/reporting/timecategory.php
index 89c617d..e6642a0 100644
--- a/src/www/reporting/timecategory.php
+++ b/src/www/reporting/timecategory.php
@@ -88,7 +88,7 @@ echo $HTML->listTableBottom();
<p>
<input type="hidden" name="submit" value="1" />
<input type="hidden" name="time_code" value="<?php echo $time_code; ?>" />
-<strong><?php echo _('Category Name'); ?>:</strong><br />
+<strong><?php echo _('Category Name')._(':'); ?></strong><br />
<input type="text" name="category_name" value="<?php echo $category_name; ?>" />
</p>
<p>
diff --git a/src/www/reporting/toolspie.php b/src/www/reporting/toolspie.php
index 618c4bb..b23e522 100644
--- a/src/www/reporting/toolspie.php
+++ b/src/www/reporting/toolspie.php
@@ -61,14 +61,14 @@ if (!$datatype) {
<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>
-<td><strong><?php echo _('Start'); ?>:</strong><br /><?php echo report_months_box($report, 'start', $start); ?></td>
-<td><strong><?php echo _('End'); ?>:</strong><br /><?php echo report_months_box($report, 'end', $end); ?></td>
+<td><strong><?php echo _('Start Date')._(':'); ?></strong><br /><?php echo report_months_box($report, 'start', $start); ?></td>
+<td><strong><?php echo _('End Date')._(':'); ?></strong><br /><?php echo report_months_box($report, 'end', $end); ?></td>
<td><input type="submit" name="submit" value="<?php echo _('Refresh'); ?>" /></td>
</tr></table>
</form>
<?php if ($start != $end) { ?>
<p>
-<img src="toolspie_graph.php?<?php echo "datatype=$datatype&start=$start&end=$end"; ?>" width="640" height="480" alt="" />
+<img src="toolspie_graph.php?<?php echo "datatype=$datatype&start=$start&end=$end"; ?>" alt="" />
</p>
<?php }
diff --git a/src/www/reporting/useract.php b/src/www/reporting/useract.php
index ddaa50d..4a585b1 100644
--- a/src/www/reporting/useract.php
+++ b/src/www/reporting/useract.php
@@ -74,17 +74,17 @@ if ($sw) {
<form action="<?php echo getStringFromServer('PHP_SELF'); ?>" method="get">
<input type="hidden" name="sw" value="<?php echo $sw; ?>" />
<table><tr>
- <td><strong><?php echo _('User'); ?>:</strong><br /><?php echo report_useract_box('dev_id',$dev_id,$sw); ?></td>
- <td><strong><?php echo _('Areas'); ?>:</strong><br /><?php echo report_area_box('area',$area); ?></td>
- <td><strong><?php echo _('Type'); ?>:</strong><br /><?php echo report_span_box('SPAN',$SPAN); ?></td>
- <td><strong><?php echo _('Start'); ?>:</strong><br /><?php echo report_months_box($report, 'start', $start); ?></td>
- <td><strong><?php echo _('End'); ?>:</strong><br /><?php echo report_months_box($report, 'end', $end); ?></td>
+ <td><strong><?php echo _('User')._(':'); ?></strong><br /><?php echo report_useract_box('dev_id',$dev_id,$sw); ?></td>
+ <td><strong><?php echo _('Areas')._(':'); ?></strong><br /><?php echo report_area_box('area',$area); ?></td>
+ <td><strong><?php echo _('Type')._(':'); ?></strong><br /><?php echo report_span_box('SPAN',$SPAN); ?></td>
+ <td><strong><?php echo _('Start Date')._(':'); ?></strong><br /><?php echo report_months_box($report, 'start', $start); ?></td>
+ <td><strong><?php echo _('End Date')._(':'); ?></strong><br /><?php echo report_months_box($report, 'end', $end); ?></td>
<td><input type="submit" name="submit" value="<?php echo _('Refresh'); ?>" /></td>
</tr></table>
</form>
<?php if ($dev_id && $start != $end) { ?>
<p>
- <img src="useract_graph.php?<?php echo "SPAN=$SPAN&start=$start&end=$end&dev_id=$dev_id&area=$area"; ?>" width="640" height="480" alt="" />
+ <img src="useract_graph.php?<?php echo "SPAN=$SPAN&start=$start&end=$end&dev_id=$dev_id&area=$area"; ?>" alt="" />
</p>
<?php
diff --git a/src/www/reporting/useradded.php b/src/www/reporting/useradded.php
index f7a52b2..bfddb13 100644
--- a/src/www/reporting/useradded.php
+++ b/src/www/reporting/useradded.php
@@ -55,14 +55,14 @@ report_header(_('Users Added'));
?>
<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>
-<td><strong><?php echo _('Start'); ?>:</strong><br /><?php echo report_months_box($report, 'start', $start); ?></td>
-<td><strong><?php echo _('End'); ?>:</strong><br /><?php echo report_months_box($report, 'end', $end); ?></td>
+<td><strong><?php echo _('Type')._(':'); ?></strong><br /><?php echo report_span_box('SPAN',$SPAN); ?></td>
+<td><strong><?php echo _('Start Date')._(':'); ?></strong><br /><?php echo report_months_box($report, 'start', $start); ?></td>
+<td><strong><?php echo _('End Date')._(':'); ?></strong><br /><?php echo report_months_box($report, 'end', $end); ?></td>
<td><input type="submit" name="submit" value="<?php echo _('Refresh'); ?>" /></td>
</tr></table>
</form>
<?php if ($start != $end) { ?>
- <p><img src="useradded_graph.php?<?php echo "SPAN=$SPAN&start=$start&end=$end"; ?>" width="640" height="480" alt="" /></p>
+ <p><img src="useradded_graph.php?<?php echo "SPAN=$SPAN&start=$start&end=$end"; ?>" alt="" /></p>
<?php }
report_footer();
diff --git a/src/www/reporting/usercum.php b/src/www/reporting/usercum.php
index a90488d..0b089e3 100644
--- a/src/www/reporting/usercum.php
+++ b/src/www/reporting/usercum.php
@@ -56,15 +56,15 @@ report_header(_('Cumulative Users'));
<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>
-<td><strong><?php echo _('Start'); ?>:</strong><br /><?php echo report_months_box($report, 'start', $start); ?></td>
-<td><strong><?php echo _('End'); ?>:</strong><br /><?php echo report_months_box($report, 'end', $end); ?></td>
+<td><strong><?php echo _('Type')._(':'); ?></strong><br /><?php echo report_span_box('SPAN',$SPAN); ?></td>
+<td><strong><?php echo _('Start Date')._(':'); ?></strong><br /><?php echo report_months_box($report, 'start', $start); ?></td>
+<td><strong><?php echo _('End Date')._(':'); ?></strong><br /><?php echo report_months_box($report, 'end', $end); ?></td>
<td><input type="submit" name="submit" value="<?php echo _('Refresh'); ?>" /></td>
</tr></table>
</form>
<?php if ($start != $end) { ?>
<p>
-<img src="usercum_graph.php?<?php echo "SPAN=$SPAN&start=$start&end=$end"; ?>" width="640" height="480" alt="" />
+<img src="usercum_graph.php?<?php echo "SPAN=$SPAN&start=$start&end=$end"; ?>" alt="" />
</p>
<?php }
diff --git a/src/www/reporting/usersummary.php b/src/www/reporting/usersummary.php
index 4318471..25bb87e 100644
--- a/src/www/reporting/usersummary.php
+++ b/src/www/reporting/usersummary.php
@@ -66,9 +66,9 @@ report_header(_('User Summary Report'));
<form action="<?php echo getStringFromServer('PHP_SELF'); ?>" method="get">
<table>
<tr>
- <td><strong><?php echo _('Start'); ?>:</strong><br /><?php echo report_weeks_box($report, 'start', $start); ?></td>
- <td><strong><?php echo _('End'); ?>:</strong><br /><?php echo report_weeks_box($report, 'end', $end); ?></td>
- <td><strong><?php echo _('Task Status'); ?>:</strong><br /><?php echo html_build_select_box_from_arrays($l,$n,'tstat',$tstat,false); ?></td>
+ <td><strong><?php echo _('Start Date')._(':'); ?></strong><br /><?php echo report_weeks_box($report, 'start', $start); ?></td>
+ <td><strong><?php echo _('End Date')._(':'); ?></strong><br /><?php echo report_weeks_box($report, 'end', $end); ?></td>
+ <td><strong><?php echo _('Task Status')._(':'); ?></strong><br /><?php echo html_build_select_box_from_arrays($l,$n,'tstat',$tstat,false); ?></td>
<td><input type="submit" name="submit" value="<?php echo _('Refresh'); ?>" /></td>
</tr>
</table>
diff --git a/src/www/reporting/usertime.php b/src/www/reporting/usertime.php
index f9d6b8e..a3ca637 100644
--- a/src/www/reporting/usertime.php
+++ b/src/www/reporting/usertime.php
@@ -85,10 +85,10 @@ if ($sw) {
<input type="hidden" name="sw" value="<?php echo $sw; ?>" />
<input type="hidden" name="typ" value="<?php echo $typ; ?>" />
<table><tr>
- <td><strong><?php echo _('User'); ?>:</strong><br /><?php echo report_usertime_box('dev_id',$dev_id,$sw); ?></td>
- <td><strong><?php echo _('Type'); ?>:</strong><br /><?php echo html_build_select_box_from_arrays($a2,$a,'type',$type,false); ?></td>
- <td><strong><?php echo _('Start'); ?>:</strong><br /><?php echo report_months_box($report, 'start', $start); ?></td>
- <td><strong><?php echo _('End'); ?>:</strong><br /><?php echo report_months_box($report, 'end', $end); ?></td>
+ <td><strong><?php echo _('User')._(':'); ?></strong><br /><?php echo report_usertime_box('dev_id',$dev_id,$sw); ?></td>
+ <td><strong><?php echo _('Type')._(':'); ?></strong><br /><?php echo html_build_select_box_from_arrays($a2,$a,'type',$type,false); ?></td>
+ <td><strong><?php echo _('Start Date')._(':'); ?></strong><br /><?php echo report_months_box($report, 'start', $start); ?></td>
+ <td><strong><?php echo _('End Date')._(':'); ?></strong><br /><?php echo report_months_box($report, 'end', $end); ?></td>
<td><input type="submit" name="submit" value="<?php echo _('Refresh'); ?>" /></td>
</tr></table>
</form>
@@ -111,7 +111,7 @@ if ($sw) {
} elseif ($dev_id && $start != $end) { ?>
<p>
- <img src="usertime_graph.php?<?php echo "start=$start&end=$end&dev_id=$dev_id&type=$type"; ?>" width="640" height="480" alt="" />
+ <img src="usertime_graph.php?<?php echo "start=$start&end=$end&dev_id=$dev_id&type=$type"; ?>" alt="" />
</p>
<?php
commit 85a08f56286e18527d658ba68314e7ff336a9ba2
Author: Alain Peyrat <alain.peyrat at alcatel-lucent.com>
Date: Fri Apr 5 18:12:54 2013 +0200
Fix logic in project registeration form when only one template project & Misc
diff --git a/src/www/register/index.php b/src/www/register/index.php
index 0e6ca97..97a0bad 100644
--- a/src/www/register/index.php
+++ b/src/www/register/index.php
@@ -170,7 +170,7 @@ site_user_header(array('title'=>_('Register Project')));
<?php echo _('You should start with specifying the name of your project. The "Full Name" is descriptive, and has no arbitrary restrictions (except a 40 character limit).') ?>
</p>
<p>
-<?php echo _('Full Name:') ?><br/>
+<?php echo _('Full Name') . _(': ') ?><br/>
<input required="required" size="40" maxlength="40" type="text" name="full_name" value="<?php echo htmlspecialchars($full_name); ?>"/>
</p>
@@ -200,7 +200,7 @@ if ( !forge_get_config ('project_auto_approval') ) {
<p><?php echo _('In addition to full project name, you will need to choose short, "Unix" name for your project.') ?></p>
<p><?php echo _('The "Unix Name" has several restrictions because it is used in so many places around the site. They are:') ?></p>
<ul>
-<li><?php echo _('cannot match the unix name of any other project;') ?></li>
+<li><?php echo _('cannot match the Unix name of any other project;') ?></li>
<li><?php echo _('must be between 3 and 15 characters in length;') ?></li>
<li><?php echo _('must be in lower case (upper case letters will be converted to lower case);') ?></li>
<li><?php echo _('can only contain characters, numbers, and dashes;') ?></li>
@@ -208,7 +208,7 @@ if ( !forge_get_config ('project_auto_approval') ) {
<li><?php echo _('cannot match one of our reserved domains;') ?></li>
<li><?php echo _('Unix name will never change for this project;') ?></li>
</ul>
-<p><?php echo _('Your unix name is important, however, because it will be used for many things, including:') ?></p>
+<p><?php echo _('Your Unix name is important, however, because it will be used for many things, including:') ?></p>
<ul>
<li><?php printf(_('a web site at <tt>unixname.%1$s</tt>,'), forge_get_config('web_host')) ?></li>
<li><?php echo _('the URL of your source code repository,') ?></li>
@@ -218,7 +218,7 @@ if ( !forge_get_config ('project_auto_approval') ) {
<li><?php echo _('search engines throughout the site.') ?></li>
</ul>
<p>
-<?php echo _('Unix Name:') ?>
+<?php echo _('Unix Name') . _(':'); ?>
<br />
<input required="required" type="text" maxlength="15" size="15" name="unix_name" value="<?php echo htmlspecialchars($unix_name); ?>"/>
</p>
@@ -249,7 +249,7 @@ if (forge_get_config('use_scm') && count($scm_plugins) > 0) {
echo '<h2>'.$index++.'. '._('Project template'). '</h2>';
-if (count ($template_projects) >= 1) {
+if (count ($template_projects) > 1) {
$tpv_arr = array () ;
$tpn_arr = array () ;
echo '<p>';
@@ -285,7 +285,7 @@ if (count ($template_projects) >= 1) {
printf(_('Your project will initially have the same configuration as the %s project (same roles and permissions, same trackers, same set of enabled plugins, and so on).'),
$template_projects[0]->getPublicName()) ;
echo '<input type="hidden" name="built_from_template" value="'.$template_projects[0]->getID().'" />' ;
- echo '</p>' ;
+ echo '</p>' ;
}
} else {
echo '<p>';
@@ -297,7 +297,7 @@ if (count ($template_projects) >= 1) {
<p class="align-center">
<input type="submit" name="submit" value="<?php echo _('Submit') ?>" />
-<input type="submit" name="i_disagree" value="<?php echo _('Cancel') ?>" />
+<input type="submit" name="i_disagree" formnovalidate="formnovalidate" value="<?php echo _('Cancel') ?>" />
</p>
</form>
-----------------------------------------------------------------------
Summary of changes:
src/common/docman/actions/forcereindexenginesearch.php | 2 +-
src/common/docman/actions/monitordirectory.php | 2 +-
src/common/docman/actions/monitorfile.php | 4 ++--
src/common/include/GroupJoinRequest.class.php | 3 +--
src/common/tracker/actions/downloadcsv.php | 4 ++--
src/plugins/quota_management/www/quota.php | 2 +-
src/plugins/quota_management/www/quota_admin.php | 2 +-
src/plugins/scmhook/library/scmhg/commitEmail.class.php | 5 +++--
8 files changed, 12 insertions(+), 12 deletions(-)
hooks/post-receive
--
FusionForge
More information about the Fusionforge-commits
mailing list