[Fusionforge-commits] FusionForge branch master updated. ea04bb35611c0c9b2e8a5891b7e23d3de1f86600

Franck Villaume nerville at fusionforge.org
Sun Nov 30 18:12:47 CET 2014


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  ea04bb35611c0c9b2e8a5891b7e23d3de1f86600 (commit)
       via  d86342934ef88f8d0a433f06a8c74ceb20853c5b (commit)
       via  befada9a603fe329695c24463394c6a4fb6eaeb2 (commit)
       via  969f78f2ccaeb015734718e41b39062a35f286a1 (commit)
      from  9c1d9595f4728e7ec20eb010a907ed85bf93409f (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 ea04bb35611c0c9b2e8a5891b7e23d3de1f86600
Merge: 9c1d959 d863429
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Sun Nov 30 18:12:41 2014 +0100

    Merge Branch_5_3

diff --cc src/common/docman/views/listfile.php
index 2e31f61,8b60d0f..e45f59b
--- a/src/common/docman/views/listfile.php
+++ b/src/common/docman/views/listfile.php
@@@ -304,30 -302,42 +304,30 @@@ if (isset($nested_docs[$dirid]) && is_a
  				break;
  			}
  		}
 -		echo '</td>';
 -		echo '<td>';
 -			echo $d->getDownload();
 -		echo '</td>';
 +		$cells[][] = $d->getDownload();
  
  		if (forge_check_perm('docman', $group_id, 'approve')) {
 -			echo '<td>';
 -			/* should we steal the lock on file ? */
 -			if ($d->getLocked()) {
 -				if ($d->getLockedBy() == $u->getID()) {
 -					$d->setLock(0);
 -				/* if you change the 60000 value below, please update here too */
 -				} elseif ((time() - $d->getLockdate()) > 600) {
 -					$d->setLock(0);
 -				}
 -			}
 -			$editfileaction = '?action=editfile&fromview=listfile&dirid='.$d->getDocGroupID();
 +			$nextcell = '';
 +			$editfileaction = '/docman/?action=editfile&fromview=listfile&dirid='.$d->getDocGroupID();
  			if (isset($GLOBALS['childgroup_id']) && $GLOBALS['childgroup_id']) {
 -				$editfileaction .= '&childgroup_id='.$GLOBALS['childgroup_id'];
 +				$editfileaction .= '&childgroup_id='.$GLOBALS['childgroup_id'];
  			}
 -			$editfileaction .= '&group_id='.$GLOBALS['group_id'];
 +			$editfileaction .= '&group_id='.$GLOBALS['group_id'];
  			if (!$d->getLocked() && !$d->getReserved()) {
 -				echo '<a class="tabtitle-ne" href="'.$actionlistfileurl.'&action=trashfile&fileid='.$d->getID().'" title="'. _('Move this document to trash') .'" >'.html_image('docman/trash-empty.png',22,22,array('alt'=>_('Move this document to trash'))). '</a>';
 -				echo '<a class="tabtitle-ne" href="#" onclick="javascript:controllerListFile.toggleEditFileView({action:\''.$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').', title:\''.addslashes($d->getName()).'\', filename:\''.addslashes($d->getFilename()).'\', description:\''.addslashes($d->getDescription()).'\', isURL:\''.$d->isURL().'\', isText:\''.$d->isText().'\', isHtml:\''.$d->isHtml().'\', useCreateOnline:'.$d->Group->useCreateOnline().', docManURL:\''.util_make_uri("docman").'\'})" title="'. _('Edit this document') .'" >'.html_image('docman/edit-file.png',22,22,array('alt'=>_('Edit this document'))). '</a>';
 +				$nextcell .= util_make_link($redirecturl.'&action=trashfile&fileid='.$d->getID(), $HTML->getDeletePic(_('Move this document to trash'), 'delfile'));
- 				$nextcell .= util_make_link('#', html_image('docman/edit-file.png',22,22,array('alt'=>_('Edit this document'))), 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').', title:\''.addslashes($d->getName()).'\', filename:\''.$d->getFilename().'\', description:\''.addslashes($d->getDescription()).'\', isURL:\''.$d->isURL().'\', 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_image('docman/edit-file.png',22,22,array('alt'=>_('Edit this document'))), 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').', title:\''.addslashes($d->getName()).'\', filename:\''.addslashes($d->getFilename()).'\', description:\''.addslashes($d->getDescription()).'\', isURL:\''.$d->isURL().'\', isText:\''.$d->isText().'\', isHtml:\''.$d->isHtml().'\', useCreateOnline:'.$d->Group->useCreateOnline().', docManURL:\''.util_make_uri('/docman').'\'})', 'title' => _('Edit this document')), true);
  				if (session_loggedin()) {
 -					echo '<a class="tabtitle-ne" href="'.$actionlistfileurl.'&action=reservefile&fileid='.$d->getID().'" title="'. _('Reserve this document for later edition') .'" >'.html_image('docman/reserve-document.png',22,22,array('alt'=>_('Reserve this document'))). '</a>';
 +					$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')));
  				}
  			} else {
  				if (session_loggedin() && $d->getReservedBy() != $u->getID()) {
  					if (forge_check_perm('docman', $ndg->Group->getID(), 'admin')) {
 -						echo '<a class="tabtitle-ne" href="'.$actionlistfileurl.'&action=enforcereserve&fileid='.$d->getID().'" title="'. _('Enforce reservation') .'" >'.html_image('docman/enforce-document.png',22,22,array('alt'=>_('Enforce reservation'))).'</a>';
 +						$nextcell .= util_make_link($redirecturl.'&action=enforcereserve&fileid='.$d->getID(), html_image('docman/enforce-document.png',22,22,array('alt'=>_('Enforce reservation'))), array('title' => _('Enforce reservation')));
  					}
  				} else {
 -					echo '<a class="tabtitle-ne" href="'.$actionlistfileurl.'&action=trashfile&fileid='.$d->getID().'" title="'. _('Move this document to trash') .'" >'.html_image('docman/trash-empty.png',22,22,array('alt'=>_('Move this document to trash'))). '</a>';
 -					echo '<a class="tabtitle-ne" href="#" onclick="javascript:controllerListFile.toggleEditFileView({action:\''.$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').', title:\''.addslashes($d->getName()).'\', filename:\''.addslashes($d->getFilename()).'\', description:\''.addslashes($d->getDescription()).'\', isURL:\''.$d->isURL().'\', isText:\''.$d->isText().'\', isHtml:\''.$d->isHtml().'\', useCreateOnline:'.$d->Group->useCreateOnline().', docManURL:\''.util_make_uri("docman").'\'})" title="'. _('Edit this document') .'" >'.html_image('docman/edit-file.png',22,22,array('alt'=>_('Edit this document'))). '</a>';
 -					echo '<a class="tabtitle-ne" href="'.$actionlistfileurl.'&action=releasefile&fileid='.$d->getID().'" title="'. _('Release reservation') .'" >'.html_image('docman/release-document.png',22,22,array('alt'=>_('Release reservation'))). '</a>';
 +					$nextcell .= util_make_link($redirecturl.'&action=trashfile&fileid='.$d->getID(), $HTML->getDeletePic(_('Move this document to trash'), 'delfile'));
- 					$nextcell .= util_make_link('#', html_image('docman/edit-file.png', 22 ,22, array('alt' => _('Edit this document'))), 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').', title:\''.addslashes($d->getName()).'\', filename:\''.$d->getFilename().'\', description:\''.addslashes($d->getDescription()).'\', isURL:\''.$d->isURL().'\', 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_image('docman/edit-file.png', 22 ,22, array('alt' => _('Edit this document'))), 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').', title:\''.addslashes($d->getName()).'\', filename:\''.addslashes($d->getFilename()).'\', description:\''.addslashes($d->getDescription()).'\', isURL:\''.$d->isURL().'\', isText:\''.$d->isText().'\', isHtml:\''.$d->isHtml().'\', useCreateOnline:'.$d->Group->useCreateOnline().', docManURL:\''.util_make_uri('/docman').'\'})', 'title' => _('Edit this document')), 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')));
  				}
  			}
  			if (session_loggedin()) {
@@@ -385,32 -391,6 +385,32 @@@ if ($DocGroupName) 
  	}
  	if (forge_check_perm('docman', $g->getID(), 'approve') && $foundFiles) {
  		include ($gfcommon.'docman/views/editfile.php');
 +		$directViewFileRequestedID = getIntFromRequest('filedetailid', null);
 +		if ($directViewFileRequestedID) {
 +			$localDocumentObject = document_get_object($directViewFileRequestedID);
 +			echo html_ao('script', array('type' => 'text/javascript'));
 +			echo '//<![CDATA['."\n";
 +			echo 'jQuery(document).ready(function() {javascript:controllerListFile.toggleEditFileView({action:\''.util_make_uri($editfileaction).'\',
 +														lockIntervalDelay: 60000,
 +														childGroupId: '.util_ifsetor($childgroup_id, 0).',
 +														id:'.$localDocumentObject->getID().',
 +														groupId:'.$localDocumentObject->Group->getID().',
 +														docgroupId:'.$localDocumentObject->getDocGroupID().',
 +														statusId:'.$localDocumentObject->getStateID().',
 +														statusDict:'.$dm->getStatusNameList('json').',
 +														docgroupDict:'.$dm->getDocGroupList($nested_groups, 'json').',
 +														title:\''.addslashes($localDocumentObject->getName()).'\',
- 														filename:\''.$localDocumentObject->getFilename().'\',
++														filename:\''.addslashes($localDocumentObject->getFilename()).'\',
 +														description:\''.addslashes($localDocumentObject->getDescription()).'\',
 +														isURL:\''.$localDocumentObject->isURL().'\',
 +														isText:\''.$localDocumentObject->isText().'\',
 +														isHtml:\''.$d->isHtml().'\',
 +														useCreateOnline:'.$localDocumentObject->Group->useCreateOnline().',
 +														docManURL:\''.util_make_uri('/docman').'\'})';
 +			echo '})';
 +			echo '//]]>';
 +			echo html_ac(html_ap() - 1);
 +		}
  	}
  }
  
