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 a587ed02922b6f19d5cc3b01790973f7a79cc05a (commit)
from 6b5022cd32562968958a8d09496e465ea983c071 (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=a587ed02922b6f19d5cc3b01790973f7a79cc05a
commit a587ed02922b6f19d5cc3b01790973f7a79cc05a
Author: Franck Villaume <[email protected]>
Date: Wed Dec 27 12:58:48 2017 +0100
display trove link if trove is used. display tags if tags is used
diff --git a/src/www/softwaremap/full_list.php
b/src/www/softwaremap/full_list.php
index 7e5f932..ac108e9 100644
--- a/src/www/softwaremap/full_list.php
+++ b/src/www/softwaremap/full_list.php
@@ -2,7 +2,7 @@
/**
* Copyright (C) 2008-2009 Alcatel-Lucent
* Copyright (C) 2010 Alain Peyrat - Alcatel-Lucent
- * Copyright 2012,2014,2015, Franck Villaume - TrivialDev
+ * Copyright 2012,2014-2015,2017, Franck Villaume - TrivialDev
*
* This file is part of FusionForge. FusionForge is free software;
* you can redistribute it and/or modify it under the terms of the
@@ -114,11 +114,15 @@ for ($i_proj = 0; $i_proj < count($projects); $i_proj++) {
$cells[] = array($content, 'colspan' => 2);
echo $HTML->multiTableRow(array('class' => 'top'), $cells);
// extra description
+ if (forge_get_config('use_project_tags')) {
+ $cells = array();
+ $cells[] = array(_('Tags') . _(': ') .
list_project_tag($row_grp['group_id']), 'colspan' => 2);
+ echo $HTML->multiTableRow(array('class' => 'top'), $cells);
+ }
$cells = array();
- $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);
+ if (forge_get_config('use_trove')) {
+ $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) {
@@ -132,7 +136,11 @@ for ($i_proj = 0; $i_proj < count($projects); $i_proj++) {
$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');
+ if (forge_get_config('use_trove')) {
+ $cells[] = array($content, 'class' => 'align-right');
+ } else {
+ $cells[] = array($content, 'class' => 'align-right', 'colspan'
=> 2);
+ }
echo $HTML->multiTableRow(array('class' => 'top'), $cells);
if (forge_get_config('use_people') &&
people_group_has_job($row_grp['group_id'])) {
$cells = array();
diff --git a/src/www/softwaremap/tag_cloud.php
b/src/www/softwaremap/tag_cloud.php
index b5b1ce6..8faa652 100644
--- a/src/www/softwaremap/tag_cloud.php
+++ b/src/www/softwaremap/tag_cloud.php
@@ -1,7 +1,7 @@
<?php
/**
* Copyright (C) 2008-2009 Alcatel-Lucent
- * Copyright 2015, Franck Villaume - TrivialDev
+ * Copyright 2015,2017, Franck Villaume - TrivialDev
*
* This file is part of FusionForge. FusionForge is free software;
* you can redistribute it and/or modify it under the terms of the
@@ -117,7 +117,9 @@ if ($selected_tag) {
$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,0);
+ if (forge_get_config('use_trove')) {
+ $cells[][] = trove_getcatlisting($row_grp['group_id'],
0, 1, 0);
+ }
$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) {
@@ -131,7 +133,11 @@ if ($selected_tag) {
$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');
+ if (forge_get_config('use_trove')) {
+ $cells[] = array($content, 'class' => 'align-right');
+ } else {
+ $cells[] = array($content, 'class' => 'align-right',
'colspan' => 2);
+ }
echo $HTML->multiTableRow(array('class' => 'top'), $cells);
if (forge_get_config('use_people') &&
people_group_has_job($row_grp['group_id'])) {
$cells = array();
-----------------------------------------------------------------------
Summary of changes:
src/www/softwaremap/full_list.php | 20 ++++++++++++++------
src/www/softwaremap/tag_cloud.php | 12 +++++++++---
2 files changed, 23 insertions(+), 9 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
