[Fusionforge-commits] FusionForge branch master updated. 5f801eb5e7af1e3e7947dca5f64e409e312d30dd

Franck Villaume nerville at fusionforge.org
Sun Jun 1 18:54:35 CEST 2014


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  5f801eb5e7af1e3e7947dca5f64e409e312d30dd (commit)
      from  900572e817ba05704a44674b50500481748c8589 (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 5f801eb5e7af1e3e7947dca5f64e409e312d30dd
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Sun Jun 1 18:53:07 2014 +0200

    feature [#684]: display FRS in Public Area widget

diff --git a/src/common/widget/Widget_ProjectPublicAreas.class.php b/src/common/widget/Widget_ProjectPublicAreas.class.php
index c82ed17..94704e6 100644
--- a/src/common/widget/Widget_ProjectPublicAreas.class.php
+++ b/src/common/widget/Widget_ProjectPublicAreas.class.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * Copyright (c) Xerox Corporation, Codendi Team, 2001-2009. All rights reserved
- * Copyright 2012, Franck Villaume - TrivialDev
+ * Copyright 2012,2014 Franck Villaume - TrivialDev
  * http://fusionforge.org
  *
  * This file is a part of Fusionforge.
@@ -54,7 +54,7 @@ class Widget_ProjectPublicAreas extends Widget {
 		if ($project->usesTracker()) {
 			echo '<div class="public-area-box">'."\n";
 			$link_content = $HTML->getFollowPic(_('Tracker')) . ' ' . _('Tracker');
-			echo util_make_link ( '/tracker/?group_id=' . $group_id, $link_content);
+			echo util_make_link('/tracker/?group_id=' . $group_id, $link_content);
 
 			$result=db_query_params ('SELECT agl.*,aca.count,aca.open_count
 					FROM artifact_group_list agl
@@ -82,7 +82,7 @@ class Widget_ProjectPublicAreas extends Widget {
 					$tracker_stdzd_uri = util_make_url('/tracker/cm/project/'. $project->getUnixName() .'/atid/'. $group_artifact_id);
 					echo "\t".'<li about="'. $tracker_stdzd_uri . '" typeof="sioc:Container">'."\n";
 					print '<span rel="http://www.w3.org/2002/07/owl#sameAs">'."\n";
-					echo util_make_link ('/tracker/?atid='. $group_artifact_id . '&group_id='.$group_id.'&func=browse',$row['name']) . ' ' ;
+					echo util_make_link('/tracker/?atid='. $group_artifact_id . '&group_id='.$group_id.'&func=browse', $row['name']) . ' ' ;
 					echo "</span>\n"; // /owl:sameAs
 					printf(ngettext('(<strong>%1$s</strong> open / <strong>%2$s</strong> total)', '(<strong>%1$s</strong> open / <strong>%2$s</strong> total)', $row['open_count']), $row['open_count'], $row['count']);
 					echo '<br />';
@@ -109,7 +109,7 @@ class Widget_ProjectPublicAreas extends Widget {
 			}
 
 			$link_content = $HTML->getForumPic('') . ' ' . _('Public Forums');
-			echo util_make_link ( '/forum/?group_id=' . $group_id, $link_content);
+			echo util_make_link('/forum/?group_id=' . $group_id, $link_content);
 			print ' (';
 			printf(ngettext("<strong>%d</strong> message","<strong>%d</strong> messages",$messages_count),$messages_count);
 			print ' ' . _('in') . ' ';
@@ -124,7 +124,17 @@ class Widget_ProjectPublicAreas extends Widget {
 			echo '<div class="public-area-box">';
 			$link_content = $HTML->getDocmanPic('') . ' ' . _('DocManager: Project Documentation');
 			//	<a rel="sioc:container_of" xmlns:sioc="http://rdfs.org/sioc/ns#" href="'.util_make_url ('/docman/?group_id='.$group_id).'">';
-			print util_make_link( '/docman/?group_id='.$group_id, $link_content);
+			echo util_make_link('/docman/?group_id='.$group_id, $link_content);
+			echo '</div>';
+		}
+
+		// ##################### FRS
+
+		if ($project->usesFRS()) {
+			echo '<div class="public-area-box">';
+			$link_content = $HTML->getDownloadPic('') . ' ' . _('Files');
+			//	<a rel="sioc:container_of" xmlns:sioc="http://rdfs.org/sioc/ns#" href="'.util_make_url ('/frs/?group_id='.$group_id).'">';
+			echo util_make_link('/frs/?group_id='.$group_id, $link_content);
 			echo '</div>';
 		}
 
@@ -133,7 +143,7 @@ class Widget_ProjectPublicAreas extends Widget {
 		if ($project->usesMail()) {
 			echo '<div class="public-area-box">';
 			$link_content = $HTML->getMailPic('') . ' ' . _('Mailing Lists');
-			print util_make_link( '/mail/?group_id='.$group_id, $link_content);
+			print util_make_link('/mail/?group_id='.$group_id, $link_content);
 			$n = project_get_mail_list_count($group_id);
 			echo ' ';
 			printf(ngettext('(<strong>%s</strong> public mailing list)', '(<strong>%s</strong> public mailing lists)', $n), $n);
@@ -145,7 +155,7 @@ class Widget_ProjectPublicAreas extends Widget {
 		if ($project->usesPm()) {
 			echo '<div class="public-area-box">';
 			$link_content = $HTML->getPmPic('') . ' ' . _('Tasks');
-			print util_make_link( '/pm/?group_id='.$group_id, $link_content);
+			echo util_make_link('/pm/?group_id='.$group_id, $link_content);
 
 			$pgf = new ProjectGroupFactory ($project);
 			$pgs = $pgf->getProjectGroups();
@@ -156,7 +166,7 @@ class Widget_ProjectPublicAreas extends Widget {
 				echo "\n".'<ul class="task-manager">';
 				foreach ($pgs as $pg) {
 					echo "\n\t<li>";
-					print util_make_link ('/pm/task.php?group_project_id='.$pg->getID().'&group_id='.$group_id.'&func=browse',$pg->getName());
+					echo util_make_link('/pm/task.php?group_project_id='.$pg->getID().'&group_id='.$group_id.'&func=browse',$pg->getName());
 					echo '</li>' ;
 				}
 				echo "\n</ul>";
@@ -169,7 +179,7 @@ class Widget_ProjectPublicAreas extends Widget {
 		if ($project->usesSurvey()) {
 			echo '<div class="public-area-box">'."\n";
 			$link_content = $HTML->getSurveyPic('') . ' ' . _('Surveys');
-			echo util_make_link( '/survey/?group_id='.$group_id, $link_content);
+			echo util_make_link('/survey/?group_id='.$group_id, $link_content);
 			echo ' (<strong>'. project_get_survey_count($group_id) .'</strong> ' . _('surveys').')';
 			echo "\n</div>\n";
 		}
@@ -181,7 +191,7 @@ class Widget_ProjectPublicAreas extends Widget {
 
 			$link_content = $HTML->getScmPic('') . ' ' . _('SCM Repository');
 			//	print '<hr size="1" /><a rel="doap:repository" href="'.util_make_url ('/scm/?group_id='.$group_id).'">';
-			print util_make_link( '/scm/?group_id='.$group_id, $link_content);
+			echo util_make_link('/scm/?group_id='.$group_id, $link_content);
 
 			$hook_params = array () ;
 			$hook_params['group_id'] = $group_id ;
@@ -205,9 +215,9 @@ class Widget_ProjectPublicAreas extends Widget {
 				$link_content = $HTML->getFtpPic('') . ' ' . _('Anonymous FTP Space');
 				//		print '<a rel="doap:anonymous root" href="ftp://' . $project->getUnixName() . '.' . forge_get_config('web_host') . '/pub/'. $project->getUnixName() .'/">';
 				if (forge_get_config('use_project_vhost')) {
-					print util_make_link('ftp://' . $project->getUnixName() . '.' . forge_get_config('web_host') . '/pub/'. $project->getUnixName(), $link_content, false, true);
+					echo util_make_link('ftp://' . $project->getUnixName() . '.' . forge_get_config('web_host') . '/pub/'. $project->getUnixName(), $link_content, false, true);
 				} else {
-					print util_make_link('ftp://' . forge_get_config('web_host') . '/pub/'. $project->getUnixName(), $link_content, false, true);
+					echo util_make_link('ftp://' . forge_get_config('web_host') . '/pub/'. $project->getUnixName(), $link_content, false, true);
 				}
 				echo "\n</div>\n";
 			}

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

Summary of changes:
 .../widget/Widget_ProjectPublicAreas.class.php     |   34 +++++++++++++-------
 1 file changed, 22 insertions(+), 12 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list