[Fusionforge-commits] FusionForge branch master updated. c0ddf5f2e88ed7cdaf8182dd22df09e6f0d83905

Franck Villaume nerville at fusionforge.org
Sat Nov 22 14:13:01 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  c0ddf5f2e88ed7cdaf8182dd22df09e6f0d83905 (commit)
      from  6c0ddb6c8e7039c6d82432fbfd326f3ca7db66b9 (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 c0ddf5f2e88ed7cdaf8182dd22df09e6f0d83905
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Sat Nov 22 14:12:30 2014 +0100

    partial [#693]: sync docman icon with standard icon

diff --git a/src/common/docman/views/listfile.php b/src/common/docman/views/listfile.php
index 0cd2c07..b4b64a2 100644
--- a/src/common/docman/views/listfile.php
+++ b/src/common/docman/views/listfile.php
@@ -184,15 +184,15 @@ if ($DocGroupName) {
 	if (!$ndg->getLocked()) {
 		if (forge_check_perm('docman', $ndg->Group->getID(), 'approve')) {
 			echo html_e('input', array('type' => 'hidden', 'id' => 'doc_group_id', 'value' => $ndg->getID()));
-			echo util_make_link('#', $HTML->getConfigurePic('', _('Edit')), array('id' => 'docman-editdirectory', 'title' => _('Edit this folder'), 'onclick' => 'javascript:controllerListFile.toggleEditDirectoryView()'), true);
-			echo util_make_link($redirecturl.'&action=trashdir', $HTML->getDeletePic('', 'trashdir'), array('id' => 'docman-trashdirectory', 'title' => _('Move this folder and his content to trash')));
+			echo util_make_link('#', $HTML->getConfigurePic(_('Edit this folder'), 'edit'), array('id' => 'docman-editdirectory', 'onclick' => 'javascript:controllerListFile.toggleEditDirectoryView()'), true);
+			echo util_make_link($redirecturl.'&action=trashdir', $HTML->getDeletePic(_('Move this folder and his content to trash'), 'trashdir'), array('id' => 'docman-trashdirectory'));
 			if (!isset($nested_docs[$dirid]) && !isset($nested_groups[$dirid]) && !isset($nested_pending_docs[$dirid])) {
-				echo util_make_link($redirecturl.'&action=deldir', html_image('docman/delete-directory.png', 22, 22, array('alt' => 'deldir')), array('id' => 'docman-deletedirectory', 'title' => _('Permanently delete this folder')));
+				echo util_make_link($redirecturl.'&action=deldir', $HTML->getRemovePic(_('Permanently delete this folder'), 'deldir'), array('id' => 'docman-deletedirectory'));
 			}
 		}
 
 		if (forge_check_perm('docman', $group_id, 'submit')) {
-			echo util_make_link('#', html_image('docman/insert-directory.png', 22, 22, array('alt' => 'additem')), array('id' => 'docman-additem', 'title' => _('Add a new item in this folder')), true);
+			echo util_make_link('#', $HTML->getAddDirPic(_('Add a new item in this folder'), 'additem'), array('id' => 'docman-additem'));
 		}
 	}
 
@@ -206,11 +206,11 @@ if ($DocGroupName) {
 		if ($ndg->isMonitoredBy($u->getID())) {
 			$option = 'stop';
 			$titleMonitor = _('Stop monitoring this folder');
-			$image = $HTML->getStopMonitoringPic('', $titleMonitor);
+			$image = $HTML->getStopMonitoringPic($titleMonitor, '');
 		} else {
 			$option = 'start';
 			$titleMonitor = _('Start monitoring this folder');
-			$image = $HTML->getStartMonitoringPic('', $titleMonitor);
+			$image = $HTML->getStartMonitoringPic($titleMonitor, '');
 		}
 		echo util_make_link($redirecturl.'&action=monitordirectory&option='.$option.'&directoryid='.$ndg->getID(), $image, array('title' => $titleMonitor));
 	}
@@ -314,7 +314,7 @@ if (isset($nested_docs[$dirid]) && is_array($nested_docs[$dirid])) {
 			}
 			$editfileaction .= '&group_id='.$GLOBALS['group_id'];
 			if (!$d->getLocked() && !$d->getReserved()) {
-				$nextcell .= util_make_link($redirecturl.'&action=trashfile&fileid='.$d->getID(), $HTML->getDeletePic(_('Move this document to trash'), _('Move this document to trash')), array('title' => _('Move this document to trash')));
+				$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);
 				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')));
@@ -325,7 +325,7 @@ if (isset($nested_docs[$dirid]) && is_array($nested_docs[$dirid])) {
 						$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 {
-					$nextcell .= util_make_link($redirecturl.'&action=trashfile&fileid='.$d->getID(), $HTML->getDeletePic('', _('Move this document to trash')), array('title' => _('Move this document to trash')));
+					$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($redirecturl.'&action=releasefile&fileid='.$d->getID(), html_image('docman/release-document.png', 22, 22, array('alt' => _('Release reservation'))), array('title' => _('Release reservation')));
 				}
@@ -334,11 +334,11 @@ if (isset($nested_docs[$dirid]) && is_array($nested_docs[$dirid])) {
 				if ($d->isMonitoredBy($u->getID())) {
 					$option = 'stop';
 					$titleMonitor = _('Stop monitoring this document');
-					$image = $HTML->getStopMonitoringPic($titleMonitor, $titleMonitor);
+					$image = $HTML->getStopMonitoringPic($titleMonitor, '');
 				} else {
 					$option = 'start';
 					$titleMonitor = _('Start monitoring this document');
-					$image = $HTML->getStartMonitoringPic($titleMonitor, $titleMonitor);
+					$image = $HTML->getStartMonitoringPic($titleMonitor, '');
 				}
 				$nextcell .= util_make_link($redirecturl.'&action=monitorfile&option='.$option.'&fileid='.$d->getID(), $image, array('title' => $titleMonitor));
 			}
@@ -351,12 +351,12 @@ if (isset($nested_docs[$dirid]) && is_array($nested_docs[$dirid])) {
 	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);
 	if (forge_check_perm('docman', $ndg->Group->getID(), 'approve')) {
-		echo util_make_link('#', $HTML->getDeletePic('', _('Move to trash')), array('onclick' => 'window.location.href=\''.util_make_uri($redirecturl.'&action=trashfile&fileid=\'+controllerListFile.buildUrlByCheckbox("active")'), 'title' => _('Move to trash')), true);
+		echo util_make_link('#', $HTML->getDeletePic(_('Move to trash'), ''), array('onclick' => 'window.location.href=\''.util_make_uri($redirecturl.'&action=trashfile&fileid=\'+controllerListFile.buildUrlByCheckbox("active")')), true);
 		if (session_loggedin()) {
 			echo util_make_link('#', html_image('docman/reserve-document.png', 22, 22, array('alt' => _('Reserve'))), array('onclick' => 'window.location.href=\''.util_make_uri($redirecturl.'&action=reservefile&fileid=\'+controllerListFile.buildUrlByCheckbox("active")'), 'title' => _('Reserve for later edition')), true);
 			echo util_make_link('#', html_image('docman/release-document.png', 22, 22, array('alt' => _('Release reservation'))) , array('onclick' => 'window.location.href=\''.util_make_uri($redirecturl.'&action=releasefile&fileid=\'+controllerListFile.buildUrlByCheckbox("active")'), 'title' => _('Release reservation')), true);
-			echo util_make_link('#', $HTML->getStartMonitoringPic('', _('Start monitoring')), array('onclick' => 'window.location.href=\''.util_make_uri($redirecturl.'&action=monitorfile&option=add&fileid=\'+controllerListFile.buildUrlByCheckbox("active")'), 'title' => _('Monitor')), true);
-			echo util_make_link('#', $HTML->getStopMonitoringPic('', _('Stop monitoring')), array('onclick' => 'window.location.href=\''.util_make_uri($redirecturl.'&action=monitorfile&option=remove&fileid=\'+controllerListFile.buildUrlByCheckbox("active")'), 'title' => _('Stop Monitoring')), true);
+			echo util_make_link('#', $HTML->getStartMonitoringPic(_('Start monitoring'), ''), array('onclick' => 'window.location.href=\''.util_make_uri($redirecturl.'&action=monitorfile&option=add&fileid=\'+controllerListFile.buildUrlByCheckbox("active")')), true);
+			echo util_make_link('#', $HTML->getStopMonitoringPic(_('Stop monitoring'), ''), array('onclick' => 'window.location.href=\''.util_make_uri($redirecturl.'&action=monitorfile&option=remove&fileid=\'+controllerListFile.buildUrlByCheckbox("active")')), true);
 			echo util_make_link('#', html_image('docman/move-document.png', 22, 22, array('alt' => _('Move files to another folder'))), array('onclick' => 'javascript:controllerListFile.toggleMoveFileView({})', 'title' => _('Move files to another folder')), true);
 		}
 	}
diff --git a/src/common/docman/views/listtrashfile.php b/src/common/docman/views/listtrashfile.php
index 39869ab..e135337 100644
--- a/src/common/docman/views/listtrashfile.php
+++ b/src/common/docman/views/listtrashfile.php
@@ -128,8 +128,8 @@ echo html_ac(html_ap() - 1);
 if ($DocGroupName) {
 	$content = _('Document Folder')._(': ').html_e('i', array(), $DocGroupName, false).' ';
 	if ($DocGroupName != '.trash') {
-		$content .= util_make_link('#', $HTML->getConfigurePic('', _('Edit')), array('id' => 'docman-editdirectory', 'title' => _('Edit this folder'), 'onclick' => 'javascript:controllerListTrash.toggleEditDirectoryView()' ), true);
-		$content .= util_make_link($redirecturl.'&action=deldir', html_image('docman/delete-directory.png', 22, 22, array('alt' => _('Delete folder'))), array('id' => 'docman-deletedirectory', 'title' => _('Delete permanently this folder and his content.')));
+		$content .= util_make_link('#', $HTML->getConfigurePic(_('Edit this folder'), 'edit'), array('id' => 'docman-editdirectory', 'onclick' => 'javascript:controllerListTrash.toggleEditDirectoryView()'), true);
+		$content .= util_make_link($redirecturl.'&action=deldir', $HTML->getRemovePic(_('Delete permanently this folder and his content.'), 'deldir'), array('id' => 'docman-deletedirectory'));
 	}
 	echo html_e('h3', array('class' => 'docman_h3'), $content, false);
 	echo html_ao('div', array('class' => 'docman_div_include hide', 'id' => 'editdocgroup'));
@@ -187,7 +187,7 @@ if (isset($nested_docs[$dirid]) && is_array($nested_docs[$dirid])) {
 		}
 		$editfileaction .= '&group_id='.$GLOBALS['group_id'];
 		$nextcell = '';
-		$nextcell .= util_make_link($redirecturl.'&action=delfile&fileid='.$d->getID(), html_image('docman/delete-directory.png', 22, 22, array('alt' => _('Delete permanently this document.'))), array('title' => _('Delete permanently this document.')));
+		$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);
 		$cells[][] = $nextcell;
 		echo $HTML->multiTableRow(array(), $cells);
@@ -196,7 +196,7 @@ if (isset($nested_docs[$dirid]) && is_array($nested_docs[$dirid])) {
 	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_image('docman/delete-directory.png', 22, 22, array('alt' => _('Permanently Delete'))), array('onclick' => 'window.location.href=\''.util_make_uri($redirecturl.'&action=delfile&fileid=\'+controllerListTrash.buildUrlByCheckbox("active")'), 'title' => _('Permanently Delete')), true);
+	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 {
diff --git a/src/www/include/Layout.class.php b/src/www/include/Layout.class.php
index 46150a8..ec94b9a 100644
--- a/src/www/include/Layout.class.php
+++ b/src/www/include/Layout.class.php
@@ -1281,6 +1281,10 @@ if (isset($params['group']) && $params['group']) {
 		return $this->getPicto('ic/delete.png', $title, $alt, 20, 20, $otherAttr);
 	}
 
+	function getRemovePic($title = '', $alt = '', $otherAttr = array()) {
+		return $this->getPicto('ic/remove.png', $title, $alt, 20, 20, $otherAttr);
+	}
+
 	function getConfigurePic($title = '', $alt = '', $otherAttr = array()) {
 		return $this->getPicto('ic/configure.png', $title, $alt, 20, 20, $otherAttr);
 	}
@@ -1289,6 +1293,10 @@ if (isset($params['group']) && $params['group']) {
 		return $this->getPicto('ic/file_type_archive.png', $title, $alt, 20, 20, $otherAttr);
 	}
 
+	function getAddDirPic($title = '', $alt = '', $otherAttr = array()) {
+		return $this->getPicto('ic/directory-add.png', $title, $alt, 20, 20, $otherAttr);
+	}
+
 	function getPicto($url, $title, $alt, $width = '20', $height = '20', $otherAttr = array()) {
 		$otherAttr['title'] = $title;
 		if (!$alt) {
diff --git a/src/www/themes/funky-wOw/images/docman/insert-directory.png b/src/www/themes/funky-wOw/images/ic/directory-add.png
similarity index 100%
rename from src/www/themes/funky-wOw/images/docman/insert-directory.png
rename to src/www/themes/funky-wOw/images/ic/directory-add.png
diff --git a/src/www/themes/funky-wOw/images/docman/delete-directory.png b/src/www/themes/funky-wOw/images/ic/remove.png
similarity index 100%
rename from src/www/themes/funky-wOw/images/docman/delete-directory.png
rename to src/www/themes/funky-wOw/images/ic/remove.png
diff --git a/src/www/themes/funky/images/docman/insert-directory.png b/src/www/themes/funky/images/ic/directory-add.png
similarity index 100%
rename from src/www/themes/funky/images/docman/insert-directory.png
rename to src/www/themes/funky/images/ic/directory-add.png
diff --git a/src/www/themes/funky/images/docman/delete-directory.png b/src/www/themes/funky/images/ic/remove.png
similarity index 100%
rename from src/www/themes/funky/images/docman/delete-directory.png
rename to src/www/themes/funky/images/ic/remove.png

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

Summary of changes:
 src/common/docman/views/listfile.php               |   26 ++++++++++----------
 src/common/docman/views/listtrashfile.php          |    8 +++---
 src/www/include/Layout.class.php                   |    8 ++++++
 .../insert-directory.png => ic/directory-add.png}  |  Bin 919 -> 919 bytes
 .../{docman/delete-directory.png => ic/remove.png} |  Bin 1251 -> 1251 bytes
 .../insert-directory.png => ic/directory-add.png}  |  Bin 919 -> 919 bytes
 .../{docman/delete-directory.png => ic/remove.png} |  Bin 1251 -> 1251 bytes
 7 files changed, 25 insertions(+), 17 deletions(-)
 rename src/www/themes/funky-wOw/images/{docman/insert-directory.png => ic/directory-add.png} (100%)
 rename src/www/themes/funky-wOw/images/{docman/delete-directory.png => ic/remove.png} (100%)
 rename src/www/themes/funky/images/{docman/insert-directory.png => ic/directory-add.png} (100%)
 rename src/www/themes/funky/images/{docman/delete-directory.png => ic/remove.png} (100%)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list