[Fusionforge-commits] FusionForge branch master updated. v6.0.5-2171-g8759637

Franck Villaume nerville at libremir.placard.fr.eu.org
Thu Sep 14 17:48:43 CEST 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  8759637f43f8e68718bdbdbb26b2dbaa689f9338 (commit)
       via  f802ecc5f88cab6f31574807fdf7297f756e23c9 (commit)
      from  ca9fb7e11135284a5d8a2b62e4a888df9e202168 (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=8759637f43f8e68718bdbdbb26b2dbaa689f9338

commit 8759637f43f8e68718bdbdbb26b2dbaa689f9338
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Thu Sep 14 15:48:37 2017 +0000

    align display with tag_cloud view

diff --git a/src/www/softwaremap/full_list.php b/src/www/softwaremap/full_list.php
index 0b9499f..7e5f932 100644
--- a/src/www/softwaremap/full_list.php
+++ b/src/www/softwaremap/full_list.php
@@ -45,6 +45,7 @@
 require_once '../env.inc.php';
 require_once $gfcommon.'include/pre.php';
 require_once $gfwww.'include/trove.php';
+require_once $gfwww.'people/people_utils.php';
 
 if (!forge_get_config('use_project_full_list')) {
 	exit_disabled();
@@ -103,32 +104,43 @@ for ($i_proj = 0; $i_proj < count($projects); $i_proj++) {
 	echo html_ao('div', array('typeof' => 'doap:Project sioc:Space', 'about' => $proj_uri));
 	echo html_e('span', array('rel' => 'planetforge:hosted_by', 'resource' => util_make_url('/')), '', false);
 
-	echo $HTML->listTableTop();
+	echo $HTML->listTableTop(array(), array(), 'full');
 	$cells = array();
-	$content = util_make_link_g(strtolower($row_grp['unix_group_name']),$row_grp['group_id'],'<strong>'
-		.'<span property="doap:name">'
-		.$row_grp['group_name']
-		.'</span>'
-		.'</strong>').' ';
+	$content = util_make_link ('/projects/'. strtolower($row_grp['unix_group_name']).'/',
+				'<strong>'.html_e('span', array('property' => 'doap:name'), $row_grp['group_name']).'</strong> ');
 	if ($row_grp['short_description']) {
-		$content .= '- '
-		. '<span property="doap:short_desc">'
-		. $row_grp['short_description']
-		. '</span>';
+		$content .= "- " . html_e('span', array('property' => 'doap:short_desc'), $row_grp['short_description']);
 	}
 	$cells[] = array($content, 'colspan' => 2);
 	echo $HTML->multiTableRow(array('class' => 'top'), $cells);
+	// extra description
 	$cells = array();
-	$content = '';
-	// list all trove categories
-	if (forge_get_config('use_trove')) {
-		$content .= trove_getcatlisting($row_grp['group_id'], 0, 1, 1);
+	$cells[] = array(_('Tags') . _(': ') . list_project_tag($row_grp['group_id']), 'colspan' => 2);
+	echo $HTML->multiTableRow(array('class' => 'top'), $cells);
+	$cells = array();
+	$cells[][] = trove_getcatlisting($row_grp['group_id'], 0, 1, 1);
+	$res = db_query_params('SELECT percentile, ranking FROM project_weekly_metric WHERE group_id = $1', array($row_grp['group_id']));
+	$nb_line = db_numrows($res);
+	if ($nb_line) {
+		$percentile = html_e('strong', array(), sprintf('%3.0f', number_format(db_result($res, 0, 'percentile'))));
+		$ranking = html_e('strong', array(), sprintf('%d', number_format(db_result($res, 0, 'ranking'))));
+	} else {
+		$percentile = _('N/A');
+		$ranking = _('N/A');
 	}
-	$cells[] = array($content, 'class' => 'top');
-	$cells[] = array(html_e('br')._('Register Date')._(': ').html_e('strong', array(), date(_('Y-m-d H:i'),$row_grp['register_time'])),
-			'class' => 'bottom align-right');
+	$content = html_e('br')._('Activity Percentile')._(': ').$percentile;
+	$content .= html_e('br')._('Activity Ranking')._(': ').$ranking;
+	$content .= html_e('br').sprintf(_('Registered') . _(': '));
+	$content .= html_e('strong', array(), date(_('Y-m-d H:i'),$row_grp['register_time']));
+	$cells[] = array($content, 'class' => 'align-right');
 	echo $HTML->multiTableRow(array('class' => 'top'), $cells);
+	if (forge_get_config('use_people') && people_group_has_job($row_grp['group_id'])) {
+		$cells = array();
+		$cells[] = array(util_make_link('/people/?group_id='.$row_grp['group_id'],_('[This project needs help]')), 'colspan' => 2, 'class' => 'align-center');
+		echo $HTML->multiTableRow(array('class' => 'top'), $cells);
+	}
 	echo $HTML->listTableBottom();
+
 	echo html_ac(html_ap() -1);
 	echo html_e('hr');
 }

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

commit f802ecc5f88cab6f31574807fdf7297f756e23c9
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Thu Sep 14 15:31:06 2017 +0000

    fix PHP warning

diff --git a/src/www/include/Layout.class.php b/src/www/include/Layout.class.php
index 249458d..76ea676 100644
--- a/src/www/include/Layout.class.php
+++ b/src/www/include/Layout.class.php
@@ -530,7 +530,7 @@ abstract class Layout extends FFError {
 			if (count($groups) < 1) {
 				return '';
 			} else {
-				$result .= html_ao('div', array('id' => 'quicknavdiv'));
+				$result = html_ao('div', array('id' => 'quicknavdiv'));
 				$result .= html_ao('select', array('name' => 'quicknav', 'id' => 'quicknav', 'onchange' => 'location.href=document.quicknavdiv.quicknav.value'));
 				$result .= html_e('option', array('value' => ''), _('Quick Jump To...'), false);
 				if (!forge_get_config('use_quicknav_default') && session_get_user()->getPreference('quicknav_mode')) {

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

Summary of changes:
 src/www/include/Layout.class.php  |  2 +-
 src/www/softwaremap/full_list.php | 46 ++++++++++++++++++++++++---------------
 2 files changed, 30 insertions(+), 18 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list