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 d63f9812d0b494e120ab394fbdadb59cff77aa71 (commit)
via 729ef112061ccabee8a55056ce8ff2e7b09d8056 (commit)
via 603eb885136f5756e9a544bc3680fd6f47f5ec7c (commit)
from 2559ece7d7ad9a0908020ae93aaf3e207b4a7f4f (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=d63f9812d0b494e120ab394fbdadb59cff77aa71
commit d63f9812d0b494e120ab394fbdadb59cff77aa71
Author: Franck Villaume <[email protected]>
Date: Sun Dec 4 10:52:27 2016 +0100
use the new icon: notify by mail
diff --git a/src/common/docman/views/listfile.php
b/src/common/docman/views/listfile.php
index ed25a71..97a283b 100644
--- a/src/common/docman/views/listfile.php
+++ b/src/common/docman/views/listfile.php
@@ -351,7 +351,7 @@ if (isset($nested_docs[$dirid]) &&
is_array($nested_docs[$dirid])) {
}
$nextcell .=
util_make_link($redirecturl.'&action=monitorfile&option='.$option.'&fileid='.$d->getID(),
$image, array('title' => $titleMonitor));
}
- $nextcell .= util_make_link('#',
html_image('ic/mail-send.png', 22, 22, array('alt' => _('Notify'))),
array('onclick' =>
'javascript:controllerListFile.toggleNotifyUserView({action:\''.util_make_uri($notifyaction).'\',
lockIntervalDelay: 60000, childGroupId: '.util_ifsetor($childgroup_id, 0).' ,
id:'.$d->getID().', groupId:'.$d->Group->getID().',
docgroupId:'.$d->getDocGroupID().', title:\''.addslashes($d->getName()).'\',
filename:\''.addslashes($d->getFileName()).'\',
description:'.json_encode($d->getDescription()).', isURL:\''.$d->isURL().'\',
isText:\''.$d->isText().'\', isHtml:\''.$d->isHtml().'\',
docManURL:\''.util_make_uri('/docman').'\'})', 'title' => _('Notify users')),
true);
+ $nextcell .= util_make_link('#',
$HTML->getMailNotifyPic(_('Notify users'), 'notifyusers'), array('onclick' =>
'javascript:controllerListFile.toggleNotifyUserView({action:\''.util_make_uri($notifyaction).'\',
lockIntervalDelay: 60000, childGroupId: '.util_ifsetor($childgroup_id, 0).' ,
id:'.$d->getID().', groupId:'.$d->Group->getID().',
docgroupId:'.$d->getDocGroupID().', title:\''.addslashes($d->getName()).'\',
filename:\''.addslashes($d->getFileName()).'\',
description:'.json_encode($d->getDescription()).', isURL:\''.$d->isURL().'\',
isText:\''.$d->isText().'\', isHtml:\''.$d->isHtml().'\',
docManURL:\''.util_make_uri('/docman').'\'})', 'title' => _('Notify users')),
true);
$cells[][] = $nextcell;
}
echo $HTML->multiTableRow(array(), $cells);
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=729ef112061ccabee8a55056ce8ff2e7b09d8056
commit 729ef112061ccabee8a55056ce8ff2e7b09d8056
Author: Franck Villaume <[email protected]>
Date: Sun Dec 4 10:51:58 2016 +0100
add new themeable icon: notify by mail
diff --git a/src/www/include/Layout.class.php b/src/www/include/Layout.class.php
index c0a7eb1..67612e3 100644
--- a/src/www/include/Layout.class.php
+++ b/src/www/include/Layout.class.php
@@ -1290,6 +1290,10 @@ if (isset($params['group']) && $params['group']) {
return $this->getPicto('ic/mail16b.png', $title, $alt);
}
+ function getMailNotifyPic($title = '', $alt = '') {
+ return $this->getPicto('ic/mail-send.png', $title, $alt);
+ }
+
function getPmPic($title = '', $alt = '') {
return $this->getPicto('ic/taskman20g.png', $title, $alt);
}
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=603eb885136f5756e9a544bc3680fd6f47f5ec7c
commit 603eb885136f5756e9a544bc3680fd6f47f5ec7c
Author: Franck Villaume <[email protected]>
Date: Sun Dec 4 10:51:16 2016 +0100
add link to file directly in sendNotice
diff --git a/src/common/docman/Document.class.php
b/src/common/docman/Document.class.php
index 29b7513..88d652d 100644
--- a/src/common/docman/Document.class.php
+++ b/src/common/docman/Document.class.php
@@ -1016,7 +1016,7 @@ class Document extends FFObject {
$body .= _('Submitter')._(':
').$this->getCreatorRealName()." (".$this->getCreatorUserName().") \n";
$body .=
"\n\n-------------------------------------------------------\n".
_('For more info, visit:').
- "\n\n" .
util_make_url('/docman/?group_id='.$this->Group->getID().'&view=listfile&dirid='.$this->getDocGroupID());
+ "\n\n" .
util_make_url('/docman/?group_id='.$this->Group->getID().'&view=listfile&dirid='.$this->getDocGroupID().'&filedetailid='.$this->getID());
$BCCarray = explode(',',$BCC);
foreach ($BCCarray as $dest_email) {
-----------------------------------------------------------------------
Summary of changes:
src/common/docman/Document.class.php | 2 +-
src/common/docman/views/listfile.php | 2 +-
src/www/include/Layout.class.php | 4 ++++
3 files changed, 6 insertions(+), 2 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
