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 d9219073e0eea546c66307043601e2667290b137 (commit)
from a587ed02922b6f19d5cc3b01790973f7a79cc05a (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=d9219073e0eea546c66307043601e2667290b137
commit d9219073e0eea546c66307043601e2667290b137
Author: Franck Villaume <[email protected]>
Date: Wed Dec 27 15:01:02 2017 +0100
better html handling. use colspan only when needed
diff --git a/src/www/softwaremap/full_list.php
b/src/www/softwaremap/full_list.php
index ac108e9..1590c93 100644
--- a/src/www/softwaremap/full_list.php
+++ b/src/www/softwaremap/full_list.php
@@ -111,12 +111,20 @@ for ($i_proj = 0; $i_proj < count($projects); $i_proj++) {
if ($row_grp['short_description']) {
$content .= "- " . html_e('span', array('property' =>
'doap:short_desc'), $row_grp['short_description']);
}
- $cells[] = array($content, 'colspan' => 2);
+ if (forge_get_config('use_trove')) {
+ $cells[] = array($content, 'colspan' => 2);
+ } else {
+ $cells[][] = $content;
+ }
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);
+ if (forge_get_config('use_trove')) {
+ $cells[] = array(_('Tags') . _(': ') .
list_project_tag($row_grp['group_id']), 'colspan' => 2);
+ } else {
+ $cells[][] = _('Tags') . _(': ') .
list_project_tag($row_grp['group_id']);
+ }
echo $HTML->multiTableRow(array('class' => 'top'), $cells);
}
$cells = array();
@@ -136,11 +144,7 @@ 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']));
- if (forge_get_config('use_trove')) {
- $cells[] = array($content, 'class' => 'align-right');
- } else {
- $cells[] = array($content, 'class' => 'align-right', 'colspan'
=> 2);
- }
+ $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();
diff --git a/src/www/softwaremap/tag_cloud.php
b/src/www/softwaremap/tag_cloud.php
index 8faa652..3c78054 100644
--- a/src/www/softwaremap/tag_cloud.php
+++ b/src/www/softwaremap/tag_cloud.php
@@ -110,11 +110,19 @@ if ($selected_tag) {
if ($row_grp['short_description']) {
$content .= "- " . $row_grp['short_description'];
}
- $cells[] = array($content, 'colspan' => 2);
+ if (forge_get_config('use_trove')) {
+ $cells[] = array($content, 'colspan' => 2);
+ } else {
+ $cells[][] = $content;
+ }
echo $HTML->multiTableRow(array('class' => 'top'), $cells);
// extra description
$cells = array();
- $cells[] = array(_('Tags') . _(': ') .
list_project_tag($row_grp['group_id']), 'colspan' => 2);
+ if (forge_get_config('use_trove')) {
+ $cells[] = array(_('Tags') . _(': ') .
list_project_tag($row_grp['group_id']), 'colspan' => 2);
+ } else {
+ $cells[][] = _('Tags') . _(': ') .
list_project_tag($row_grp['group_id']);
+ }
echo $HTML->multiTableRow(array('class' => 'top'), $cells);
$cells = array();
if (forge_get_config('use_trove')) {
@@ -133,11 +141,7 @@ 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']));
- if (forge_get_config('use_trove')) {
- $cells[] = array($content, 'class' => 'align-right');
- } else {
- $cells[] = array($content, 'class' => 'align-right',
'colspan' => 2);
- }
+ $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();
-----------------------------------------------------------------------
Summary of changes:
src/www/softwaremap/full_list.php | 18 +++++++++++-------
src/www/softwaremap/tag_cloud.php | 18 +++++++++++-------
2 files changed, 22 insertions(+), 14 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
