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, 6.1 has been updated
via 2ea8b90d698c83f297cfab2e4308d364604ca344 (commit)
via 323c40d0bf919478aa798229869a122315983cf4 (commit)
from cccd3f1e55edfef65e526be23e07d373dedeb514 (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 -----------------------------------------------------------------
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=2ea8b90d698c83f297cfab2e4308d364604ca344
commit 2ea8b90d698c83f297cfab2e4308d364604ca344
Author: Franck Villaume <franck.villa...@trivialdev.com>
Date: Thu May 10 14:01:12 2018 +0200
use same space between img & text across public tools widget
diff --git a/src/common/widget/Widget_ProjectPublicAreas.class.php
b/src/common/widget/Widget_ProjectPublicAreas.class.php
index 24df553..c2134c0 100644
--- a/src/common/widget/Widget_ProjectPublicAreas.class.php
+++ b/src/common/widget/Widget_ProjectPublicAreas.class.php
@@ -48,13 +48,13 @@ class Widget_ProjectPublicAreas extends Widget {
// ################# Homepage Link
$result .= html_e('div', array('class' => 'public-area-box',
'rel' => 'doap:homepage'),
- util_make_link($project->getHomePage(),
$HTML->getHomePic(_('Home Page')). ' ' ._('Project Home Page'), false, true));
+ util_make_link($project->getHomePage(),
$HTML->getHomePic(_('Home Page')). ' ' ._('Project Home Page'), false, true));
// ################## ArtifactTypes
if ($project->usesTracker()) {
$result .= '<div class="public-area-box">'."\n";
- $link_content = $HTML->getFollowPic(_('Tracker')) . ' '
. _('Tracker');
+ $link_content = $HTML->getFollowPic(_('Tracker')) . ' '
. _('Tracker');
$result .= util_make_link('/tracker/?group_id=' .
$group_id, $link_content);
$res = db_query_params ('SELECT
agl.*,aca.count,aca.open_count
@@ -107,7 +107,7 @@ class Widget_ProjectPublicAreas extends Widget {
$messages_count += $f->getMessageCount();
}
- $link_content = $HTML->getForumPic('') . ' ' .
_('Public Forums');
+ $link_content = $HTML->getForumPic() . ' ' . _('Public
Forums');
$result .= util_make_link('/forum/?group_id=' .
$group_id, $link_content);
$result .= ' (';
$result .= sprintf(ngettext("<strong>%d</strong>
message","<strong>%d</strong> messages",$messages_count),$messages_count);
@@ -121,7 +121,7 @@ class Widget_ProjectPublicAreas extends Widget {
if ($project->usesDocman()) {
$result .= '<div class="public-area-box">';
- $link_content = $HTML->getDocmanPic('') . ' ' .
_('Document Manager');
+ $link_content = $HTML->getDocmanPic() . ' ' .
_('Document Manager');
// <a rel="sioc:container_of"
xmlns:sioc="http://rdfs.org/sioc/ns#"; href="'.util_make_url
('/docman/?group_id='.$group_id).'">';
$result .=
util_make_link('/docman/?group_id='.$group_id, $link_content);
if (forge_check_perm('docman', $group_id, 'read')) {
@@ -135,7 +135,7 @@ class Widget_ProjectPublicAreas extends Widget {
if ($project->usesFRS()) {
$result .= '<div class="public-area-box">';
- $link_content = $HTML->getPackagePic('') . ' ' .
_('Files');
+ $link_content = $HTML->getPackagePic() . ' ' .
_('Files');
// <a rel="sioc:container_of"
xmlns:sioc="http://rdfs.org/sioc/ns#"; href="'.util_make_url
('/frs/?group_id='.$group_id).'">';
$result .= util_make_link('/frs/?group_id='.$group_id,
$link_content);
$frsm = new FRSManager($project);
@@ -147,7 +147,7 @@ class Widget_ProjectPublicAreas extends Widget {
if ($project->usesMail()) {
$result .= '<div class="public-area-box">';
- $link_content = $HTML->getMailPic('') . ' ' .
_('Mailing Lists');
+ $link_content = $HTML->getMailPic() . ' ' . _('Mailing
Lists');
$result .= util_make_link('/mail/?group_id='.$group_id,
$link_content);
$n = project_get_mail_list_count($group_id);
$result .= ' ';
@@ -159,7 +159,7 @@ class Widget_ProjectPublicAreas extends Widget {
if ($project->usesPM()) {
$result .= '<div class="public-area-box">';
- $link_content = $HTML->getPmPic('') . ' ' . _('Tasks');
+ $link_content = $HTML->getPmPic() . ' ' . _('Tasks');
$result .= util_make_link('/pm/?group_id='.$group_id,
$link_content);
$pgf = new ProjectGroupFactory ($project);
@@ -183,7 +183,7 @@ class Widget_ProjectPublicAreas extends Widget {
if ($project->usesSurvey()) {
$result .= '<div class="public-area-box">'."\n";
- $link_content = $HTML->getSurveyPic('') . ' ' .
_('Surveys');
+ $link_content = $HTML->getSurveyPic() . ' ' .
_('Surveys');
$result .=
util_make_link('/survey/?group_id='.$group_id, $link_content);
$result .= ' (<strong>'.
project_get_survey_count($group_id) .'</strong> ' . _('surveys').')';
$result .= "\n</div>\n";
@@ -194,7 +194,7 @@ class Widget_ProjectPublicAreas extends Widget {
if ($project->usesSCM()) {
$result .= '<div class="public-area-box">'."\n";
- $link_content = $HTML->getScmPic('') . ' ' . _('SCM
Repository');
+ $link_content = $HTML->getScmPic() . ' ' . _('SCM
Repository');
// $result .= '<hr size="1" /><a
rel="doap:repository" href="'.util_make_url ('/scm/?group_id='.$group_id).'">';
$result .= util_make_link('/scm/?group_id='.$group_id,
$link_content);
@@ -219,7 +219,7 @@ class Widget_ProjectPublicAreas extends Widget {
if ($project->isActive()) {
$result .= '<div class="public-area-box">'."\n";
- $link_content = $HTML->getFtpPic('') . ' ' .
_('Anonymous FTP Space');
+ $link_content = $HTML->getFtpPic() . ' ' .
_('Anonymous FTP Space');
// $result .= '<a
rel="doap:anonymous root" href="ftp://' . $project->getUnixName() . '.' .
forge_get_config('web_host') . '/pub/'. $project->getUnixName() .'/">';
if (forge_get_config('use_project_vhost')) {
$result .= util_make_link('ftp://' .
$project->getUnixName() . '.' . forge_get_config('web_host') . '/pub/'.
$project->getUnixName(), $link_content, false, true);
diff --git a/src/plugins/mediawiki/common/mediawikiPlugin.class.php
b/src/plugins/mediawiki/common/mediawikiPlugin.class.php
index e0e94b9..abf355c 100644
--- a/src/plugins/mediawiki/common/mediawikiPlugin.class.php
+++ b/src/plugins/mediawiki/common/mediawikiPlugin.class.php
@@ -118,7 +118,7 @@ _('This plugin allows each project to embed Mediawiki under
a tab.');
$params['result'] .= '<div
class="public-area-box">';
$params['result'] .=
util_make_link('/plugins/'.$this->name.'/wiki/'.$project->getUnixName().'/index.php',
html_abs_image(util_make_url('/plugins/'.$this->name.'/wiki/'.$project->getUnixName().'/skins/monobook/wiki.png'),'20','20',array('alt'=>'Mediawiki')).
- ' '.'Mediawiki');
+ ' Mediawiki');
$params['result'] .= '</div>';
}
} elseif ($hookname == 'role_get') {
diff --git a/src/plugins/moinmoin/common/MoinMoinPlugin.class.php
b/src/plugins/moinmoin/common/MoinMoinPlugin.class.php
index 365e031..1602f00 100644
--- a/src/plugins/moinmoin/common/MoinMoinPlugin.class.php
+++ b/src/plugins/moinmoin/common/MoinMoinPlugin.class.php
@@ -97,7 +97,7 @@ _("This plugin allows each project to embed MoinMoinWiki
under a tab.");
}
if ( $project->usesPlugin ( $this->name ) ) {
$params['result'] .= '<div
class="public-area-box">';
- $params['result'] .=
util_make_link($this->getWikiUrl($project), html_image('ic/wiki20g.png', 20,
20, array('alt' => 'Wiki')).' '.'MoinMoin', array(), true);
+ $params['result'] .=
util_make_link($this->getWikiUrl($project), html_image('ic/wiki20g.png', 20,
20, array('alt' => 'Wiki')).' MoinMoin', array(), true);
$params['result'] .= '</div>';
}
} elseif ($hookname == "role_get") {
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=323c40d0bf919478aa798229869a122315983cf4
commit 323c40d0bf919478aa798229869a122315983cf4
Author: Franck Villaume <franck.villa...@trivialdev.com>
Date: Thu May 10 14:00:13 2018 +0200
less strings
diff --git a/src/plugins/hudson/include/hudsonPlugin.class.php
b/src/plugins/hudson/include/hudsonPlugin.class.php
index f3208b3..3576cba 100644
--- a/src/plugins/hudson/include/hudsonPlugin.class.php
+++ b/src/plugins/hudson/include/hudsonPlugin.class.php
@@ -264,7 +264,7 @@ control over it to the project administrator.");
if ($dar && $dar->valid()) {
$row = $dar->current();
$build = new
HudsonBuild($row['job_url'].'/'.$build_id.'/');
- echo '<strong>' . _("Build performed
on:") . '</strong> ' . $build->getBuildTime() . '<br />';
+ echo '<strong>' . _('Build performed
on')._(': ').'</strong> ' . $build->getBuildTime() . '<br />';
echo '<strong>' . _("Status") . _(": ")
. '</strong> ' . $build->getResult();
} else {
echo $HTML->error_msg(_('Error: Hudson
object not found.'));
@@ -308,7 +308,7 @@ control over it to the project administrator.");
} catch (Exception $e) {
}
} else {
- echo $HTML->error_msg(_('Error: Hudson
object not found.'));
+ echo $HTML->error_msg(_('Error')._(':
')._('Hudson object not found.'));
}
break;
}
-----------------------------------------------------------------------
Summary of changes:
.../widget/Widget_ProjectPublicAreas.class.php | 20 ++++++++++----------
src/plugins/hudson/include/hudsonPlugin.class.php | 4 ++--
.../mediawiki/common/mediawikiPlugin.class.php | 2 +-
src/plugins/moinmoin/common/MoinMoinPlugin.class.php | 2 +-
4 files changed, 14 insertions(+), 14 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
Fusionforge-commits@lists.fusionforge.org
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
