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.0 has been updated
via d178a73a0e61150462f1770a31ad84e4837f0252 (commit)
from 031d83f56719c10e643fe7c275043ed6eed9afc3 (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 d178a73a0e61150462f1770a31ad84e4837f0252
Author: Franck Villaume <[email protected]>
Date: Sat May 23 18:50:37 2015 +0200
tracker: use HTML helper
diff --git a/src/common/tracker/actions/detail.php
b/src/common/tracker/actions/detail.php
index 3ea6d5a..00a8307 100644
--- a/src/common/tracker/actions/detail.php
+++ b/src/common/tracker/actions/detail.php
@@ -60,14 +60,12 @@ jQuery(document).ready(function() {
$key="monitor";
$text=_('Monitor');
}
- echo '
- <a id="tracker-monitor"
href="index.php?group_id='.$group_id.'&artifact_id='.$ah->getID().'&atid='.$ath->getID().'&func=monitor"
title="'.util_html_secure(html_get_tooltip_description('monitor')).'"><strong>'.
-
html_image('ic/'.$img.'','20','20').' '.$text.'</strong></a>';
+ echo
util_make_link('/tracker/?group_id='.$group_id.'&artifact_id='.$ah->getID().'&atid='.$ath->getID().'&func=monitor',
html_e('strong', array(), html_image('ic/'.$img.'','20','20').' '.$text),
array('id' => 'tracker-monitor', 'title' =>
util_html_secure(html_get_tooltip_description('monitor'))));
?>
</td>
<td><?php
$votes = $ah->getVotes();
- echo '<span id="tracker-votes"
title="'.html_get_tooltip_description('votes').'" >'.html_e('strong', array(),
_('Votes') . _(': ')).sprintf('%1$d/%2$d (%3$d%%)', $votes[0], $votes[1],
$votes[2]).'</span>';
+ echo html_e('span', array('id' =>
'tracker-votes', 'title' => html_get_tooltip_description('votes')),
html_e('strong', array(), _('Votes') . _(': ')).sprintf('%1$d/%2$d (%3$d%%)',
$votes[0], $votes[1], $votes[2]));
if ($ath->canVote()) {
if ($ah->hasVote()) {
$key = 'pointer_down';
diff --git a/src/common/tracker/actions/mod.php
b/src/common/tracker/actions/mod.php
index 1800592..35209d1 100644
--- a/src/common/tracker/actions/mod.php
+++ b/src/common/tracker/actions/mod.php
@@ -71,15 +71,12 @@ if (session_loggedin()) {
$key="monitor";
$text=_('Monitor');
}
- echo '
- <a id="tracker-monitor"
href="index.php?group_id='.$group_id.'&artifact_id='.$ah->getID().'&atid='.$ath->getID().'&func=monitor"
title="'.util_html_secure(html_get_tooltip_description('monitor')).'"><strong>'.
- html_image('ic/'.$img.'','20','20').'
'.$text.'</strong></a>';
+ echo
util_make_link('/tracker/?group_id='.$group_id.'&artifact_id='.$ah->getID().'&atid='.$ath->getID().'&func=monitor',
html_e('strong', array(), html_image('ic/'.$img.'','20','20').' '.$text),
array('id' => 'tracker-monitor', 'title' =>
util_html_secure(html_get_tooltip_description('monitor'))));
?>
</td>
<td><?php
$votes = $ah->getVotes();
- echo '<span id="tracker-votes"
title="'.html_get_tooltip_description('votes').'" >'.html_e('strong', array(),
_('Votes') . _(': ')).sprintf('%1$d/%2$d (%3$d%%)', $votes[0], $votes[1],
$votes[2]).'</span>';
-
+ echo html_e('span', array('id' =>
'tracker-votes', 'title' => html_get_tooltip_description('votes')),
html_e('strong', array(), _('Votes') . _(': ')).sprintf('%1$d/%2$d (%3$d%%)',
$votes[0], $votes[1], $votes[2]));
if ($ath->canVote()) {
if ($ah->hasVote()) {
$key = 'pointer_down';
-----------------------------------------------------------------------
Summary of changes:
src/common/tracker/actions/detail.php | 6 ++----
src/common/tracker/actions/mod.php | 7 ++-----
2 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/src/common/tracker/actions/detail.php
b/src/common/tracker/actions/detail.php
index 3ea6d5a..00a8307 100644
--- a/src/common/tracker/actions/detail.php
+++ b/src/common/tracker/actions/detail.php
@@ -60,14 +60,12 @@ jQuery(document).ready(function() {
$key="monitor";
$text=_('Monitor');
}
- echo '
- <a id="tracker-monitor"
href="index.php?group_id='.$group_id.'&artifact_id='.$ah->getID().'&atid='.$ath->getID().'&func=monitor"
title="'.util_html_secure(html_get_tooltip_description('monitor')).'"><strong>'.
-
html_image('ic/'.$img.'','20','20').' '.$text.'</strong></a>';
+ echo
util_make_link('/tracker/?group_id='.$group_id.'&artifact_id='.$ah->getID().'&atid='.$ath->getID().'&func=monitor',
html_e('strong', array(), html_image('ic/'.$img.'','20','20').' '.$text),
array('id' => 'tracker-monitor', 'title' =>
util_html_secure(html_get_tooltip_description('monitor'))));
?>
</td>
<td><?php
$votes = $ah->getVotes();
- echo '<span id="tracker-votes"
title="'.html_get_tooltip_description('votes').'" >'.html_e('strong', array(),
_('Votes') . _(': ')).sprintf('%1$d/%2$d (%3$d%%)', $votes[0], $votes[1],
$votes[2]).'</span>';
+ echo html_e('span', array('id' =>
'tracker-votes', 'title' => html_get_tooltip_description('votes')),
html_e('strong', array(), _('Votes') . _(': ')).sprintf('%1$d/%2$d (%3$d%%)',
$votes[0], $votes[1], $votes[2]));
if ($ath->canVote()) {
if ($ah->hasVote()) {
$key = 'pointer_down';
diff --git a/src/common/tracker/actions/mod.php
b/src/common/tracker/actions/mod.php
index 1800592..35209d1 100644
--- a/src/common/tracker/actions/mod.php
+++ b/src/common/tracker/actions/mod.php
@@ -71,15 +71,12 @@ if (session_loggedin()) {
$key="monitor";
$text=_('Monitor');
}
- echo '
- <a id="tracker-monitor"
href="index.php?group_id='.$group_id.'&artifact_id='.$ah->getID().'&atid='.$ath->getID().'&func=monitor"
title="'.util_html_secure(html_get_tooltip_description('monitor')).'"><strong>'.
- html_image('ic/'.$img.'','20','20').'
'.$text.'</strong></a>';
+ echo
util_make_link('/tracker/?group_id='.$group_id.'&artifact_id='.$ah->getID().'&atid='.$ath->getID().'&func=monitor',
html_e('strong', array(), html_image('ic/'.$img.'','20','20').' '.$text),
array('id' => 'tracker-monitor', 'title' =>
util_html_secure(html_get_tooltip_description('monitor'))));
?>
</td>
<td><?php
$votes = $ah->getVotes();
- echo '<span id="tracker-votes"
title="'.html_get_tooltip_description('votes').'" >'.html_e('strong', array(),
_('Votes') . _(': ')).sprintf('%1$d/%2$d (%3$d%%)', $votes[0], $votes[1],
$votes[2]).'</span>';
-
+ echo html_e('span', array('id' =>
'tracker-votes', 'title' => html_get_tooltip_description('votes')),
html_e('strong', array(), _('Votes') . _(': ')).sprintf('%1$d/%2$d (%3$d%%)',
$votes[0], $votes[1], $votes[2]));
if ($ath->canVote()) {
if ($ah->hasVote()) {
$key = 'pointer_down';
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
