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 e963775c1990259de2a87f54ff1f0ced2c77f1a9 (commit)
from fb0d2618ebe88777c48d3cec7720003090199742 (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 e963775c1990259de2a87f54ff1f0ced2c77f1a9
Author: Franck Villaume <[email protected]>
Date: Sun Jun 7 11:03:51 2015 +0200
tracker: fix monitor, post PHP_SELF removed
diff --git a/src/common/tracker/actions/detail.php
b/src/common/tracker/actions/detail.php
index dcf73ee..53fb9e2 100644
--- a/src/common/tracker/actions/detail.php
+++ b/src/common/tracker/actions/detail.php
@@ -54,14 +54,12 @@ if (session_loggedin()) { ?>
<?php
if ($ah->isMonitoring()) {
$img="xmail16w.png";
- $key="monitorstop";
$text=_('Stop Monitoring');
} else {
$img="mail16w.png";
- $key="monitor";
$text=_('Monitor');
}
- echo
util_make_link('/tracker/?group_id='.$group_id.'&artifact_id='.$ah->getID().'&atid='.$ath->getID().'&func='.$key,
html_e('strong', array(), html_image('ic/'.$img, 20, 20).' '.$text),
array('id' => 'tracker-monitor', 'title' =>
util_html_secure(html_get_tooltip_description('monitor'))));
+ 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
diff --git a/src/common/tracker/actions/mod-limited.php
b/src/common/tracker/actions/mod-limited.php
index d22af7e..63fb600 100644
--- a/src/common/tracker/actions/mod-limited.php
+++ b/src/common/tracker/actions/mod-limited.php
@@ -64,14 +64,12 @@ if (session_loggedin()) {
<td><?php
if ($ah->isMonitoring()) {
$img="xmail16w.png";
- $key="monitorstop";
$text=_('Stop Monitoring');
} else {
$img="mail16w.png";
- $key="monitor";
$text=_('Monitor');
}
- echo
util_make_link('/tracker/?group_id='.$group_id.'&artifact_id='.$ah->getID().'&atid='.$ath->getID().'&func='.$key,
html_e('strong', array(), html_image('ic/'.$img, 20, 20).' '.$text),
array('id' => 'tracker-monitor', 'title' =>
util_html_secure(html_get_tooltip_description('monitor'))));
+ 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
diff --git a/src/common/tracker/actions/mod.php
b/src/common/tracker/actions/mod.php
index 56bb86a..4e0b137 100644
--- a/src/common/tracker/actions/mod.php
+++ b/src/common/tracker/actions/mod.php
@@ -67,11 +67,9 @@ if (session_loggedin()) {
<td><?php
if ($ah->isMonitoring()) {
$img="xmail16w.png";
- $key="monitorstop";
$text=_('Stop Monitoring');
} else {
$img="mail16w.png";
- $key="monitor";
$text=_('Monitor');
}
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'))));
@@ -88,8 +86,7 @@ if (session_loggedin()) {
$key = 'pointer_up';
$txt = _('Cast Vote');
}
- echo '<a id="tracker-vote"
alt="'.$txt.'" title="'.html_get_tooltip_description('vote').'"
href="'.getselfhref(array('func' => $key)) . '">' .
- html_image('ic/' . $key
. '.png', '16', '16', array('border' => '0')) . '</a>';
+ echo
util_make_link('/tracker/?group_id='.$group_id.'&artifact_id='.$ah->getID().'&atid='.$ath->getID().'&func='.$key,
html_image('ic/'.$key.'.png', 16, 16, array('border' => 0)), array('id' =>
'tracker-vote', 'alt' => $txt, 'title' =>
util_html_secure(html_get_tooltip_description('vote'))));
}
?>
</td>
-----------------------------------------------------------------------
Summary of changes:
src/common/tracker/actions/detail.php | 4 +---
src/common/tracker/actions/mod-limited.php | 4 +---
src/common/tracker/actions/mod.php | 5 +----
3 files changed, 3 insertions(+), 10 deletions(-)
diff --git a/src/common/tracker/actions/detail.php
b/src/common/tracker/actions/detail.php
index dcf73ee..53fb9e2 100644
--- a/src/common/tracker/actions/detail.php
+++ b/src/common/tracker/actions/detail.php
@@ -54,14 +54,12 @@ if (session_loggedin()) { ?>
<?php
if ($ah->isMonitoring()) {
$img="xmail16w.png";
- $key="monitorstop";
$text=_('Stop Monitoring');
} else {
$img="mail16w.png";
- $key="monitor";
$text=_('Monitor');
}
- echo
util_make_link('/tracker/?group_id='.$group_id.'&artifact_id='.$ah->getID().'&atid='.$ath->getID().'&func='.$key,
html_e('strong', array(), html_image('ic/'.$img, 20, 20).' '.$text),
array('id' => 'tracker-monitor', 'title' =>
util_html_secure(html_get_tooltip_description('monitor'))));
+ 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
diff --git a/src/common/tracker/actions/mod-limited.php
b/src/common/tracker/actions/mod-limited.php
index d22af7e..63fb600 100644
--- a/src/common/tracker/actions/mod-limited.php
+++ b/src/common/tracker/actions/mod-limited.php
@@ -64,14 +64,12 @@ if (session_loggedin()) {
<td><?php
if ($ah->isMonitoring()) {
$img="xmail16w.png";
- $key="monitorstop";
$text=_('Stop Monitoring');
} else {
$img="mail16w.png";
- $key="monitor";
$text=_('Monitor');
}
- echo
util_make_link('/tracker/?group_id='.$group_id.'&artifact_id='.$ah->getID().'&atid='.$ath->getID().'&func='.$key,
html_e('strong', array(), html_image('ic/'.$img, 20, 20).' '.$text),
array('id' => 'tracker-monitor', 'title' =>
util_html_secure(html_get_tooltip_description('monitor'))));
+ 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
diff --git a/src/common/tracker/actions/mod.php
b/src/common/tracker/actions/mod.php
index 56bb86a..4e0b137 100644
--- a/src/common/tracker/actions/mod.php
+++ b/src/common/tracker/actions/mod.php
@@ -67,11 +67,9 @@ if (session_loggedin()) {
<td><?php
if ($ah->isMonitoring()) {
$img="xmail16w.png";
- $key="monitorstop";
$text=_('Stop Monitoring');
} else {
$img="mail16w.png";
- $key="monitor";
$text=_('Monitor');
}
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'))));
@@ -88,8 +86,7 @@ if (session_loggedin()) {
$key = 'pointer_up';
$txt = _('Cast Vote');
}
- echo '<a id="tracker-vote"
alt="'.$txt.'" title="'.html_get_tooltip_description('vote').'"
href="'.getselfhref(array('func' => $key)) . '">' .
- html_image('ic/' . $key
. '.png', '16', '16', array('border' => '0')) . '</a>';
+ echo
util_make_link('/tracker/?group_id='.$group_id.'&artifact_id='.$ah->getID().'&atid='.$ath->getID().'&func='.$key,
html_image('ic/'.$key.'.png', 16, 16, array('border' => 0)), array('id' =>
'tracker-vote', 'alt' => $txt, 'title' =>
util_html_secure(html_get_tooltip_description('vote'))));
}
?>
</td>
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