diff --cc src/common/docman/views/listtrashfile.php
index 85ef5f0,68b7d38..957da86
--- a/src/common/docman/views/listtrashfile.php
+++ b/src/common/docman/views/listtrashfile.php
@@@ -180,28 -197,34 +180,28 @@@ if (isset($nested_docs[$dirid]) && is_a
  				break;
  			}
  		}
 -		echo '</td>';
 -
 -		echo '<td>';
  		$newdgf = new DocumentGroupFactory($d->Group);
 -		$editfileaction = '?action=editfile&fromview=listfile&dirid='.$d->getDocGroupID();
 +		$editfileaction = '/docman/?action=editfile&fromview=listfile&dirid='.$d->getDocGroupID();
  		if (isset($GLOBALS['childgroup_id']) && $GLOBALS['childgroup_id']) {
 -			$editfileaction .= '&childgroup_id='.$GLOBALS['childgroup_id'];
 +			$editfileaction .= '&childgroup_id='.$GLOBALS['childgroup_id'];
  		}
 -		$editfileaction .= '&group_id='.$GLOBALS['group_id'];
 -		echo '<a class="tabtitle" href="'.$actionlistfileurl.'&action=delfile&fileid='.$d->getID().'" title="'. _('Delete permanently this document.') .'" >'.html_image('docman/delete-directory.png',22,22,array('alt'=>_('Delete permanently this document.'))). '</a>';
 -		echo '<a class="tabtitle-ne" href="#" onclick="javascript:controllerListTrash.toggleEditFileView({action:\''.$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','2').', docgroupDict:'.$dm->getDocGroupList($newdgf->getNested(), 'json').', title:\''.addslashes($d->getName()).'\', filename:\''.addslashes($d->getFilename()).'\', description:\''.addslashes($d->getDescription()).'\', isURL:\''.$d->isURL().'\', isText:\''.$d->isText().'\', useCreateOnline:'.$d->Group->useCreateOnline().', docManURL:\''.util_make_uri("docman").'\'})" title="'. _('Edit this document') .'" >'.html_image('docman/edit-file.png',22,22,array('alt'=>_('Edit this document'))). '</a>';
 -		echo '</td>';
 -		echo '</tr>'."\n";
 +		$editfileaction .= '&group_id='.$GLOBALS['group_id'];
 +		$nextcell = '';
 +		$nextcell .= util_make_link($redirecturl.'&action=delfile&fileid='.$d->getID(), $HTML->getRemovePic(_('Delete permanently this document.'), 'delfile'));
