[Fusionforge-commits] FusionForge branch master updated. v6.1alpha0-90-g54a1921

Marc-Etienne VARGENAU vargenau at libremir.placard.fr.eu.org
Mon Nov 13 11:18:49 CET 2017


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  54a1921b39568ffaa22b7e3c0d486d65d1cacec1 (commit)
       via  93b99b5f247b405db02fa94501e2cfe9a3682c4f (commit)
      from  c6dd7187354d9bc5f9e899a5e7edd5777466519c (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=54a1921b39568ffaa22b7e3c0d486d65d1cacec1

commit 54a1921b39568ffaa22b7e3c0d486d65d1cacec1
Author: Marc-Etienne Vargenau <marc-etienne.vargenau at nokia.com>
Date:   Mon Nov 13 11:18:06 2017 +0100

    Use default value

diff --git a/src/common/widget/Widget_ProjectPublicAreas.class.php b/src/common/widget/Widget_ProjectPublicAreas.class.php
index dd1dc10..dc43d4e 100644
--- a/src/common/widget/Widget_ProjectPublicAreas.class.php
+++ b/src/common/widget/Widget_ProjectPublicAreas.class.php
@@ -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);
 			$docm = new DocumentManager($project);
@@ -133,7 +133,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);
@@ -145,7 +145,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 .= ' ';
@@ -157,7 +157,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);
@@ -181,7 +181,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";
@@ -192,7 +192,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);
 
@@ -217,7 +217,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);

https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=93b99b5f247b405db02fa94501e2cfe9a3682c4f

commit 93b99b5f247b405db02fa94501e2cfe9a3682c4f
Author: Marc-Etienne Vargenau <marc-etienne.vargenau at nokia.com>
Date:   Mon Nov 13 11:12:43 2017 +0100

    Use same value for title and alt for images

diff --git a/src/common/include/Activity.class.php b/src/common/include/Activity.class.php
index 19ff7e8..2140031 100644
--- a/src/common/include/Activity.class.php
+++ b/src/common/include/Activity.class.php
@@ -86,48 +86,48 @@ class Activity extends FFError {
 		$docmanerror = 0;
 		switch (@$arr['section']) {
 			case 'scm': {
-				$icon = $HTML->getScmPic(_('Source Code'), 'sourcecode');
+				$icon = $HTML->getScmPic(_('Source Code'), _('Source Code'));
 				$url = util_make_link('/scm/'.$arr['ref_id'].$arr['subref_id'],_('scm commit')._(': ').$arr['description']);
 				break;
 			}
 			case 'trackeropen': {
-				$icon = $HTML->getOpenTicketPic(_('Tracker Open'), 'trackeropen');
+				$icon = $HTML->getOpenTicketPic(_('Tracker Open'), _('Tracker Open'));
 				$url = util_make_link('/tracker/a_follow.php/'.$arr['subref_id'],_('Tracker Item').' [#'.$arr['subref_id'].'] '.$arr['description'].' '._('Opened'));
 				break;
 			}
 			case 'trackerclose': {
-				$icon = $HTML->getClosedTicketPic(_('Tracker Closed'), 'trackerclose');
+				$icon = $HTML->getClosedTicketPic(_('Tracker Closed'), _('Tracker Closed'));
 				$url = util_make_link('/tracker/a_follow.php/'.$arr['subref_id'],_('Tracker Item').' [#'.$arr['subref_id'].'] '.$arr['description'].' '._('Closed'));
 				break;
 			}
 			case 'frsrelease': {
-				$icon = $HTML->getPackagePic(_('Files'), 'files');
+				$icon = $HTML->getPackagePic(_('Files'), _('Files'));
 				$url = util_make_link('/frs/?release_id='.$arr['subref_id'].'&group_id='.$arr['group_id'],_('FRS Release').' '.$arr['description']);
 				break;
 			}
 			case 'forumpost': {
-				$icon = $HTML->getForumPic(_('Forum'), 'forum');
+				$icon = $HTML->getForumPic(_('Forum'), _('Forum'));
 				$url = util_make_link('/forum/message.php?msg_id='.$arr['subref_id'].'&group_id='.$arr['group_id'],_('Forum Post').' '.$arr['description']);
 				break;
 			}
 			case 'news': {
-				$icon = $HTML->getNewsPic(_('News'), 'news');
+				$icon = $HTML->getNewsPic(_('News'), _('News'));
 				$url = util_make_link('/forum/forum.php?forum_id='.$arr['subref_id'],_('News').' '.$arr['description']);
 				break;
 			}
 			case 'taskopen': {
-				$icon = $HTML->getPmPic(_('Open Task'), 'opentask');
+				$icon = $HTML->getPmPic(_('Open Task'), _('Open Task'));
 				$url = util_make_link('/pm/t_follow.php/'.$arr['subref_id'],_('Tasks').' '.$arr['description']);
 				break;
 			}
 			case 'taskclose': {
-				$icon = $HTML->getPmPic(_('Closed Task'), 'closedtask');
+				$icon = $HTML->getPmPic(_('Closed Task'), _('Closed Task'));
 				$url = util_make_link('/pm/t_follow.php/'.$arr['subref_id'],_('Tasks').' '.$arr['description']);
 				break;
 			}
 
 			case 'taskdelete': {
-				$icon = $HTML->getPmPic(_('Deleted Task', 'deletedtask'));
+				$icon = $HTML->getPmPic(_('Deleted Task'), _('Deleted Task'));
 				$url = util_make_link('/pm/t_follow.php/'.$arr['subref_id'],_('Tasks').' '.$arr['description']);
 				break;
 			}

-----------------------------------------------------------------------

Summary of changes:
 src/common/include/Activity.class.php                 | 18 +++++++++---------
 src/common/widget/Widget_ProjectPublicAreas.class.php | 16 ++++++++--------
 2 files changed, 17 insertions(+), 17 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list