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 4017da328b347f82f4dcbe0962cb7cdb2eff1f21 (commit)
from d63f9812d0b494e120ab394fbdadb59cff77aa71 (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=4017da328b347f82f4dcbe0962cb7cdb2eff1f21
commit 4017da328b347f82f4dcbe0962cb7cdb2eff1f21
Author: Franck Villaume <[email protected]>
Date: Sun Dec 4 11:57:12 2016 +0100
make the edit icon title adjusted with configuration
diff --git a/src/common/docman/views/listfile.php
b/src/common/docman/views/listfile.php
index 97a283b..9139dd2 100644
--- a/src/common/docman/views/listfile.php
+++ b/src/common/docman/views/listfile.php
@@ -322,9 +322,17 @@ if (isset($nested_docs[$dirid]) &&
is_array($nested_docs[$dirid])) {
}
$editfileaction .= '&group_id='.$group_id;
$notifyaction .= '&group_id='.$group_id;
+ $edittitle = _('Edit this document, add version');
+ if (forge_get_config('use_object_associations')) {
+ $edittitle .= ', '._('associate to other
objects');
+ }
+ if (forge_get_config('use_docman_review')) {
+ $edittitle .= ', '._('create or comment a
review');
+ }
if (!$d->getLocked() && !$d->getReserved()) {
$nextcell .=
util_make_link($redirecturl.'&action=trashfile&fileid='.$d->getID(),
$HTML->getDeletePic(_('Move this document to trash'), 'delfile'));
- $nextcell .= util_make_link('#',
$HTML->getEditFilePic(_('Edit this document'), 'editdocument'), array('onclick'
=>
'javascript:controllerListFile.toggleEditFileView({action:\''.util_make_uri($editfileaction).'\',
lockIntervalDelay: 60000, childGroupId: '.util_ifsetor($childgroup_id, 0).' ,
id:'.$d->getID().', groupId:'.$d->Group->getID().',
docgroupId:'.$d->getDocGroupID().', statusId:'.$d->getStateID().',
statusDict:'.$dm->getStatusNameList('json').',
docgroupDict:'.$dm->getDocGroupList($nested_groups, 'json').',
isText:\''.$d->isText().'\', isHtml:\''.$d->isHtml().'\',
useCreateOnline:'.$d->Group->useCreateOnline().',
docManURL:\''.util_make_uri('/docman').'\'})', 'title' => _('Edit this
document')), true);
+
+ $nextcell .= util_make_link('#',
$HTML->getEditFilePic($edittitle, 'editdocument'), array('onclick' =>
'javascript:controllerListFile.toggleEditFileView({action:\''.util_make_uri($editfileaction).'\',
lockIntervalDelay: 60000, childGroupId: '.util_ifsetor($childgroup_id, 0).' ,
id:'.$d->getID().', groupId:'.$d->Group->getID().',
docgroupId:'.$d->getDocGroupID().', statusId:'.$d->getStateID().',
statusDict:'.$dm->getStatusNameList('json').',
docgroupDict:'.$dm->getDocGroupList($nested_groups, 'json').',
isText:\''.$d->isText().'\', isHtml:\''.$d->isHtml().'\',
useCreateOnline:'.$d->Group->useCreateOnline().',
docManURL:\''.util_make_uri('/docman').'\'})'), true);
if (session_loggedin()) {
$nextcell .=
util_make_link($redirecturl.'&action=reservefile&fileid='.$d->getID(),
html_image('docman/reserve-document.png', 22, 22, array('alt' => _('Reserve
this document'))), array('title' => _('Reserve this document for later
edition')));
}
@@ -335,7 +343,7 @@ if (isset($nested_docs[$dirid]) &&
is_array($nested_docs[$dirid])) {
}
} else {
$nextcell .=
util_make_link($redirecturl.'&action=trashfile&fileid='.$d->getID(),
$HTML->getDeletePic(_('Move this document to trash'), 'delfile'));
- $nextcell .= util_make_link('#',
$HTML->getEditFilePic(_('Edit this document'), 'editdocument'), array('onclick'
=>
'javascript:controllerListFile.toggleEditFileView({action:\''.util_make_uri($editfileaction).'\',
lockIntervalDelay: 60000, childGroupId: '.util_ifsetor($childgroup_id, 0).' ,
id:'.$d->getID().', groupId:'.$d->Group->getID().',
docgroupId:'.$d->getDocGroupID().', statusId:'.$d->getStateID().',
statusDict:'.$dm->getStatusNameList('json').',
docgroupDict:'.$dm->getDocGroupList($nested_groups, 'json').',
isText:\''.$d->isText().'\', isHtml:\''.$d->isHtml().'\',
useCreateOnline:'.$d->Group->useCreateOnline().',
docManURL:\''.util_make_uri('/docman').'\'})', 'title' => _('Edit this
document')), true);
+ $nextcell .= util_make_link('#',
$HTML->getEditFilePic($edittitle, 'editdocument'), array('onclick' =>
'javascript:controllerListFile.toggleEditFileView({action:\''.util_make_uri($editfileaction).'\',
lockIntervalDelay: 60000, childGroupId: '.util_ifsetor($childgroup_id, 0).' ,
id:'.$d->getID().', groupId:'.$d->Group->getID().',
docgroupId:'.$d->getDocGroupID().', statusId:'.$d->getStateID().',
statusDict:'.$dm->getStatusNameList('json').',
docgroupDict:'.$dm->getDocGroupList($nested_groups, 'json').',
isText:\''.$d->isText().'\', isHtml:\''.$d->isHtml().'\',
useCreateOnline:'.$d->Group->useCreateOnline().',
docManURL:\''.util_make_uri('/docman').'\'})'), true);
$nextcell .=
util_make_link($redirecturl.'&action=releasefile&fileid='.$d->getID(),
html_image('docman/release-document.png', 22, 22, array('alt' => _('Release
reservation'))), array('title' => _('Release reservation')));
}
}
-----------------------------------------------------------------------
Summary of changes:
src/common/docman/views/listfile.php | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
