[Fusionforge-commits] r10790 - in trunk/src/www: admin news/admin people
Alain Peyrat
aljeux at libremir.placard.fr.eu.org
Fri Oct 1 20:23:59 CEST 2010
Author: aljeux
Date: 2010-10-01 20:23:59 +0200 (Fri, 01 Oct 2010)
New Revision: 10790
Modified:
trunk/src/www/admin/pluginman.php
trunk/src/www/news/admin/index.php
trunk/src/www/people/editjob.php
Log:
Better messages
Modified: trunk/src/www/admin/pluginman.php
===================================================================
--- trunk/src/www/admin/pluginman.php 2010-10-01 18:23:53 UTC (rev 10789)
+++ trunk/src/www/admin/pluginman.php 2010-10-01 18:23:59 UTC (rev 10790)
@@ -104,8 +104,8 @@
if (!is_link('../'.$installdir)) {
$code = symlink(forge_get_config('plugins_path') . '/' . $pluginname . '/www', '../'.$installdir);
if (!$code) {
- $feedback .= '<br />['.'../'.$installdir.'->'.forge_get_config('plugins_path') . '/' . $pluginname . '/www]';
- $feedback .= _('<br />Soft link to www couldn\'t be created. Check the write permissions for apache in gforge www/plugins dir or create the link manually.');
+ $error_msg .= '<br />['.'../'.$installdir.'->'.forge_get_config('plugins_path') . '/' . $pluginname . '/www]';
+ $error_msg .= _('<br />Soft link to www couldn\'t be created. Check the write permissions for apache in gforge www/plugins dir or create the link manually.');
}
}
}
@@ -115,8 +115,8 @@
// The apache group or user should have write perms in /etc/gforge/plugins folder...
$code = symlink(forge_get_config('plugins_path') . '/' . $pluginname . '/etc/plugins/' . $pluginname, forge_get_config('config_path'). '/plugins/'.$pluginname);
if (!$code) {
- $warning_msg .= '<br />['.forge_get_config('config_path'). '/plugins/'.$pluginname.'->'.forge_get_config('plugins_path') . '/' . $pluginname . '/etc/plugins/' . $pluginname . ']';
- $warning_msg .= sprintf(_('<br />Config file could not be linked to etc/gforge/plugins/%1$s. Check the write permissions for apache in /etc/gforge/plugins or create the link manually.'), $pluginname);
+ $error_msg .= '<br />['.forge_get_config('config_path'). '/plugins/'.$pluginname.'->'.forge_get_config('plugins_path') . '/' . $pluginname . '/etc/plugins/' . $pluginname . ']';
+ $error_msg .= sprintf(_('<br />Config file could not be linked to etc/gforge/plugins/%1$s. Check the write permissions for apache in /etc/gforge/plugins or create the link manually.'), $pluginname);
}
}
@@ -181,7 +181,7 @@
_('Action'),
_('Run Init Script?'),
_('Users Using it'),
- _('Groups Using it'),);
+ _('Projects Using it'),);
echo $HTML->listTableTop($title_arr);
// Get the activated plugins.
Modified: trunk/src/www/news/admin/index.php
===================================================================
--- trunk/src/www/news/admin/index.php 2010-10-01 18:23:53 UTC (rev 10789)
+++ trunk/src/www/news/admin/index.php 2010-10-01 18:23:59 UTC (rev 10790)
@@ -87,7 +87,7 @@
$error_msg .= _('Error On Update:');
$error_msg .= db_error();
} else {
- $feedback .= _('NewsByte Updated.');
+ $feedback .= _('Newsbyte Updated.');
// No notification if news is deleted.
// if ($status != 4)
// send_news_notification_email($id);
@@ -109,7 +109,7 @@
$result=db_query_params("SELECT * FROM news_bytes WHERE id=$1 AND group_id=$2", array($id, $group_id));
if (db_numrows($result) < 1) {
- exit_error(_('NewsByte not found'),'news');
+ exit_error(_('Newsbyte not found'),'news');
}
$group =& group_get_object($group_id);
@@ -134,7 +134,7 @@
<input type="radio" name="status" value="4" /> '._('Delete').'<br />
<strong>'._('Subject').'</strong><br />
- <input type="text" name="summary" value="'.db_result($result,0,'summary').'" size="30" maxlength="60" /><br />
+ <input type="text" name="summary" value="'.db_result($result,0,'summary').'" size="60" maxlength="60" /><br />
<strong>'._('Details').'</strong>'.notepad_button('document.forms.newsadminform.details').'<br />';
$GLOBALS['editor_was_set_up']=false;
@@ -168,7 +168,7 @@
echo '<h1>'._('List of News Submitted for Project').': '.$group->getPublicName().'</h1>';
if ($rows < 1) {
echo '
- <div class="warning_msg">'._('No Queued Items Found').'</div>';
+ <p class="warning_msg">'._('No Queued Items Found').'</p>';
} else {
echo '
<ul>';
@@ -205,7 +205,7 @@
if (!$result || db_affected_rows($result) < 1) {
$error_msg .= _('Error On Update:');
} else {
- $feedback .= _('NewsByte Updated.');
+ $feedback .= _('Newsbyte Updated.');
}
} else if ($status==2) {
/*
@@ -216,7 +216,7 @@
$error_msg .= _('Error On Update:');
$error_msg .= db_error();
} else {
- $feedback .= _('NewsByte Deleted.');
+ $feedback .= _('Newsbyte Deleted.');
}
}
@@ -237,7 +237,7 @@
$error_msg .= _('Error On Update:');
$error_msg .= db_error();
} else {
- $feedback .= _('NewsBytes Rejected.');
+ $feedback .= _('Newsbytes Rejected.');
}
}
}
@@ -253,10 +253,10 @@
FROM news_bytes,groups WHERE id=$1
AND news_bytes.group_id=groups.group_id ", array($id));
if (db_numrows($result) < 1) {
- exit_error(_('NewsByte not found'),'news');
+ exit_error(_('Newsbyte not found'),'news');
}
if (db_result($result,0,'is_approved') == 4) {
- exit_error(_('NewsByte deleted'),'news');
+ exit_error(_('Newsbyte deleted'),'news');
}
$group =& group_get_object(db_result($result,0,'group_id'));
@@ -277,7 +277,7 @@
<input type="radio" name="status" value="0" /> '._('Do Nothing').'<br />
<input type="radio" name="status" value="2" checked="checked" /> '._('Reject').'<br />
<strong>'._('Subject').':</strong><br />
- <input type="text" name="summary" value="'.db_result($result,0,'summary').'" size="30" maxlength="60" /><br />
+ <input type="text" name="summary" value="'.db_result($result,0,'summary').'" size="60" maxlength="60" /><br />
<strong>'._('Details').':</strong><br />';
$GLOBALS['editor_was_set_up']=false;
Modified: trunk/src/www/people/editjob.php
===================================================================
--- trunk/src/www/people/editjob.php 2010-10-01 18:23:53 UTC (rev 10789)
+++ trunk/src/www/people/editjob.php 2010-10-01 18:23:59 UTC (rev 10790)
@@ -63,7 +63,7 @@
form_release_key(getStringFromRequest("form_key"));
} else {
$job_id=db_insertid($result,'people_job','job_id');
- $feedback = _('JOB inserted successfully');
+ $feedback .= _('JOB inserted successfully');
}
} else if (getStringFromRequest('update_job')) {
@@ -94,13 +94,12 @@
if (people_verify_job_group($job_id,$group_id)) {
people_add_to_job_inventory($job_id,$skill_id,$skill_level_id,$skill_year_id);
- $feedback = _('JOB updated successfully');
+ $feedback .= _('JOB updated successfully');
} else {
$error_msg .= _('JOB update failed - wrong project_id');
}
} else if (getStringFromRequest('update_job_inventory')) {
-
/*
Change Skill level, experience etc.
*/
@@ -115,7 +114,7 @@
if (!$result || db_affected_rows($result) < 1) {
$error_msg .= sprintf(_('JOB skill update FAILED: %s'), db_error());
} else {
- $feedback = _('JOB skill updated successfully');
+ $feedback .= _('JOB skill updated successfully');
}
} else {
$error_msg .= _('JOB skill update failed - wrong project_id');
@@ -135,7 +134,7 @@
if (!$result || db_affected_rows($result) < 1) {
$error_msg .= sprintf(_('JOB skill delete FAILED : %s'),db_error());
} else {
- $feedback = _('JOB skill deleted successfully');
+ $feedback .= _('JOB skill deleted successfully');
}
} else {
$error_msg .= _('JOB skill delete failed - wrong project_id');
More information about the Fusionforge-commits
mailing list