- 		$nextcell .= util_make_link('#', html_image('docman/edit-file.png',22,22,array('alt'=>_('Edit this document'))), array('onclick' => 'javascript:controllerListTrash.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','2').', docgroupDict:'.$dm->getDocGroupList($newdgf->getNested(), 'json').', title:\''.$d->getName().'\', filename:\''.$d->getFilename().'\', description:\''.$d->getDescription().'\', isURL:\''.$d->isURL().'\', isText:\''.$d->isText().'\', useCreateOnline:'.$d->Group->useCreateOnline().', docManURL:\''.util_make_uri("docman").'\'})', 'title' => _('Edit this document')), true);
++		$nextcell .= util_make_link('#', html_image('docman/edit-file.png',22,22,array('alt'=>_('Edit this document'))), array('onclick' => 'javascript:controllerListTrash.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','2').', docgroupDict:'.$dm->getDocGroupList($newdgf->getNested(), 'json').', title:\''.addslashes($d->getName()).'\', filename:\''.addslashes($d->getFilename()).'\', description:\''.addslashes($d->getDescription()).'\', isURL:\''.$d->isURL().'\', isText:\''.$d->isText().'\', useCreateOnline:'.$d->Group->useCreateOnline().', docManURL:\''.util_make_uri("docman").'\'})', 'title' => _('Edit this document')), true);
 +		$cells[][] = $nextcell;
 +		echo $HTML->multiTableRow(array(), $cells);
  	}
  	echo $HTML->listTableBottom();
 -	echo '<p>';
 -	echo '<span id="massactionactive" style="display: none;" >';
 -    echo '<span class="tabtitle" id="docman-massactionmessage" title="'. _('Actions availables for selected documents, you need to check at least one document to get actions') . '" >';
 -    echo _('Mass actions for selected documents:');
 -    echo '</span>';
 -	echo '<a class="tabtitle" href="#" onclick="window.location.href=\''.$actionlistfileurl.'&action=delfile&fileid=\'+controllerListTrash.buildUrlByCheckbox(\'active\')" title="'. _('Permanently Delete') .'" >'.html_image('docman/delete-directory.png',22,22,array('alt'=>_('Permanently Delete'))). '</a>';
 -	echo '<a class="tabtitle" href="#" onclick="window.location.href=\'/docman/view.php/'.$group_id.'/zip/selected/\'+controllerListTrash.buildUrlByCheckbox(\'active\')" title="'. _('Download as a ZIP') . '" >' . html_image('docman/download-directory-zip.png',22,22,array('alt'=>_('Download as a ZIP'))). '</a>';
 -	echo '</span>';
 -	echo '</p>';
 -	echo '</div>';
 +	echo html_ao('p');
 +	echo html_ao('span', array('id' => 'massactionactive', 'class' => 'hide'));
 +	echo html_e('span', array('id' => 'docman-massactionmessage', 'title' => _('Actions availables for selected documents, you need to check at least one document to get actions')), _('Mass actions for selected documents:'), false);
 +	echo util_make_link('#', $HTML->getRemovePic(_('Permanently Delete'), 'del'), array('onclick' => 'window.location.href=\''.util_make_uri($redirecturl.'&action=delfile&fileid=\'+controllerListTrash.buildUrlByCheckbox("active")')), true);
 +	echo util_make_link('#', html_image('docman/download-directory-zip.png', 22, 22, array('alt' => _('Download as a ZIP'))), array('onclick' => 'window.location.href=\''.util_make_uri('/docman/view.php/'.$group_id.'/zip/selected/\'+controllerListTrash.buildUrlByCheckbox("active")'), 'title' => _('Download as a ZIP')), true);
 +	echo html_ac(html_ap() - 3);
  } else {
  	if ($dirid) {
 -		echo '<p class="information">'._('No documents.').'</p>';
 +		echo $HTML->information(_('No documents.'));
  	}
  }
  
