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 f5e3b36f09bc147316f0b1725a21d57716167d03 (commit)
via f44bfa46d4f2b91f5fff202780acad3adb6fbbdd (commit)
from 6031ad7d8fe53da023a4a78c88859b4e6b575a89 (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=f5e3b36f09bc147316f0b1725a21d57716167d03
commit f5e3b36f09bc147316f0b1725a21d57716167d03
Author: Franck Villaume <[email protected]>
Date: Sun Jan 22 14:05:38 2017 +0100
use HTML helpers & util_display_user
diff --git a/src/plugins/scmcvs/common/CVSPlugin.class.php
b/src/plugins/scmcvs/common/CVSPlugin.class.php
index a71563d..e281698 100644
--- a/src/plugins/scmcvs/common/CVSPlugin.class.php
+++ b/src/plugins/scmcvs/common/CVSPlugin.class.php
@@ -3,7 +3,7 @@
* FusionForge CVS plugin
*
* Copyright 2004-2009, Roland Mas
- * Copyright 2013,2016, Franck Villaume - TrivialDev
+ * Copyright 2013,2016-2017, Franck Villaume - TrivialDev
*
* This file is part of FusionForge.
*
@@ -183,20 +183,20 @@ over it to the project's administrator.");
$total = array('adds' => 0, 'commits' => 0);
while($data = db_fetch_array($result)) {
- $b .= '<tr '. $HTML->boxGetAltRowStyle($i) .'>';
- $b .= '<td class="halfwidth">' ;
- $b .= util_make_link_u ($data['user_name'],
$data['user_id'], $data['realname']) ;
- $b .= '</td><td class="onequarterwidth
align-right">'.$data['adds']. '</td>'.
- '<td class="onequarterwidth
align-right">'.$data['commits'].'</td></tr>';
+ $cells = array();
+ $cells[] =
array(util_display_user($data['user_name'], $data['user_id'],
$data['realname']), 'class' => 'halfwidth');
+ $cells[] = array($data['adds'], 'class' =>
'onequarterwidth align-right');
+ $cells[] = array($data['updates'], 'class' =>
'onequarterwidth align-right');
+ $b .= $HTML->multiTableRow(array('class' =>
$HTML->boxGetAltRowStyle($i, true)), $cells);
$total['adds'] += $data['adds'];
- $total['commits'] += $data['commits'];
+ $total['updates'] += $data['commits'];
$i++;
}
- $b .= '<tr '. $HTML->boxGetAltRowStyle($i) .'>';
- $b .= '<td
class="halfwidth"><strong>'._('Total').':</strong></td>'.
- '<td class="onequarterwidth
align-right"><strong>'.$total['adds']. '</strong></td>'.
- '<td class="onequarterwidth
align-right"><strong>'.$total['commits'].'</strong></td>';
- $b .= '</tr>';
+ $cells = array();
+ $cells[] = array(html_e('strong', array(),
_('Total')._(':')), 'class' => 'halfwidth');
+ $cells[] = array($total['adds'], 'class' =>
'onequarterwidth align-right');
+ $cells[] = array($total['commits'], 'class' =>
'onequarterwidth align-right');
+ $b .= $HTML->multiTableRow(array('class' =>
$HTML->boxGetAltRowStyle($i, true)), $cells);
$b .= $HTML->listTableBottom();
} else {
$b .= $HTML->information(_('No history yet'));
diff --git a/src/plugins/scmgit/common/GitPlugin.class.php
b/src/plugins/scmgit/common/GitPlugin.class.php
index 10b948f..3302114 100644
--- a/src/plugins/scmgit/common/GitPlugin.class.php
+++ b/src/plugins/scmgit/common/GitPlugin.class.php
@@ -4,7 +4,7 @@
*
* Copyright 2009, Roland Mas
* Copyright 2009, Mehdi Dogguy <[email protected]>
- * Copyright 2012-2014,2016, Franck Villaume - TrivialDev
+ * Copyright 2012-2014,2016-2017, Franck Villaume - TrivialDev
* Copyright © 2013
* Thorsten Glaser <[email protected]>
* http://fusionforge.org
@@ -375,7 +375,7 @@ control over it to the project's administrator.");
while ($data = db_fetch_array($result)) {
$cells = array();
- $cells[] =
array(util_make_link_u($data['user_name'], $data['user_id'],
$data['realname']), 'class' => 'halfwidth');
+ $cells[] =
array(util_display_user($data['user_name'], $data['user_id'],
$data['realname']), 'class' => 'halfwidth');
$cells[] = array($data['adds'], 'class' =>
'onequarterwidth align-right');
$cells[] = array($data['updates'], 'class' =>
'onequarterwidth align-right');
$b .= $HTML->multiTableRow(array('class' =>
$HTML->boxGetAltRowStyle($i, true)), $cells);
diff --git a/src/plugins/scmhg/common/HgPlugin.class.php
b/src/plugins/scmhg/common/HgPlugin.class.php
index 9d96eaa..ed2c7f2 100644
--- a/src/plugins/scmhg/common/HgPlugin.class.php
+++ b/src/plugins/scmhg/common/HgPlugin.class.php
@@ -4,7 +4,7 @@
*
* Copyright 2009, Roland Mas
* Copyright 2012, Denise Patzker
- * Copyright 2012-2014, Franck Villaume - TrivialDev
+ * Copyright 2012-2014,2017, Franck Villaume - TrivialDev
*
* This file is part of FusionForge.
*
@@ -159,7 +159,7 @@ Offer DAV or SSH access.");
while($data = db_fetch_array($result)) {
$cells = array();
- $cells[] =
array(util_make_link_u($data['user_name'], $data['user_id'],
$data['realname']), 'class' => 'halfwidth');
+ $cells[] =
array(util_display_user($data['user_name'], $data['user_id'],
$data['realname']), 'class' => 'halfwidth');
$cells[] = array($data['adds'], 'class' =>
'onequarterwidth align-right');
$cells[] = array($data['updates'], 'class' =>
'onequarterwidth align-right');
$b .= $HTML->multiTableRow(array('class' =>
$HTML->boxGetAltRowStyle($i, true)), $cells);
diff --git a/src/plugins/scmsvn/common/SVNPlugin.class.php
b/src/plugins/scmsvn/common/SVNPlugin.class.php
index 777f14c..90118cd 100644
--- a/src/plugins/scmsvn/common/SVNPlugin.class.php
+++ b/src/plugins/scmsvn/common/SVNPlugin.class.php
@@ -230,7 +230,7 @@ some control over it to the project's administrator.");
while($data = db_fetch_array($result)) {
$cells = array();
- $cells[] =
array(util_make_link_u($data['user_name'], $data['user_id'],
$data['realname']), 'class' => 'halfwidth');
+ $cells[] =
array(util_display_user($data['user_name'], $data['user_id'],
$data['realname']), 'class' => 'halfwidth');
$cells[] = array($data['adds'], 'class' =>
'onequarterwidth align-right');
$cells[] = array($data['updates'], 'class' =>
'onequarterwidth align-right');
$b .= $HTML->multiTableRow(array('class' =>
$HTML->boxGetAltRowStyle($i, true)), $cells);
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=f44bfa46d4f2b91f5fff202780acad3adb6fbbdd
commit f44bfa46d4f2b91f5fff202780acad3adb6fbbdd
Author: Franck Villaume <[email protected]>
Date: Sun Jan 22 13:54:47 2017 +0100
add preview icon for project latest commits widget
diff --git
a/src/www/images/widget/widget-preview-projectlatestcommits-en_US.png
b/src/www/images/widget/widget-preview-projectlatestcommits-en_US.png
new file mode 100644
index 0000000..bfb92a6
Binary files /dev/null and
b/src/www/images/widget/widget-preview-projectlatestcommits-en_US.png differ
diff --git a/src/www/themes/css/fusionforge.css
b/src/www/themes/css/fusionforge.css
index 2d2e921..3da7ab7 100644
--- a/src/www/themes/css/fusionforge.css
+++ b/src/www/themes/css/fusionforge.css
@@ -3,7 +3,7 @@
*
* Copyright 2009 Matthieu Faure // Open-s.com
* Copyright 2010 Franck Villaume - Capgemini
- * Copyright 2014 Franck Villaume - TrivialDev
+ * Copyright 2014,2017, Franck Villaume - TrivialDev
* Copyright 2016, Stéphane-Eymeric Bredthauer - TrivialDev
*
* This file is part of FusionForge. FusionForge is free software;
@@ -554,14 +554,6 @@ p.information {
background-image:
url('../../images/widget/widget-preview-latest_file_releases-en_US.png');
}
-.widget-preview-projectlatestsvncommits-fr_FR {
- background-image:
url('../../images/widget/widget-preview-project_latest_svn_commits-fr_FR.png');
-}
-
-.widget-preview-projectlatestsvncommits-en_US {
- background-image:
url('../../images/widget/widget-preview-project_latest_svn_commits-en_US.png');
-}
-
.widget-preview-projectlatestnews-fr_FR {
background-image:
url('../../images/widget/widget-preview-project_latest_news-fr_FR.png');
}
@@ -608,6 +600,10 @@ p.information {
background-image:
url('../../images/widget/widget-preview-project_plugin_blocks_summary-en_US.png');
}
+.widget-preview-projectlatestcommits-en_US {
+ background-image:
url('../../images/widget/widget-preview-projectlatestcommits-en_US.png');
+}
+
.widget-preview-mysystemevent-fr_FR {
background-image:
url('../../images/widget/widget-preview-mysystemevent-fr_FR.png');
}
-----------------------------------------------------------------------
Summary of changes:
src/plugins/scmcvs/common/CVSPlugin.class.php | 24 ++++++++++-----------
src/plugins/scmgit/common/GitPlugin.class.php | 4 ++--
src/plugins/scmhg/common/HgPlugin.class.php | 4 ++--
src/plugins/scmsvn/common/SVNPlugin.class.php | 2 +-
.../widget-preview-projectlatestcommits-en_US.png | Bin 0 -> 12064 bytes
src/www/themes/css/fusionforge.css | 14 +++++-------
6 files changed, 22 insertions(+), 26 deletions(-)
create mode 100644
src/www/images/widget/widget-preview-projectlatestcommits-en_US.png
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