diff --cc src/common/docman/views/pendingfiles.php
index 0020998,fdf4c54..91583cd
--- a/src/common/docman/views/pendingfiles.php
+++ b/src/common/docman/views/pendingfiles.php
@@@ -100,23 -117,29 +100,23 @@@ jQuery(document).ready(function() 
  					break;
  				}
  			}
 -			echo '</td>';
 -
 -			echo '<td>';
 -			$editfileaction = '?action=editfile&fromview=listfile&dirid='.$d->getDocGroupID();
 +			$nextcell = '';
 +			$editfileaction = '/docman/?action=editfile&fromview=listfile&dirid='.$d->getDocGroupID();
  			if (isset($GLOBALS['childgroup_id']) && $GLOBALS['childgroup_id']) {
 -				$editfileaction .= '&childgroup_id='.$GLOBALS['childgroup_id'];
 +				$editfileaction .= '&childgroup_id='.$GLOBALS['childgroup_id'];
  			}
 -			$editfileaction .= '&group_id='.$GLOBALS['group_id'];
 -			echo '<a class="tabtitle-ne" href="#" onclick="javascript:controllerListPending.toggleEditFileView({action:\''.$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').', title:\''.addslashes($d->getName()).'\', filename:\''.addslashes($d->getFilename()).'\', description:\''.addslashes($d->getDescription()).'\', isURL:\''.$d->isURL().'\', isText:\''.$d->isText().'\', useCreateOnline:'.$d->Group->useCreateOnline().', docManURL:\''.util_make_uri("docman").'\'})" title="'. _('Edit this document') .'" >'.html_image('docman/edit-file.png', 22, 22, array('alt'=>_('Edit this document'))). '</a>';
 -			echo '<a class="tabtitle" href="#" onclick="window.location.href=\''.$actionlistfileurl.'&action=validatefile&fileid='.$d->getID().'\'" title="'. _('Activate in this folder') . '" >' . html_image('docman/validate.png', 22, 22, array('alt'=>'Activate in this folder')). '</a>';
 -			echo '</td>';
 -			echo '</tr>';
 +			$editfileaction .= '&group_id='.$GLOBALS['group_id'];
- 			$nextcell .= util_make_link('#', html_image('docman/edit-file.png', 22, 22, array('alt' => _('Edit this document'))), array('onclick' => 'javascript:controllerListPending.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').', title:\''.htmlspecialchars($d->getName()).'\', filename:\''.$d->getFilename().'\', description:\''.htmlspecialchars($d->getDescription()).'\', isURL:\''.$d->isURL().'\', isText:\''.$d->isText().'\', useCreateOnline:'.$d->Group->useCreateOnline().', docManURL:\''.util_make_uri("docman").'\'})', 'title' => _('Edit this document')), true);
++			$nextcell .= util_make_link('#', html_image('docman/edit-file.png', 22, 22, array('alt' => _('Edit this document'))), array('onclick' => 'javascript:controllerListPending.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').', title:\''.addslashes($d->getName()).'\', filename:\''.addslashes($d->getFilename()).'\', description:\''.addslashes($d->getDescription()).'\', isURL:\''.$d->isURL().'\', isText:\''.$d->isText().'\', useCreateOnline:'.$d->Group->useCreateOnline().', docManURL:\''.util_make_uri("docman").'\'})', 'title' => _('Edit this document')), true);
 +			$nextcell .= util_make_link('#', html_image('docman/validate.png', 22, 22, array('alt' => _('Activate in this folder'))), array('onclick' => 'window.location.href=\''.util_make_uri($redirecturl.'&action=validatefile&fileid='.$d->getID()).'\'', 'title' => _('Activate in this folder')), true);
 +			$cells[][] = $nextcell;
 +			echo $HTML->multiTableRow(array(), $cells);
  		}
  		echo $HTML->listTableBottom();
 -		echo '<p>';
 -		echo '<span id="massactionpending" class="docman-massaction-hide" style="display:none;" >';
 -		echo '<span id="docman-massactionpendingmessage" class="tabtitle-nw" title="'. _('Actions availables for checked files, you need to check at least one file to get actions') . '">';
 -		echo _('Mass actions for selected pending files:');
 -		echo '</span>';
 -		echo '<a class="tabtitle" href="#" onclick="window.location.href=\'/docman/view.php/'.$g->getID().'/zip/selected/'.$dirid.'/\'+controllerListPending.buildUrlByCheckbox(\'pending\')" title="'. _('Download as a ZIP') . '" >' . html_image('docman/download-directory-zip.png', 22, 22, array('alt'=>_('Download as a ZIP'))). '</a>';
 -		echo '<a class="tabtitle" href="#" onclick="window.location.href=\''.$actionlistfileurl.'&action=validatefile&fileid=\'+controllerListPending.buildUrlByCheckbox(\'pending\')" title="'. _('Activate in this folder') . '" >' . html_image('docman/validate.png', 22, 22, array('alt'=>'Activate in this folder')). '</a>';
 -		echo '</span>';
 -		echo '</p>';
 -		echo '</div>';
 +		echo html_ao('p');
 +		echo html_ao('span', array('id' => 'massactionpending', 'class' => 'hide'));
 +		echo html_e('span', array('id' => 'docman-massactionpendingmessage', 'title' => _('Actions availables for selected documents, you need to check at least one document to get actions')), _('Mass actions for selected pending documents:'), false);
 +		echo util_make_link('#', html_image('docman/download-directory-zip.png', 22, 22, array('alt'=>_('Download as a ZIP'))), array('onclick' => 'window.location.href=\''.util_make_uri('/docman/view.php/'.$g->getID().'/zip/selected/'.$dirid.'/\'+controllerListPending.buildUrlByCheckbox("pending")'), 'title' => _('Download as a ZIP')), true);
 +		echo util_make_link('#', html_image('docman/validate.png', 22, 22, array('alt' => _('Activate in this folder'))), array('onclick' => 'window.location.href=\''.util_make_uri($redirecturl.'&action=validatefile&fileid=\'+controllerListPending.buildUrlByCheckbox("pending")'), 'title' => _('Activate in this folder')), true);
 +		echo html_ac(html_ap() - 3);
  	}
  }

-----------------------------------------------------------------------

Summary of changes:
 src/CHANGES                               |    1 +
 src/common/docman/views/listfile.php      |    6 +++---
 src/common/docman/views/listtrashfile.php |    2 +-
 src/common/docman/views/pendingfiles.php  |    2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list